SimpleMachines / SMF2.1

Sources/Drafts.php

Braces +75 added lines, -53 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 loadLanguage('Drafts');
 
@@ -33,8 +34,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings, $board;
 
 	// can you be, should you be ... here?
-	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft']))
-		return false;
+	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft'])) {
+			return false;
+	}
 
 	// read in what they sent us, if anything
 	$id_draft = (int) $_POST['id_draft'];
@@ -46,14 +48,16 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// since we were called from the autosave function, send something back
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
 
-	if (!isset($_POST['message']))
-		$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	if (!isset($_POST['message'])) {
+			$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	}
 
 	// prepare any data from the form
 	$topic_id = empty($_REQUEST['topic']) ? 0 : (int) $_REQUEST['topic'];
@@ -66,8 +70,9 @@ 
 
 	// message and subject still need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing draft, like hitting the save draft button or autosave enabled?
 	if (!empty($id_draft) && !empty($draft_info))
@@ -148,9 +153,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_draft'] = $id_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 
 		// cleanup
 		unset($_POST['save_draft']);
@@ -180,8 +185,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings;
 
 	// PM survey says ... can you stay or must you go
-	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft']))
-		return false;
+	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft'])) {
+			return false;
+	}
 
 	// read in what you sent us
 	$id_pm_draft = (int) $_POST['id_pm_draft'];
@@ -193,8 +199,9 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// Send something back to the javascript caller
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
@@ -204,9 +211,9 @@ 
 	{
 		$recipientList['to'] = isset($_POST['recipient_to']) ? explode(',', $_POST['recipient_to']) : array();
 		$recipientList['bcc'] = isset($_POST['recipient_bcc']) ? explode(',', $_POST['recipient_bcc']) : array();
+	} elseif (!empty($draft_info['to_list']) && empty($recipientList)) {
+			$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 	}
-	elseif (!empty($draft_info['to_list']) && empty($recipientList))
-		$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 
 	// prepare the data we got from the form
 	$reply_id = empty($_POST['replied_to']) ? 0 : (int) $_POST['replied_to'];
@@ -215,8 +222,9 @@ 
 
 	// message and subject always need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing PM draft?
 	if (!empty($id_pm_draft) && !empty($draft_info))
@@ -280,9 +288,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_pm_draft'] = $id_pm_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 	}
 
 	// if we were called from the autosave function, send something back
@@ -315,8 +323,9 @@ 
 	$type = (int) $type;
 
 	// nothing to read, nothing to do
-	if (empty($id_draft))
-		return false;
+	if (empty($id_draft)) {
+			return false;
+	}
 
 	// load in this draft from the DB
 	$request = $smcFunc['db_query']('', '
@@ -337,8 +346,9 @@ 
 	);
 
 	// no results?
-	if (!$smcFunc['db_num_rows']($request))
-		return false;
+	if (!$smcFunc['db_num_rows']($request)) {
+			return false;
+	}
 
 	// load up the data
 	$draft_info = $smcFunc['db_fetch_assoc']($request);
@@ -358,8 +368,7 @@ 
 			$context['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
 			$context['board'] = !empty($draft_info['id_board']) ? $draft_info['id_board'] : '';
 			$context['id_draft'] = !empty($draft_info['id_draft']) ? $draft_info['id_draft'] : 0;
-		}
-		elseif ($type === 1)
+		} elseif ($type === 1)
 		{
 			// one of those pm drafts? then set it up like we have an error
 			$_REQUEST['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
@@ -395,12 +404,14 @@ 
 	global $user_info, $smcFunc;
 
 	// Only a single draft.
-	if (is_numeric($id_draft))
-		$id_draft = array($id_draft);
+	if (is_numeric($id_draft)) {
+			$id_draft = array($id_draft);
+	}
 
 	// can't delete nothing
-	if (empty($id_draft) || ($check && empty($user_info['id'])))
-		return false;
+	if (empty($id_draft) || ($check && empty($user_info['id']))) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}user_drafts
@@ -429,14 +440,16 @@ 
 	global $smcFunc, $scripturl, $context, $txt, $modSettings;
 
 	// Permissions
-	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id))
-		return false;
+	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id)) {
+			return false;
+	}
 
 	$context['drafts'] = array();
 
 	// has a specific draft has been selected?  Load it up if there is not a message already in the editor
-	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-		ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message'])) {
+			ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	}
 
 	// load the drafts this user has available
 	$request = $smcFunc['db_query']('', '
@@ -459,8 +472,9 @@ 
 	// add them to the draft array for display
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		// Post drafts
 		if ($draft_type === 0)
@@ -545,8 +559,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts on the boards they can (still) see ...
 	// @todo .. should we just let them see their drafts even if they have lost board access ?
@@ -611,12 +626,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -648,8 +665,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If the drafts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// Menu tab
 	$context[$context['profile_menu_name']]['tab_data'] = array(
@@ -707,8 +725,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts
 	$request = $smcFunc['db_query']('', '
@@ -767,12 +786,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -827,8 +848,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// if the drafts were retrieved in reverse order, then put them in the right order again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// off to the template we go
 	$context['page_title'] = $txt['drafts'];

Doc Comments +3 added lines, -3 removed lines

@@ -173,7 +173,7 @@ 
  *
  * @param string $post_errors A string of info about errors encountered trying to save this draft
  * @param array $recipientList An array of data about who this PM is being sent to
- * @return boolean false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise
+ * @return boolean|null false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise
  */
 function SavePMDraft(&$post_errors, $recipientList)
 {
@@ -388,7 +388,7 @@ 
  *
  * @param int $id_draft The ID of the draft to delete
  * @param boolean $check Whether or not to check that the draft belongs to the current user
- * @return boolean False if it couldn't be deleted (doesn't return anything otherwise)
+ * @return false|null False if it couldn't be deleted (doesn't return anything otherwise)
  */
 function DeleteDraft($id_draft, $check = true)
 {
@@ -422,7 +422,7 @@ 
  * @param int $member_id ID of the member to show drafts for
  * @param boolean|integer $topic If $type is 1, this can be set to only load drafts for posts in the specific topic
  * @param int $draft_type The type of drafts to show - 0 for post drafts, 1 for PM drafts
- * @return boolean False if the drafts couldn't be loaded, nothing otherwise
+ * @return false|null False if the drafts couldn't be loaded, nothing otherwise
  */
 function ShowDrafts($member_id, $topic = false, $draft_type = 0)
 {

subscriptions.php

Braces +38 added lines, -28 removed lines

@@ -16,8 +16,9 @@ 
 
 // Start things rolling by getting SMF alive...
 $ssi_guest_access = true;
-if (!file_exists(dirname(__FILE__) . '/SSI.php'))
+if (!file_exists(dirname(__FILE__) . '/SSI.php')) {
 	die('Cannot find SSI.php');
+}
 
 require_once(dirname(__FILE__) . '/SSI.php');
 require_once($sourcedir . '/ManagePaid.php');
@@ -35,20 +36,22 @@ 
 }
 
 // I assume we're even active?
-if (empty($modSettings['paid_enabled']))
+if (empty($modSettings['paid_enabled'])) {
 	exit;
+}
 
 // If we have some custom people who find out about problems load them here.
 $notify_users = array();
 if (!empty($modSettings['paid_email_to']))
 {
-	foreach (explode(',', $modSettings['paid_email_to']) as $email)
-		$notify_users[] = array(
+	foreach (explode(',', $modSettings['paid_email_to']) as $email) {
+			$notify_users[] = array(
 			'email' => $email,
 			'name' => $txt['who_member'],
 			'id' => 0,
 		);
-}
+	}
+	}
 
 // We need to see whether we can find the correct payment gateway,
 // we'll going to go through all our gateway scripts and find out
@@ -65,8 +68,9 @@ 
 	}
 }
 
-if (empty($txnType))
+if (empty($txnType)) {
 	generateSubscriptionError($txt['paid_unknown_transaction_type']);
+}
 
 // Get the subscription and member ID amoungst others...
 @list($subscription_id, $member_id) = $gatewayClass->precheck();
@@ -76,8 +80,9 @@ 
 $member_id = (int) $member_id;
 
 // This would be bad...
-if (empty($member_id))
+if (empty($member_id)) {
 	generateSubscriptionError($txt['paid_empty_member']);
+}
 
 // Verify the member.
 $request = $smcFunc['db_query']('', '
@@ -89,8 +94,9 @@ 
 	)
 );
 // Didn't find them?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_could_not_find_member'], $member_id));
+}
 $member_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -105,8 +111,9 @@ 
 );
 
 // Didn't find it?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription'], $member_id, $subscription_id));
+}
 
 $subscription_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
@@ -123,8 +130,9 @@ 
 		'current_member' => $member_id,
 	)
 );
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription_log'], $member_id, $subscription_id));
+}
 $subscription_info += $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -139,8 +147,7 @@ 
 		removeSubscription($subscription_id, $member_id);
 		$subscription_act = time();
 		$status = 0;
-	}
-	else
+	} else
 	{
 		loadSubscriptions();
 		$subscription_act = $subscription_info['end_time'] - $context['subscriptions'][$subscription_id]['num_length'];
@@ -188,16 +195,18 @@ 
 	if (!$gatewayClass->isSubscription())
 	{
 		$real_details = $smcFunc['json_decode']($subscription_info['pending_details'], true);
-		if (empty($real_details))
-			generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		if (empty($real_details)) {
+					generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		}
 
 		// Now we just try to find anything pending.
 		// We don't really care which it is as security happens later.
 		foreach ($real_details as $id => $detail)
 		{
 			unset($real_details[$id]);
-			if ($detail[3] == 'payback' && $subscription_info['payments_pending'])
-				$subscription_info['payments_pending']--;
+			if ($detail[3] == 'payback' && $subscription_info['payments_pending']) {
+							$subscription_info['payments_pending']--;
+			}
 			break;
 		}
 
@@ -223,10 +232,11 @@ 
 		// This is a little harder, can we find the right duration?
 		foreach ($cost as $duration => $value)
 		{
-			if ($duration == 'fixed')
-				continue;
-			elseif ((float) $value == (float) $total_cost)
-				$found_duration = strtoupper(substr($duration, 0, 1));
+			if ($duration == 'fixed') {
+							continue;
+			} elseif ((float) $value == (float) $total_cost) {
+							$found_duration = strtoupper(substr($duration, 0, 1));
+			}
 		}
 
 		// If we have the duration then we're done.
@@ -235,8 +245,7 @@ 
 			$notify = true;
 			addSubscription($subscription_id, $member_id, $found_duration);
 		}
-	}
-	else
+	} else
 	{
 		$actual_cost = $cost['fixed'];
 
@@ -268,10 +277,10 @@ 
 // Maybe they're cancelling. Some subscriptions may require actively doing something, but PayPal doesn't, for example.
 elseif ($gatewayClass->isCancellation())
 {
-	if (method_exists($gatewayClass, 'performCancel'))
-		$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
-}
-else
+	if (method_exists($gatewayClass, 'performCancel')) {
+			$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
+	}
+	} else
 {
 	// Some other "valid" transaction such as:
 	//
@@ -308,8 +317,9 @@ 
 	// Maybe we can try to give them the post data?
 	if (!empty($_POST))
 	{
-		foreach ($_POST as $key => $val)
-			$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		foreach ($_POST as $key => $val) {
+					$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		}
 	}
 
 	// Then just log and die.

Sources/Load.php

Doc Comments +5 added lines, -5 removed lines

@@ -2259,9 +2259,9 @@ 
  *
  * @uses the template_include() function to include the file.
  * @param string $template_name The name of the template to load
- * @param array|string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load
+ * @param string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load
  * @param bool $fatal If true, dies with an error message if the template cannot be found
- * @return boolean Whether or not the template was loaded
+ * @return boolean|null Whether or not the template was loaded
  */
 function loadTemplate($template_name, $style_sheets = array(), $fatal = true)
 {
@@ -2444,7 +2444,7 @@ 
  * - all code added with this function is added to the same <style> tag so do make sure your css is valid!
  *
  * @param string $css Some css code
- * @return void|bool Adds the CSS to the $context['css_header'] array or returns if no CSS is specified
+ * @return false|null Adds the CSS to the $context['css_header'] array or returns if no CSS is specified
  */
 function addInlineCss($css)
 {
@@ -2558,7 +2558,7 @@ 
  *
  * @param string $javascript Some JS code
  * @param bool $defer Whether the script should load in <head> or before the closing <html> tag
- * @return void|bool Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified
+ * @return false|null Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified
  */
 function addInlineJavaScript($javascript, $defer = false)
 {
@@ -2791,7 +2791,7 @@ 
  * It will try to choose only utf8 or non-utf8 languages.
  *
  * @param bool $use_cache Whether or not to use the cache
- * @return array An array of information about available languages
+ * @return string An array of information about available languages
  */
 function getLanguages($use_cache = true)
 {

Spacing +3 added lines, -3 removed lines

@@ -1742,7 +1742,7 @@ 
 	}
 		
 	// We already load the basic stuff?
-	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme )
+	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme)
 	{
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
 
@@ -1767,7 +1767,7 @@ 
 				SELECT variable, value, id_member, id_theme
 				FROM {db_prefix}themes
 				WHERE id_member' . (empty($themeData[0]) ? ' IN (-1, 0, {int:id_member})' : ' = {int:id_member}') . '
-					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') .'
+					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') . '
 				ORDER BY id_theme asc',
 				array(
 					'id_theme' => $id_theme,
@@ -1997,7 +1997,7 @@ 
 	if (!isset($context['javascript_vars']))
 		$context['javascript_vars'] = array();
 
-	$context['login_url'] =  $scripturl . '?action=login2';
+	$context['login_url'] = $scripturl . '?action=login2';
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
 	$context['session_var'] = $_SESSION['session_var'];
 	$context['session_id'] = $_SESSION['session_value'];

Braces +795 added lines, -599 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Load the $modSettings array.
@@ -25,13 +26,14 @@ 
 	global $cache_enable, $sourcedir, $context;
 
 	// Most database systems have not set UTF-8 as their default input charset.
-	if (!empty($db_character_set))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set)) {
+			$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_character_set' => $db_character_set,
 			)
 		);
+	}
 
 	// We need some caching support, maybe.
 	loadCacheAccelerator();
@@ -46,28 +48,36 @@ 
 			)
 		);
 		$modSettings = array();
-		if (!$request)
-			display_db_error();
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$modSettings[$row[0]] = $row[1];
+		if (!$request) {
+					display_db_error();
+		}
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$modSettings[$row[0]] = $row[1];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Do a few things to protect against missing settings or settings with invalid values...
-		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999)
-			$modSettings['defaultMaxTopics'] = 20;
-		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999)
-			$modSettings['defaultMaxMessages'] = 15;
-		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999)
-			$modSettings['defaultMaxMembers'] = 30;
-		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999)
-			$modSettings['defaultMaxListItems'] = 15;
+		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999) {
+					$modSettings['defaultMaxTopics'] = 20;
+		}
+		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999) {
+					$modSettings['defaultMaxMessages'] = 15;
+		}
+		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999) {
+					$modSettings['defaultMaxMembers'] = 30;
+		}
+		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999) {
+					$modSettings['defaultMaxListItems'] = 15;
+		}
 
 		// We excpiclity do not use $smcFunc['json_decode'] here yet, as $smcFunc is not fully loaded.
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		}
 
-		if (!empty($cache_enable))
-			cache_put_data('modSettings', $modSettings, 90);
+		if (!empty($cache_enable)) {
+					cache_put_data('modSettings', $modSettings, 90);
+		}
 	}
 
 	$modSettings['cache_enable'] = $cache_enable;
@@ -87,8 +97,9 @@ 
 		};
 	$fix_utf8mb4 = function($string) use ($utf8, $smcFunc)
 	{
-		if (!$utf8 || $smcFunc['db_mb4'])
-			return $string;
+		if (!$utf8 || $smcFunc['db_mb4']) {
+					return $string;
+		}
 
 		$i = 0;
 		$len = strlen($string);
@@ -100,18 +111,15 @@ 
 			{
 				$new_string .= $string[$i];
 				$i++;
-			}
-			elseif ($ord < 224)
+			} elseif ($ord < 224)
 			{
 				$new_string .= $string[$i] . $string[$i + 1];
 				$i += 2;
-			}
-			elseif ($ord < 240)
+			} elseif ($ord < 240)
 			{
 				$new_string .= $string[$i] . $string[$i + 1] . $string[$i + 2];
 				$i += 3;
-			}
-			elseif ($ord < 248)
+			} elseif ($ord < 248)
 			{
 				// Magic happens.
 				$val = (ord($string[$i]) & 0x07) << 18;
@@ -155,8 +163,7 @@ 
 			{
 				$result = array_search($needle, array_slice($haystack_arr, $offset));
 				return is_int($result) ? $result + $offset : false;
-			}
-			else
+			} else
 			{
 				$needle_arr = preg_split('~(' . $ent_list . '|.)~' . ($utf8 ? 'u' : '') . '', $ent_check($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 				$needle_size = count($needle_arr);
@@ -165,8 +172,9 @@ 
 				while ((int) $result === $result)
 				{
 					$offset += $result;
-					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr)
-						return $offset;
+					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr) {
+											return $offset;
+					}
 					$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
 				}
 				return false;
@@ -204,8 +212,9 @@ 
 			$string = $ent_check($string);
 			preg_match('~^(' . $ent_list . '|.){' . $smcFunc['strlen'](substr($string, 0, $length)) . '}~' . ($utf8 ? 'u' : ''), $string, $matches);
 			$string = $matches[0];
-			while (strlen($string) > $length)
-				$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			while (strlen($string) > $length) {
+							$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			}
 			return $string;
 		},
 		'ucfirst' => $utf8 ? function($string) use (&$smcFunc)
@@ -215,8 +224,9 @@ 
 		'ucwords' => $utf8 ? function($string) use (&$smcFunc)
 		{
 			$words = preg_split('~([\s\r\n\t]+)~', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
-			for ($i = 0, $n = count($words); $i < $n; $i += 2)
-				$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			for ($i = 0, $n = count($words); $i < $n; $i += 2) {
+							$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			}
 			return implode('', $words);
 		} : 'ucwords',
 		'json_decode' => 'smf_json_decode',
@@ -224,16 +234,17 @@ 
 	);
 
 	// Setting the timezone is a requirement for some functions.
-	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list()))
-		date_default_timezone_set($modSettings['default_timezone']);
-	else
+	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list())) {
+			date_default_timezone_set($modSettings['default_timezone']);
+	} else
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$modSettings['default_timezone'] = $ini_tz;
-		else
-			$modSettings['default_timezone'] = '';
+		if (!empty($ini_tz)) {
+					$modSettings['default_timezone'] = $ini_tz;
+		} else {
+					$modSettings['default_timezone'] = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($modSettings['default_timezone'], timezone_identifiers_list()))
@@ -251,22 +262,26 @@ 
 		if (($modSettings['load_average'] = cache_get_data('loadavg', 90)) == null)
 		{
 			$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
-			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0)
-				$modSettings['load_average'] = (float) $matches[1];
-			elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0)
-				$modSettings['load_average'] = (float) $matches[1];
-			else
-				unset($modSettings['load_average']);
+			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0) {
+							$modSettings['load_average'] = (float) $matches[1];
+			} elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0) {
+							$modSettings['load_average'] = (float) $matches[1];
+			} else {
+							unset($modSettings['load_average']);
+			}
 
-			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
-				cache_put_data('loadavg', $modSettings['load_average'], 90);
+			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+							cache_put_data('loadavg', $modSettings['load_average'], 90);
+			}
 		}
 
-		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
-			call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+					call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		}
 
-		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum'])
-			display_loadavg_error();
+		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum']) {
+					display_loadavg_error();
+		}
 	}
 
 	// Is post moderation alive and well? Everywhere else assumes this has been defined, so let's make sure it is.
@@ -287,8 +302,9 @@ 
 	if (defined('SMF_INTEGRATION_SETTINGS'))
 	{
 		$integration_settings = $smcFunc['json_decode'](SMF_INTEGRATION_SETTINGS, true);
-		foreach ($integration_settings as $hook => $function)
-			add_integration_function($hook, $function, '', false);
+		foreach ($integration_settings as $hook => $function) {
+					add_integration_function($hook, $function, '', false);
+		}
 	}
 
 	// Any files to pre include?
@@ -298,8 +314,9 @@ 
 		foreach ($pre_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -392,9 +409,9 @@ 
 				break;
 			}
 		}
+	} else {
+			$id_member = 0;
 	}
-	else
-		$id_member = 0;
 
 	if (empty($id_member) && isset($_COOKIE[$cookiename]))
 	{
@@ -402,8 +419,9 @@ 
 		$cookie_data = $smcFunc['json_decode']($_COOKIE[$cookiename], true, false);
 
 		// Legacy format (for recent 2.0 --> 2.1 upgrades)
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		}
 
 		list($id_member, $password, $login_span, $cookie_domain, $cookie_path) = array_pad((array) $cookie_data, 5, '');
 
@@ -411,16 +429,17 @@ 
 
 		// Make sure the cookie is set to the correct domain and path
 		require_once($sourcedir . '/Subs-Auth.php');
-		if (array($cookie_domain, $cookie_path) !== url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies'])))
-			setLoginCookie((int) $login_span - time(), $id_member);
-	}
-	elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
+		if (array($cookie_domain, $cookie_path) !== url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies']))) {
+					setLoginCookie((int) $login_span - time(), $id_member);
+		}
+	} elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
 	{
 		// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
 		$cookie_data = $smcFunc['json_decode']($_SESSION['login_' . $cookiename], true);
 
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		}
 
 		list($id_member, $password, $login_span) = array_pad((array) $cookie_data, 3, '');
 		$id_member = !empty($id_member) && strlen($password) == 128 && (int) $login_span > time() ? (int) $id_member : 0;
@@ -445,30 +464,34 @@ 
 			$user_settings = $smcFunc['db_fetch_assoc']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
-				$user_settings['avatar'] = get_proxied_url($user_settings['avatar']);
+			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
+							$user_settings['avatar'] = get_proxied_url($user_settings['avatar']);
+			}
 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+							cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			}
 		}
 
 		// Did we find 'im?  If not, junk it.
 		if (!empty($user_settings))
 		{
 			// As much as the password should be right, we can assume the integration set things up.
-			if (!empty($already_verified) && $already_verified === true)
-				$check = true;
+			if (!empty($already_verified) && $already_verified === true) {
+							$check = true;
+			}
 			// SHA-512 hash should be 128 characters long.
-			elseif (strlen($password) == 128)
-				$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
-			else
-				$check = false;
+			elseif (strlen($password) == 128) {
+							$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
+			} else {
+							$check = false;
+			}
 
 			// Wrong password or not activated - either way, you're going nowhere.
 			$id_member = $check && ($user_settings['is_activated'] == 1 || $user_settings['is_activated'] == 11) ? (int) $user_settings['id_member'] : 0;
+		} else {
+					$id_member = 0;
 		}
-		else
-			$id_member = 0;
 
 		// If we no longer have the member maybe they're being all hackey, stop brute force!
 		if (!$id_member)
@@ -497,8 +520,9 @@ 
 
 					list ($tfamember, $tfasecret) = array_pad((array) $tfa_data, 2, '');
 
-					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member)
-						$tfasecret = null;
+					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member) {
+											$tfasecret = null;
+					}
 				}
 
 				// They didn't finish logging in before coming here? Then they're no one to us.
@@ -520,10 +544,12 @@ 
 		// Are we forcing 2FA? Need to check if the user groups actually require 2FA
 		elseif (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] >= 2 && $id_member && empty($user_settings['tfa_secret']))
 		{
-			if ($modSettings['tfa_mode'] == 2) //only do this if we are just forcing SOME membergroups
+			if ($modSettings['tfa_mode'] == 2) {
+				//only do this if we are just forcing SOME membergroups
 			{
 				//Build an array of ALL user membergroups.
 				$full_groups = array($user_settings['id_group']);
+			}
 				if (!empty($user_settings['additional_groups']))
 				{
 					$full_groups = array_merge($full_groups, explode(',', $user_settings['additional_groups']));
@@ -543,15 +569,17 @@ 
 				);
 				$row = $smcFunc['db_fetch_assoc']($request);
 				$smcFunc['db_free_result']($request);
+			} else {
+							$row['total'] = 1;
 			}
-			else
-				$row['total'] = 1; //simplifies logics in the next "if"
+			//simplifies logics in the next "if"
 
 			$area = !empty($_REQUEST['area']) ? $_REQUEST['area'] : '';
 			$action = !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup'))
-				redirectexit('action=profile;area=tfasetup;forced');
+			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup')) {
+							redirectexit('action=profile;area=tfasetup;forced');
+			}
 		}
 	}
 
@@ -588,33 +616,37 @@ 
 				updateMemberData($id_member, array('id_msg_last_visit' => (int) $modSettings['maxMsgID'], 'last_login' => time(), 'member_ip' => $_SERVER['REMOTE_ADDR'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']));
 				$user_settings['last_login'] = time();
 
-				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-					cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+									cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				}
 
-				if (!empty($modSettings['cache_enable']))
-					cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+				if (!empty($modSettings['cache_enable'])) {
+									cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+				}
 			}
+		} elseif (empty($_SESSION['id_msg_last_visit'])) {
+					$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
 		}
-		elseif (empty($_SESSION['id_msg_last_visit']))
-			$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
 
 		$username = $user_settings['member_name'];
 
-		if (empty($user_settings['additional_groups']))
-			$user_info = array(
+		if (empty($user_settings['additional_groups'])) {
+					$user_info = array(
 				'groups' => array($user_settings['id_group'], $user_settings['id_post_group'])
 			);
-		else
-			$user_info = array(
+		} else {
+					$user_info = array(
 				'groups' => array_merge(
 					array($user_settings['id_group'], $user_settings['id_post_group']),
 					explode(',', $user_settings['additional_groups'])
 				)
 			);
+		}
 
 		// Because history has proven that it is possible for groups to go bad - clean up in case.
-		foreach ($user_info['groups'] as $k => $v)
-			$user_info['groups'][$k] = (int) $v;
+		foreach ($user_info['groups'] as $k => $v) {
+					$user_info['groups'][$k] = (int) $v;
+		}
 
 		// This is a logged in user, so definitely not a spider.
 		$user_info['possibly_robot'] = false;
@@ -628,8 +660,7 @@ 
 			$time_system = new DateTime('now', $tz_system);
 			$time_user = new DateTime('now', $tz_user);
 			$user_info['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
-		}
-		else
+		} else
 		{
 			// !!! Compatibility.
 			$user_info['time_offset'] = empty($user_settings['time_offset']) ? 0 : $user_settings['time_offset'];
@@ -643,8 +674,9 @@ 
 		$user_info = array('groups' => array(-1));
 		$user_settings = array();
 
-		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member']))
-			$_COOKIE[$cookiename] = '';
+		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member'])) {
+					$_COOKIE[$cookiename] = '';
+		}
 
 		// Expire the 2FA cookie
 		if (isset($_COOKIE[$cookiename . '_tfa']) && empty($context['tfa_member']))
@@ -661,19 +693,20 @@ 
 		}
 
 		// Create a login token if it doesn't exist yet.
-		if (!isset($_SESSION['token']['post-login']))
-			createToken('login');
-		else
-			list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		if (!isset($_SESSION['token']['post-login'])) {
+					createToken('login');
+		} else {
+					list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		}
 
 		// Do we perhaps think this is a search robot? Check every five minutes just in case...
 		if ((!empty($modSettings['spider_mode']) || !empty($modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300))
 		{
 			require_once($sourcedir . '/ManageSearchEngines.php');
 			$user_info['possibly_robot'] = SpiderCheck();
+		} elseif (!empty($modSettings['spider_mode'])) {
+					$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 		}
-		elseif (!empty($modSettings['spider_mode']))
-			$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 		// If we haven't turned on proper spider hunts then have a guess!
 		else
 		{
@@ -721,8 +754,9 @@ 
 	$user_info['groups'] = array_unique($user_info['groups']);
 
 	// Make sure that the last item in the ignore boards array is valid. If the list was too long it could have an ending comma that could cause problems.
-	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1]))
-		unset($user_info['ignoreboards'][$tmp]);
+	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1])) {
+			unset($user_info['ignoreboards'][$tmp]);
+	}
 
 	// Allow the user to change their language.
 	if (!empty($modSettings['userLanguage']))
@@ -735,13 +769,14 @@ 
 			$user_info['language'] = strtr($_GET['language'], './\\:', '____');
 
 			// Make it permanent for members.
-			if (!empty($user_info['id']))
-				updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
-			else
-				$_SESSION['language'] = $user_info['language'];
+			if (!empty($user_info['id'])) {
+							updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
+			} else {
+							$_SESSION['language'] = $user_info['language'];
+			}
+		} elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')])) {
+					$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 		}
-		elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')]))
-			$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 	}
 
 	$temp = build_query_board($user_info['id']);
@@ -804,9 +839,9 @@ 
 		}
 
 		// Remember redirection is the key to avoiding fallout from your bosses.
-		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
-		else
+		if (!empty($topic)) {
+					redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
+		} else
 		{
 			loadPermissions();
 			loadTheme();
@@ -824,10 +859,11 @@ 
 	if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 	{
 		// @todo SLOW?
-		if (!empty($topic))
-			$temp = cache_get_data('topic_board-' . $topic, 120);
-		else
-			$temp = cache_get_data('board-' . $board, 120);
+		if (!empty($topic)) {
+					$temp = cache_get_data('topic_board-' . $topic, 120);
+		} else {
+					$temp = cache_get_data('board-' . $board, 120);
+		}
 
 		if (!empty($temp))
 		{
@@ -865,8 +901,9 @@ 
 			$row = $smcFunc['db_fetch_assoc']($request);
 
 			// Set the current board.
-			if (!empty($row['id_board']))
-				$board = $row['id_board'];
+			if (!empty($row['id_board'])) {
+							$board = $row['id_board'];
+			}
 
 			// Basic operating information. (globals... :/)
 			$board_info = array(
@@ -902,21 +939,23 @@ 
 
 			do
 			{
-				if (!empty($row['id_moderator']))
-					$board_info['moderators'][$row['id_moderator']] = array(
+				if (!empty($row['id_moderator'])) {
+									$board_info['moderators'][$row['id_moderator']] = array(
 						'id' => $row['id_moderator'],
 						'name' => $row['real_name'],
 						'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 						'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 					);
+				}
 
-				if (!empty($row['id_moderator_group']))
-					$board_info['moderator_groups'][$row['id_moderator_group']] = array(
+				if (!empty($row['id_moderator_group'])) {
+									$board_info['moderator_groups'][$row['id_moderator_group']] = array(
 						'id' => $row['id_moderator_group'],
 						'name' => $row['group_name'],
 						'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 						'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 					);
+				}
 			}
 			while ($row = $smcFunc['db_fetch_assoc']($request));
 
@@ -948,12 +987,12 @@ 
 			if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 			{
 				// @todo SLOW?
-				if (!empty($topic))
-					cache_put_data('topic_board-' . $topic, $board_info, 120);
+				if (!empty($topic)) {
+									cache_put_data('topic_board-' . $topic, $board_info, 120);
+				}
 				cache_put_data('board-' . $board, $board_info, 120);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise the topic is invalid, there are no moderators, etc.
 			$board_info = array(
@@ -967,8 +1006,9 @@ 
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($topic))
-		$_GET['board'] = (int) $board;
+	if (!empty($topic)) {
+			$_GET['board'] = (int) $board;
+	}
 
 	if (!empty($board))
 	{
@@ -978,10 +1018,12 @@ 
 		// Now check if the user is a moderator.
 		$user_info['is_mod'] = isset($board_info['moderators'][$user_info['id']]) || count(array_intersect($user_info['groups'], $moderator_groups)) != 0;
 
-		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
-		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
+		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin']) {
+					$board_info['error'] = 'access';
+		}
+		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin']) {
+					$board_info['error'] = 'access';
+		}
 
 		// Build up the linktree.
 		$context['linktree'] = array_merge(
@@ -1004,8 +1046,9 @@ 
 	$context['current_board'] = $board;
 
 	// No posting in redirection boards!
-	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect']))
-		$board_info['error'] == 'post_in_redirect';
+	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect'])) {
+			$board_info['error'] == 'post_in_redirect';
+	}
 
 	// Hacker... you can't see this topic, I'll tell you that. (but moderators can!)
 	if (!empty($board_info['error']) && (!empty($modSettings['deny_boards_access']) || $board_info['error'] != 'access' || !$user_info['is_mod']))
@@ -1031,24 +1074,23 @@ 
 			ob_end_clean();
 			header('HTTP/1.1 403 Forbidden');
 			die;
-		}
-		elseif ($board_info['error'] == 'post_in_redirect')
+		} elseif ($board_info['error'] == 'post_in_redirect')
 		{
 			// Slightly different error message here...
 			fatal_lang_error('cannot_post_redirect', false);
-		}
-		elseif ($user_info['is_guest'])
+		} elseif ($user_info['is_guest'])
 		{
 			loadLanguage('Errors');
 			is_not_guest($txt['topic_gone']);
+		} else {
+					fatal_lang_error('topic_gone', false);
 		}
-		else
-			fatal_lang_error('topic_gone', false);
 	}
 
-	if ($user_info['is_mod'])
-		$user_info['groups'][] = 3;
-}
+	if ($user_info['is_mod']) {
+			$user_info['groups'][] = 3;
+	}
+	}
 
 /**
  * Load this user's permissions.
@@ -1069,8 +1111,9 @@ 
 		asort($cache_groups);
 		$cache_groups = implode(',', $cache_groups);
 		// If it's a spider then cache it different.
-		if ($user_info['possibly_robot'])
-			$cache_groups .= '-spider';
+		if ($user_info['possibly_robot']) {
+					$cache_groups .= '-spider';
+		}
 
 		if ($modSettings['cache_enable'] >= 2 && !empty($board) && ($temp = cache_get_data('permissions:' . $cache_groups . ':' . $board, 240)) != null && time() - 240 > $modSettings['settings_updated'])
 		{
@@ -1078,9 +1121,9 @@ 
 			banPermissions();
 
 			return;
+		} elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated']) {
+					list ($user_info['permissions'], $removals) = $temp;
 		}
-		elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated'])
-			list ($user_info['permissions'], $removals) = $temp;
 	}
 
 	// If it is detected as a robot, and we are restricting permissions as a special group - then implement this.
@@ -1102,23 +1145,26 @@ 
 		$removals = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (isset($cache_groups))
-			cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		if (isset($cache_groups)) {
+					cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		}
 	}
 
 	// Get the board permissions.
 	if (!empty($board))
 	{
 		// Make sure the board (if any) has been loaded by loadBoard().
-		if (!isset($board_info['profile']))
-			fatal_lang_error('no_board');
+		if (!isset($board_info['profile'])) {
+					fatal_lang_error('no_board');
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT permission, add_deny
@@ -1134,20 +1180,23 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Remove all the permissions they shouldn't have ;).
-	if (!empty($modSettings['permission_enable_deny']))
-		$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	if (!empty($modSettings['permission_enable_deny'])) {
+			$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	}
 
-	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2) {
+			cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	}
 
 	// Banned?  Watch, don't touch..
 	banPermissions();
@@ -1159,17 +1208,18 @@ 
 		{
 			require_once($sourcedir . '/Subs-Auth.php');
 			rebuildModCache();
+		} else {
+					$user_info['mod_cache'] = $_SESSION['mc'];
 		}
-		else
-			$user_info['mod_cache'] = $_SESSION['mc'];
 
 		// This is a useful phantom permission added to the current user, and only the current user while they are logged in.
 		// For example this drastically simplifies certain changes to the profile area.
 		$user_info['permissions'][] = 'is_not_guest';
 		// And now some backwards compatibility stuff for mods and whatnot that aren't expecting the new permissions.
 		$user_info['permissions'][] = 'profile_view_own';
-		if (in_array('profile_view', $user_info['permissions']))
-			$user_info['permissions'][] = 'profile_view_any';
+		if (in_array('profile_view', $user_info['permissions'])) {
+					$user_info['permissions'][] = 'profile_view_any';
+		}
 	}
 }
 
@@ -1187,8 +1237,9 @@ 
 	global $image_proxy_enabled, $boardurl, $user_info;
 
 	// Can't just look for no users :P.
-	if (empty($users))
-		return array();
+	if (empty($users)) {
+			return array();
+	}
 
 	// Pass the set value
 	$context['loadMemberContext_set'] = $set;
@@ -1203,8 +1254,9 @@ 
 		for ($i = 0, $n = count($users); $i < $n; $i++)
 		{
 			$data = cache_get_data('member_data-' . $set . '-' . $users[$i], 240);
-			if ($data == null)
-				continue;
+			if ($data == null) {
+							continue;
+			}
 
 			$loaded_ids[] = $data['id_member'];
 			$user_profile[$data['id_member']] = $data;
@@ -1271,16 +1323,19 @@ 
 			$row['avatar_original'] = !empty($row['avatar']) ? $row['avatar'] : '';
 
 			// Take care of proxying avatar if required, do this here for maximum reach
-			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
-				$row['avatar'] = get_proxied_url($row['avatar']);
+			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
+							$row['avatar'] = get_proxied_url($row['avatar']);
+			}
 
 			// Keep track of the member's normal member group
 			$row['primary_group'] = $row['member_group'];
 
-			if (isset($row['member_ip']))
-				$row['member_ip'] = inet_dtop($row['member_ip']);
-			if (isset($row['member_ip2']))
-				$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			if (isset($row['member_ip'])) {
+							$row['member_ip'] = inet_dtop($row['member_ip']);
+			}
+			if (isset($row['member_ip2'])) {
+							$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			}
 			$new_loaded_ids[] = $row['id_member'];
 			$loaded_ids[] = $row['id_member'];
 			$row['options'] = array();
@@ -1299,8 +1354,9 @@ 
 				'loaded_ids' => $new_loaded_ids,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1311,10 +1367,11 @@ 
 	{
 		foreach ($loaded_ids as $a_member)
 		{
-			if (!empty($user_profile[$a_member]['additional_groups']))
-				$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
-			else
-				$groups = array($user_profile[$a_member]['id_group']);
+			if (!empty($user_profile[$a_member]['additional_groups'])) {
+							$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
+			} else {
+							$groups = array($user_profile[$a_member]['id_group']);
+			}
 
 			$temp = array_intersect($groups, array_keys($board_info['moderator_groups']));
 
@@ -1327,8 +1384,9 @@ 
 
 	if (!empty($new_loaded_ids) && !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
 	{
-		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++)
-			cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++) {
+					cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		}
 	}
 
 	// Are we loading any moderators?  If so, fix their group data...
@@ -1354,14 +1412,17 @@ 
 		foreach ($temp_mods as $id)
 		{
 			// By popular demand, don't show admins or global moderators as moderators.
-			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2)
-				$user_profile[$id]['member_group'] = $row['member_group'];
+			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2) {
+							$user_profile[$id]['member_group'] = $row['member_group'];
+			}
 
 			// If the Moderator group has no color or icons, but their group does... don't overwrite.
-			if (!empty($row['icons']))
-				$user_profile[$id]['icons'] = $row['icons'];
-			if (!empty($row['member_group_color']))
-				$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			if (!empty($row['icons'])) {
+							$user_profile[$id]['icons'] = $row['icons'];
+			}
+			if (!empty($row['member_group_color'])) {
+							$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			}
 		}
 	}
 
@@ -1383,12 +1444,14 @@ 
 	static $loadedLanguages = array();
 
 	// If this person's data is already loaded, skip it.
-	if (isset($dataLoaded[$user]))
-		return true;
+	if (isset($dataLoaded[$user])) {
+			return true;
+	}
 
 	// We can't load guests or members not loaded by loadMemberData()!
-	if ($user == 0)
-		return false;
+	if ($user == 0) {
+			return false;
+	}
 	if (!isset($user_profile[$user]))
 	{
 		trigger_error('loadMemberContext(): member id ' . $user . ' not previously loaded by loadMemberData()', E_USER_WARNING);
@@ -1414,12 +1477,16 @@ 
 	$buddy_list = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
 
 	//We need a little fallback for the membergroup icons. If it doesn't exist in the current theme, fallback to default theme
-	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) //icon is set and exists
+	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) {
+		//icon is set and exists
 		$group_icon_url = $settings['images_url'] . '/membericons/' . $profile['icons'][1];
-	elseif (isset($profile['icons'][1])) //icon is set and doesn't exist, fallback to default
+	} elseif (isset($profile['icons'][1])) {
+		//icon is set and doesn't exist, fallback to default
 		$group_icon_url = $settings['default_images_url'] . '/membericons/' . $profile['icons'][1];
-	else //not set, bye bye
+	} else {
+		//not set, bye bye
 		$group_icon_url = '';
+	}
 
 	// These minimal values are always loaded
 	$memberContext[$user] = array(
@@ -1438,8 +1505,9 @@ 
 	if ($context['loadMemberContext_set'] != 'minimal')
 	{
 		// Go the extra mile and load the user's native language name.
-		if (empty($loadedLanguages))
-			$loadedLanguages = getLanguages();
+		if (empty($loadedLanguages)) {
+					$loadedLanguages = getLanguages();
+		}
 
 		$memberContext[$user] += array(
 			'username_color' => '<span ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['member_name'] . '</span>',
@@ -1494,31 +1562,33 @@ 
 	{
 		if (!empty($modSettings['gravatarOverride']) || (!empty($modSettings['gravatarEnabled']) && stristr($profile['avatar'], 'gravatar://')))
 		{
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11)
-				$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
-			else
-				$image = get_gravatar_url($profile['email_address']);
-		}
-		else
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11) {
+							$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
+			} else {
+							$image = get_gravatar_url($profile['email_address']);
+			}
+		} else
 		{
 			// So it's stored in the member table?
 			if (!empty($profile['avatar']))
 			{
 				$image = (stristr($profile['avatar'], 'http://') || stristr($profile['avatar'], 'https://')) ? $profile['avatar'] : $modSettings['avatar_url'] . '/' . $profile['avatar'];
+			} elseif (!empty($profile['filename'])) {
+							$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			}
-			elseif (!empty($profile['filename']))
-				$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			// Right... no avatar...use the default one
-			else
-				$image = $modSettings['avatar_url'] . '/default.png';
+			else {
+							$image = $modSettings['avatar_url'] . '/default.png';
+			}
 		}
-		if (!empty($image))
-			$memberContext[$user]['avatar'] = array(
+		if (!empty($image)) {
+					$memberContext[$user]['avatar'] = array(
 				'name' => $profile['avatar'],
 				'image' => '<img class="avatar" src="' . $image . '" alt="avatar_' . $profile['member_name'] . '">',
 				'href' => $image,
 				'url' => $image,
 			);
+		}
 	}
 
 	// Are we also loading the members custom fields into context?
@@ -1526,13 +1596,15 @@ 
 	{
 		$memberContext[$user]['custom_fields'] = array();
 
-		if (!isset($context['display_fields']))
-			$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
+		if (!isset($context['display_fields'])) {
+					$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
+		}
 
 		foreach ($context['display_fields'] as $custom)
 		{
-			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']]))
-				continue;
+			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']])) {
+							continue;
+			}
 
 			$value = $profile['options'][$custom['col_name']];
 
@@ -1540,31 +1612,36 @@ 
 			$currentKey = 0;
 
 			// Create a key => value array for multiple options fields
-			if (!empty($custom['options']))
-				foreach ($custom['options'] as $k => $v)
+			if (!empty($custom['options'])) {
+							foreach ($custom['options'] as $k => $v)
 				{
 					$fieldOptions[] = $v;
-					if (empty($currentKey))
-						$currentKey = $v == $value ? $k : 0;
+			}
+					if (empty($currentKey)) {
+											$currentKey = $v == $value ? $k : 0;
+					}
 				}
 
 			// BBC?
-			if ($custom['bbc'])
-				$value = parse_bbc($value);
+			if ($custom['bbc']) {
+							$value = parse_bbc($value);
+			}
 
 			// ... or checkbox?
-			elseif (isset($custom['type']) && $custom['type'] == 'check')
-				$value = $value ? $txt['yes'] : $txt['no'];
+			elseif (isset($custom['type']) && $custom['type'] == 'check') {
+							$value = $value ? $txt['yes'] : $txt['no'];
+			}
 
 			// Enclosing the user input within some other text?
-			if (!empty($custom['enclose']))
-				$value = strtr($custom['enclose'], array(
+			if (!empty($custom['enclose'])) {
+							$value = strtr($custom['enclose'], array(
 					'{SCRIPTURL}' => $scripturl,
 					'{IMAGES_URL}' => $settings['images_url'],
 					'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 					'{INPUT}' => $value,
 					'{KEY}' => $currentKey,
 				));
+			}
 
 			$memberContext[$user]['custom_fields'][] = array(
 				'title' => !empty($custom['title']) ? $custom['title'] : $custom['col_name'],
@@ -1591,8 +1668,9 @@ 
 	global $smcFunc, $txt, $scripturl, $settings;
 
 	// Do not waste my time...
-	if (empty($users) || empty($params))
-		return false;
+	if (empty($users) || empty($params)) {
+			return false;
+	}
 
 	// Make sure it's an array.
 	$users = !is_array($users) ? array($users) : array_unique($users);
@@ -1619,41 +1697,48 @@ 
 		$currentKey = 0;
 
 		// Create a key => value array for multiple options fields
-		if (!empty($row['field_options']))
-			foreach (explode(',', $row['field_options']) as $k => $v)
+		if (!empty($row['field_options'])) {
+					foreach (explode(',', $row['field_options']) as $k => $v)
 			{
 				$fieldOptions[] = $v;
-				if (empty($currentKey))
-					$currentKey = $v == $row['value'] ? $k : 0;
+		}
+				if (empty($currentKey)) {
+									$currentKey = $v == $row['value'] ? $k : 0;
+				}
 			}
 
 		// BBC?
-		if (!empty($row['bbc']))
-			$row['value'] = parse_bbc($row['value']);
+		if (!empty($row['bbc'])) {
+					$row['value'] = parse_bbc($row['value']);
+		}
 
 		// ... or checkbox?
-		elseif (isset($row['type']) && $row['type'] == 'check')
-			$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		elseif (isset($row['type']) && $row['type'] == 'check') {
+					$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']))
-			$row['value'] = strtr($row['enclose'], array(
+		if (!empty($row['enclose'])) {
+					$row['value'] = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($row['value']),
 				'{KEY}' => $currentKey,
 			));
+		}
 
 		// Send a simple array if there is just 1 param
-		if (count($params) == 1)
-			$return[$row['id_member']] = $row;
+		if (count($params) == 1) {
+					$return[$row['id_member']] = $row;
+		}
 
 		// More than 1? knock yourself out...
 		else
 		{
-			if (!isset($return[$row['id_member']]))
-				$return[$row['id_member']] = array();
+			if (!isset($return[$row['id_member']])) {
+							$return[$row['id_member']] = array();
+			}
 
 			$return[$row['id_member']][$row['variable']] = $row;
 		}
@@ -1687,8 +1772,9 @@ 
 	global $context;
 
 	// Don't know any browser!
-	if (empty($context['browser']))
-		detectBrowser();
+	if (empty($context['browser'])) {
+			detectBrowser();
+	}
 
 	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_' . $browser]) ? true : false;
 }
@@ -1706,8 +1792,9 @@ 
 	global $context, $settings, $options, $sourcedir, $ssi_theme, $smcFunc, $language, $board, $image_proxy_enabled;
 
 	// The theme was specified by parameter.
-	if (!empty($id_theme))
-		$id_theme = (int) $id_theme;
+	if (!empty($id_theme)) {
+			$id_theme = (int) $id_theme;
+	}
 	// The theme was specified by REQUEST.
 	elseif (!empty($_REQUEST['theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
 	{
@@ -1715,32 +1802,38 @@ 
 		$_SESSION['id_theme'] = $id_theme;
 	}
 	// The theme was specified by REQUEST... previously.
-	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
-		$id_theme = (int) $_SESSION['id_theme'];
+	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum'))) {
+			$id_theme = (int) $_SESSION['id_theme'];
+	}
 	// The theme is just the user's choice. (might use ?board=1;theme=0 to force board theme.)
-	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme']))
-		$id_theme = $user_info['theme'];
+	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme'])) {
+			$id_theme = $user_info['theme'];
+	}
 	// The theme was specified by the board.
-	elseif (!empty($board_info['theme']))
-		$id_theme = $board_info['theme'];
+	elseif (!empty($board_info['theme'])) {
+			$id_theme = $board_info['theme'];
+	}
 	// The theme is the forum's default.
-	else
-		$id_theme = $modSettings['theme_guests'];
+	else {
+			$id_theme = $modSettings['theme_guests'];
+	}
 
 	// Verify the id_theme... no foul play.
 	// Always allow the board specific theme, if they are overriding.
-	if (!empty($board_info['theme']) && $board_info['override_theme'])
-		$id_theme = $board_info['theme'];
+	if (!empty($board_info['theme']) && $board_info['override_theme']) {
+			$id_theme = $board_info['theme'];
+	}
 	// If they have specified a particular theme to use with SSI allow it to be used.
-	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme)
-		$id_theme = (int) $id_theme;
-	elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
+	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme) {
+			$id_theme = (int) $id_theme;
+	} elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
 	{
 		$themes = explode(',', $modSettings['enableThemes']);
-		if (!in_array($id_theme, $themes))
-			$id_theme = $modSettings['theme_guests'];
-		else
-			$id_theme = (int) $id_theme;
+		if (!in_array($id_theme, $themes)) {
+					$id_theme = $modSettings['theme_guests'];
+		} else {
+					$id_theme = (int) $id_theme;
+		}
 	}
 		
 	// We already load the basic stuff?
@@ -1749,18 +1842,19 @@ 
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
 
 		// Disable image proxy if we don't have SSL enabled
-		if (empty($modSettings['force_ssl']))
-			$image_proxy_enabled = false;
+		if (empty($modSettings['force_ssl'])) {
+					$image_proxy_enabled = false;
+		}
 
 		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && ($temp = cache_get_data('theme_settings-' . $id_theme . ':' . $member, 60)) != null && time() - 60 > $modSettings['settings_updated'])
 		{
 			$themeData = $temp;
 			$flag = true;
+		} elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated']) {
+					$themeData = $temp + array($member => array());
+		} else {
+					$themeData = array(-1 => array(), 0 => array(), $member => array());
 		}
-		elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated'])
-			$themeData = $temp + array($member => array());
-		else
-			$themeData = array(-1 => array(), 0 => array(), $member => array());
 
 		if (empty($flag))
 		{
@@ -1780,31 +1874,37 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				// There are just things we shouldn't be able to change as members.
-				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url')))
-					continue;
+				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url'))) {
+									continue;
+				}
 
 				// If this is the theme_dir of the default theme, store it.
-				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member']))
-					$themeData[0]['default_' . $row['variable']] = $row['value'];
+				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member'])) {
+									$themeData[0]['default_' . $row['variable']] = $row['value'];
+				}
 
 				// If this isn't set yet, is a theme option, or is not the default theme..
-				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1')
-					$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1') {
+									$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+				}
 			}
 			$smcFunc['db_free_result']($result);
 
-			if (!empty($themeData[-1]))
-				foreach ($themeData[-1] as $k => $v)
+			if (!empty($themeData[-1])) {
+							foreach ($themeData[-1] as $k => $v)
 				{
 					if (!isset($themeData[$member][$k]))
 						$themeData[$member][$k] = $v;
+			}
 				}
 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+							cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+			}
 			// Only if we didn't already load that part of the cache...
-			elseif (!isset($temp))
-				cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+			elseif (!isset($temp)) {
+							cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+			}
 		}
 
 		$settings = $themeData[0];
@@ -1821,17 +1921,20 @@ 
 		$settings['template_dirs'][] = $settings['theme_dir'];
 
 		// Based on theme (if there is one).
-		if (!empty($settings['base_theme_dir']))
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
+		if (!empty($settings['base_theme_dir'])) {
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
+		}
 	}
 
 
-	if (!$initialize)
-		return;
+	if (!$initialize) {
+			return;
+	}
 
 	// Check to see if we're forcing SSL
 	if (!empty($modSettings['force_ssl']) && empty($maintenance) &&
@@ -1852,8 +1955,9 @@ 
 		$detected_url = httpsOn() ? 'https://' : 'http://';
 		$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
 		$temp = preg_replace('~/' . basename($scripturl) . '(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
-		if ($temp != '/')
-			$detected_url .= $temp;
+		if ($temp != '/') {
+					$detected_url .= $temp;
+		}
 	}
 	if (isset($detected_url) && $detected_url != $boardurl)
 	{
@@ -1865,8 +1969,9 @@ 
 			foreach ($aliases as $alias)
 			{
 				// Rip off all the boring parts, spaces, etc.
-				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias))
-					$do_fix = true;
+				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias)) {
+									$do_fix = true;
+				}
 			}
 		}
 
@@ -1874,21 +1979,23 @@ 
 		if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == $boardurl && (empty($_GET) || count($_GET) == 1) && SMF != 'SSI')
 		{
 			// Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;).
-			if (empty($_GET))
-				redirectexit('wwwRedirect');
-			else
+			if (empty($_GET)) {
+							redirectexit('wwwRedirect');
+			} else
 			{
 				$k = key($_GET);
 				$v = current($_GET);
 
-				if ($k != 'wwwRedirect')
-					redirectexit('wwwRedirect;' . $k . '=' . $v);
+				if ($k != 'wwwRedirect') {
+									redirectexit('wwwRedirect;' . $k . '=' . $v);
+				}
 			}
 		}
 
 		// #3 is just a check for SSL...
-		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl)
-			$do_fix = true;
+		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl) {
+					$do_fix = true;
+		}
 
 		// Okay, #4 - perhaps it's an IP address?  We're gonna want to use that one, then. (assuming it's the IP or something...)
 		if (!empty($do_fix) || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) == 1)
@@ -1923,8 +2030,9 @@ 
 					$board_info['moderators'][$k]['link'] = strtr($dummy['link'], array('"' . $oldurl => '"' . $boardurl));
 				}
 			}
-			foreach ($context['linktree'] as $k => $dummy)
-				$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			foreach ($context['linktree'] as $k => $dummy) {
+							$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			}
 		}
 	}
 	// Set up the contextual user array.
@@ -1943,16 +2051,16 @@ 
 			'email' => $user_info['email'],
 			'ignoreusers' => $user_info['ignoreusers'],
 		);
-		if (!$context['user']['is_guest'])
-			$context['user']['name'] = $user_info['name'];
-		elseif ($context['user']['is_guest'] && !empty($txt['guest_title']))
-			$context['user']['name'] = $txt['guest_title'];
+		if (!$context['user']['is_guest']) {
+					$context['user']['name'] = $user_info['name'];
+		} elseif ($context['user']['is_guest'] && !empty($txt['guest_title'])) {
+					$context['user']['name'] = $txt['guest_title'];
+		}
 
 		// Determine the current smiley set.
 		$user_info['smiley_set'] = (!in_array($user_info['smiley_set'], explode(',', $modSettings['smiley_sets_known'])) && $user_info['smiley_set'] != 'none') || empty($modSettings['smiley_sets_enable']) ? (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default']) : $user_info['smiley_set'];
 		$context['user']['smiley_set'] = $user_info['smiley_set'];
-	}
-	else
+	} else
 	{
 		// What to do when there is no $user_info (e.g., an error very early in the login process)
 		$context['user'] = array(
@@ -1986,18 +2094,24 @@ 
 	}
 
 	// Some basic information...
-	if (!isset($context['html_headers']))
-		$context['html_headers'] = '';
-	if (!isset($context['javascript_files']))
-		$context['javascript_files'] = array();
-	if (!isset($context['css_files']))
-		$context['css_files'] = array();
-	if (!isset($context['css_header']))
-		$context['css_header'] = array();
-	if (!isset($context['javascript_inline']))
-		$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
-	if (!isset($context['javascript_vars']))
-		$context['javascript_vars'] = array();
+	if (!isset($context['html_headers'])) {
+			$context['html_headers'] = '';
+	}
+	if (!isset($context['javascript_files'])) {
+			$context['javascript_files'] = array();
+	}
+	if (!isset($context['css_files'])) {
+			$context['css_files'] = array();
+	}
+	if (!isset($context['css_header'])) {
+			$context['css_header'] = array();
+	}
+	if (!isset($context['javascript_inline'])) {
+			$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
+	}
+	if (!isset($context['javascript_vars'])) {
+			$context['javascript_vars'] = array();
+	}
 
 	$context['login_url'] =  $scripturl . '?action=login2';
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
@@ -2009,16 +2123,18 @@ 
 	$context['current_action'] = isset($_REQUEST['action']) ? $smcFunc['htmlspecialchars']($_REQUEST['action']) : null;
 	$context['current_subaction'] = isset($_REQUEST['sa']) ? $_REQUEST['sa'] : null;
 	$context['can_register'] = empty($modSettings['registration_method']) || $modSettings['registration_method'] != 3;
-	if (isset($modSettings['load_average']))
-		$context['load_average'] = $modSettings['load_average'];
+	if (isset($modSettings['load_average'])) {
+			$context['load_average'] = $modSettings['load_average'];
+	}
 
 	// Detect the browser. This is separated out because it's also used in attachment downloads
 	detectBrowser();
 
 	// Set the top level linktree up.
 	// Note that if we're dealing with certain very early errors (e.g., login) the linktree might not be set yet...
-	if (empty($context['linktree']))
-		$context['linktree'] = array();
+	if (empty($context['linktree'])) {
+			$context['linktree'] = array();
+	}
 	array_unshift($context['linktree'], array(
 		'url' => $scripturl,
 		'name' => $context['forum_name_html_safe']
@@ -2027,8 +2143,9 @@ 
 	// This allows sticking some HTML on the page output - useful for controls.
 	$context['insert_after_template'] = '';
 
-	if (!isset($txt))
-		$txt = array();
+	if (!isset($txt)) {
+			$txt = array();
+	}
 
 	$simpleActions = array(
 		'findmember',
@@ -2074,9 +2191,10 @@ 
 
 	// See if theres any extra param to check.
 	$requiresXML = false;
-	foreach ($extraParams as $key => $extra)
-		if (isset($_REQUEST[$extra]))
+	foreach ($extraParams as $key => $extra) {
+			if (isset($_REQUEST[$extra]))
 			$requiresXML = true;
+	}
 
 	// Output is fully XML, so no need for the index template.
 	if (isset($_REQUEST['xml']) && (in_array($context['current_action'], $xmlActions) || $requiresXML))
@@ -2091,37 +2209,39 @@ 
 	{
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
-	}
-
-	else
+	} else
 	{
 		// Custom templates to load, or just default?
-		if (isset($settings['theme_templates']))
-			$templates = explode(',', $settings['theme_templates']);
-		else
-			$templates = array('index');
+		if (isset($settings['theme_templates'])) {
+					$templates = explode(',', $settings['theme_templates']);
+		} else {
+					$templates = array('index');
+		}
 
 		// Load each template...
-		foreach ($templates as $template)
-			loadTemplate($template);
+		foreach ($templates as $template) {
+					loadTemplate($template);
+		}
 
 		// ...and attempt to load their associated language files.
 		$required_files = implode('+', array_merge($templates, array('Modifications')));
 		loadLanguage($required_files, '', false);
 
 		// Custom template layers?
-		if (isset($settings['theme_layers']))
-			$context['template_layers'] = explode(',', $settings['theme_layers']);
-		else
-			$context['template_layers'] = array('html', 'body');
+		if (isset($settings['theme_layers'])) {
+					$context['template_layers'] = explode(',', $settings['theme_layers']);
+		} else {
+					$context['template_layers'] = array('html', 'body');
+		}
 	}
 
 	// Initialize the theme.
 	loadSubTemplate('init', 'ignore');
 
 	// Allow overriding the board wide time/number formats.
-	if (empty($user_settings['time_format']) && !empty($txt['time_format']))
-		$user_info['time_format'] = $txt['time_format'];
+	if (empty($user_settings['time_format']) && !empty($txt['time_format'])) {
+			$user_info['time_format'] = $txt['time_format'];
+	}
 
 	// Set the character set from the template.
 	$context['character_set'] = empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set'];
@@ -2129,12 +2249,14 @@ 
 	$context['right_to_left'] = !empty($txt['lang_rtl']);
 
 	// Guests may still need a name.
-	if ($context['user']['is_guest'] && empty($context['user']['name']))
-		$context['user']['name'] = $txt['guest_title'];
+	if ($context['user']['is_guest'] && empty($context['user']['name'])) {
+			$context['user']['name'] = $txt['guest_title'];
+	}
 
 	// Any theme-related strings that need to be loaded?
-	if (!empty($settings['require_theme_strings']))
-		loadLanguage('ThemeStrings', '', false);
+	if (!empty($settings['require_theme_strings'])) {
+			loadLanguage('ThemeStrings', '', false);
+	}
 
 	// Make a special URL for the language.
 	$settings['lang_images_url'] = $settings['images_url'] . '/' . (!empty($txt['image_lang']) ? $txt['image_lang'] : $user_info['language']);
@@ -2145,8 +2267,9 @@ 
 	// Here is my luvly Responsive CSS
 	loadCSSFile('responsive.css', array('force_current' => false, 'validate' => true, 'minimize' => true, 'order_pos' => 9000), 'smf_responsive');
 
-	if ($context['right_to_left'])
-		loadCSSFile('rtl.css', array('order_pos' => 200), 'smf_rtl');
+	if ($context['right_to_left']) {
+			loadCSSFile('rtl.css', array('order_pos' => 200), 'smf_rtl');
+	}
 
 	// We allow theme variants, because we're cool.
 	$context['theme_variant'] = '';
@@ -2154,14 +2277,17 @@ 
 	if (!empty($settings['theme_variants']))
 	{
 		// Overriding - for previews and that ilk.
-		if (!empty($_REQUEST['variant']))
-			$_SESSION['id_variant'] = $_REQUEST['variant'];
+		if (!empty($_REQUEST['variant'])) {
+					$_SESSION['id_variant'] = $_REQUEST['variant'];
+		}
 		// User selection?
-		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum'))
-			$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum')) {
+					$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		}
 		// If not a user variant, select the default.
-		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants']))
-			$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants'])) {
+					$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		}
 
 		// Do this to keep things easier in the templates.
 		$context['theme_variant'] = '_' . $context['theme_variant'];
@@ -2170,20 +2296,23 @@ 
 		if (!empty($context['theme_variant']))
 		{
 			loadCSSFile('index' . $context['theme_variant'] . '.css', array('order_pos' => 300), 'smf_index' . $context['theme_variant']);
-			if ($context['right_to_left'])
-				loadCSSFile('rtl' . $context['theme_variant'] . '.css', array('order_pos' => 400), 'smf_rtl' . $context['theme_variant']);
+			if ($context['right_to_left']) {
+							loadCSSFile('rtl' . $context['theme_variant'] . '.css', array('order_pos' => 400), 'smf_rtl' . $context['theme_variant']);
+			}
 		}
 	}
 
 	// Let's be compatible with old themes!
-	if (!function_exists('template_html_above') && in_array('html', $context['template_layers']))
-		$context['template_layers'] = array('main');
+	if (!function_exists('template_html_above') && in_array('html', $context['template_layers'])) {
+			$context['template_layers'] = array('main');
+	}
 
 	$context['tabindex'] = 1;
 
 	// Compatibility.
-	if (!isset($settings['theme_version']))
-		$modSettings['memberCount'] = $modSettings['totalMembers'];
+	if (!isset($settings['theme_version'])) {
+			$modSettings['memberCount'] = $modSettings['totalMembers'];
+	}
 
 	// Default JS variables for use in every theme
 	$context['javascript_vars'] = array(
@@ -2203,18 +2332,18 @@ 
 	);
 
 	// Add the JQuery library to the list of files to load.
-	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn')
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local')
-		loadJavaScriptFile('jquery-3.2.1.min.js', array('seed' => false), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom')
-		loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
+	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn') {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local') {
+			loadJavaScriptFile('jquery-3.2.1.min.js', array('seed' => false), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom') {
+			loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
+	}
 
 	// Auto loading? template_javascript() will take care of the local half of this.
-	else
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	else {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	}
 
 	// Queue our JQuery plugins!
 	loadJavaScriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
@@ -2237,12 +2366,12 @@ 
 			require_once($sourcedir . '/ScheduledTasks.php');
 
 			// What to do, what to do?!
-			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time())
-				AutoTask();
-			else
-				ReduceMailQueue();
-		}
-		else
+			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time()) {
+							AutoTask();
+			} else {
+							ReduceMailQueue();
+			}
+		} else
 		{
 			$type = empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time() ? 'task' : 'mailq';
 			$ts = $type == 'mailq' ? $modSettings['mail_next_send'] : $modSettings['next_task_time'];
@@ -2293,8 +2422,9 @@ 
 		foreach ($theme_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -2324,16 +2454,19 @@ 
 	// Do any style sheets first, cause we're easy with those.
 	if (!empty($style_sheets))
 	{
-		if (!is_array($style_sheets))
-			$style_sheets = array($style_sheets);
+		if (!is_array($style_sheets)) {
+					$style_sheets = array($style_sheets);
+		}
 
-		foreach ($style_sheets as $sheet)
-			loadCSSFile($sheet . '.css', array(), $sheet);
+		foreach ($style_sheets as $sheet) {
+					loadCSSFile($sheet . '.css', array(), $sheet);
+		}
 	}
 
 	// No template to load?
-	if ($template_name === false)
-		return true;
+	if ($template_name === false) {
+			return true;
+	}
 
 	$loaded = false;
 	foreach ($settings['template_dirs'] as $template_dir)
@@ -2348,12 +2481,14 @@ 
 
 	if ($loaded)
 	{
-		if ($db_show_debug === true)
-			$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		if ($db_show_debug === true) {
+					$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		}
 
 		// If they have specified an initialization function for this template, go ahead and call it now.
-		if (function_exists('template_' . $template_name . '_init'))
-			call_user_func('template_' . $template_name . '_init');
+		if (function_exists('template_' . $template_name . '_init')) {
+					call_user_func('template_' . $template_name . '_init');
+		}
 	}
 	// Hmmm... doesn't exist?!  I don't suppose the directory is wrong, is it?
 	elseif (!file_exists($settings['default_theme_dir']) && file_exists($boarddir . '/Themes/default'))
@@ -2373,13 +2508,14 @@ 
 		loadTemplate($template_name);
 	}
 	// Cause an error otherwise.
-	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal)
-		fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
-	elseif ($fatal)
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
-	else
-		return false;
-}
+	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
+	} elseif ($fatal) {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Load a sub-template.
@@ -2397,17 +2533,19 @@ 
 {
 	global $context, $txt, $db_show_debug;
 
-	if ($db_show_debug === true)
-		$context['debug']['sub_templates'][] = $sub_template_name;
+	if ($db_show_debug === true) {
+			$context['debug']['sub_templates'][] = $sub_template_name;
+	}
 
 	// Figure out what the template function is named.
 	$theme_function = 'template_' . $sub_template_name;
-	if (function_exists($theme_function))
-		$theme_function();
-	elseif ($fatal === false)
-		fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
-	elseif ($fatal !== 'ignore')
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	if (function_exists($theme_function)) {
+			$theme_function();
+	} elseif ($fatal === false) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
+	} elseif ($fatal !== 'ignore') {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	}
 
 	// Are we showing debugging for templates?  Just make sure not to do it before the doctype...
 	if (allowedTo('admin_forum') && isset($_REQUEST['debug']) && !in_array($sub_template_name, array('init', 'main_below')) && ob_get_length() > 0 && !isset($_REQUEST['xml']))
@@ -2437,8 +2575,9 @@ 
 {
 	global $settings, $context, $modSettings;
 
-	if (empty($context['css_files_order']))
-		$context['css_files_order'] = array();
+	if (empty($context['css_files_order'])) {
+			$context['css_files_order'] = array();
+	}
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? (array_key_exists('browser_cache', $modSettings) ? $modSettings['browser_cache'] : '') : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
@@ -2449,8 +2588,9 @@ 
 	$params['order_pos'] = isset($params['order_pos']) ? (int) $params['order_pos'] : 3000;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.css?alp21 filenames
 	$has_seed = strpos($fileName, '.css?');
@@ -2467,16 +2607,12 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
-			}
-
-			else
+			} else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2494,16 +2630,18 @@ 
 	if (!empty($fileName))
 	{
 		// find a free number/position
-		while (isset($context['css_files_order'][$params['order_pos']]))
-			$params['order_pos']++;
+		while (isset($context['css_files_order'][$params['order_pos']])) {
+					$params['order_pos']++;
+		}
 		$context['css_files_order'][$params['order_pos']] = $id;
 
 		$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
 	}
 
-	if (!empty($context['right_to_left']) && !empty($params['rtl']))
-		loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
-}
+	if (!empty($context['right_to_left']) && !empty($params['rtl'])) {
+			loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
+	}
+	}
 
 /**
  * Add a block of inline css code to be executed later
@@ -2520,8 +2658,9 @@ 
 	global $context;
 
 	// Gotta add something...
-	if (empty($css))
-		return false;
+	if (empty($css)) {
+			return false;
+	}
 
 	$context['css_header'][] = $css;
 }
@@ -2557,8 +2696,9 @@ 
 	$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.js?alp21 filenames
 	$has_seed = strpos($fileName, '.js?');
@@ -2575,16 +2715,12 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
-			}
-
-			else
+			} else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2599,9 +2735,10 @@ 
 	}
 
 	// Add it to the array for use in the template
-	if (!empty($fileName))
-		$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
-}
+	if (!empty($fileName)) {
+			$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	}
+	}
 
 /**
  * Add a Javascript variable for output later (for feeding text strings and similar to JS)
@@ -2615,9 +2752,10 @@ 
 {
 	global $context;
 
-	if (!empty($key) && (!empty($value) || $value === '0'))
-		$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
-}
+	if (!empty($key) && (!empty($value) || $value === '0')) {
+			$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
+	}
+	}
 
 /**
  * Add a block of inline Javascript code to be executed later
@@ -2634,8 +2772,9 @@ 
 {
 	global $context;
 
-	if (empty($javascript))
-		return false;
+	if (empty($javascript)) {
+			return false;
+	}
 
 	$context['javascript_inline'][($defer === true ? 'defer' : 'standard')][] = $javascript;
 }
@@ -2656,15 +2795,18 @@ 
 	static $already_loaded = array();
 
 	// Default to the user's language.
-	if ($lang == '')
-		$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	if ($lang == '') {
+			$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	}
 
 	// Do we want the English version of language file as fallback?
-	if (empty($modSettings['disable_language_fallback']) && $lang != 'english')
-		loadLanguage($template_name, 'english', false);
+	if (empty($modSettings['disable_language_fallback']) && $lang != 'english') {
+			loadLanguage($template_name, 'english', false);
+	}
 
-	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang)
-		return $lang;
+	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang) {
+			return $lang;
+	}
 
 	// Make sure we have $settings - if not we're in trouble and need to find it!
 	if (empty($settings['default_theme_dir']))
@@ -2675,8 +2817,9 @@ 
 
 	// What theme are we in?
 	$theme_name = basename($settings['theme_url']);
-	if (empty($theme_name))
-		$theme_name = 'unknown';
+	if (empty($theme_name)) {
+			$theme_name = 'unknown';
+	}
 
 	// For each file open it up and write it out!
 	foreach (explode('+', $template_name) as $template)
@@ -2718,8 +2861,9 @@ 
 				$found = true;
 
 				// setlocale is required for basename() & pathinfo() to work properly on the selected language
-				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set']))
-					setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
+				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set'])) {
+									setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
+				}
 
 				break;
 			}
@@ -2759,8 +2903,9 @@ 
 	}
 
 	// Keep track of what we're up to soldier.
-	if ($db_show_debug === true)
-		$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	if ($db_show_debug === true) {
+			$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	}
 
 	// Remember what we have loaded, and in which language.
 	$already_loaded[$template_name] = $lang;
@@ -2806,8 +2951,9 @@ 
 				)
 			);
 			// In the EXTREMELY unlikely event this happens, give an error message.
-			if ($smcFunc['db_num_rows']($result) == 0)
-				fatal_lang_error('parent_not_found', 'critical');
+			if ($smcFunc['db_num_rows']($result) == 0) {
+							fatal_lang_error('parent_not_found', 'critical');
+			}
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				if (!isset($boards[$row['id_board']]))
@@ -2824,8 +2970,8 @@ 
 					);
 				}
 				// If a moderator exists for this board, add that moderator for all children too.
-				if (!empty($row['id_moderator']))
-					foreach ($boards as $id => $dummy)
+				if (!empty($row['id_moderator'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderators'][$row['id_moderator']] = array(
 							'id' => $row['id_moderator'],
@@ -2833,11 +2979,12 @@ 
 							'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 							'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 						);
+				}
 					}
 
 				// If a moderator group exists for this board, add that moderator group for all children too
-				if (!empty($row['id_moderator_group']))
-					foreach ($boards as $id => $dummy)
+				if (!empty($row['id_moderator_group'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderator_groups'][$row['id_moderator_group']] = array(
 							'id' => $row['id_moderator_group'],
@@ -2845,6 +2992,7 @@ 
 							'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 							'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 						);
+				}
 					}
 			}
 			$smcFunc['db_free_result']($result);
@@ -2871,23 +3019,27 @@ 
 	if (!$use_cache || ($context['languages'] = cache_get_data('known_languages', !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600)) == null)
 	{
 		// If we don't have our ucwords function defined yet, let's load the settings data.
-		if (empty($smcFunc['ucwords']))
-			reloadSettings();
+		if (empty($smcFunc['ucwords'])) {
+					reloadSettings();
+		}
 
 		// If we don't have our theme information yet, let's get it.
-		if (empty($settings['default_theme_dir']))
-			loadTheme(0, false);
+		if (empty($settings['default_theme_dir'])) {
+					loadTheme(0, false);
+		}
 
 		// Default language directories to try.
 		$language_directories = array(
 			$settings['default_theme_dir'] . '/languages',
 		);
-		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir'])
-			$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir']) {
+					$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		}
 
 		// We possibly have a base theme directory.
-		if (!empty($settings['base_theme_dir']))
-			$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		if (!empty($settings['base_theme_dir'])) {
+					$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		}
 
 		// Remove any duplicates.
 		$language_directories = array_unique($language_directories);
@@ -2901,20 +3053,21 @@ 
 		foreach ($language_directories as $language_dir)
 		{
 			// Can't look in here... doesn't exist!
-			if (!file_exists($language_dir))
-				continue;
+			if (!file_exists($language_dir)) {
+							continue;
+			}
 
 			$dir = dir($language_dir);
 			while ($entry = $dir->read())
 			{
 				// Look for the index language file... For good measure skip any "index.language-utf8.php" files
-				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches))
-					continue;
-
-				if (!empty($langList) && !empty($langList[$matches[1]]))
-					$langName = $langList[$matches[1]];
+				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches)) {
+									continue;
+				}
 
-				else
+				if (!empty($langList) && !empty($langList[$matches[1]])) {
+									$langName = $langList[$matches[1]];
+				} else
 				{
 					$langName = $smcFunc['ucwords'](strtr($matches[1], array('_' => ' ')));
 
@@ -2955,12 +3108,14 @@ 
 		}
 
 		// Do we need to store the lang list?
-		if (empty($langList))
-			updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
+		if (empty($langList)) {
+					updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
+		}
 
 		// Let's cash in on this deal.
-		if (!empty($modSettings['cache_enable']))
-			cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		if (!empty($modSettings['cache_enable'])) {
+					cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		}
 	}
 
 	return $context['languages'];
@@ -2983,8 +3138,9 @@ 
 	global $modSettings, $options, $txt;
 	static $censor_vulgar = null, $censor_proper;
 
-	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '')
-		return $text;
+	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '') {
+			return $text;
+	}
 
 	// If they haven't yet been loaded, load them.
 	if ($censor_vulgar == null)
@@ -3015,9 +3171,9 @@ 
 	{
 		$func = !empty($modSettings['censorIgnoreCase']) ? 'str_ireplace' : 'str_replace';
 		$text = $func($censor_vulgar, $censor_proper, $text);
+	} else {
+			$text = preg_replace($censor_vulgar, $censor_proper, $text);
 	}
-	else
-		$text = preg_replace($censor_vulgar, $censor_proper, $text);
 
 	return $text;
 }
@@ -3043,30 +3199,35 @@ 
 	@ini_set('track_errors', '1');
 
 	// Don't include the file more than once, if $once is true.
-	if ($once && in_array($filename, $templates))
-		return;
+	if ($once && in_array($filename, $templates)) {
+			return;
+	}
 	// Add this file to the include list, whether $once is true or not.
-	else
-		$templates[] = $filename;
+	else {
+			$templates[] = $filename;
+	}
 
 
 	$file_found = file_exists($filename);
 
-	if ($once && $file_found)
-		require_once($filename);
-	elseif ($file_found)
-		require($filename);
+	if ($once && $file_found) {
+			require_once($filename);
+	} elseif ($file_found) {
+			require($filename);
+	}
 
 	if ($file_found !== true)
 	{
 		ob_end_clean();
-		if (!empty($modSettings['enableCompressedOutput']))
-			@ob_start('ob_gzhandler');
-		else
-			ob_start();
+		if (!empty($modSettings['enableCompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
-		if (isset($_GET['debug']))
-			header('content-type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		if (isset($_GET['debug'])) {
+					header('content-type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		}
 
 		// Don't cache error pages!!
 		header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -3085,12 +3246,13 @@ 
 		echo '<!DOCTYPE html>
 <html', !empty($context['right_to_left']) ? ' dir="rtl"' : '', '>
 	<head>';
-		if (isset($context['character_set']))
-			echo '
+		if (isset($context['character_set'])) {
+					echo '
 		<meta charset="', $context['character_set'], '">';
+		}
 
-		if (!empty($maintenance) && !allowedTo('admin_forum'))
-			echo '
+		if (!empty($maintenance) && !allowedTo('admin_forum')) {
+					echo '
 		<title>', $mtitle, '</title>
 	</head>
 	<body>
@@ -3098,8 +3260,8 @@ 
 		', $mmessage, '
 	</body>
 </html>';
-		elseif (!allowedTo('admin_forum'))
-			echo '
+		} elseif (!allowedTo('admin_forum')) {
+					echo '
 		<title>', $txt['template_parse_error'], '</title>
 	</head>
 	<body>
@@ -3107,14 +3269,16 @@ 
 		', $txt['template_parse_error_message'], '
 	</body>
 </html>';
-		else
+		} else
 		{
 			$error = fetch_web_data($boardurl . strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 			$error_array = error_get_last();
-			if (empty($error) && ini_get('track_errors') && !empty($error_array))
-				$error = $error_array['message'];
-			if (empty($error))
-				$error = $txt['template_parse_errmsg'];
+			if (empty($error) && ini_get('track_errors') && !empty($error_array)) {
+							$error = $error_array['message'];
+			}
+			if (empty($error)) {
+							$error = $txt['template_parse_errmsg'];
+			}
 
 			$error = strtr($error, array('<b>' => '<strong>', '</b>' => '</strong>'));
 
@@ -3125,11 +3289,12 @@ 
 		<h3>', $txt['template_parse_error'], '</h3>
 		', sprintf($txt['template_parse_error_details'], strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 
-			if (!empty($error))
-				echo '
+			if (!empty($error)) {
+							echo '
 		<hr>
 
 		<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>' . $boarddir => '<strong>...', '<strong>' . strtr($boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
+			}
 
 			// I know, I know... this is VERY COMPLICATED.  Still, it's good.
 			if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0)
@@ -3139,10 +3304,11 @@ 
 				$data2 = preg_split('~\<br( /)?\>~', $data2);
 
 				// Fix the PHP code stuff...
-				if (!isBrowser('gecko'))
-					$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
-				else
-					$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				if (!isBrowser('gecko')) {
+									$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
+				} else {
+									$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				}
 
 				// Now we get to work around a bug in PHP where it doesn't escape <br>s!
 				$j = -1;
@@ -3150,8 +3316,9 @@ 
 				{
 					$j++;
 
-					if (substr_count($line, '<br>') == 0)
-						continue;
+					if (substr_count($line, '<br>') == 0) {
+											continue;
+					}
 
 					$n = substr_count($line, '<br>');
 					for ($i = 0; $i < $n; $i++)
@@ -3170,38 +3337,42 @@ 
 				// Figure out what the color coding was before...
 				$line = max($match[1] - 9, 1);
 				$last_line = '';
-				for ($line2 = $line - 1; $line2 > 1; $line2--)
-					if (strpos($data2[$line2], '<') !== false)
+				for ($line2 = $line - 1; $line2 > 1; $line2--) {
+									if (strpos($data2[$line2], '<') !== false)
 					{
 						if (preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line2], $color_match) != 0)
 							$last_line = $color_match[1];
+				}
 						break;
 					}
 
 				// Show the relevant lines...
 				for ($n = min($match[1] + 4, count($data2) + 1); $line <= $n; $line++)
 				{
-					if ($line == $match[1])
-						echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					if ($line == $match[1]) {
+											echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					}
 
 					echo '<span style="color: black;">', sprintf('%' . strlen($n) . 's', $line), ':</span> ';
-					if (isset($data2[$line]) && $data2[$line] != '')
-						echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					if (isset($data2[$line]) && $data2[$line] != '') {
+											echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					}
 
 					if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0)
 					{
 						$last_line = $color_match[1];
 						echo '</', substr($last_line, 1, 4), '>';
+					} elseif ($last_line != '' && strpos($data2[$line], '<') !== false) {
+											$last_line = '';
+					} elseif ($last_line != '' && $data2[$line] != '') {
+											echo '</', substr($last_line, 1, 4), '>';
 					}
-					elseif ($last_line != '' && strpos($data2[$line], '<') !== false)
-						$last_line = '';
-					elseif ($last_line != '' && $data2[$line] != '')
-						echo '</', substr($last_line, 1, 4), '>';
 
-					if ($line == $match[1])
-						echo '</pre></div><pre style="margin: 0;">';
-					else
-						echo "\n";
+					if ($line == $match[1]) {
+											echo '</pre></div><pre style="margin: 0;">';
+					} else {
+											echo "\n";
+					}
 				}
 
 				echo '</pre></div>';
@@ -3225,8 +3396,9 @@ 
 	global $db_type, $db_name, $ssi_db_user, $ssi_db_passwd, $sourcedir, $db_prefix, $db_port, $db_mb4;
 
 	// Figure out what type of database we are using.
-	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
-		$db_type = 'mysql';
+	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php')) {
+			$db_type = 'mysql';
+	}
 
 	// Load the file for the database.
 	require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
@@ -3234,11 +3406,13 @@ 
 	$db_options = array();
 
 	// Add in the port if needed
-	if (!empty($db_port))
-		$db_options['port'] = $db_port;
+	if (!empty($db_port)) {
+			$db_options['port'] = $db_port;
+	}
 
-	if (!empty($db_mb4))
-		$db_options['db_mb4'] = $db_mb4;
+	if (!empty($db_mb4)) {
+			$db_options['db_mb4'] = $db_mb4;
+	}
 
 	// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
 	if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
@@ -3257,13 +3431,15 @@ 
 	}
 
 	// Safe guard here, if there isn't a valid connection lets put a stop to it.
-	if (!$db_connection)
-		display_db_error();
+	if (!$db_connection) {
+			display_db_error();
+	}
 
 	// If in SSI mode fix up the prefix.
-	if (SMF == 'SSI')
-		db_fix_prefix($db_prefix, $db_name);
-}
+	if (SMF == 'SSI') {
+			db_fix_prefix($db_prefix, $db_name);
+	}
+	}
 
 /**
  * Try to load up a supported caching method. This is saved in $cacheAPI if we are not overriding it.
@@ -3277,10 +3453,11 @@ 
 	global $sourcedir, $cacheAPI, $cache_accelerator;
 
 	// Not overriding this and we have a cacheAPI, send it back.
-	if (empty($overrideCache) && is_object($cacheAPI))
-		return $cacheAPI;
-	elseif (is_null($cacheAPI))
-		$cacheAPI = false;
+	if (empty($overrideCache) && is_object($cacheAPI)) {
+			return $cacheAPI;
+	} elseif (is_null($cacheAPI)) {
+			$cacheAPI = false;
+	}
 
 	// Make sure our class is in session.
 	require_once($sourcedir . '/Class-CacheAPI.php');
@@ -3301,8 +3478,9 @@ 
 		if (!$testAPI->isSupported())
 		{
 			// Can we save ourselves?
-			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf')
-				return loadCacheAccelerator(null, false);
+			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf') {
+							return loadCacheAccelerator(null, false);
+			}
 			return false;
 		}
 
@@ -3314,9 +3492,9 @@ 
 		{
 			$cacheAPI = $testAPI;
 			return $cacheAPI;
+		} else {
+					return $testAPI;
 		}
-		else
-			return $testAPI;
 	}
 }
 
@@ -3336,8 +3514,9 @@ 
 
 	// @todo Why are we doing this if caching is disabled?
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	}
 
 	/* Refresh the cache if either:
 		1. Caching is disabled.
@@ -3351,16 +3530,19 @@ 
 		require_once($sourcedir . '/' . $file);
 		$cache_block = call_user_func_array($function, $params);
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level)
-			cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level) {
+					cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		}
 	}
 
 	// Some cached data may need a freshening up after retrieval.
-	if (!empty($cache_block['post_retri_eval']))
-		eval($cache_block['post_retri_eval']);
+	if (!empty($cache_block['post_retri_eval'])) {
+			eval($cache_block['post_retri_eval']);
+	}
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	}
 
 	return $cache_block['data'];
 }
@@ -3387,8 +3569,9 @@ 
 	global $smcFunc, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3401,12 +3584,14 @@ 
 	$value = $value === null ? null : (isset($smcFunc['json_encode']) ? $smcFunc['json_encode']($value) : json_encode($value));
 	$cacheAPI->putData($key, $value, $ttl);
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	}
 
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
-}
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
+	}
 
 /**
  * Gets the value from the cache specified by key, so long as it is not older than ttl seconds.
@@ -3422,8 +3607,9 @@ 
 	global $smcFunc, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $cache_misses, $cache_count_misses, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3443,16 +3629,18 @@ 
 
 		if (empty($value))
 		{
-			if (!is_array($cache_misses))
-				$cache_misses = array();
+			if (!is_array($cache_misses)) {
+							$cache_misses = array();
+			}
 
 			$cache_count_misses = isset($cache_count_misses) ? $cache_count_misses + 1 : 1;
 			$cache_misses[$cache_count_misses] = array('k' => $original_key, 'd' => 'get');
 		}
 	}
 
-	if (function_exists('call_integration_hook') && isset($value))
-		call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	if (function_exists('call_integration_hook') && isset($value)) {
+			call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	}
 
 	return empty($value) ? null : (isset($smcFunc['json_decode']) ? $smcFunc['json_decode']($value, true) : smf_json_decode($value, true));
 }
@@ -3474,8 +3662,9 @@ 
 	global $cacheAPI;
 
 	// If we can't get to the API, can't do this.
-	if (empty($cacheAPI))
-		return;
+	if (empty($cacheAPI)) {
+			return;
+	}
 
 	// Ask the API to do the heavy lifting. cleanCache also calls invalidateCache to be sure.
 	$cacheAPI->cleanCache($type);
@@ -3500,8 +3689,9 @@ 
 	global $modSettings, $boardurl, $smcFunc, $image_proxy_enabled, $user_info;
 
 	// Come on!
-	if (empty($data))
-		return array();
+	if (empty($data)) {
+			return array();
+	}
 
 	// Set a nice default var.
 	$image = '';
@@ -3509,11 +3699,11 @@ 
 	// Gravatar has been set as mandatory!
 	if (!empty($modSettings['gravatarOverride']))
 	{
-		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://'))
-			$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
-
-		else if (!empty($data['email']))
-			$image = get_gravatar_url($data['email']);
+		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://')) {
+					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+		} else if (!empty($data['email'])) {
+					$image = get_gravatar_url($data['email']);
+		}
 	}
 
 	// Look if the user has a gravatar field or has set an external url as avatar.
@@ -3525,54 +3715,60 @@ 
 			// Gravatar.
 			if (stristr($data['avatar'], 'gravatar://'))
 			{
-				if ($data['avatar'] == 'gravatar://')
-					$image = get_gravatar_url($data['email']);
-
-				elseif (!empty($modSettings['gravatarAllowExtraEmail']))
-					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				if ($data['avatar'] == 'gravatar://') {
+									$image = get_gravatar_url($data['email']);
+				} elseif (!empty($modSettings['gravatarAllowExtraEmail'])) {
+									$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				}
 			}
 
 			// External url.
 			else
 			{
 				// Using ssl?
-				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
-					$image = get_proxied_url($data['avatar']);
+				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
+									$image = get_proxied_url($data['avatar']);
+				}
 
 				// Just a plain external url.
-				else
-					$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				else {
+									$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				}
 			}
 		}
 
 		// Perhaps this user has an attachment as avatar...
-		else if (!empty($data['filename']))
-			$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		else if (!empty($data['filename'])) {
+					$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		}
 
 		// Right... no avatar... use our default image.
-		else
-			$image = $modSettings['avatar_url'] . '/default.png';
+		else {
+					$image = $modSettings['avatar_url'] . '/default.png';
+		}
 	}
 
 	call_integration_hook('integrate_set_avatar_data', array(&$image, &$data));
 
 	// At this point in time $image has to be filled unless you chose to force gravatar and the user doesn't have the needed data to retrieve it... thus a check for !empty() is still needed.
-	if (!empty($image))
-		return array(
+	if (!empty($image)) {
+			return array(
 			'name' => !empty($data['avatar']) ? $data['avatar'] : '',
 			'image' => '<img class="avatar" src="' . $image . '" />',
 			'href' => $image,
 			'url' => $image,
 		);
+	}
 
 	// Fallback to make life easier for everyone...
-	else
-		return array(
+	else {
+			return array(
 			'name' => '',
 			'image' => '',
 			'href' => '',
 			'url' => '',
 		);
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Subs-Db-postgresql.php

Doc Comments +2 added lines, -2 removed lines

@@ -500,7 +500,7 @@ 
 /**
  * Returns the amount of affected rows for a query.
  *
- * @param mixed $result
+ * @param resource|null $result
  *
  * @return int
  *
@@ -869,7 +869,7 @@ 
  *
  * @param string $db_name The database name
  * @param resource $db_connection The database connection
- * @return true Always returns true
+ * @return boolean Always returns true
  */
 function smf_db_select_db($db_name, $db_connection)
 {

Spacing +9 added lines, -9 removed lines

@@ -199,22 +199,22 @@ 
 
 		case 'date':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
+				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]) . '::date';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'time':
 			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
+				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]) . '::time';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'datetime':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'to_timestamp('.
-					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
+				return 'to_timestamp(' .
+					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
 					',\'YYYY-MM-DD HH24:MI:SS\')';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
@@ -424,7 +424,7 @@ 
 		$old_pos = 0;
 		$pos = -1;
 		// Remove the string escape for better runtime
-		$db_string_1 = str_replace('\'\'','',$db_string);
+		$db_string_1 = str_replace('\'\'', '', $db_string);
 		while (true)
 		{
 			$pos = strpos($db_string_1, '\'', $pos + 1);
@@ -802,7 +802,7 @@ 
 	if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
 	{
 		// we only take the first key
-		$returning = ' RETURNING '.$keys[0];
+		$returning = ' RETURNING ' . $keys[0];
 		$with_returning = true;
 	}
 
@@ -833,7 +833,7 @@ 
 			INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
 			VALUES
 				' . implode(',
-				', $insertRows).$replace.$returning,
+				', $insertRows) . $replace . $returning,
 			array(
 				'security_override' => true,
 				'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
@@ -846,7 +846,7 @@ 
 			if ($returnmode === 2)
 				$return_var = array();
 
-			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
+			while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
 			{
 				if (is_numeric($row[0])) // try to emulate mysql limitation
 				{
@@ -1009,7 +1009,7 @@ 
  */
 function smf_db_custom_order($field, $array_values, $desc = false)
 {
-	$return = 'CASE '. $field . ' ';
+	$return = 'CASE ' . $field . ' ';
 	$count = count($array_values);
 	$then = ($desc ? ' THEN -' : ' THEN ');
 

Braces +238 added lines, -175 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Maps the implementations in this file (smf_db_function_name)
@@ -34,8 +35,8 @@ 
 	global $smcFunc;
 
 	// Map some database specific functions, only do this once.
-	if (!isset($smcFunc['db_fetch_assoc']))
-		$smcFunc += array(
+	if (!isset($smcFunc['db_fetch_assoc'])) {
+			$smcFunc += array(
 			'db_query'					=> 'smf_db_query',
 			'db_quote'					=> 'smf_db_quote',
 			'db_insert'					=> 'smf_db_insert',
@@ -65,15 +66,18 @@ 
 			'db_custom_order'			=> 'smf_db_custom_order',
 			'db_native_replace'			=> 'smf_db_native_replace',
 		);
+	}
 
 	// We are not going to make it very far without these.
-	if (!function_exists('pg_pconnect'))
-		display_db_error();
+	if (!function_exists('pg_pconnect')) {
+			display_db_error();
+	}
 
-	if (!empty($db_options['persist']))
-		$connection = @pg_pconnect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
-	else
-		$connection = @pg_connect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	if (!empty($db_options['persist'])) {
+			$connection = @pg_pconnect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	} else {
+			$connection = @pg_connect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	}
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if (!$connection)
@@ -81,15 +85,15 @@ 
 		if (!empty($db_options['non_fatal']))
 		{
 			return null;
-		}
-		else
+		} else
 		{
 			display_db_error();
 		}
 	}
 
-	if (!empty($db_options['db_mb4']))
-		$smcFunc['db_mb4'] = (bool) $db_options['db_mb4'];
+	if (!empty($db_options['db_mb4'])) {
+			$smcFunc['db_mb4'] = (bool) $db_options['db_mb4'];
+	}
 
 	return $connection;
 }
@@ -136,31 +140,38 @@ 
 
 	list ($values, $connection) = $db_callback;
 
-	if ($matches[1] === 'db_prefix')
-		return $db_prefix;
+	if ($matches[1] === 'db_prefix') {
+			return $db_prefix;
+	}
 
-	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false)
-		return $user_info[$matches[1]];
+	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false) {
+			return $user_info[$matches[1]];
+	}
 
-	if ($matches[1] === 'empty')
-		return '\'\'';
+	if ($matches[1] === 'empty') {
+			return '\'\'';
+	}
 
-	if (!isset($matches[2]))
-		smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($matches[2])) {
+			smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
-	if ($matches[1] === 'literal')
-		return '\'' . pg_escape_string($matches[2]) . '\'';
+	if ($matches[1] === 'literal') {
+			return '\'' . pg_escape_string($matches[2]) . '\'';
+	}
 
-	if (!isset($values[$matches[2]]))
-		smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($values[$matches[2]])) {
+			smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
 	$replacement = $values[$matches[2]];
 
 	switch ($matches[1])
 	{
 		case 'int':
-			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
-				smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (int) $replacement;
 		break;
 
@@ -172,65 +183,73 @@ 
 		case 'array_int':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if (!is_numeric($value) || (string) $value !== (string) (int) $value)
-						smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
+											smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
 					$replacement[$key] = (string) (int) $value;
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
 		break;
 
 		case 'array_string':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
-				foreach ($replacement as $key => $value)
-					$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($value));
+				foreach ($replacement as $key => $value) {
+									$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($value));
+				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'date':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
+							return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'time':
-			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
+							return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'datetime':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'to_timestamp('.
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) {
+							return 'to_timestamp('.
 					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
 					',\'YYYY-MM-DD HH24:MI:SS\')';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'float':
-			if (!is_numeric($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (float) $replacement;
 		break;
 
@@ -243,31 +262,36 @@ 
 		break;
 
 		case 'inet':
-			if ($replacement == 'null' || $replacement == '')
-				return 'null';
-			if (inet_pton($replacement) === false)
-				smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if ($replacement == 'null' || $replacement == '') {
+							return 'null';
+			}
+			if (inet_pton($replacement) === false) {
+							smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return sprintf('\'%1$s\'::inet', pg_escape_string($replacement));
 
 		case 'array_inet':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if ($replacement == 'null' || $replacement == '')
-						$replacement[$key] = 'null';
-					if (!isValidIP($value))
-						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if ($replacement == 'null' || $replacement == '') {
+											$replacement[$key] = 'null';
+					}
+					if (!isValidIP($value)) {
+											smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 					$replacement[$key] = sprintf('\'%1$s\'::inet', pg_escape_string($value));
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		default:
@@ -355,14 +379,16 @@ 
 		),
 	);
 
-	if (isset($replacements[$identifier]))
-		$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	if (isset($replacements[$identifier])) {
+			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	}
 
 	// Limits need to be a little different.
 	$db_string = preg_replace('~\sLIMIT\s(\d+|{int:.+}),\s*(\d+|{int:.+})\s*$~i', 'LIMIT $2 OFFSET $1', $db_string);
 
-	if (trim($db_string) == '')
-		return false;
+	if (trim($db_string) == '') {
+			return false;
+	}
 
 	// Comments that are allowed in a query are preg_removed.
 	static $allowed_comments_from = array(
@@ -382,8 +408,9 @@ 
 	$db_count = !isset($db_count) ? 1 : $db_count + 1;
 	$db_replace_result = 0;
 
-	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
-		smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
+			smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	}
 
 	if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
 	{
@@ -408,17 +435,18 @@ 
 		while (true)
 		{
 			$pos = strpos($db_string_1, '\'', $pos + 1);
-			if ($pos === false)
-				break;
+			if ($pos === false) {
+							break;
+			}
 			$clean .= substr($db_string_1, $old_pos, $pos - $old_pos);
 
 			while (true)
 			{
 				$pos1 = strpos($db_string_1, '\'', $pos + 1);
 				$pos2 = strpos($db_string_1, '\\', $pos + 1);
-				if ($pos1 === false)
-					break;
-				elseif ($pos2 === false || $pos2 > $pos1)
+				if ($pos1 === false) {
+									break;
+				} elseif ($pos2 === false || $pos2 > $pos1)
 				{
 					$pos = $pos1;
 					break;
@@ -434,16 +462,19 @@ 
 		$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
 
 		// Comments?  We don't use comments in our queries, we leave 'em outside!
-		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
-			$fail = true;
+		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
+					$fail = true;
+		}
 		// Trying to change passwords, slow us down, or something?
-		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
-			$fail = true;
-		elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
-			$fail = true;
+		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
+					$fail = true;
+		} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
+					$fail = true;
+		}
 
-		if (!empty($fail) && function_exists('log_error'))
-			smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		if (!empty($fail) && function_exists('log_error')) {
+					smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		}
 	}
 
 	// Set optimize stuff
@@ -470,8 +501,9 @@ 
 		list ($file, $line) = smf_db_error_backtrace('', '', 'return', __FILE__, __LINE__);
 
 		// Initialize $db_cache if not already initialized.
-		if (!isset($db_cache))
-			$db_cache = array();
+		if (!isset($db_cache)) {
+					$db_cache = array();
+		}
 
 		if (!empty($_SESSION['debug_redirect']))
 		{
@@ -489,12 +521,14 @@ 
 
 	$db_last_result = @pg_query($connection, $db_string);
 
-	if ($db_last_result === false && empty($db_values['db_error_skip']))
-		$db_last_result = smf_db_error($db_string, $connection);
+	if ($db_last_result === false && empty($db_values['db_error_skip'])) {
+			$db_last_result = smf_db_error($db_string, $connection);
+	}
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
 
 	return $db_last_result;
 }
@@ -511,10 +545,11 @@ 
 {
 	global $db_last_result, $db_replace_result;
 
-	if ($db_replace_result)
-		return $db_replace_result;
-	elseif ($result === null && !$db_last_result)
-		return 0;
+	if ($db_replace_result) {
+			return $db_replace_result;
+	} elseif ($result === null && !$db_last_result) {
+			return 0;
+	}
 
 	return pg_affected_rows($result === null ? $db_last_result : $result);
 }
@@ -538,8 +573,9 @@ 
 		array(
 		)
 	);
-	if (!$request)
-		return false;
+	if (!$request) {
+			return false;
+	}
 	list ($lastID) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -560,12 +596,13 @@ 
 	// Decide which connection to use
 	$connection = $connection === null ? $db_connection : $connection;
 
-	if ($type == 'begin')
-		return @pg_query($connection, 'BEGIN');
-	elseif ($type == 'rollback')
-		return @pg_query($connection, 'ROLLBACK');
-	elseif ($type == 'commit')
-		return @pg_query($connection, 'COMMIT');
+	if ($type == 'begin') {
+			return @pg_query($connection, 'BEGIN');
+	} elseif ($type == 'rollback') {
+			return @pg_query($connection, 'ROLLBACK');
+	} elseif ($type == 'commit') {
+			return @pg_query($connection, 'COMMIT');
+	}
 
 	return false;
 }
@@ -593,19 +630,22 @@ 
 	$query_error = @pg_last_error($connection);
 
 	// Log the error.
-	if (function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
+	}
 
 	// Nothing's defined yet... just die with it.
-	if (empty($context) || empty($txt))
-		die($query_error);
+	if (empty($context) || empty($txt)) {
+			die($query_error);
+	}
 
 	// Show an error message, if possible.
 	$context['error_title'] = $txt['database_error'];
-	if (allowedTo('admin_forum'))
-		$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
-	else
-		$context['error_message'] = $txt['try_again'];
+	if (allowedTo('admin_forum')) {
+			$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
+	} else {
+			$context['error_message'] = $txt['try_again'];
+	}
 
 	if (allowedTo('admin_forum') && isset($db_show_debug) && $db_show_debug === true)
 	{
@@ -627,12 +667,14 @@ 
 {
 	global $db_row_count;
 
-	if ($counter !== false)
-		return pg_fetch_row($request, $counter);
+	if ($counter !== false) {
+			return pg_fetch_row($request, $counter);
+	}
 
 	// Reset the row counter...
-	if (!isset($db_row_count[(int) $request]))
-		$db_row_count[(int) $request] = 0;
+	if (!isset($db_row_count[(int) $request])) {
+			$db_row_count[(int) $request] = 0;
+	}
 
 	// Return the right row.
 	return @pg_fetch_row($request, $db_row_count[(int) $request]++);
@@ -649,12 +691,14 @@ 
 {
 	global $db_row_count;
 
-	if ($counter !== false)
-		return pg_fetch_assoc($request, $counter);
+	if ($counter !== false) {
+			return pg_fetch_assoc($request, $counter);
+	}
 
 	// Reset the row counter...
-	if (!isset($db_row_count[(int) $request]))
-		$db_row_count[(int) $request] = 0;
+	if (!isset($db_row_count[(int) $request])) {
+			$db_row_count[(int) $request] = 0;
+	}
 
 	// Return the right row.
 	return @pg_fetch_assoc($request, $db_row_count[(int) $request]++);
@@ -707,11 +751,13 @@ 
 
 	$replace = '';
 
-	if (empty($data))
-		return;
+	if (empty($data)) {
+			return;
+	}
 
-	if (!is_array($data[array_rand($data)]))
-		$data = array($data);
+	if (!is_array($data[array_rand($data)])) {
+			$data = array($data);
+	}
 
 	// Replace the prefix holder with the actual prefix.
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
@@ -737,32 +783,35 @@ 
 					$key_str .= ($count_pk > 0 ? ',' : '');
 					$key_str .= $columnName;
 					$count_pk++;
-				}
-				else if ($method == 'replace') //normal field
+				} else if ($method == 'replace') {
+					//normal field
 				{
 					$col_str .= ($count > 0 ? ',' : '');
+				}
 					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
 					$count++;
 				}
 			}
-			if ($method == 'replace')
-				$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
-			else
-				$replace = ' ON CONFLICT (' . $key_str . ') DO NOTHING';
-		}
-		else if ($method == 'replace')
+			if ($method == 'replace') {
+							$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
+			} else {
+							$replace = ' ON CONFLICT (' . $key_str . ') DO NOTHING';
+			}
+		} else if ($method == 'replace')
 		{
 			foreach ($columns as $columnName => $type)
 			{
 				// Are we restricting the length?
-				if (strpos($type, 'string-') !== false)
-					$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
-				else
-					$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				if (strpos($type, 'string-') !== false) {
+									$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
+				} else {
+									$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				}
 
 				// A key? That's what we were looking for.
-				if (in_array($columnName, $keys))
-					$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				if (in_array($columnName, $keys)) {
+									$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				}
 				$count++;
 			}
 
@@ -798,10 +847,11 @@ 
 		foreach ($columns as $columnName => $type)
 		{
 			// Are we restricting the length?
-			if (strpos($type, 'string-') !== false)
-				$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-			else
-				$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+			if (strpos($type, 'string-') !== false) {
+							$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
+			} else {
+							$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+			}
 		}
 		$insertData = substr($insertData, 0, -2) . ')';
 
@@ -810,8 +860,9 @@ 
 
 		// Here's where the variables are injected to the query.
 		$insertRows = array();
-		foreach ($data as $dataRow)
-			$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+		foreach ($data as $dataRow) {
+					$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+		}
 
 		// Do the insert.
 		$request = $smcFunc['db_query']('', '
@@ -828,19 +879,21 @@ 
 
 		if ($with_returning && $request !== false)
 		{
-			if ($returnmode === 2)
-				$return_var = array();
+			if ($returnmode === 2) {
+							$return_var = array();
+			}
 
 			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
 			{
-				if (is_numeric($row[0])) // try to emulate mysql limitation
+				if (is_numeric($row[0])) {
+					// try to emulate mysql limitation
 				{
 					if ($returnmode === 1)
 						$return_var = $row[0];
-					elseif ($returnmode === 2)
-						$return_var[] = $row[0];
-				}
-				else
+				} elseif ($returnmode === 2) {
+											$return_var[] = $row[0];
+					}
+				} else
 				{
 					$with_returning = false;
 					trigger_error('trying to returning ID Field which is not a Int field', E_USER_ERROR);
@@ -849,9 +902,10 @@ 
 		}
 	}
 
-	if ($with_returning && !empty($return_var))
-		return $return_var;
-}
+	if ($with_returning && !empty($return_var)) {
+			return $return_var;
+	}
+	}
 
 /**
  * Dummy function really. Doesn't do anything on PostgreSQL.
@@ -888,8 +942,9 @@ 
  */
 function smf_db_error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 {
-	if (empty($log_message))
-		$log_message = $error_message;
+	if (empty($log_message)) {
+			$log_message = $error_message;
+	}
 
 	foreach (debug_backtrace() as $step)
 	{
@@ -908,12 +963,14 @@ 
 	}
 
 	// A special case - we want the file and line numbers for debugging.
-	if ($error_type == 'return')
-		return array($file, $line);
+	if ($error_type == 'return') {
+			return array($file, $line);
+	}
 
 	// Is always a critical error.
-	if (function_exists('log_error'))
-		log_error($log_message, 'critical', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($log_message, 'critical', $file, $line);
+	}
 
 	if (function_exists('fatal_error'))
 	{
@@ -921,12 +978,12 @@ 
 
 		// Cannot continue...
 		exit;
+	} elseif ($error_type) {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
+	} else {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
+	}
 	}
-	elseif ($error_type)
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
-	else
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
-}
 
 /**
  * Escape the LIKE wildcards so that they match the character and not the wildcard.
@@ -943,10 +1000,11 @@ 
 		'\\' => '\\\\',
 	);
 
-	if ($translate_human_wildcards)
-		$replacements += array(
+	if ($translate_human_wildcards) {
+			$replacements += array(
 			'*' => '%',
 		);
+	}
 
 	return strtr($string, $replacements);
 }
@@ -975,14 +1033,16 @@ 
 	static $pg_error_data_prep;
 
 	// without database we can't do anything
-	if (empty($db_connection))
-		return;
+	if (empty($db_connection)) {
+			return;
+	}
 
-	if (empty($pg_error_data_prep))
-			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
+	if (empty($pg_error_data_prep)) {
+				$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
 				'INSERT INTO ' . $db_prefix . 'log_errors(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)
 													VALUES(		$1,		$2,		$3, $4, 	$5,		$6,			$7,		$8,	$9, $10)'
 			);
+	}
 
 	pg_execute($db_connection, 'smf_log_errors', $error_array);
 }
@@ -1002,8 +1062,9 @@ 
 	$count = count($array_values);
 	$then = ($desc ? ' THEN -' : ' THEN ');
 
-	for ($i = 0; $i < $count; $i++)
-		$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+	for ($i = 0; $i < $count; $i++) {
+			$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+	}
 
 	$return .= 'END';
 	return $return;
@@ -1026,11 +1087,13 @@ 
 		//pg 9.5 got replace support
 		$pg_version = $smcFunc['db_get_version']();
 		// if we got a Beta Version
-		if (stripos($pg_version, 'beta') !== false)
-			$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
+		if (stripos($pg_version, 'beta') !== false) {
+					$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
+		}
 		// or RC
-		if (stripos($pg_version, 'rc') !== false)
-			$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
+		if (stripos($pg_version, 'rc') !== false) {
+					$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
+		}
 
 		$replace_support = (version_compare($pg_version, '9.5.0', '>=') ? true : false);
 	}

Sources/ManageSettings.php

Spacing +15 added lines, -15 removed lines

@@ -1334,7 +1334,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['disabled'] ? '' : ' checked';
 						$onClickHandler = $rowData['can_show_register'] ? sprintf(' onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
@@ -1350,7 +1350,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked' : '';
 						$isDisabled = $rowData['can_show_register'] ? '' : ' disabled';
@@ -1397,15 +1397,15 @@ 
 					'value' => $txt['custom_profile_fieldorder'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($context, $txt, $scripturl)
+					'function' => function($rowData) use ($context, $txt, $scripturl)
 					{
-						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
+						$return = '<p class="centertext bold_text">' . $rowData['field_order'] . '<br>';
 
 						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_up'] . '"></span></a>';
 
 						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_down'] . '"></span></a>';
 
 						$return .= '</p>';
 
@@ -1423,7 +1423,7 @@ 
 					'value' => $txt['custom_profile_fieldname'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>', $scripturl, $rowData['id_field'], $rowData['field_name'], $rowData['field_desc']);
 					},
@@ -1439,7 +1439,7 @@ 
 					'value' => $txt['custom_profile_fieldtype'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
 						return isset($txt[$textKey]) ? $txt[$textKey] : $textKey;
@@ -1457,7 +1457,7 @@ 
 					'value' => $txt['custom_profile_active'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return $rowData['active'] ? $txt['yes'] : $txt['no'];
 					},
@@ -1474,7 +1474,7 @@ 
 					'value' => $txt['custom_profile_placement'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						global $txt, $context;
 
@@ -1709,7 +1709,7 @@ 
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
 
 		// All good, proceed.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:old_order}
 			WHERE field_order = {int:new_order}',
@@ -1718,7 +1718,7 @@ 
 				'old_order' => $context['field']['order'],
 			)
 		);
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:new_order}
 			WHERE id_field = {int:id_field}',
@@ -1820,7 +1820,7 @@ 
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
-			for ($i = 0; !$unique && $i < 9; $i ++)
+			for ($i = 0; !$unique && $i < 9; $i++)
 			{
 				if (!in_array($col_name, $current_fields))
 					$unique = true;
@@ -1993,7 +1993,7 @@ 
 		);
 
 		// Re-arrange the order.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = field_order - 1
 			WHERE field_order > {int:current_order}',
@@ -2257,7 +2257,7 @@ 
 	$context['token_check'] = 'noti-admin';
 
 	// Specify our action since we'll want to post back here instead of the profile
-	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;'. $context['session_var'] .'='. $context['session_id'];
+	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;' . $context['session_var'] . '=' . $context['session_id'];
 
 	loadTemplate('Profile');
 	loadLanguage('Profile');

Braces +276 added lines, -201 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function makes sure the requested subaction does exists, if it doesn't, it sets a default action or.
@@ -206,16 +207,18 @@ 
 	{
 		$all_zones = timezone_identifiers_list();
 		// Make sure we set the value to the same as the printed value.
-		foreach ($all_zones as $zone)
-			$config_vars['default_timezone'][2][$zone] = $zone;
+		foreach ($all_zones as $zone) {
+					$config_vars['default_timezone'][2][$zone] = $zone;
+		}
+	} else {
+			unset($config_vars['default_timezone']);
 	}
-	else
-		unset($config_vars['default_timezone']);
 
 	call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -223,8 +226,9 @@ 
 		checkSession();
 
 		// Prevent absurd boundaries here - make it a day tops.
-		if (isset($_POST['lastActive']))
-			$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		if (isset($_POST['lastActive'])) {
+					$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		}
 
 		call_integration_hook('integrate_save_basic_settings');
 
@@ -232,8 +236,9 @@ 
 		$_SESSION['adm-save'] = true;
 
 		// Do a bit of housekeeping
-		if (empty($_POST['minimize_files']))
-			deleteAllMinified();
+		if (empty($_POST['minimize_files'])) {
+					deleteAllMinified();
+		}
 
 		writeLog();
 		redirectexit('action=admin;area=featuresettings;sa=basic');
@@ -273,8 +278,9 @@ 
 
 	call_integration_hook('integrate_modify_bbc_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -291,13 +297,15 @@ 
 
 		// Clean up the tags.
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array();
-		elseif (!is_array($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		if (!isset($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array();
+		} elseif (!is_array($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		}
 		// Work out what is actually disabled!
 		$_POST['disabledBBC'] = implode(',', array_diff($bbcTags, $_POST['disabledBBC_enabledTags']));
 
@@ -341,8 +349,9 @@ 
 
 	call_integration_hook('integrate_layout_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -382,8 +391,9 @@ 
 
 	call_integration_hook('integrate_likes_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -421,8 +431,9 @@ 
 
 	call_integration_hook('integrate_mentions_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -466,8 +477,8 @@ 
 			'enable' => array('check', 'warning_enable'),
 	);
 
-	if (!empty($modSettings['warning_settings']) && $currently_enabled)
-		$config_vars += array(
+	if (!empty($modSettings['warning_settings']) && $currently_enabled) {
+			$config_vars += array(
 			'',
 				array('int', 'warning_watch', 'subtext' => $txt['setting_warning_watch_note'] . ' ' . $txt['zero_to_disable']),
 				'moderate' => array('int', 'warning_moderate', 'subtext' => $txt['setting_warning_moderate_note'] . ' ' . $txt['zero_to_disable']),
@@ -476,15 +487,18 @@ 
 				'rem2' => array('int', 'warning_decrement', 'subtext' => $txt['setting_warning_decrement_note'] . ' ' . $txt['zero_to_disable']),
 				array('permissions', 'view_warning'),
 		);
+	}
 
 	call_integration_hook('integrate_warning_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Cannot use moderation if post moderation is not enabled.
-	if (!$modSettings['postmod_active'])
-		unset($config_vars['moderate']);
+	if (!$modSettings['postmod_active']) {
+			unset($config_vars['moderate']);
+	}
 
 	// Will need the utility functions from here.
 	require_once($sourcedir . '/ManageServer.php');
@@ -509,16 +523,16 @@ 
 				'warning_watch' => 10,
 				'warning_mute' => 60,
 			);
-			if ($modSettings['postmod_active'])
-				$vars['warning_moderate'] = 35;
+			if ($modSettings['postmod_active']) {
+							$vars['warning_moderate'] = 35;
+			}
 
 			foreach ($vars as $var => $value)
 			{
 				$config_vars[] = array('int', $var);
 				$_POST[$var] = $value;
 			}
-		}
-		else
+		} else
 		{
 			$_POST['warning_watch'] = min($_POST['warning_watch'], 100);
 			$_POST['warning_moderate'] = $modSettings['postmod_active'] ? min($_POST['warning_moderate'], 100) : 0;
@@ -606,8 +620,9 @@ 
 
 	call_integration_hook('integrate_spam_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// You need to be an admin to edit settings!
 	isAllowedTo('admin_forum');
@@ -641,8 +656,9 @@ 
 
 	if (empty($context['qa_by_lang'][strtr($language, array('-utf8' => ''))]) && !empty($context['question_answers']))
 	{
-		if (empty($context['settings_insert_above']))
-			$context['settings_insert_above'] = '';
+		if (empty($context['settings_insert_above'])) {
+					$context['settings_insert_above'] = '';
+		}
 
 		$context['settings_insert_above'] .= '<div class="noticebox">' . sprintf($txt['question_not_defined'], $context['languages'][$language]['name']) . '</div>';
 	}
@@ -685,8 +701,9 @@ 
 		$_POST['pm_spam_settings'] = (int) $_POST['max_pm_recipients'] . ',' . (int) $_POST['pm_posts_verification'] . ',' . (int) $_POST['pm_posts_per_hour'];
 
 		// Hack in guest requiring verification!
-		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha']))
-			$_POST['posts_require_captcha'] = -1;
+		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha'])) {
+					$_POST['posts_require_captcha'] = -1;
+		}
 
 		$save_vars = $config_vars;
 		unset($save_vars['pm1'], $save_vars['pm2'], $save_vars['pm3'], $save_vars['guest_verify']);
@@ -703,14 +720,16 @@ 
 		foreach ($context['qa_languages'] as $lang_id => $dummy)
 		{
 			// If we had some questions for this language before, but don't now, delete everything from that language.
-			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id]))
-				$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id])) {
+							$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			}
 
 			// Now step through and see if any existing questions no longer exist.
-			if (!empty($context['qa_by_lang'][$lang_id]))
-				foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+			if (!empty($context['qa_by_lang'][$lang_id])) {
+							foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 					if (empty($_POST['question'][$lang_id][$q_id]))
 						$changes['delete'][] = $q_id;
+			}
 
 			// Now let's see if there are new questions or ones that need updating.
 			if (isset($_POST['question'][$lang_id]))
@@ -719,14 +738,16 @@ 
 				{
 					// Ignore junky ids.
 					$q_id = (int) $q_id;
-					if ($q_id <= 0)
-						continue;
+					if ($q_id <= 0) {
+											continue;
+					}
 
 					// Check the question isn't empty (because they want to delete it?)
 					if (empty($question) || trim($question) == '')
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$question = $smcFunc['htmlspecialchars'](trim($question));
@@ -734,19 +755,22 @@ 
 					// Get the answers. Firstly check there actually might be some.
 					if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id]))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					// Now get them and check that they might be viable.
 					$answers = array();
-					foreach ($_POST['answer'][$lang_id][$q_id] as $answer)
-						if (!empty($answer) && trim($answer) !== '')
+					foreach ($_POST['answer'][$lang_id][$q_id] as $answer) {
+											if (!empty($answer) && trim($answer) !== '')
 							$answers[] = $smcFunc['htmlspecialchars'](trim($answer));
+					}
 					if (empty($answers))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$answers = $smcFunc['json_encode']($answers);
@@ -756,16 +780,17 @@ 
 					{
 						// New question. Now, we don't want to randomly consume ids, so we'll set those, rather than trusting the browser's supplied ids.
 						$changes['insert'][] = array($lang_id, $question, $answers);
-					}
-					else
+					} else
 					{
 						// It's an existing question. Let's see what's changed, if anything.
-						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers'])
-							$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers']) {
+													$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						}
 					}
 
-					if (!isset($qs_per_lang[$lang_id]))
-						$qs_per_lang[$lang_id] = 0;
+					if (!isset($qs_per_lang[$lang_id])) {
+											$qs_per_lang[$lang_id] = 0;
+					}
 					$qs_per_lang[$lang_id]++;
 				}
 			}
@@ -815,8 +840,9 @@ 
 
 		// Lastly, the count of messages needs to be no more than the lowest number of questions for any one language.
 		$count_questions = empty($qs_per_lang) ? 0 : min($qs_per_lang);
-		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions)
-			$_POST['qa_verification_number'] = $count_questions;
+		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions) {
+					$_POST['qa_verification_number'] = $count_questions;
+		}
 
 		call_integration_hook('integrate_save_spam_settings', array(&$save_vars));
 
@@ -831,24 +857,27 @@ 
 
 	$character_range = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
 	$_SESSION['visual_verification_code'] = '';
-	for ($i = 0; $i < 6; $i++)
-		$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	for ($i = 0; $i < 6; $i++) {
+			$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	}
 
 	// Some javascript for CAPTCHA.
 	$context['settings_post_javascript'] = '';
-	if ($context['use_graphic_library'])
-		$context['settings_post_javascript'] .= '
+	if ($context['use_graphic_library']) {
+			$context['settings_post_javascript'] .= '
 		function refreshImages()
 		{
 			var imageType = document.getElementById(\'visual_verification_type\').value;
 			document.getElementById(\'verification_image\').src = \'' . $context['verification_image_href'] . ';type=\' + imageType;
 		}';
+	}
 
 	// Show the image itself, or text saying we can't.
-	if ($context['use_graphic_library'])
-		$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
-	else
-		$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	if ($context['use_graphic_library']) {
+			$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
+	} else {
+			$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	}
 
 	// Hack for PM spam settings.
 	list ($modSettings['max_pm_recipients'], $modSettings['pm_posts_verification'], $modSettings['pm_posts_per_hour']) = explode(',', $modSettings['pm_spam_settings']);
@@ -858,9 +887,10 @@ 
 	$modSettings['posts_require_captcha'] = !isset($modSettings['posts_require_captcha']) || $modSettings['posts_require_captcha'] == -1 ? 0 : $modSettings['posts_require_captcha'];
 
 	// Some minor javascript for the guest post setting.
-	if ($modSettings['posts_require_captcha'])
-		$context['settings_post_javascript'] .= '
+	if ($modSettings['posts_require_captcha']) {
+			$context['settings_post_javascript'] .= '
 		document.getElementById(\'guests_require_captcha\').disabled = true;';
+	}
 
 	// And everything else.
 	$context['post_url'] = $scripturl . '?action=admin;area=antispam;save';
@@ -907,8 +937,9 @@ 
 
 	call_integration_hook('integrate_signature_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	$context['page_title'] = $txt['signature_settings'];
@@ -963,8 +994,9 @@ 
 				$sig = strtr($row['signature'], array('<br>' => "\n"));
 
 				// Max characters...
-				if (!empty($sig_limits[1]))
-					$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				if (!empty($sig_limits[1])) {
+									$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				}
 				// Max lines...
 				if (!empty($sig_limits[2]))
 				{
@@ -974,8 +1006,9 @@ 
 						if ($sig[$i] == "\n")
 						{
 							$count++;
-							if ($count >= $sig_limits[2])
-								$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							if ($count >= $sig_limits[2]) {
+															$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							}
 						}
 					}
 				}
@@ -986,17 +1019,19 @@ 
 					{
 						$limit_broke = 0;
 						// Attempt to allow all sizes of abuse, so to speak.
-						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-							$limit_broke = $sig_limits[7] . 'px';
-						elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-							$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-						elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-							$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-						elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-							$limit_broke = 'large';
-
-						if ($limit_broke)
-							$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
+													$limit_broke = $sig_limits[7] . 'px';
+						} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
+													$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+						} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
+													$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+						} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
+													$limit_broke = 'large';
+						}
+
+						if ($limit_broke) {
+													$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						}
 					}
 				}
 
@@ -1052,32 +1087,34 @@ 
 											$img_offset = false;
 										}
 									}
+								} else {
+																	$replaces[$image] = '';
 								}
-								else
-									$replaces[$image] = '';
 
 								continue;
 							}
 
 							// Does it have predefined restraints? Width first.
-							if ($matches[6][$key])
-								$matches[2][$key] = $matches[6][$key];
+							if ($matches[6][$key]) {
+															$matches[2][$key] = $matches[6][$key];
+							}
 							if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 							{
 								$width = $sig_limits[5];
 								$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
+							} elseif ($matches[2][$key]) {
+															$width = $matches[2][$key];
 							}
-							elseif ($matches[2][$key])
-								$width = $matches[2][$key];
 							// ... and height.
 							if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 							{
 								$height = $sig_limits[6];
-								if ($width != -1)
-									$width = $width * ($height / $matches[4][$key]);
+								if ($width != -1) {
+																	$width = $width * ($height / $matches[4][$key]);
+								}
+							} elseif ($matches[4][$key]) {
+															$height = $matches[4][$key];
 							}
-							elseif ($matches[4][$key])
-								$height = $matches[4][$key];
 
 							// If the dimensions are still not fixed - we need to check the actual image.
 							if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -1095,12 +1132,13 @@ 
 									if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
 									{
 										$height = $sig_limits[6];
-										if ($width == -1)
-											$width = $sizes[0];
+										if ($width == -1) {
+																					$width = $sizes[0];
+										}
 										$width = $width * ($height / $sizes[1]);
+									} elseif ($width != -1) {
+																			$height = $sizes[1];
 									}
-									elseif ($width != -1)
-										$height = $sizes[1];
 								}
 							}
 
@@ -1113,8 +1151,9 @@ 
 							// Record that we got one.
 							$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
 						}
-						if (!empty($replaces))
-							$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						if (!empty($replaces)) {
+													$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						}
 					}
 				}
 				// Try to fix disabled tags.
@@ -1126,18 +1165,20 @@ 
 
 				$sig = strtr($sig, array("\n" => '<br>'));
 				call_integration_hook('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
-				if ($sig != $row['signature'])
-					$changes[$row['id_member']] = $sig;
+				if ($sig != $row['signature']) {
+									$changes[$row['id_member']] = $sig;
+				}
+			}
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							$done = true;
 			}
-			if ($smcFunc['db_num_rows']($request) == 0)
-				$done = true;
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to delete what we have?
 			if (!empty($changes))
 			{
-				foreach ($changes as $id => $sig)
-					$smcFunc['db_query']('', '
+				foreach ($changes as $id => $sig) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET signature = {string:signature}
 						WHERE id_member = {int:id_member}',
@@ -1146,11 +1187,13 @@ 
 							'signature' => $sig,
 						)
 					);
+				}
 			}
 
 			$_GET['step'] += 50;
-			if (!$done)
-				pauseSignatureApplySettings();
+			if (!$done) {
+							pauseSignatureApplySettings();
+			}
 		}
 		$settings_applied = true;
 	}
@@ -1168,8 +1211,9 @@ 
 	);
 
 	// Temporarily make each setting a modSetting!
-	foreach ($context['signature_settings'] as $key => $value)
-		$modSettings['signature_' . $key] = $value;
+	foreach ($context['signature_settings'] as $key => $value) {
+			$modSettings['signature_' . $key] = $value;
+	}
 
 	// Make sure we check the right tags!
 	$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
@@ -1181,23 +1225,26 @@ 
 
 		// Clean up the tag stuff!
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array();
-		elseif (!is_array($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		if (!isset($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array();
+		} elseif (!is_array($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		}
 
 		$sig_limits = array();
 		foreach ($context['signature_settings'] as $key => $value)
 		{
-			if ($key == 'allow_smileys')
-				continue;
-			elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys']))
-				$sig_limits[] = -1;
-			else
-				$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			if ($key == 'allow_smileys') {
+							continue;
+			} elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys'])) {
+							$sig_limits[] = -1;
+			} else {
+							$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			}
 		}
 
 		call_integration_hook('integrate_save_signature_settings', array(&$sig_limits, &$bbcTags));
@@ -1230,12 +1277,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we exhausted all the time we allowed?
-	if (time() - array_sum(explode(' ', $sig_start)) < 3)
-		return;
+	if (time() - array_sum(explode(' ', $sig_start)) < 3) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $_GET['step'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1281,9 +1330,10 @@ 
 		$disable_fields = array_flip($standard_fields);
 		if (!empty($_POST['active']))
 		{
-			foreach ($_POST['active'] as $value)
-				if (isset($disable_fields[$value]))
+			foreach ($_POST['active'] as $value) {
+							if (isset($disable_fields[$value]))
 					unset($disable_fields[$value]);
+			}
 		}
 		// What we have left!
 		$changes['disabled_profile_fields'] = empty($disable_fields) ? '' : implode(',', array_keys($disable_fields));
@@ -1292,16 +1342,18 @@ 
 		$reg_fields = array();
 		if (!empty($_POST['reg']))
 		{
-			foreach ($_POST['reg'] as $value)
-				if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
+			foreach ($_POST['reg'] as $value) {
+							if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
 					$reg_fields[] = $value;
+			}
 		}
 		// What we have left!
 		$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
 
 		$_SESSION['adm-save'] = true;
-		if (!empty($changes))
-			updateSettings($changes);
+		if (!empty($changes)) {
+					updateSettings($changes);
+		}
 	}
 
 	createToken('admin-scp');
@@ -1404,11 +1456,13 @@ 
 					{
 						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
 
-						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						if ($rowData['field_order'] > 1) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						}
 
-						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						if ($rowData['field_order'] < $context['custFieldsMaxOrder']) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						}
 
 						$return .= '</p>';
 
@@ -1546,16 +1600,16 @@ 
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
 
-		foreach ($standard_fields as $field)
-			$list[] = array(
+		foreach ($standard_fields as $field) {
+					$list[] = array(
 				'id' => $field,
 				'label' => isset($txt['standard_profile_field_' . $field]) ? $txt['standard_profile_field_' . $field] : (isset($txt[$field]) ? $txt[$field] : $field),
 				'disabled' => in_array($field, $disabled_fields),
 				'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
 				'can_show_register' => !in_array($field, $fields_no_registration),
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Load all the fields.
 		$request = $smcFunc['db_query']('', '
@@ -1569,8 +1623,9 @@ 
 				'items_per_page' => $items_per_page,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$list[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$list[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1636,9 +1691,9 @@ 
 		$context['field'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['field_type'] == 'textarea')
-				@list ($rows, $cols) = @explode(',', $row['default_value']);
-			else
+			if ($row['field_type'] == 'textarea') {
+							@list ($rows, $cols) = @explode(',', $row['default_value']);
+			} else
 			{
 				$rows = 3;
 				$cols = 30;
@@ -1674,8 +1729,8 @@ 
 	}
 
 	// Setup the default values as needed.
-	if (empty($context['field']))
-		$context['field'] = array(
+	if (empty($context['field'])) {
+			$context['field'] = array(
 			'name' => '',
 			'col_name' => '???',
 			'desc' => '',
@@ -1700,6 +1755,7 @@ 
 			'enclose' => '',
 			'placement' => 0,
 		);
+	}
 
 	// Are we moving it?
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
@@ -1708,8 +1764,10 @@ 
 		$new_order = ($_GET['move'] == 'up' ? ($context['field']['order'] - 1) : ($context['field']['order'] + 1));
 
 		// Is this a valid position?
-		if ($new_order <= 0 || $new_order > $order_count)
-			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
+		if ($new_order <= 0 || $new_order > $order_count) {
+					redirectexit('action=admin;area=featuresettings;sa=profile');
+		}
+		// @todo implement an error handler
 
 		// All good, proceed.
 		$smcFunc['db_query']('','
@@ -1740,12 +1798,14 @@ 
 		validateToken('admin-ecp');
 
 		// Everyone needs a name - even the (bracket) unknown...
-		if (trim($_POST['field_name']) == '')
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		if (trim($_POST['field_name']) == '') {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		}
 
 		// Regex you say?  Do a very basic test to see if the pattern is valid
-		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false)
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false) {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		}
 
 		$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);
 		$_POST['field_desc'] = $smcFunc['htmlspecialchars']($_POST['field_desc']);
@@ -1762,8 +1822,9 @@ 
 
 		// Some masking stuff...
 		$mask = isset($_POST['mask']) ? $_POST['mask'] : '';
-		if ($mask == 'regex' && isset($_POST['regex']))
-			$mask .= $_POST['regex'];
+		if ($mask == 'regex' && isset($_POST['regex'])) {
+					$mask .= $_POST['regex'];
+		}
 
 		$field_length = isset($_POST['max_length']) ? (int) $_POST['max_length'] : 255;
 		$enclose = isset($_POST['enclose']) ? $_POST['enclose'] : '';
@@ -1782,8 +1843,9 @@ 
 				$v = strtr($v, array(',' => ''));
 
 				// Nada, zip, etc...
-				if (trim($v) == '')
-					continue;
+				if (trim($v) == '') {
+									continue;
+				}
 
 				// Otherwise, save it boy.
 				$field_options .= $v . ',';
@@ -1791,15 +1853,17 @@ 
 				$newOptions[$k] = $v;
 
 				// Is it default?
-				if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
-					$default = $v;
+				if (isset($_POST['default_select']) && $_POST['default_select'] == $k) {
+									$default = $v;
+				}
 			}
 			$field_options = substr($field_options, 0, -1);
 		}
 
 		// Text area has default has dimensions
-		if ($_POST['field_type'] == 'textarea')
-			$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		if ($_POST['field_type'] == 'textarea') {
+					$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		}
 
 		// Come up with the unique name?
 		if (empty($context['fid']))
@@ -1808,32 +1872,36 @@ 
 			preg_match('~([\w\d_-]+)~', $col_name, $matches);
 
 			// If there is nothing to the name, then let's start out own - for foreign languages etc.
-			if (isset($matches[1]))
-				$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
-			else
-				$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			if (isset($matches[1])) {
+							$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
+			} else {
+							$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			}
 
 			// Make sure this is unique.
 			$current_fields = array();
 			$request = $smcFunc['db_query']('', '
 				SELECT id_field, col_name
 				FROM {db_prefix}custom_fields');
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$current_fields[$row['id_field']] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$current_fields[$row['id_field']] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
 			for ($i = 0; !$unique && $i < 9; $i ++)
 			{
-				if (!in_array($col_name, $current_fields))
-					$unique = true;
-				else
-					$col_name = $initial_col_name . $i;
+				if (!in_array($col_name, $current_fields)) {
+									$unique = true;
+				} else {
+									$col_name = $initial_col_name . $i;
+				}
 			}
 
 			// Still not a unique column name? Leave it up to the user, then.
-			if (!$unique)
-				fatal_lang_error('custom_option_not_unique');
+			if (!$unique) {
+							fatal_lang_error('custom_option_not_unique');
+			}
 		}
 		// Work out what to do with the user data otherwise...
 		else
@@ -1861,8 +1929,9 @@ 
 				// Work out what's changed!
 				foreach ($context['field']['options'] as $k => $option)
 				{
-					if (trim($option) == '')
-						continue;
+					if (trim($option) == '') {
+											continue;
+					}
 
 					// Still exists?
 					if (in_array($option, $newOptions))
@@ -1876,8 +1945,8 @@ 
 				foreach ($optionChanges as $k => $option)
 				{
 					// Just been renamed?
-					if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-						$smcFunc['db_query']('', '
+					if (!in_array($k, $takenKeys) && !empty($newOptions[$k])) {
+											$smcFunc['db_query']('', '
 							UPDATE {db_prefix}themes
 							SET value = {string:new_value}
 							WHERE variable = {string:current_column}
@@ -1890,6 +1959,7 @@ 
 								'old_value' => $option,
 							)
 						);
+					}
 				}
 			}
 			// @todo Maybe we should adjust based on new text length limits?
@@ -1932,8 +2002,8 @@ 
 			);
 
 			// Just clean up any old selects - these are a pain!
-			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions))
-				$smcFunc['db_query']('', '
+			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE variable = {string:current_column}
 						AND value NOT IN ({array_string:new_option_values})
@@ -1944,8 +2014,8 @@ 
 						'current_column' => $context['field']['col_name'],
 					)
 				);
-		}
-		else
+			}
+		} else
 		{
 			// Gotta figure it out the order.
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
@@ -2120,11 +2190,13 @@ 
 	call_integration_hook('integrate_prune_settings', array(&$config_vars, &$prune_toggle, false));
 
 	$prune_toggle_dt = array();
-	foreach ($prune_toggle as $item)
-		$prune_toggle_dt[] = 'setting_' . $item;
+	foreach ($prune_toggle as $item) {
+			$prune_toggle_dt[] = 'setting_' . $item;
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	addInlineJavaScript('
 	function togglePruned()
@@ -2162,15 +2234,16 @@ 
 			$vals = array();
 			foreach ($config_vars as $index => $dummy)
 			{
-				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle))
-					continue;
+				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle)) {
+									continue;
+				}
 
 				$vals[] = empty($_POST[$dummy[1]]) || $_POST[$dummy[1]] < 0 ? 0 : (int) $_POST[$dummy[1]];
 			}
 			$_POST['pruningOptions'] = implode(',', $vals);
+		} else {
+					$_POST['pruningOptions'] = '';
 		}
-		else
-			$_POST['pruningOptions'] = '';
 
 		saveDBSettings($savevar);
 		$_SESSION['adm-save'] = true;
@@ -2182,10 +2255,11 @@ 
 	$context['sub_template'] = 'show_settings';
 
 	// Get the actual values
-	if (!empty($modSettings['pruningOptions']))
-		@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
-	else
-		$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	if (!empty($modSettings['pruningOptions'])) {
+			@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+	} else {
+			$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	}
 
 	prepareDBSettingContext($config_vars);
 }
@@ -2207,8 +2281,9 @@ 
 	// Make it even easier to add new settings.
 	call_integration_hook('integrate_general_mod_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=modsettings;save;sa=general';
 	$context['settings_title'] = $txt['mods_cat_modifications_misc'];

Sources/Post.php

Spacing +4 added lines, -4 removed lines

@@ -256,8 +256,8 @@ 
 			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
 
 		$js_time_string = str_replace(
-			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
-			array('H',  'G',  'h',  'g',  'i',  'A',  'a',  'h:i:s A', 'H:i', 's',  'H:i:s', 'H:i:s'),
+			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r', '%R', '%S', '%T', '%X'),
+			array('H', 'G', 'h', 'g', 'i', 'A', 'a', 'h:i:s A', 'H:i', 's', 'H:i:s', 'H:i:s'),
 			$time_string
 		);
 
@@ -1305,14 +1305,14 @@ 
 	if (isset($context['name']) && isset($context['email']))
 	{
 		$context['posting_fields']['guestname'] = array(
-			'dt' => '<span id="caption_guestname"' .  (isset($context['post_error']['long_name']) || isset($context['post_error']['no_name']) || isset($context['post_error']['bad_name']) ? ' class="error"' : '') . '>' . $txt['name'] . '</span>',
+			'dt' => '<span id="caption_guestname"' . (isset($context['post_error']['long_name']) || isset($context['post_error']['no_name']) || isset($context['post_error']['bad_name']) ? ' class="error"' : '') . '>' . $txt['name'] . '</span>',
 			'dd' => '<input type="text" name="guestname" size="25" value="' . $context['name'] . '" required>',
 		);
 
 		if (empty($modSettings['guest_post_no_email']))
 		{
 			$context['posting_fields']['email'] = array(
-				'dt' => '<span id="caption_email"' .  (isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '') . '>' . $txt['email'] . '</span>',
+				'dt' => '<span id="caption_email"' . (isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '') . '>' . $txt['email'] . '</span>',
 				'dd' => '<input type="email" name="email" size="25" value="' . $context['email'] . '" required>',
 			);
 		}

Braces +677 added lines, -523 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Handles showing the post screen, loading the post to be modified, and loading any post quoted.
@@ -35,12 +36,14 @@ 
 	global $sourcedir, $smcFunc, $language;
 
 	loadLanguage('Post');
-	if (!empty($modSettings['drafts_post_enabled']))
-		loadLanguage('Drafts');
+	if (!empty($modSettings['drafts_post_enabled'])) {
+			loadLanguage('Drafts');
+	}
 
 	// You can't reply with a poll... hacker.
-	if (isset($_REQUEST['poll']) && !empty($topic) && !isset($_REQUEST['msg']))
-		unset($_REQUEST['poll']);
+	if (isset($_REQUEST['poll']) && !empty($topic) && !isset($_REQUEST['msg'])) {
+			unset($_REQUEST['poll']);
+	}
 
 	// Posting an event?
 	$context['make_event'] = isset($_REQUEST['calendar']);
@@ -60,12 +63,14 @@ 
 	{
 		// Get ids of all the boards they can post in.
 		$post_permissions = array('post_new');
-		if ($modSettings['postmod_active'])
-			$post_permissions[] = 'post_unapproved_topics';
+		if ($modSettings['postmod_active']) {
+					$post_permissions[] = 'post_unapproved_topics';
+		}
 
 		$boards = boardsAllowedTo($post_permissions);
-		if (empty($boards))
-			fatal_lang_error('cannot_post_new', false);
+		if (empty($boards)) {
+					fatal_lang_error('cannot_post_new', false);
+		}
 
 		// Get a list of boards for the select menu
 		require_once($sourcedir . '/Subs-MessageIndex.php');
@@ -78,8 +83,9 @@ 
 		$board_list = getBoardList($boardListOptions);
 	}
 	// Let's keep things simple for ourselves below
-	else
-		$boards = array($board);
+	else {
+			$boards = array($board);
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -102,10 +108,11 @@ 
 			array(
 				'msg' => (int) $_REQUEST['msg'],
 		));
-		if ($smcFunc['db_num_rows']($request) != 1)
-			unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
-		else
-			list ($topic) = $smcFunc['db_fetch_row']($request);
+		if ($smcFunc['db_num_rows']($request) != 1) {
+					unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
+		} else {
+					list ($topic) = $smcFunc['db_fetch_row']($request);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -132,33 +139,36 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If this topic already has a poll, they sure can't add another.
-		if (isset($_REQUEST['poll']) && $pollID > 0)
-			unset($_REQUEST['poll']);
+		if (isset($_REQUEST['poll']) && $pollID > 0) {
+					unset($_REQUEST['poll']);
+		}
 
 		if (empty($_REQUEST['msg']))
 		{
-			if ($user_info['is_guest'] && !allowedTo('post_reply_any') && (!$modSettings['postmod_active'] || !allowedTo('post_unapproved_replies_any')))
-				is_not_guest();
+			if ($user_info['is_guest'] && !allowedTo('post_reply_any') && (!$modSettings['postmod_active'] || !allowedTo('post_unapproved_replies_any'))) {
+							is_not_guest();
+			}
 
 			// By default the reply will be approved...
 			$context['becomes_approved'] = true;
 			if ($id_member_poster != $user_info['id'] || $user_info['is_guest'])
 			{
-				if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
-					$context['becomes_approved'] = false;
-				else
-					isAllowedTo('post_reply_any');
-			}
-			elseif (!allowedTo('post_reply_any'))
+				if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any')) {
+									$context['becomes_approved'] = false;
+				} else {
+									isAllowedTo('post_reply_any');
+				}
+			} elseif (!allowedTo('post_reply_any'))
 			{
-				if ($modSettings['postmod_active'] && ((allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) || allowedTo('post_unapproved_replies_any')))
-					$context['becomes_approved'] = false;
-				else
-					isAllowedTo('post_reply_own');
+				if ($modSettings['postmod_active'] && ((allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) || allowedTo('post_unapproved_replies_any'))) {
+									$context['becomes_approved'] = false;
+				} else {
+									isAllowedTo('post_reply_own');
+				}
 			}
+		} else {
+					$context['becomes_approved'] = true;
 		}
-		else
-			$context['becomes_approved'] = true;
 
 		$context['can_lock'] = allowedTo('lock_any') || ($user_info['id'] == $id_member_poster && allowedTo('lock_own'));
 		$context['can_sticky'] = allowedTo('make_sticky');
@@ -173,17 +183,18 @@ 
 		$context['sticky'] = isset($_REQUEST['sticky']) ? !empty($_REQUEST['sticky']) : $sticky;
 
 		// Check whether this is a really old post being bumped...
-		if (!empty($modSettings['oldTopicDays']) && $lastPostTime + $modSettings['oldTopicDays'] * 86400 < time() && empty($sticky) && !isset($_REQUEST['subject']))
-			$post_errors[] = array('old_topic', array($modSettings['oldTopicDays']));
-	}
-	else
+		if (!empty($modSettings['oldTopicDays']) && $lastPostTime + $modSettings['oldTopicDays'] * 86400 < time() && empty($sticky) && !isset($_REQUEST['subject'])) {
+					$post_errors[] = array('old_topic', array($modSettings['oldTopicDays']));
+		}
+	} else
 	{
 		// @todo Should use JavaScript to hide and show the warning based on the selection in the board select menu
 		$context['becomes_approved'] = true;
-		if ($modSettings['postmod_active'] && !allowedTo('post_new', $boards, true) && allowedTo('post_unapproved_topics', $boards, true))
-			$context['becomes_approved'] = false;
-		else
-			isAllowedTo('post_new', $boards, true);
+		if ($modSettings['postmod_active'] && !allowedTo('post_new', $boards, true) && allowedTo('post_unapproved_topics', $boards, true)) {
+					$context['becomes_approved'] = false;
+		} else {
+					isAllowedTo('post_new', $boards, true);
+		}
 
 		$locked = 0;
 		$context['already_locked'] = 0;
@@ -213,27 +224,32 @@ 
 	if (empty($_REQUEST['message']) && empty($_REQUEST['preview']) && !empty($_SESSION['already_attached']))
 	{
 		require_once($sourcedir . '/ManageAttachments.php');
-		foreach ($_SESSION['already_attached'] as $attachID => $attachment)
-			removeAttachments(array('id_attach' => $attachID));
+		foreach ($_SESSION['already_attached'] as $attachID => $attachment) {
+					removeAttachments(array('id_attach' => $attachID));
+		}
 
 		unset($_SESSION['already_attached']);
 	}
 
 	// Don't allow a post if it's locked and you aren't all powerful.
-	if ($locked && !allowedTo('moderate_board'))
-		fatal_lang_error('topic_locked', false);
+	if ($locked && !allowedTo('moderate_board')) {
+			fatal_lang_error('topic_locked', false);
+	}
 	// Check the users permissions - is the user allowed to add or post a poll?
 	if (isset($_REQUEST['poll']) && $modSettings['pollMode'] == '1')
 	{
 		// New topic, new poll.
-		if (empty($topic))
-			isAllowedTo('poll_post');
+		if (empty($topic)) {
+					isAllowedTo('poll_post');
+		}
 		// This is an old topic - but it is yours!  Can you add to it?
-		elseif ($user_info['id'] == $id_member_poster && !allowedTo('poll_add_any'))
-			isAllowedTo('poll_add_own');
+		elseif ($user_info['id'] == $id_member_poster && !allowedTo('poll_add_any')) {
+					isAllowedTo('poll_add_own');
+		}
 		// If you're not the owner, can you add to any poll?
-		else
-			isAllowedTo('poll_add_any');
+		else {
+					isAllowedTo('poll_add_any');
+		}
 
 		if (!empty($board))
 		{
@@ -242,8 +258,9 @@ 
 			$guest_vote_enabled = in_array(-1, $allowedVoteGroups['allowed']);
 		}
 		// No board, so we'll have to check this again in Post2
-		else
-			$guest_vote_enabled = true;
+		else {
+					$guest_vote_enabled = true;
+		}
 
 		// Set up the poll options.
 		$context['poll_options'] = array(
@@ -269,8 +286,9 @@ 
 	if ($context['make_event'])
 	{
 		// They might want to pick a board.
-		if (!isset($context['current_board']))
-			$context['current_board'] = 0;
+		if (!isset($context['current_board'])) {
+					$context['current_board'] = 0;
+		}
 
 		// Start loading up the event info.
 		$context['event'] = array();
@@ -284,10 +302,11 @@ 
 		isAllowedTo('calendar_post');
 
 		// We want a fairly compact version of the time, but as close as possible to the user's settings.
-		if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-			$time_string = '%k:%M';
-		else
-			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+		if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+					$time_string = '%k:%M';
+		} else {
+					$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+		}
 
 		$js_time_string = str_replace(
 			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
@@ -309,8 +328,7 @@ 
 			require_once($sourcedir . '/Subs-Calendar.php');
 			$eventProperties = getEventProperties($context['event']['id']);
 			$context['event'] = array_merge($context['event'], $eventProperties);
-		}
-		else
+		} else
 		{
 			// Get the current event information.
 			require_once($sourcedir . '/Subs-Calendar.php');
@@ -318,10 +336,12 @@ 
 			$context['event'] = array_merge($context['event'], $eventProperties);
 
 			// Make sure the year and month are in the valid range.
-			if ($context['event']['month'] < 1 || $context['event']['month'] > 12)
-				fatal_lang_error('invalid_month', false);
-			if ($context['event']['year'] < $modSettings['cal_minyear'] || $context['event']['year'] > $modSettings['cal_maxyear'])
-				fatal_lang_error('invalid_year', false);
+			if ($context['event']['month'] < 1 || $context['event']['month'] > 12) {
+							fatal_lang_error('invalid_month', false);
+			}
+			if ($context['event']['year'] < $modSettings['cal_minyear'] || $context['event']['year'] > $modSettings['cal_maxyear']) {
+							fatal_lang_error('invalid_year', false);
+			}
 
 			$context['event']['categories'] = $board_list;
 		}
@@ -432,10 +452,11 @@ 
 
 			if (!empty($context['new_replies']))
 			{
-				if ($context['new_replies'] == 1)
-					$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
-				else
-					$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
+				if ($context['new_replies'] == 1) {
+									$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
+				} else {
+									$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
+				}
 
 				$post_errors[] = 'new_replies';
 
@@ -447,9 +468,9 @@ 
 	// Get a response prefix (like 'Re:') in the default forum language.
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 	{
-		if ($language === $user_info['language'])
-			$context['response_prefix'] = $txt['response_prefix'];
-		else
+		if ($language === $user_info['language']) {
+					$context['response_prefix'] = $txt['response_prefix'];
+		} else
 		{
 			loadLanguage('index', $language, false);
 			$context['response_prefix'] = $txt['response_prefix'];
@@ -462,23 +483,26 @@ 
 	// Do we have a body, but an error happened.
 	if (isset($_REQUEST['message']) || isset($_REQUEST['quickReply']) || !empty($context['post_error']))
 	{
-		if (isset($_REQUEST['quickReply']))
-			$_REQUEST['message'] = $_REQUEST['quickReply'];
+		if (isset($_REQUEST['quickReply'])) {
+					$_REQUEST['message'] = $_REQUEST['quickReply'];
+		}
 
 		// Validate inputs.
 		if (empty($context['post_error']))
 		{
 			// This means they didn't click Post and get an error.
 			$really_previewing = true;
-		}
-		else
+		} else
 		{
-			if (!isset($_REQUEST['subject']))
-				$_REQUEST['subject'] = '';
-			if (!isset($_REQUEST['message']))
-				$_REQUEST['message'] = '';
-			if (!isset($_REQUEST['icon']))
-				$_REQUEST['icon'] = 'xx';
+			if (!isset($_REQUEST['subject'])) {
+							$_REQUEST['subject'] = '';
+			}
+			if (!isset($_REQUEST['message'])) {
+							$_REQUEST['message'] = '';
+			}
+			if (!isset($_REQUEST['icon'])) {
+							$_REQUEST['icon'] = 'xx';
+			}
 
 			// They are previewing if they asked to preview (i.e. came from quick reply).
 			$really_previewing = !empty($_POST['preview']);
@@ -494,8 +518,9 @@ 
 		$form_message = $smcFunc['htmlspecialchars']($_REQUEST['message'], ENT_QUOTES);
 
 		// Make sure the subject isn't too long - taking into account special characters.
-		if ($smcFunc['strlen']($form_subject) > 100)
-			$form_subject = $smcFunc['substr']($form_subject, 0, 100);
+		if ($smcFunc['strlen']($form_subject) > 100) {
+					$form_subject = $smcFunc['substr']($form_subject, 0, 100);
+		}
 
 		if (isset($_REQUEST['poll']))
 		{
@@ -507,8 +532,9 @@ 
 			$_POST['options'] = empty($_POST['options']) ? array() : htmlspecialchars__recursive($_POST['options']);
 			foreach ($_POST['options'] as $option)
 			{
-				if (trim($option) == '')
-					continue;
+				if (trim($option) == '') {
+									continue;
+				}
 
 				$context['choices'][] = array(
 					'id' => $choice_id++,
@@ -570,13 +596,14 @@ 
 				$context['preview_subject'] = $form_subject;
 
 				censorText($context['preview_subject']);
+			} else {
+							$context['preview_subject'] = '<em>' . $txt['no_subject'] . '</em>';
 			}
-			else
-				$context['preview_subject'] = '<em>' . $txt['no_subject'] . '</em>';
 
 			// Protect any CDATA blocks.
-			if (isset($_REQUEST['xml']))
-				$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
+			if (isset($_REQUEST['xml'])) {
+							$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
+			}
 		}
 
 		// Set up the checkboxes.
@@ -615,29 +642,32 @@ 
 			);
 			// The message they were trying to edit was most likely deleted.
 			// @todo Change this error message?
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('no_board', false);
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('no_board', false);
+			}
 			$row = $smcFunc['db_fetch_assoc']($request);
 
 			$attachment_stuff = array($row);
-			while ($row2 = $smcFunc['db_fetch_assoc']($request))
-				$attachment_stuff[] = $row2;
+			while ($row2 = $smcFunc['db_fetch_assoc']($request)) {
+							$attachment_stuff[] = $row2;
+			}
 			$smcFunc['db_free_result']($request);
 
 			if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 			{
 				// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
-				if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-					fatal_lang_error('modify_post_time_passed', false);
-				elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own'))
-					isAllowedTo('modify_replies');
-				else
-					isAllowedTo('modify_own');
+				if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+									fatal_lang_error('modify_post_time_passed', false);
+				} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own')) {
+									isAllowedTo('modify_replies');
+				} else {
+									isAllowedTo('modify_own');
+				}
+			} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_any');
 			}
-			elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_any');
 
 			if ($context['can_announce'] && !empty($row['id_action']))
 			{
@@ -661,8 +691,9 @@ 
 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
 				{
-					if ($row['filesize'] <= 0)
-						continue;
+					if ($row['filesize'] <= 0) {
+											continue;
+					}
 					$context['current_attachments'][$row['id_attach']] = array(
 						'name' => $smcFunc['htmlspecialchars']($row['filename']),
 						'size' => $row['filesize'],
@@ -732,29 +763,32 @@ 
 			)
 		);
 		// The message they were trying to edit was most likely deleted.
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_message', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_message', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 
 		$attachment_stuff = array($row);
-		while ($row2 = $smcFunc['db_fetch_assoc']($request))
-			$attachment_stuff[] = $row2;
+		while ($row2 = $smcFunc['db_fetch_assoc']($request)) {
+					$attachment_stuff[] = $row2;
+		}
 		$smcFunc['db_free_result']($request);
 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
 			// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
-			if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
-			elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_own');
+			if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
+			} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_own');
+			}
+		} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any')) {
+					isAllowedTo('modify_replies');
+		} else {
+					isAllowedTo('modify_any');
 		}
-		elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any'))
-			isAllowedTo('modify_replies');
-		else
-			isAllowedTo('modify_any');
 
 		if ($context['can_announce'] && !empty($row['id_action']))
 		{
@@ -781,15 +815,17 @@ 
 		$context['icon'] = $row['icon'];
 
 		// Show an "approve" box if the user can approve it, and the message isn't approved.
-		if (!$row['approved'] && !$context['show_approval'])
-			$context['show_approval'] = allowedTo('approve_posts');
+		if (!$row['approved'] && !$context['show_approval']) {
+					$context['show_approval'] = allowedTo('approve_posts');
+		}
 
 		// Sort the attachments so they are in the order saved
 		$temp = array();
 		foreach ($attachment_stuff as $attachment)
 		{
-			if ($attachment['filesize'] >= 0 && !empty($modSettings['attachmentEnable']))
-				$temp[$attachment['id_attach']] = $attachment;
+			if ($attachment['filesize'] >= 0 && !empty($modSettings['attachmentEnable'])) {
+							$temp[$attachment['id_attach']] = $attachment;
+			}
 		}
 		ksort($temp);
 
@@ -850,14 +886,16 @@ 
 					'is_approved' => 1,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('quoted_post_deleted', false);
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('quoted_post_deleted', false);
+			}
 			list ($form_subject, $mname, $mdate, $form_message) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
 			// Add 'Re: ' to the front of the quoted subject.
-			if (trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-				$form_subject = $context['response_prefix'] . $form_subject;
+			if (trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+							$form_subject = $context['response_prefix'] . $form_subject;
+			}
 
 			// Censor the message and subject.
 			censorText($form_message);
@@ -870,10 +908,11 @@ 
 				for ($i = 0, $n = count($parts); $i < $n; $i++)
 				{
 					// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
-					if ($i % 4 == 0)
-						$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m)
+					if ($i % 4 == 0) {
+											$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m)
 						{
 							return '[html]' . preg_replace('~<br\s?/?' . '>~i', '&lt;br /&gt;<br>', "$m[1]") . '[/html]';
+					}
 						}, $parts[$i]);
 				}
 				$form_message = implode('', $parts);
@@ -882,8 +921,9 @@ 
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $form_message);
 
 			// Remove any nested quotes, if necessary.
-			if (!empty($modSettings['removeNestedQuotes']))
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			if (!empty($modSettings['removeNestedQuotes'])) {
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			}
 
 			// Add a quote string on the front and end.
 			$form_message = '[quote author=' . $mname . ' link=msg=' . (int) $_REQUEST['quote'] . ' date=' . $mdate . ']' . "\n" . rtrim($form_message) . "\n" . '[/quote]';
@@ -895,15 +935,15 @@ 
 			$form_subject = $first_subject;
 
 			// Add 'Re: ' to the front of the subject.
-			if (trim($context['response_prefix']) != '' && $form_subject != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-				$form_subject = $context['response_prefix'] . $form_subject;
+			if (trim($context['response_prefix']) != '' && $form_subject != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+							$form_subject = $context['response_prefix'] . $form_subject;
+			}
 
 			// Censor the subject.
 			censorText($form_subject);
 
 			$form_message = '';
-		}
-		else
+		} else
 		{
 			$form_subject = isset($_GET['subject']) ? $_GET['subject'] : '';
 			$form_message = '';
@@ -922,13 +962,15 @@ 
 		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']);
+		}
 
 		if (!empty($_SESSION['temp_attachments']))
 		{
@@ -937,9 +979,10 @@ 
 			{
 				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 				{
-					if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
-						if (file_exists($attachment['tmp_name']))
+					if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false) {
+											if (file_exists($attachment['tmp_name']))
 							unlink($attachment['tmp_name']);
+					}
 				}
 				$post_errors[] = 'temp_attachments_gone';
 				$_SESSION['temp_attachments'] = array();
@@ -953,8 +996,9 @@ 
 					// See if any files still exist before showing the warning message and the files attached.
 					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 					{
-						if (strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
-							continue;
+						if (strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
+													continue;
+						}
 
 						if (file_exists($attachment['tmp_name']))
 						{
@@ -964,20 +1008,21 @@ 
 							break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					// Since, they don't belong here. Let's inform the user that they exist..
-					if (!empty($topic))
-						$delete_url = $scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
-					else
-						$delete_url = $scripturl . '?action=post' . (!empty($board) ? ';board=' . $board : '') . ';delete_temp';
+					if (!empty($topic)) {
+											$delete_url = $scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
+					} else {
+											$delete_url = $scripturl . '?action=post' . (!empty($board) ? ';board=' . $board : '') . ';delete_temp';
+					}
 
 					// Compile a list of the files to show the user.
 					$file_list = array();
-					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-						if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
+					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+											if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
 							$file_list[] = $attachment['name'];
+					}
 
 					$_SESSION['temp_attachments']['post']['files'] = $file_list;
 					$file_list = '<div class="attachments">' . implode('<br>', $file_list) . '</div>';
@@ -989,8 +1034,7 @@ 
 
 						$post_errors[] = array('temp_attachments_found', array($delete_url, $goback_url, $file_list));
 						$context['ignore_temp_attachments'] = true;
-					}
-					else
+					} else
 					{
 						$post_errors[] = array('temp_attachments_lost', array($delete_url, $file_list));
 						$context['ignore_temp_attachments'] = true;
@@ -998,16 +1042,19 @@ 
 				}
 			}
 
-			if (!empty($context['we_are_history']))
-				$post_errors[] = $context['we_are_history'];
+			if (!empty($context['we_are_history'])) {
+							$post_errors[] = $context['we_are_history'];
+			}
 
 			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 			{
-				if (isset($context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files']))
-					break;
+				if (isset($context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files'])) {
+									break;
+				}
 
-				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
-					continue;
+				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
+									continue;
+				}
 
 				if ($attachID == 'initial_error')
 				{
@@ -1022,15 +1069,17 @@ 
 				{
 					$txt['error_attach_errors'] = empty($txt['error_attach_errors']) ? '<br>' : '';
 					$txt['error_attach_errors'] .= vsprintf($txt['attach_warning'], $attachment['name']) . '<div style="padding: 0 1em;">';
-					foreach ($attachment['errors'] as $error)
-						$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br >';
+					foreach ($attachment['errors'] as $error) {
+											$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br >';
+					}
 					$txt['error_attach_errors'] .= '</div>';
 					$post_errors[] = 'attach_errors';
 
 					// Take out the trash.
 					unset($_SESSION['temp_attachments'][$attachID]);
-					if (file_exists($attachment['tmp_name']))
-						unlink($attachment['tmp_name']);
+					if (file_exists($attachment['tmp_name'])) {
+											unlink($attachment['tmp_name']);
+					}
 					continue;
 				}
 
@@ -1043,8 +1092,9 @@ 
 
 				$context['attachments']['quantity']++;
 				$context['attachments']['total_size'] += $attachment['size'];
-				if (!isset($context['files_in_session_warning']))
-					$context['files_in_session_warning'] = $txt['attached_files_in_session'];
+				if (!isset($context['files_in_session_warning'])) {
+									$context['files_in_session_warning'] = $txt['attached_files_in_session'];
+				}
 
 				$context['current_attachments'][$attachID] = array(
 					'name' => '<u>' . $smcFunc['htmlspecialchars']($attachment['name']) . '</u>',
@@ -1072,8 +1122,9 @@ 
 	}
 
 	// If they came from quick reply, and have to enter verification details, give them some notice.
-	if (!empty($_REQUEST['from_qr']) && !empty($context['require_verification']))
-		$post_errors[] = 'need_qr_verification';
+	if (!empty($_REQUEST['from_qr']) && !empty($context['require_verification'])) {
+			$post_errors[] = 'need_qr_verification';
+	}
 
 	/*
 	 * There are two error types: serious and minor. Serious errors
@@ -1090,52 +1141,56 @@ 
 	{
 		loadLanguage('Errors');
 		$context['error_type'] = 'minor';
-		foreach ($post_errors as $post_error)
-			if (is_array($post_error))
+		foreach ($post_errors as $post_error) {
+					if (is_array($post_error))
 			{
 				$post_error_id = $post_error[0];
+		}
 				$context['post_error'][$post_error_id] = vsprintf($txt['error_' . $post_error_id], $post_error[1]);
 
 				// If it's not a minor error flag it as such.
-				if (!in_array($post_error_id, $minor_errors))
-					$context['error_type'] = 'serious';
-			}
-			else
+				if (!in_array($post_error_id, $minor_errors)) {
+									$context['error_type'] = 'serious';
+				}
+			} else
 			{
 				$context['post_error'][$post_error] = $txt['error_' . $post_error];
 
 				// If it's not a minor error flag it as such.
-				if (!in_array($post_error, $minor_errors))
-					$context['error_type'] = 'serious';
+				if (!in_array($post_error, $minor_errors)) {
+									$context['error_type'] = 'serious';
+				}
 			}
 	}
 
 	// What are you doing? Posting a poll, modifying, previewing, new post, or reply...
-	if (isset($_REQUEST['poll']))
-		$context['page_title'] = $txt['new_poll'];
-	elseif ($context['make_event'])
-		$context['page_title'] = $context['event']['id'] == -1 ? $txt['calendar_post_event'] : $txt['calendar_edit'];
-	elseif (isset($_REQUEST['msg']))
-		$context['page_title'] = $txt['modify_msg'];
-	elseif (isset($_REQUEST['subject'], $context['preview_subject']))
-		$context['page_title'] = $txt['preview'] . ' - ' . strip_tags($context['preview_subject']);
-	elseif (empty($topic))
-		$context['page_title'] = $txt['start_new_topic'];
-	else
-		$context['page_title'] = $txt['post_reply'];
+	if (isset($_REQUEST['poll'])) {
+			$context['page_title'] = $txt['new_poll'];
+	} elseif ($context['make_event']) {
+			$context['page_title'] = $context['event']['id'] == -1 ? $txt['calendar_post_event'] : $txt['calendar_edit'];
+	} elseif (isset($_REQUEST['msg'])) {
+			$context['page_title'] = $txt['modify_msg'];
+	} elseif (isset($_REQUEST['subject'], $context['preview_subject'])) {
+			$context['page_title'] = $txt['preview'] . ' - ' . strip_tags($context['preview_subject']);
+	} elseif (empty($topic)) {
+			$context['page_title'] = $txt['start_new_topic'];
+	} else {
+			$context['page_title'] = $txt['post_reply'];
+	}
 
 	// Build the link tree.
-	if (empty($topic))
-		$context['linktree'][] = array(
+	if (empty($topic)) {
+			$context['linktree'][] = array(
 			'name' => '<em>' . $txt['start_new_topic'] . '</em>'
 		);
-	else
-		$context['linktree'][] = array(
+	} else {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?topic=' . $topic . '.' . $_REQUEST['start'],
 			'name' => $form_subject,
 			'extra_before' => '<span><strong class="nav">' . $context['page_title'] . ' (</strong></span>',
 			'extra_after' => '<span><strong class="nav">)</strong></span>'
 		);
+	}
 
 	$context['subject'] = addcslashes($form_subject, '"');
 	$context['message'] = str_replace(array('"', '<', '>', '&nbsp;'), array('&quot;', '&lt;', '&gt;', ' '), $form_message);
@@ -1179,8 +1234,9 @@ 
 	// Message icons - customized icons are off?
 	$context['icons'] = getMessageIcons(!empty($board) ? $board : 0);
 
-	if (!empty($context['icons']))
-		$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	if (!empty($context['icons'])) {
+			$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	}
 
 	// Are we starting a poll? if set the poll icon as selected if its available
 	if (isset($_REQUEST['poll']))
@@ -1200,8 +1256,9 @@ 
 	for ($i = 0, $n = count($context['icons']); $i < $n; $i++)
 	{
 		$context['icons'][$i]['selected'] = $context['icon'] == $context['icons'][$i]['value'];
-		if ($context['icons'][$i]['selected'])
-			$context['icon_url'] = $context['icons'][$i]['url'];
+		if ($context['icons'][$i]['selected']) {
+					$context['icon_url'] = $context['icons'][$i]['url'];
+		}
 	}
 	if (empty($context['icon_url']))
 	{
@@ -1215,8 +1272,9 @@ 
 		));
 	}
 
-	if (!empty($topic) && !empty($modSettings['topicSummaryPosts']))
-		getTopic();
+	if (!empty($topic) && !empty($modSettings['topicSummaryPosts'])) {
+			getTopic();
+	}
 
 	// If the user can post attachments prepare the warning labels.
 	if ($context['can_post_attachment'])
@@ -1227,12 +1285,13 @@ 
 		$context['attachment_restrictions'] = array();
 		$context['allowed_extensions'] = strtr(strtolower($modSettings['attachmentExtensions']), array(',' => ', '));
 		$attachmentRestrictionTypes = array('attachmentNumPerPostLimit', 'attachmentPostLimit', 'attachmentSizeLimit');
-		foreach ($attachmentRestrictionTypes as $type)
-			if (!empty($modSettings[$type]))
+		foreach ($attachmentRestrictionTypes as $type) {
+					if (!empty($modSettings[$type]))
 			{
 				// Show the max number of attachments if not 0.
 				if ($type == 'attachmentNumPerPostLimit')
 					$context['attachment_restrictions'][] = sprintf($txt['attach_remaining'], $modSettings['attachmentNumPerPostLimit'] - $context['attachments']['quantity']);
+		}
 			}
 	}
 
@@ -1266,8 +1325,8 @@ 
 
 	if (!empty($context['current_attachments']))
 	{
-		foreach ($context['current_attachments'] as $key => $mock)
-			addInlineJavaScript('
+		foreach ($context['current_attachments'] as $key => $mock) {
+					addInlineJavaScript('
 	current_attachments.push({
 		name: '. JavaScriptEscape($mock['name']) . ',
 		size: '. $mock['size'] . ',
@@ -1276,6 +1335,7 @@ 
 		type: '. JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') . ',
 		thumbID: '. (!empty($mock['thumb']) ? $mock['thumb'] : 0) . '
 	});');
+		}
 	}
 
 	// File Upload.
@@ -1350,9 +1410,10 @@ 
 			$context['posting_fields']['board']['dd'] .= '
 							<optgroup label="' . $category['name'] . '">';
 
-			foreach ($category['boards'] as $brd)
-				$context['posting_fields']['board']['dd'] .= '
+			foreach ($category['boards'] as $brd) {
+							$context['posting_fields']['board']['dd'] .= '
 								<option value="' . $brd['id'] . '"' . ($brd['selected'] ? ' selected' : '') . '>' . ($brd['child_level'] > 0 ? str_repeat('==', $brd['child_level'] - 1) . '=&gt;' : '') . ' ' . $brd['name'] . '</option>';
+			}
 
 			$context['posting_fields']['board']['dd'] .= '
 							</optgroup>';
@@ -1383,8 +1444,9 @@ 
 
 
 	// Finally, load the template.
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Post');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Post');
+	}
 
 	call_integration_hook('integrate_post_end');
 }
@@ -1405,13 +1467,14 @@ 
 	// Sneaking off, are we?
 	if (empty($_POST) && empty($topic))
 	{
-		if (empty($_SERVER['CONTENT_LENGTH']))
-			redirectexit('action=post;board=' . $board . '.0');
-		else
-			fatal_lang_error('post_upload_error', false);
+		if (empty($_SERVER['CONTENT_LENGTH'])) {
+					redirectexit('action=post;board=' . $board . '.0');
+		} else {
+					fatal_lang_error('post_upload_error', false);
+		}
+	} elseif (empty($_POST) && !empty($topic)) {
+			redirectexit('action=post;topic=' . $topic . '.0');
 	}
-	elseif (empty($_POST) && !empty($topic))
-		redirectexit('action=post;topic=' . $topic . '.0');
 
 	// No need!
 	$context['robot_no_index'] = true;
@@ -1423,8 +1486,9 @@ 
 	$post_errors = array();
 
 	// If the session has timed out, let the user re-submit their form.
-	if (checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	// Wrong verification code?
 	if (!$user_info['is_admin'] && !$user_info['is_mod'] && !empty($modSettings['posts_require_captcha']) && ($user_info['posts'] < $modSettings['posts_require_captcha'] || ($user_info['is_guest'] && $modSettings['posts_require_captcha'] == -1)))
@@ -1434,8 +1498,9 @@ 
 			'id' => 'post',
 		);
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
-		if (is_array($context['require_verification']))
-			$post_errors = array_merge($post_errors, $context['require_verification']);
+		if (is_array($context['require_verification'])) {
+					$post_errors = array_merge($post_errors, $context['require_verification']);
+		}
 	}
 
 	require_once($sourcedir . '/Subs-Post.php');
@@ -1444,25 +1509,29 @@ 
 	call_integration_hook('integrate_post2_start');
 
 	// Drafts enabled and needed?
-	if (!empty($modSettings['drafts_post_enabled']) && (isset($_POST['save_draft']) || isset($_POST['id_draft'])))
-		require_once($sourcedir . '/Drafts.php');
+	if (!empty($modSettings['drafts_post_enabled']) && (isset($_POST['save_draft']) || isset($_POST['id_draft']))) {
+			require_once($sourcedir . '/Drafts.php');
+	}
 
 	// First check to see if they are trying to delete any current attachments.
 	if (isset($_POST['attach_del']))
 	{
 		$keep_temp = array();
 		$keep_ids = array();
-		foreach ($_POST['attach_del'] as $dummy)
-			if (strpos($dummy, 'post_tmp_' . $user_info['id']) !== false)
+		foreach ($_POST['attach_del'] as $dummy) {
+					if (strpos($dummy, 'post_tmp_' . $user_info['id']) !== false)
 				$keep_temp[] = $dummy;
-			else
-				$keep_ids[] = (int) $dummy;
+		}
+			else {
+							$keep_ids[] = (int) $dummy;
+			}
 
-		if (isset($_SESSION['temp_attachments']))
-			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
+		if (isset($_SESSION['temp_attachments'])) {
+					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 			{
 				if ((isset($_SESSION['temp_attachments']['post']['files'], $attachment['name']) && in_array($attachment['name'], $_SESSION['temp_attachments']['post']['files'])) || in_array($attachID, $keep_temp) || strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
 					continue;
+		}
 
 				unset($_SESSION['temp_attachments'][$attachID]);
 				unlink($attachment['tmp_name']);
@@ -1494,8 +1563,9 @@ 
 	{
 		require_once($sourcedir . '/ManageAttachments.php');
 
-		foreach ($_SESSION['already_attached'] as $attachID => $attachment)
-			removeAttachments(array('id_attach' => $attachID));
+		foreach ($_SESSION['already_attached'] as $attachID => $attachment) {
+					removeAttachments(array('id_attach' => $attachID));
+		}
 
 		unset($_SESSION['already_attached']);
 
@@ -1518,12 +1588,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Though the topic should be there, it might have vanished.
-		if (!is_array($topic_info))
-			fatal_lang_error('topic_doesnt_exist', 404);
+		if (!is_array($topic_info)) {
+					fatal_lang_error('topic_doesnt_exist', 404);
+		}
 
 		// Did this topic suddenly move? Just checking...
-		if ($topic_info['id_board'] != $board)
-			fatal_lang_error('not_a_topic');
+		if ($topic_info['id_board'] != $board) {
+					fatal_lang_error('not_a_topic');
+		}
 
 		// Do the permissions and approval stuff...
 		$becomesApproved = true;
@@ -1546,49 +1618,50 @@ 
 	if (!empty($topic) && !isset($_REQUEST['msg']))
 	{
 		// Don't allow a post if it's locked.
-		if ($topic_info['locked'] != 0 && !allowedTo('moderate_board'))
-			fatal_lang_error('topic_locked', false);
+		if ($topic_info['locked'] != 0 && !allowedTo('moderate_board')) {
+					fatal_lang_error('topic_locked', false);
+		}
 
 		// Sorry, multiple polls aren't allowed... yet.  You should stop giving me ideas :P.
-		if (isset($_REQUEST['poll']) && $topic_info['id_poll'] > 0)
-			unset($_REQUEST['poll']);
-
-		elseif ($topic_info['id_member_started'] != $user_info['id'])
-		{
-			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
-				$becomesApproved = false;
-
-			else
-				isAllowedTo('post_reply_any');
-		}
-		elseif (!allowedTo('post_reply_any'))
+		if (isset($_REQUEST['poll']) && $topic_info['id_poll'] > 0) {
+					unset($_REQUEST['poll']);
+		} elseif ($topic_info['id_member_started'] != $user_info['id'])
+		{
+			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any')) {
+							$becomesApproved = false;
+			} else {
+							isAllowedTo('post_reply_any');
+			}
+		} elseif (!allowedTo('post_reply_any'))
 		{
-			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own'))
-				$becomesApproved = false;
-
-			else
-				isAllowedTo('post_reply_own');
+			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) {
+							$becomesApproved = false;
+			} else {
+							isAllowedTo('post_reply_own');
+			}
 		}
 
 		if (isset($_POST['lock']))
 		{
 			// Nothing is changed to the lock.
-			if (empty($topic_info['locked']) == empty($_POST['lock']))
-				unset($_POST['lock']);
+			if (empty($topic_info['locked']) == empty($_POST['lock'])) {
+							unset($_POST['lock']);
+			}
 
 			// You're have no permission to lock this topic.
-			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started']))
-				unset($_POST['lock']);
+			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started'])) {
+							unset($_POST['lock']);
+			}
 
 			// You are allowed to (un)lock your own topic only.
 			elseif (!allowedTo('lock_any'))
 			{
 				// You cannot override a moderator lock.
-				if ($topic_info['locked'] == 1)
-					unset($_POST['lock']);
-
-				else
-					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				if ($topic_info['locked'] == 1) {
+									unset($_POST['lock']);
+				} else {
+									$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				}
 			}
 			// Hail mighty moderator, (un)lock this topic immediately.
 			else
@@ -1596,19 +1669,21 @@ 
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 
 				// Did someone (un)lock this while you were posting?
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked'])
-					$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked']) {
+									$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				}
 			}
 		}
 
 		// So you wanna (un)sticky this...let's see.
-		if (isset($_POST['sticky']) && ($_POST['sticky'] == $topic_info['is_sticky'] || !allowedTo('make_sticky')))
-			unset($_POST['sticky']);
-		elseif (isset($_POST['sticky']))
+		if (isset($_POST['sticky']) && ($_POST['sticky'] == $topic_info['is_sticky'] || !allowedTo('make_sticky'))) {
+					unset($_POST['sticky']);
+		} elseif (isset($_POST['sticky']))
 		{
 			// Did someone (un)sticky this while you were posting?
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky'])
-				$post_errors[] = 'topic_' . (empty($topic_info['is_sticky']) ? 'un' : '') . 'sticky';
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky']) {
+							$post_errors[] = 'topic_' . (empty($topic_info['is_sticky']) ? 'un' : '') . 'sticky';
+			}
 		}
 
 		// If drafts are enabled, then pass this off
@@ -1635,26 +1710,31 @@ 
 
 		// Do like, the permissions, for safety and stuff...
 		$becomesApproved = true;
-		if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics'))
-			$becomesApproved = false;
-		else
-			isAllowedTo('post_new');
+		if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics')) {
+					$becomesApproved = false;
+		} else {
+					isAllowedTo('post_new');
+		}
 
 		if (isset($_POST['lock']))
 		{
 			// New topics are by default not locked.
-			if (empty($_POST['lock']))
-				unset($_POST['lock']);
+			if (empty($_POST['lock'])) {
+							unset($_POST['lock']);
+			}
 			// Besides, you need permission.
-			elseif (!allowedTo(array('lock_any', 'lock_own')))
-				unset($_POST['lock']);
+			elseif (!allowedTo(array('lock_any', 'lock_own'))) {
+							unset($_POST['lock']);
+			}
 			// A moderator-lock (1) can override a user-lock (2).
-			else
-				$_POST['lock'] = allowedTo('lock_any') ? 1 : 2;
+			else {
+							$_POST['lock'] = allowedTo('lock_any') ? 1 : 2;
+			}
 		}
 
-		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !allowedTo('make_sticky')))
-			unset($_POST['sticky']);
+		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !allowedTo('make_sticky'))) {
+					unset($_POST['sticky']);
+		}
 
 		// Saving your new topic as a draft first?
 		if (!empty($modSettings['drafts_post_enabled']) && isset($_POST['save_draft']))
@@ -1679,31 +1759,37 @@ 
 				'id_msg' => $_REQUEST['msg'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('cant_find_messages', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('cant_find_messages', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($topic_info['locked']) && !allowedTo('moderate_board'))
-			fatal_lang_error('topic_locked', false);
+		if (!empty($topic_info['locked']) && !allowedTo('moderate_board')) {
+					fatal_lang_error('topic_locked', false);
+		}
 
 		if (isset($_POST['lock']))
 		{
 			// Nothing changes to the lock status.
-			if ((empty($_POST['lock']) && empty($topic_info['locked'])) || (!empty($_POST['lock']) && !empty($topic_info['locked'])))
-				unset($_POST['lock']);
+			if ((empty($_POST['lock']) && empty($topic_info['locked'])) || (!empty($_POST['lock']) && !empty($topic_info['locked']))) {
+							unset($_POST['lock']);
+			}
 			// You're simply not allowed to (un)lock this.
-			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started']))
-				unset($_POST['lock']);
+			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started'])) {
+							unset($_POST['lock']);
+			}
 			// You're only allowed to lock your own topics.
 			elseif (!allowedTo('lock_any'))
 			{
 				// You're not allowed to break a moderator's lock.
-				if ($topic_info['locked'] == 1)
-					unset($_POST['lock']);
+				if ($topic_info['locked'] == 1) {
+									unset($_POST['lock']);
+				}
 				// Lock it with a soft lock or unlock it.
-				else
-					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				else {
+									$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+				}
 			}
 			// You must be the moderator.
 			else
@@ -1711,44 +1797,46 @@ 
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 
 				// Did someone (un)lock this while you were posting?
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked'])
-					$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked']) {
+									$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
+				}
 			}
 		}
 
 		// Change the sticky status of this topic?
-		if (isset($_POST['sticky']) && (!allowedTo('make_sticky') || $_POST['sticky'] == $topic_info['is_sticky']))
-			unset($_POST['sticky']);
-		elseif (isset($_POST['sticky']))
+		if (isset($_POST['sticky']) && (!allowedTo('make_sticky') || $_POST['sticky'] == $topic_info['is_sticky'])) {
+					unset($_POST['sticky']);
+		} elseif (isset($_POST['sticky']))
 		{
 			// Did someone (un)sticky this while you were posting?
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky'])
-				$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'stickied';
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky']) {
+							$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'stickied';
+			}
 		}
 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
-			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
-			elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_own');
-		}
-		elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
+			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
+			} elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_own')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_own');
+			}
+		} elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
 			isAllowedTo('modify_replies');
 
 			// If you're modifying a reply, I say it better be logged...
 			$moderationAction = true;
-		}
-		else
+		} else
 		{
 			isAllowedTo('modify_any');
 
 			// Log it, assuming you're not modifying your own post.
-			if ($row['id_member'] != $user_info['id'])
-				$moderationAction = true;
+			if ($row['id_member'] != $user_info['id']) {
+							$moderationAction = true;
+			}
 		}
 
 		// If drafts are enabled, then lets send this off to save
@@ -1775,8 +1863,9 @@ 
 		// Update search api
 		require_once($sourcedir . '/Search.php');
 		$searchAPI = findSearchAPI();
-		if ($searchAPI->supportsMethod('postRemoved'))
-			$searchAPI->postRemoved($_REQUEST['msg']);
+		if ($searchAPI->supportsMethod('postRemoved')) {
+					$searchAPI->postRemoved($_REQUEST['msg']);
+		}
 
 	}
 
@@ -1794,20 +1883,24 @@ 
 		$_POST['guestname'] = !isset($_POST['guestname']) ? '' : trim($_POST['guestname']);
 		$_POST['email'] = !isset($_POST['email']) ? '' : trim($_POST['email']);
 
-		if ($_POST['guestname'] == '' || $_POST['guestname'] == '_')
-			$post_errors[] = 'no_name';
-		if ($smcFunc['strlen']($_POST['guestname']) > 25)
-			$post_errors[] = 'long_name';
+		if ($_POST['guestname'] == '' || $_POST['guestname'] == '_') {
+					$post_errors[] = 'no_name';
+		}
+		if ($smcFunc['strlen']($_POST['guestname']) > 25) {
+					$post_errors[] = 'long_name';
+		}
 
 		if (empty($modSettings['guest_post_no_email']))
 		{
 			// Only check if they changed it!
 			if (!isset($row) || $row['poster_email'] != $_POST['email'])
 			{
-				if (!allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == ''))
-					$post_errors[] = 'no_email';
-				if (!allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL))
-					$post_errors[] = 'bad_email';
+				if (!allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == '')) {
+									$post_errors[] = 'no_email';
+				}
+				if (!allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
+									$post_errors[] = 'bad_email';
+				}
 			}
 
 			// Now make sure this email address is not banned from posting.
@@ -1823,81 +1916,95 @@ 
 	}
 
 	// Coming from the quickReply?
-	if (isset($_POST['quickReply']))
-		$_POST['message'] = $_POST['quickReply'];
+	if (isset($_POST['quickReply'])) {
+			$_POST['message'] = $_POST['quickReply'];
+	}
 
 	// Check the subject and message.
-	if (!isset($_POST['subject']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['subject'])) === '')
-		$post_errors[] = 'no_subject';
-	if (!isset($_POST['message']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['message']), ENT_QUOTES) === '')
-		$post_errors[] = 'no_message';
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
-		$post_errors[] = array('long_message', array($modSettings['max_messageLength']));
-	else
+	if (!isset($_POST['subject']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['subject'])) === '') {
+			$post_errors[] = 'no_subject';
+	}
+	if (!isset($_POST['message']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['message']), ENT_QUOTES) === '') {
+			$post_errors[] = 'no_message';
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength']) {
+			$post_errors[] = array('long_message', array($modSettings['max_messageLength']));
+	} else
 	{
 		// Prepare the message a bit for some additional testing.
 		$_POST['message'] = $smcFunc['htmlspecialchars']($_POST['message'], ENT_QUOTES);
 
 		// Preparse code. (Zef)
-		if ($user_info['is_guest'])
-			$user_info['name'] = $_POST['guestname'];
+		if ($user_info['is_guest']) {
+					$user_info['name'] = $_POST['guestname'];
+		}
 		preparsecode($_POST['message']);
 
 		// Youtube BBC would be stripped out in the next check without this
 		$context['allowed_html_tags'][] = '<iframe>';
 
 		// Let's see if there's still some content left without the tags.
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), implode('', $context['allowed_html_tags']))) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false))
-			$post_errors[] = 'no_message';
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), implode('', $context['allowed_html_tags']))) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false)) {
+					$post_errors[] = 'no_message';
+		}
 
 		// Remove iframe from the list
 		array_pop($context['allowed_html_tags']);
 	}
-	if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && $smcFunc['htmltrim']($_POST['evtitle']) === '')
-		$post_errors[] = 'no_event';
+	if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && $smcFunc['htmltrim']($_POST['evtitle']) === '') {
+			$post_errors[] = 'no_event';
+	}
 	// You are not!
-	if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !$user_info['is_admin'])
-		fatal_error('Knave! Masquerader! Charlatan!', false);
+	if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !$user_info['is_admin']) {
+			fatal_error('Knave! Masquerader! Charlatan!', false);
+	}
 
 	// Validate the poll...
 	if (isset($_REQUEST['poll']) && $modSettings['pollMode'] == '1')
 	{
-		if (!empty($topic) && !isset($_REQUEST['msg']))
-			fatal_lang_error('no_access', false);
+		if (!empty($topic) && !isset($_REQUEST['msg'])) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// This is a new topic... so it's a new poll.
-		if (empty($topic))
-			isAllowedTo('poll_post');
+		if (empty($topic)) {
+					isAllowedTo('poll_post');
+		}
 		// Can you add to your own topics?
-		elseif ($user_info['id'] == $topic_info['id_member_started'] && !allowedTo('poll_add_any'))
-			isAllowedTo('poll_add_own');
+		elseif ($user_info['id'] == $topic_info['id_member_started'] && !allowedTo('poll_add_any')) {
+					isAllowedTo('poll_add_own');
+		}
 		// Can you add polls to any topic, then?
-		else
-			isAllowedTo('poll_add_any');
+		else {
+					isAllowedTo('poll_add_any');
+		}
 
-		if (!isset($_POST['question']) || trim($_POST['question']) == '')
-			$post_errors[] = 'no_question';
+		if (!isset($_POST['question']) || trim($_POST['question']) == '') {
+					$post_errors[] = 'no_question';
+		}
 
 		$_POST['options'] = empty($_POST['options']) ? array() : htmltrim__recursive($_POST['options']);
 
 		// Get rid of empty ones.
-		foreach ($_POST['options'] as $k => $option)
-			if ($option == '')
+		foreach ($_POST['options'] as $k => $option) {
+					if ($option == '')
 				unset($_POST['options'][$k], $_POST['options'][$k]);
+		}
 
 		// What are you going to vote between with one choice?!?
-		if (count($_POST['options']) < 2)
-			$post_errors[] = 'poll_few';
-		elseif (count($_POST['options']) > 256)
-			$post_errors[] = 'poll_many';
+		if (count($_POST['options']) < 2) {
+					$post_errors[] = 'poll_few';
+		} elseif (count($_POST['options']) > 256) {
+					$post_errors[] = 'poll_many';
+		}
 	}
 
 	if ($posterIsGuest)
 	{
 		// If user is a guest, make sure the chosen name isn't taken.
 		require_once($sourcedir . '/Subs-Members.php');
-		if (isReservedName($_POST['guestname'], 0, true, false) && (!isset($row['poster_name']) || $_POST['guestname'] != $row['poster_name']))
-			$post_errors[] = 'bad_name';
+		if (isReservedName($_POST['guestname'], 0, true, false) && (!isset($row['poster_name']) || $_POST['guestname'] != $row['poster_name'])) {
+					$post_errors[] = 'bad_name';
+		}
 	}
 	// If the user isn't a guest, get his or her name and email.
 	elseif (!isset($_REQUEST['msg']))
@@ -1928,8 +2035,9 @@ 
 	}
 
 	// Make sure the user isn't spamming the board.
-	if (!isset($_REQUEST['msg']))
-		spamProtection('post');
+	if (!isset($_REQUEST['msg'])) {
+			spamProtection('post');
+	}
 
 	// At about this point, we're posting and that's that.
 	ignore_user_abort(true);
@@ -1942,32 +2050,36 @@ 
 	$_POST['modify_reason'] = empty($_POST['modify_reason']) ? '' : strtr($smcFunc['htmlspecialchars']($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
 
 	// At this point, we want to make sure the subject isn't too long.
-	if ($smcFunc['strlen']($_POST['subject']) > 100)
-		$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
+	if ($smcFunc['strlen']($_POST['subject']) > 100) {
+			$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
+	}
 
 	// Same with the "why did you edit this" text.
-	if ($smcFunc['strlen']($_POST['modify_reason']) > 100)
-		$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+	if ($smcFunc['strlen']($_POST['modify_reason']) > 100) {
+			$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+	}
 
 	// Make the poll...
 	if (isset($_REQUEST['poll']))
 	{
 		// Make sure that the user has not entered a ridiculous number of options..
-		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0)
-			$_POST['poll_max_votes'] = 1;
-		elseif ($_POST['poll_max_votes'] > count($_POST['options']))
-			$_POST['poll_max_votes'] = count($_POST['options']);
-		else
-			$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
+		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0) {
+					$_POST['poll_max_votes'] = 1;
+		} elseif ($_POST['poll_max_votes'] > count($_POST['options'])) {
+					$_POST['poll_max_votes'] = count($_POST['options']);
+		} else {
+					$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
+		}
 
 		$_POST['poll_expire'] = (int) $_POST['poll_expire'];
 		$_POST['poll_expire'] = $_POST['poll_expire'] > 9999 ? 9999 : ($_POST['poll_expire'] < 0 ? 0 : $_POST['poll_expire']);
 
 		// Just set it to zero if it's not there..
-		if (!isset($_POST['poll_hide']))
-			$_POST['poll_hide'] = 0;
-		else
-			$_POST['poll_hide'] = (int) $_POST['poll_hide'];
+		if (!isset($_POST['poll_hide'])) {
+					$_POST['poll_hide'] = 0;
+		} else {
+					$_POST['poll_hide'] = (int) $_POST['poll_hide'];
+		}
 		$_POST['poll_change_vote'] = isset($_POST['poll_change_vote']) ? 1 : 0;
 
 		$_POST['poll_guest_vote'] = isset($_POST['poll_guest_vote']) ? 1 : 0;
@@ -1976,16 +2088,19 @@ 
 		{
 			require_once($sourcedir . '/Subs-Members.php');
 			$allowedVoteGroups = groupsAllowedTo('poll_vote', $board);
-			if (!in_array(-1, $allowedVoteGroups['allowed']))
-				$_POST['poll_guest_vote'] = 0;
+			if (!in_array(-1, $allowedVoteGroups['allowed'])) {
+							$_POST['poll_guest_vote'] = 0;
+			}
 		}
 
 		// If the user tries to set the poll too far in advance, don't let them.
-		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1)
-			fatal_lang_error('poll_range_error', false);
+		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1) {
+					fatal_lang_error('poll_range_error', false);
+		}
 		// Don't allow them to select option 2 for hidden results if it's not time limited.
-		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2)
-			$_POST['poll_hide'] = 1;
+		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2) {
+					$_POST['poll_hide'] = 1;
+		}
 
 		// Clean up the question and answers.
 		$_POST['question'] = $smcFunc['htmlspecialchars']($_POST['question']);
@@ -1999,13 +2114,15 @@ 
 	{
 		$attachIDs = array();
 		$attach_errors = array();
-		if (!empty($context['we_are_history']))
-			$attach_errors[] = '<dd>' . $txt['error_temp_attachments_flushed'] . '<br><br></dd>';
+		if (!empty($context['we_are_history'])) {
+					$attach_errors[] = '<dd>' . $txt['error_temp_attachments_flushed'] . '<br><br></dd>';
+		}
 
 		foreach ($_SESSION['temp_attachments'] as  $attachID => $attachment)
 		{
-			if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
-				continue;
+			if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
+							continue;
+			}
 
 			// If there was an initial error just show that message.
 			if ($attachID == 'initial_error')
@@ -2034,12 +2151,13 @@ 
 				if (createAttachment($attachmentOptions))
 				{
 					$attachIDs[] = $attachmentOptions['id'];
-					if (!empty($attachmentOptions['thumb']))
-						$attachIDs[] = $attachmentOptions['thumb'];
+					if (!empty($attachmentOptions['thumb'])) {
+											$attachIDs[] = $attachmentOptions['thumb'];
+					}
 				}
+			} else {
+							$attach_errors[] = '<dt>&nbsp;</dt>';
 			}
-			else
-				$attach_errors[] = '<dt>&nbsp;</dt>';
 
 			if (!empty($attachmentOptions['errors']))
 			{
@@ -2051,14 +2169,16 @@ 
 					if (!is_array($error))
 					{
 						$attach_errors[] = '<dd>' . $txt[$error] . '</dd>';
-						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 {
+											$attach_errors[] = '<dd>' . vsprintf($txt[$error[0]], $error[1]) . '</dd>';
 					}
-					else
-						$attach_errors[] = '<dd>' . vsprintf($txt[$error[0]], $error[1]) . '</dd>';
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 		}
 		unset($_SESSION['temp_attachments']);
@@ -2099,24 +2219,24 @@ 
 		);
 
 		call_integration_hook('integrate_poll_add_edit', array($id_poll, false));
+	} else {
+			$id_poll = 0;
 	}
-	else
-		$id_poll = 0;
 
 	// Creating a new topic?
 	$newTopic = empty($_REQUEST['msg']) && empty($topic);
 
 	// Check the icon.
-	if (!isset($_POST['icon']))
-		$_POST['icon'] = 'xx';
-
-	else
+	if (!isset($_POST['icon'])) {
+			$_POST['icon'] = 'xx';
+	} else
 	{
 		$_POST['icon'] = $smcFunc['htmlspecialchars']($_POST['icon']);
 
 		// Need to figure it out if this is a valid icon name.
-		if ((!file_exists($settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')))
-			$_POST['icon'] = 'xx';
+		if ((!file_exists($settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png'))) {
+					$_POST['icon'] = 'xx';
+		}
 	}
 
 	// Collect all parameters for the creation or modification of a post.
@@ -2157,8 +2277,9 @@ 
 		}
 
 		// This will save some time...
-		if (empty($approve_has_changed))
-			unset($msgOptions['approved']);
+		if (empty($approve_has_changed)) {
+					unset($msgOptions['approved']);
+		}
 
 		modifyPost($msgOptions, $topicOptions, $posterOptions);
 	}
@@ -2167,8 +2288,9 @@ 
 	{
 		createPost($msgOptions, $topicOptions, $posterOptions);
 
-		if (isset($topicOptions['id']))
-			$topic = $topicOptions['id'];
+		if (isset($topicOptions['id'])) {
+					$topic = $topicOptions['id'];
+		}
 	}
 
 	// Are there attachments already uploaded and waiting to be assigned?
@@ -2180,8 +2302,9 @@ 
 	}
 
 	// If we had a draft for this, its time to remove it since it was just posted
-	if (!empty($modSettings['drafts_post_enabled']) && !empty($_POST['id_draft']))
-		DeleteDraft($_POST['id_draft']);
+	if (!empty($modSettings['drafts_post_enabled']) && !empty($_POST['id_draft'])) {
+			DeleteDraft($_POST['id_draft']);
+	}
 
 	// Editing or posting an event?
 	if (isset($_POST['calendar']) && (!isset($_REQUEST['eventid']) || $_REQUEST['eventid'] == -1))
@@ -2200,8 +2323,7 @@ 
 			'member' => $user_info['id'],
 		);
 		insertEvent($eventOptions);
-	}
-	elseif (isset($_POST['calendar']))
+	} elseif (isset($_POST['calendar']))
 	{
 		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
 
@@ -2229,14 +2351,15 @@ 
 		}
 
 		// Delete it?
-		if (isset($_REQUEST['deleteevent']))
-			$smcFunc['db_query']('', '
+		if (isset($_REQUEST['deleteevent'])) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}calendar
 				WHERE id_event = {int:id_event}',
 				array(
 					'id_event' => $_REQUEST['eventid'],
 				)
 			);
+		}
 		// ... or just update it?
 		else
 		{
@@ -2278,9 +2401,8 @@ 
 			array($user_info['id'], $topic, 0),
 			array('id_member', 'id_topic', 'id_board')
 		);
-	}
-	elseif (!$newTopic)
-		$smcFunc['db_query']('', '
+	} elseif (!$newTopic) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_notify
 			WHERE id_member = {int:current_member}
 				AND id_topic = {int:current_topic}',
@@ -2289,16 +2411,20 @@ 
 				'current_topic' => $topic,
 			)
 		);
+	}
 
 	// Log an act of moderation - modifying.
-	if (!empty($moderationAction))
-		logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $row['id_member'], 'board' => $board));
+	if (!empty($moderationAction)) {
+			logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $row['id_member'], 'board' => $board));
+	}
 
-	if (isset($_POST['lock']) && $_POST['lock'] != 2)
-		logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	if (isset($_POST['lock']) && $_POST['lock'] != 2) {
+			logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	}
 
-	if (isset($_POST['sticky']))
-		logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	if (isset($_POST['sticky'])) {
+			logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+	}
 
 	// Returning to the topic?
 	if (!empty($_REQUEST['goback']))
@@ -2317,26 +2443,31 @@ 
 		);
 	}
 
-	if ($board_info['num_topics'] == 0)
-		cache_put_data('board-' . $board, null, 120);
+	if ($board_info['num_topics'] == 0) {
+			cache_put_data('board-' . $board, null, 120);
+	}
 
 	call_integration_hook('integrate_post2_end');
 
-	if (!empty($_POST['announce_topic']) && allowedTo('announce_topic'))
-		redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	if (!empty($_POST['announce_topic']) && allowedTo('announce_topic')) {
+			redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	}
 
-	if (!empty($_POST['move']) && allowedTo('move_any'))
-		redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	if (!empty($_POST['move']) && allowedTo('move_any')) {
+			redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	}
 
 	// Return to post if the mod is on.
-	if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback']))
-		redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
-	elseif (!empty($_REQUEST['goback']))
-		redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
+	if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback'])) {
+			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
+	} elseif (!empty($_REQUEST['goback'])) {
+			redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
+	}
 	// Dut-dut-duh-duh-DUH-duh-dut-duh-duh!  *dances to the Final Fantasy Fanfare...*
-	else
-		redirectexit('board=' . $board . '.0');
-}
+	else {
+			redirectexit('board=' . $board . '.0');
+	}
+	}
 
 /**
  * Handle the announce topic function (action=announce).
@@ -2354,8 +2485,9 @@ 
 
 	validateSession();
 
-	if (empty($topic))
-		fatal_lang_error('topic_gone', false);
+	if (empty($topic)) {
+			fatal_lang_error('topic_gone', false);
+	}
 
 	loadLanguage('Post');
 	loadTemplate('Post');
@@ -2382,8 +2514,9 @@ 
 	global $txt, $context, $topic, $board_info, $smcFunc;
 
 	$groups = array_merge($board_info['groups'], array(1));
-	foreach ($groups as $id => $group)
-		$groups[$id] = (int) $group;
+	foreach ($groups as $id => $group) {
+			$groups[$id] = (int) $group;
+	}
 
 	$context['groups'] = array();
 	if (in_array(0, $groups))
@@ -2426,8 +2559,9 @@ 
 			'group_list' => $groups,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['groups'][$row['id_group']]['name'] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['groups'][$row['id_group']]['name'] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get the subject of the topic we're about to announce.
@@ -2469,16 +2603,19 @@ 
 	$context['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
 	$groups = array_merge($board_info['groups'], array(1));
 
-	if (isset($_POST['membergroups']))
-		$_POST['who'] = explode(',', $_POST['membergroups']);
+	if (isset($_POST['membergroups'])) {
+			$_POST['who'] = explode(',', $_POST['membergroups']);
+	}
 
 	// Check whether at least one membergroup was selected.
-	if (empty($_POST['who']))
-		fatal_lang_error('no_membergroup_selected');
+	if (empty($_POST['who'])) {
+			fatal_lang_error('no_membergroup_selected');
+	}
 
 	// Make sure all membergroups are integers and can access the board of the announcement.
-	foreach ($_POST['who'] as $id => $mg)
-		$_POST['who'][$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
+	foreach ($_POST['who'] as $id => $mg) {
+			$_POST['who'][$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
+	}
 
 	// Get the topic subject and censor it.
 	$request = $smcFunc['db_query']('', '
@@ -2524,12 +2661,13 @@ 
 	if ($smcFunc['db_num_rows']($request) == 0)
 	{
 		logAction('announce_topic', array('topic' => $topic), 'user');
-		if (!empty($_REQUEST['move']) && allowedTo('move_any'))
-			redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
-		elseif (!empty($_REQUEST['goback']))
-			redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
-		else
-			redirectexit('board=' . $board . '.0');
+		if (!empty($_REQUEST['move']) && allowedTo('move_any')) {
+					redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
+		} elseif (!empty($_REQUEST['goback'])) {
+					redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
+		} else {
+					redirectexit('board=' . $board . '.0');
+		}
 	}
 
 	$announcements = array();
@@ -2548,8 +2686,9 @@ 
 	foreach ($rows as $row)
 	{
 		// Force them to have it?
-		if (empty($prefs[$row['id_member']]['announcements']))
-			continue;
+		if (empty($prefs[$row['id_member']]['announcements'])) {
+					continue;
+		}
 
 		$cur_language = empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile'];
 
@@ -2577,8 +2716,9 @@ 
 	}
 
 	// For each language send a different mail - low priority...
-	foreach ($announcements as $lang => $mail)
-		sendmail($mail['recipients'], $mail['subject'], $mail['body'], null, 'ann-' . $lang, $mail['is_html'], 5);
+	foreach ($announcements as $lang => $mail) {
+			sendmail($mail['recipients'], $mail['subject'], $mail['body'], null, 'ann-' . $lang, $mail['is_html'], 5);
+	}
 
 	$context['percentage_done'] = round(100 * $context['start'] / $modSettings['latestMember'], 1);
 
@@ -2588,9 +2728,10 @@ 
 	$context['sub_template'] = 'announcement_send';
 
 	// Go back to the correct language for the user ;).
-	if (!empty($modSettings['userLanguage']))
-		loadLanguage('Post');
-}
+	if (!empty($modSettings['userLanguage'])) {
+			loadLanguage('Post');
+	}
+	}
 
 /**
  * Get the topic for display purposes.
@@ -2603,12 +2744,13 @@ 
 {
 	global $topic, $modSettings, $context, $smcFunc, $counter, $options;
 
-	if (isset($_REQUEST['xml']))
-		$limit = '
+	if (isset($_REQUEST['xml'])) {
+			$limit = '
 		LIMIT ' . (empty($context['new_replies']) ? '0' : $context['new_replies']);
-	else
-		$limit = empty($modSettings['topicSummaryPosts']) ? '' : '
+	} else {
+			$limit = empty($modSettings['topicSummaryPosts']) ? '' : '
 		LIMIT ' . (int) $modSettings['topicSummaryPosts'];
+	}
 
 	// If you're modifying, get only those posts before the current one. (otherwise get all.)
 	$request = $smcFunc['db_query']('', '
@@ -2646,8 +2788,9 @@ 
 			'is_ignored' => !empty($modSettings['enable_buddylist']) && !empty($options['posts_apply_ignore_list']) && in_array($row['id_member'], $context['user']['ignoreusers']),
 		);
 
-		if (!empty($context['new_replies']))
-			$context['new_replies']--;
+		if (!empty($context['new_replies'])) {
+					$context['new_replies']--;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }
@@ -2664,8 +2807,9 @@ 
 	global $sourcedir, $smcFunc;
 
 	loadLanguage('Post');
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Post');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Post');
+	}
 
 	include_once($sourcedir . '/Subs-Post.php');
 
@@ -2696,8 +2840,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$context['sub_template'] = 'quotefast';
-	if (!empty($row))
-		$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
+	if (!empty($row)) {
+			$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
+	}
 
 	if (!empty($can_view_post))
 	{
@@ -2730,8 +2875,9 @@ 
 		}
 
 		// Remove any nested quotes.
-		if (!empty($modSettings['removeNestedQuotes']))
-			$row['body'] = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $row['body']);
+		if (!empty($modSettings['removeNestedQuotes'])) {
+					$row['body'] = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $row['body']);
+		}
 
 		$lb = "\n";
 
@@ -2757,14 +2903,14 @@ 
 				'time' => '',
 			),
 		);
-	}
-	else
-		$context['quote'] = array(
+	} else {
+			$context['quote'] = array(
 			'xml' => '',
 			'mozilla' => '',
 			'text' => '',
 		);
-}
+	}
+	}
 
 /**
  * Used to edit the body or subject of a message inline
@@ -2776,8 +2922,9 @@ 
 	global $user_info, $context, $smcFunc, $language, $board_info;
 
 	// We have to have a topic!
-	if (empty($topic))
-		obExit(false);
+	if (empty($topic)) {
+			obExit(false);
+	}
 
 	checkSession('get');
 	require_once($sourcedir . '/Subs-Post.php');
@@ -2803,31 +2950,35 @@ 
 			'guest_id' => 0,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board', false);
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Change either body or subject requires permissions to modify messages.
 	if (isset($_POST['message']) || isset($_POST['subject']) || isset($_REQUEST['icon']))
 	{
-		if (!empty($row['locked']))
-			isAllowedTo('moderate_board');
+		if (!empty($row['locked'])) {
+					isAllowedTo('moderate_board');
+		}
 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
 		{
-			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-				fatal_lang_error('modify_post_time_passed', false);
-			elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
-				isAllowedTo('modify_replies');
-			else
-				isAllowedTo('modify_own');
+			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
+							fatal_lang_error('modify_post_time_passed', false);
+			} elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_own')) {
+							isAllowedTo('modify_replies');
+			} else {
+							isAllowedTo('modify_own');
+			}
 		}
 		// Otherwise, they're locked out; someone who can modify the replies is needed.
-		elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
-			isAllowedTo('modify_replies');
-		else
-			isAllowedTo('modify_any');
+		elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_any')) {
+					isAllowedTo('modify_replies');
+		} else {
+					isAllowedTo('modify_any');
+		}
 
 		// Only log this action if it wasn't your message.
 		$moderationAction = $row['id_member'] != $user_info['id'];
@@ -2839,10 +2990,10 @@ 
 		$_POST['subject'] = strtr($smcFunc['htmlspecialchars']($_POST['subject']), array("\r" => '', "\n" => '', "\t" => ''));
 
 		// Maximum number of characters.
-		if ($smcFunc['strlen']($_POST['subject']) > 100)
-			$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
-	}
-	elseif (isset($_POST['subject']))
+		if ($smcFunc['strlen']($_POST['subject']) > 100) {
+					$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
+		}
+	} elseif (isset($_POST['subject']))
 	{
 		$post_errors[] = 'no_subject';
 		unset($_POST['subject']);
@@ -2854,13 +3005,11 @@ 
 		{
 			$post_errors[] = 'no_message';
 			unset($_POST['message']);
-		}
-		elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
+		} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
 		{
 			$post_errors[] = 'long_message';
 			unset($_POST['message']);
-		}
-		else
+		} else
 		{
 			$_POST['message'] = $smcFunc['htmlspecialchars']($_POST['message'], ENT_QUOTES);
 
@@ -2876,31 +3025,34 @@ 
 
 	if (isset($_POST['lock']))
 	{
-		if (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $row['id_member']))
-			unset($_POST['lock']);
-		elseif (!allowedTo('lock_any'))
+		if (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $row['id_member'])) {
+					unset($_POST['lock']);
+		} elseif (!allowedTo('lock_any'))
 		{
-			if ($row['locked'] == 1)
-				unset($_POST['lock']);
-			else
-				$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+			if ($row['locked'] == 1) {
+							unset($_POST['lock']);
+			} else {
+							$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
+			}
+		} elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked']) {
+					unset($_POST['lock']);
+		} else {
+					$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 		}
-		elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked'])
-			unset($_POST['lock']);
-		else
-			$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 	}
 
-	if (isset($_POST['sticky']) && !allowedTo('make_sticky'))
-		unset($_POST['sticky']);
+	if (isset($_POST['sticky']) && !allowedTo('make_sticky')) {
+			unset($_POST['sticky']);
+	}
 
 	if (isset($_POST['modify_reason']))
 	{
 		$_POST['modify_reason'] = strtr($smcFunc['htmlspecialchars']($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
 
 		// Maximum number of characters.
-		if ($smcFunc['strlen']($_POST['modify_reason']) > 100)
-			$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+		if ($smcFunc['strlen']($_POST['modify_reason']) > 100) {
+					$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
+		}
 	}
 
 	if (empty($post_errors))
@@ -2937,8 +3089,9 @@ 
 			}
 		}
 		// If nothing was changed there's no need to add an entry to the moderation log.
-		else
-			$moderationAction = false;
+		else {
+					$moderationAction = false;
+		}
 
 		modifyPost($msgOptions, $topicOptions, $posterOptions);
 
@@ -2956,9 +3109,9 @@ 
 			// Get the proper (default language) response prefix first.
 			if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 			{
-				if ($language === $user_info['language'])
-					$context['response_prefix'] = $txt['response_prefix'];
-				else
+				if ($language === $user_info['language']) {
+									$context['response_prefix'] = $txt['response_prefix'];
+				} else
 				{
 					loadLanguage('index', $language, false);
 					$context['response_prefix'] = $txt['response_prefix'];
@@ -2980,8 +3133,9 @@ 
 			);
 		}
 
-		if (!empty($moderationAction))
-			logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
+		if (!empty($moderationAction)) {
+					logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
+		}
 	}
 
 	if (isset($_REQUEST['xml']))
@@ -3022,8 +3176,7 @@ 
 			);
 
 			censorText($context['message']['subject']);
-		}
-		else
+		} else
 		{
 			$context['message'] = array(
 				'id' => $row['id_msg'],
@@ -3035,15 +3188,16 @@ 
 			loadLanguage('Errors');
 			foreach ($post_errors as $post_error)
 			{
-				if ($post_error == 'long_message')
-					$context['message']['errors'][] = sprintf($txt['error_' . $post_error], $modSettings['max_messageLength']);
-				else
-					$context['message']['errors'][] = $txt['error_' . $post_error];
+				if ($post_error == 'long_message') {
+									$context['message']['errors'][] = sprintf($txt['error_' . $post_error], $modSettings['max_messageLength']);
+				} else {
+									$context['message']['errors'][] = $txt['error_' . $post_error];
+				}
 			}
 		}
+	} else {
+			obExit(false);
+	}
 	}
-	else
-		obExit(false);
-}
 
 ?>
\ No newline at end of file

Sources/Modlog.php

Spacing +2 added lines, -2 removed lines

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

Braces +99 added lines, -75 removed lines

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

Sources/Likes.php

Braces +103 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 Likes
@@ -106,8 +107,9 @@ 
 		$this->_extra = isset($_GET['extra']) ? $_GET['extra'] : false;
 
 		// We do not want to output debug information here.
-		if ($this->_js)
-			$db_show_debug = false;
+		if ($this->_js) {
+					$db_show_debug = false;
+		}
 	}
 
 	/**
@@ -141,8 +143,9 @@ 
 			$call = $this->_sa;
 
 			// Guest can only view likes.
-			if ($call != 'view')
-				is_not_guest();
+			if ($call != 'view') {
+							is_not_guest();
+			}
 
 			checkSession('get');
 
@@ -180,15 +183,17 @@ 
 		global $smcFunc, $modSettings;
 
 		// This feature is currently disable.
-		if (empty($modSettings['enable_likes']))
-			return $this->_error = 'like_disable';
+		if (empty($modSettings['enable_likes'])) {
+					return $this->_error = 'like_disable';
+		}
 
 		// Zerothly, they did indicate some kind of content to like, right?
 		preg_match('~^([a-z0-9\-\_]{1,6})~i', $this->_type, $matches);
 		$this->_type = isset($matches[1]) ? $matches[1] : '';
 
-		if ($this->_type == '' || $this->_content <= 0)
-			return $this->_error = 'cannot_';
+		if ($this->_type == '' || $this->_content <= 0) {
+					return $this->_error = 'cannot_';
+		}
 
 		// First we need to verify if the user can see the type of content or not. This is set up to be extensible,
 		// so we'll check for the one type we do know about, and if it's not that, we'll defer to any hooks.
@@ -207,12 +212,14 @@ 
 					'msg' => $this->_content,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 1)
-				list ($this->_idTopic, $topicOwner) = $smcFunc['db_fetch_row']($request);
+			if ($smcFunc['db_num_rows']($request) == 1) {
+							list ($this->_idTopic, $topicOwner) = $smcFunc['db_fetch_row']($request);
+			}
 
 			$smcFunc['db_free_result']($request);
-			if (empty($this->_idTopic))
-				return $this->_error = 'cannot_';
+			if (empty($this->_idTopic)) {
+							return $this->_error = 'cannot_';
+			}
 
 			// So we know what topic it's in and more importantly we know the user can see it.
 			// If we're not viewing, we need some info set up.
@@ -221,9 +228,7 @@ 
 			$this->_validLikes['redirect'] = 'topic=' . $this->_idTopic . '.msg' . $this->_content . '#msg' . $this->_content;
 
 			$this->_validLikes['can_like'] = ($this->_user['id'] == $topicOwner ? 'cannot_like_content' : (allowedTo('likes_like') ? true : 'cannot_like_content'));
-		}
-
-		else
+		} else
 		{
 			// Modders: This will give you whatever the user offers up in terms of liking, e.g. $this->_type=msg, $this->_content=1
 			// When you hook this, check $this->_type first. If it is not something your mod worries about, return false.
@@ -241,8 +246,9 @@ 
 					if ($result !== false)
 					{
 						// Match the type with what we already have.
-						if (!isset($result['type']) || $result['type'] != $this->_type)
-							return $this->_error = 'not_valid_like_type';
+						if (!isset($result['type']) || $result['type'] != $this->_type) {
+													return $this->_error = 'not_valid_like_type';
+						}
 
 						// Fill out the rest.
 						$this->_type = $result['type'];
@@ -253,13 +259,15 @@ 
 				}
 			}
 
-			if (!$found)
-				return $this->_error = 'cannot_';
+			if (!$found) {
+							return $this->_error = 'cannot_';
+			}
 		}
 
 		// Does the user can like this? Viewing a list of likes doesn't require this permission.
-			if ($this->_sa != 'view' && isset($this->_validLikes['can_like']) && is_string($this->_validLikes['can_like']))
-				return $this->_error = $this->_validLikes['can_like'];
+			if ($this->_sa != 'view' && isset($this->_validLikes['can_like']) && is_string($this->_validLikes['can_like'])) {
+							return $this->_error = $this->_validLikes['can_like'];
+			}
 	}
 
 	/**
@@ -284,8 +292,9 @@ 
 		);
 
 		// Are we calling this directly? if so, set a proper data for the response. Do note that __METHOD__ returns both the class name and the function name.
-		if ($this->_sa == __FUNCTION__)
-			$this->_data = __FUNCTION__;
+		if ($this->_sa == __FUNCTION__) {
+					$this->_data = __FUNCTION__;
+		}
 	}
 
 	/**
@@ -315,8 +324,8 @@ 
 
 		// Add a background task to process sending alerts.
 		// Mod author, you can add your own background task for your own custom like event using the "integrate_issue_like" hook or your callback, both are immediately called after this.
-		if ($this->_type == 'msg')
-			$smcFunc['db_insert']('insert',
+		if ($this->_type == 'msg') {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}background_tasks',
 				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 				array('$sourcedir/tasks/Likes-Notify.php', 'Likes_Notify_Background', $smcFunc['json_encode'](array(
@@ -328,10 +337,12 @@ 
 				)), 0),
 				array('id_task')
 			);
+		}
 
 		// Are we calling this directly? if so, set a proper data for the response. Do note that __METHOD__ returns both the class name and the function name.
-		if ($this->_sa == __FUNCTION__)
-			$this->_data = __FUNCTION__;
+		if ($this->_sa == __FUNCTION__) {
+					$this->_data = __FUNCTION__;
+		}
 	}
 
 	/**
@@ -357,8 +368,9 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If you want to call this directly, fill out _data property too.
-		if ($this->_sa == __FUNCTION__)
-			$this->_data = $this->_numLikes;
+		if ($this->_sa == __FUNCTION__) {
+					$this->_data = $this->_numLikes;
+		}
 	}
 
 	/**
@@ -371,8 +383,9 @@ 
 		global $smcFunc;
 
 		// Safety first!
-		if (empty($this->_type) || empty($this->_content))
-			return $this->_error = 'cannot_';
+		if (empty($this->_type) || empty($this->_content)) {
+					return $this->_error = 'cannot_';
+		}
 
 		// Do we already like this?
 		$request = $smcFunc['db_query']('', '
@@ -390,26 +403,28 @@ 
 		$this->_alreadyLiked = (bool) $smcFunc['db_num_rows']($request) != 0;
 		$smcFunc['db_free_result']($request);
 
-		if ($this->_alreadyLiked)
-			$this->delete();
-
-		else
-			$this->insert();
+		if ($this->_alreadyLiked) {
+					$this->delete();
+		} else {
+					$this->insert();
+		}
 
 		// Now, how many people like this content now? We *could* just +1 / -1 the relevant container but that has proven to become unstable.
 		$this->_count();
 
 		// Update the likes count for messages.
-		if ($this->_type == 'msg')
-			$this->msgIssueLike();
+		if ($this->_type == 'msg') {
+					$this->msgIssueLike();
+		}
 
 		// Any callbacks?
 		elseif (!empty($this->_validLikes['callback']))
 		{
 			$call = call_helper($this->_validLikes['callback'], true);
 
-			if (!empty($call))
-				call_user_func_array($call, array($this));
+			if (!empty($call)) {
+							call_user_func_array($call, array($this));
+			}
 		}
 
 		// Sometimes there might be other things that need updating after we do this like.
@@ -418,8 +433,9 @@ 
 		// Now some clean up. This is provided here for any like handlers that want to do any cache flushing.
 		// This way a like handler doesn't need to explicitly declare anything in integrate_issue_like, but do so
 		// in integrate_valid_likes where it absolutely has to exist.
-		if (!empty($this->_validLikes['flush_cache']))
-			cache_put_data($this->_validLikes['flush_cache'], null);
+		if (!empty($this->_validLikes['flush_cache'])) {
+					cache_put_data($this->_validLikes['flush_cache'], null);
+		}
 
 		// All done, start building the data to pass as response.
 		$this->_data = array(
@@ -442,8 +458,9 @@ 
 	{
 		global $smcFunc;
 
-		if ($this->_type !== 'msg')
-			return;
+		if ($this->_type !== 'msg') {
+					return;
+		}
 
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
@@ -484,8 +501,9 @@ 
 				'like_type' => $this->_type,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['likers'][$row['id_member']] = array('timestamp' => $row['like_time']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['likers'][$row['id_member']] = array('timestamp' => $row['like_time']);
+		}
 
 		// Now to get member data, including avatars and so on.
 		$members = array_keys($context['likers']);
@@ -493,8 +511,9 @@ 
 		if (count($loaded) != count($members))
 		{
 			$members = array_diff($members, $loaded);
-			foreach ($members as $not_loaded)
-				unset ($context['likers'][$not_loaded]);
+			foreach ($members as $not_loaded) {
+							unset ($context['likers'][$not_loaded]);
+			}
 		}
 
 		foreach ($context['likers'] as $liker => $dummy)
@@ -536,12 +555,14 @@ 
 		global $context, $txt;
 
 		// Don't do anything if someone else has already take care of the response.
-		if (!$this->_setResponse)
-			return;
+		if (!$this->_setResponse) {
+					return;
+		}
 
 		// Want a json response huh?
-		if ($this->_validLikes['json'])
-			return $this->jsonResponse();
+		if ($this->_validLikes['json']) {
+					return $this->jsonResponse();
+		}
 
 		// Set everything up for display.
 		loadTemplate('Likes');
@@ -551,8 +572,9 @@ 
 		if ($this->_error)
 		{
 			// If this is a generic error, set it up good.
-			if ($this->_error == 'cannot_')
-				$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
+			if ($this->_error == 'cannot_') {
+							$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
+			}
 
 			// Is this request coming from an ajax call?
 			if ($this->_js)
@@ -562,8 +584,9 @@ 
 			}
 
 			// Nope?  then just do a redirect to whatever URL was provided.
-			else
-				redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] . ';error=' . $this->_error : '');
+			else {
+							redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] . ';error=' . $this->_error : '');
+			}
 
 			return;
 		}
@@ -572,8 +595,9 @@ 
 		else
 		{
 			// Not an ajax request so send the user back to the previous location or the main page.
-			if (!$this->_js)
-				redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] : '');
+			if (!$this->_js) {
+							redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] : '');
+			}
 
 			// These fine gentlemen all share the same template.
 			$generic = array('delete', 'insert', '_count');
@@ -606,8 +630,9 @@ 
 		// If there is an error, send it.
 		if ($this->_error)
 		{
-			if ($this->_error == 'cannot_')
-				$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
+			if ($this->_error == 'cannot_') {
+							$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
+			}
 
 			$print['error'] = $this->_error;
 		}
@@ -643,33 +668,36 @@ 
 	<body style="background-color: #444455; color: white; font-style: italic; font-family: serif;">
 		<div style="margin-top: 12%; font-size: 1.1em; line-height: 1.4; text-align: center;">';
 
-	if (!isset($_GET['verse']) || ($_GET['verse'] != '2:18' && $_GET['verse'] != '22:1-2'))
-		$_GET['verse'] = '4:16';
+	if (!isset($_GET['verse']) || ($_GET['verse'] != '2:18' && $_GET['verse'] != '22:1-2')) {
+			$_GET['verse'] = '4:16';
+	}
 
-	if ($_GET['verse'] == '2:18')
-		echo '
+	if ($_GET['verse'] == '2:18') {
+			echo '
 			Woe, it was that his name wasn\'t <em>known</em>, that he came in mystery, and was recognized by none.&nbsp;And it became to be in those days <em>something</em>.&nbsp; Something not yet <em id="unknown" name="[Unknown]">unknown</em> to mankind.&nbsp; And thus what was to be known the <em>secret project</em> began into its existence.&nbsp; Henceforth the opposition was only <em>weary</em> and <em>fearful</em>, for now their match was at arms against them.';
-	elseif ($_GET['verse'] == '4:16')
-		echo '
+	} elseif ($_GET['verse'] == '4:16') {
+			echo '
 			And it came to pass that the <em>unbelievers</em> dwindled in number and saw rise of many <em>proselytizers</em>, and the opposition found fear in the face of the <em>x</em> and the <em>j</em> while those who stood with the <em>something</em> grew stronger and came together.&nbsp; Still, this was only the <em>beginning</em>, and what lay in the future was <em id="unknown" name="[Unknown]">unknown</em> to all, even those on the right side.';
-	elseif ($_GET['verse'] == '22:1-2')
-		echo '
+	} elseif ($_GET['verse'] == '22:1-2') {
+			echo '
 			<p>Now <em>behold</em>, that which was once the secret project was <em id="unknown" name="[Unknown]">unknown</em> no longer.&nbsp; Alas, it needed more than <em>only one</em>, but yet even thought otherwise.&nbsp; It became that the opposition <em>rumored</em> and lied, but still to no avail.&nbsp; Their match, though not <em>perfect</em>, had them outdone.</p>
 			<p style="margin: 2ex 1ex 0 1ex; font-size: 1.05em; line-height: 1.5; text-align: center;">Let it continue.&nbsp; <em>The end</em>.</p>';
+	}
 
 	echo '
 		</div>
 		<div style="margin-top: 2ex; font-size: 2em; text-align: right;">';
 
-	if ($_GET['verse'] == '2:18')
-		echo '
+	if ($_GET['verse'] == '2:18') {
+			echo '
 			from <span style="font-family: Georgia, serif;"><strong><a href="', $scripturl, '?action=about:unknown;verse=4:16" style="color: white; text-decoration: none; cursor: text;">The Book of Unknown</a></strong>, 2:18</span>';
-	elseif ($_GET['verse'] == '4:16')
-		echo '
+	} elseif ($_GET['verse'] == '4:16') {
+			echo '
 			from <span style="font-family: Georgia, serif;"><strong><a href="', $scripturl, '?action=about:unknown;verse=22:1-2" style="color: white; text-decoration: none; cursor: text;">The Book of Unknown</a></strong>, 4:16</span>';
-	elseif ($_GET['verse'] == '22:1-2')
-		echo '
+	} elseif ($_GET['verse'] == '22:1-2') {
+			echo '
 			from <span style="font-family: Georgia, serif;"><strong>The Book of Unknown</strong>, 22:1-2</span>';
+	}
 
 	echo '
 		</div>

Sources/Class-CacheAPI.php

Braces +20 added lines, -15 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Interface cache_api_interface
@@ -182,8 +183,9 @@ 
 	{
 		global $cache_enable;
 
-		if ($test)
-			return true;
+		if ($test) {
+					return true;
+		}
 		return !empty($cache_enable);
 	}
 
@@ -202,18 +204,20 @@ 
 		global $boardurl, $cachedir;
 
 		// Find a valid good file to do mtime checks on.
-		if (file_exists($cachedir . '/' . 'index.php'))
-			$filemtime = $cachedir . '/' . 'index.php';
-		elseif (is_dir($cachedir . '/'))
-			$filemtime = $cachedir . '/';
-		else
-			$filemtime = $boardurl . '/index.php';
+		if (file_exists($cachedir . '/' . 'index.php')) {
+					$filemtime = $cachedir . '/' . 'index.php';
+		} elseif (is_dir($cachedir . '/')) {
+					$filemtime = $cachedir . '/';
+		} else {
+					$filemtime = $boardurl . '/index.php';
+		}
 
 		// Set the default if no prefix was specified.
-		if (empty($prefix))
-			$this->prefix = md5($boardurl . filemtime($filemtime)) . '-SMF-';
-		else
-			$this->prefix = $prefix;
+		if (empty($prefix)) {
+					$this->prefix = md5($boardurl . filemtime($filemtime)) . '-SMF-';
+		} else {
+					$this->prefix = $prefix;
+		}
 
 		return true;
 	}
@@ -276,8 +280,9 @@ 
 
 		// Invalidate cache, to be sure!
 		// ... as long as index.php can be modified, anyway.
-		if (is_writable($cachedir . '/' . 'index.php'))
-			@touch($cachedir . '/' . 'index.php');
+		if (is_writable($cachedir . '/' . 'index.php')) {
+					@touch($cachedir . '/' . 'index.php');
+		}
 
 		return true;
 	}