SimpleMachines / SMF2.1

Themes/default/GenericMenu.template.php

Braces +50 added lines, -37 removed lines

@@ -89,8 +89,9 @@ 
 		foreach ($section['areas'] as $i => $area)
 		{
 			// Not supposed to be printed?
-			if (empty($area['label']))
-				continue;
+			if (empty($area['label'])) {
+							continue;
+			}
 
 			echo '
 								<li', !empty($area['subsections']) ? ' class="subsections"' : '', '>';
@@ -99,8 +100,9 @@ 
 									<a class="', $area['icon_class'], !empty($area['selected']) ? ' chosen ' : '', '" href="', (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i), $menu_context['extra_parameters'], '">', $area['icon'], $area['label'], '</a>';
 
 			// Is this the current area, or just some area?
-			if (!empty($area['selected']) && empty($context['tabs']))
-					$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
+			if (!empty($area['selected']) && empty($context['tabs'])) {
+								$context['tabs'] = isset($area['subsections']) ? $area['subsections'] : array();
+			}
 
 			// Are there any subsections?
 			if (!empty($area['subsections']))
@@ -110,8 +112,9 @@ 
 
 				foreach ($area['subsections'] as $sa => $sub)
 				{
-					if (!empty($sub['disabled']))
-						continue;
+					if (!empty($sub['disabled'])) {
+											continue;
+					}
 
 					$url = isset($sub['url']) ? $sub['url'] : (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa;
 
@@ -158,8 +161,9 @@ 
 							<h3 class="catbg">';
 
 		// The function is in Admin.template.php, but since this template is used elsewhere too better check if the function is available
-		if (function_exists('template_admin_quick_search'))
-			template_admin_quick_search();
+		if (function_exists('template_admin_quick_search')) {
+					template_admin_quick_search();
+		}
 
 		// Exactly how many tabs do we have?
 		if (!empty($context['tabs']))
@@ -174,30 +178,36 @@ 
 				}
 
 				// Did this not even exist - or do we not have a label?
-				if (!isset($tab_context['tabs'][$id]))
-					$tab_context['tabs'][$id] = array('label' => $tab['label']);
-				elseif (!isset($tab_context['tabs'][$id]['label']))
-					$tab_context['tabs'][$id]['label'] = $tab['label'];
+				if (!isset($tab_context['tabs'][$id])) {
+									$tab_context['tabs'][$id] = array('label' => $tab['label']);
+				} elseif (!isset($tab_context['tabs'][$id]['label'])) {
+									$tab_context['tabs'][$id]['label'] = $tab['label'];
+				}
 
 				// Has a custom URL defined in the main admin structure?
-				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url']))
-					$tab_context['tabs'][$id]['url'] = $tab['url'];
+				if (isset($tab['url']) && !isset($tab_context['tabs'][$id]['url'])) {
+									$tab_context['tabs'][$id]['url'] = $tab['url'];
+				}
 
 				// Any additional paramaters for the url?
-				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params']))
-					$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
+				if (isset($tab['add_params']) && !isset($tab_context['tabs'][$id]['add_params'])) {
+									$tab_context['tabs'][$id]['add_params'] = $tab['add_params'];
+				}
 
 				// Has it been deemed selected?
-				if (!empty($tab['is_selected']))
-					$tab_context['tabs'][$id]['is_selected'] = true;
+				if (!empty($tab['is_selected'])) {
+									$tab_context['tabs'][$id]['is_selected'] = true;
+				}
 
 				// Does it have its own help?
-				if (!empty($tab['help']))
-					$tab_context['tabs'][$id]['help'] = $tab['help'];
+				if (!empty($tab['help'])) {
+									$tab_context['tabs'][$id]['help'] = $tab['help'];
+				}
 
 				// Is this the last one?
-				if (!empty($tab['is_last']) && !isset($tab_context['override_last']))
-					$tab_context['tabs'][$id]['is_last'] = true;
+				if (!empty($tab['is_last']) && !isset($tab_context['override_last'])) {
+									$tab_context['tabs'][$id]['is_last'] = true;
+				}
 			}
 
 			// Find the selected tab
@@ -214,17 +224,18 @@ 
 		// Show an icon and/or a help item?
 		if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']) || !empty($selected_tab['icon']) || !empty($tab_context['icon']) || !empty($selected_tab['help']) || !empty($tab_context['help']))
 		{
-			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class']))
-				echo '<span class="', !empty($selected_tab['icon_class']) ? $selected_tab['icon_class'] : $tab_context['icon_class'], ' icon"></span>';
-			elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon']))
-				echo '<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
+			if (!empty($selected_tab['icon_class']) || !empty($tab_context['icon_class'])) {
+							echo '<span class="', !empty($selected_tab['icon_class']) ? $selected_tab['icon_class'] : $tab_context['icon_class'], ' icon"></span>';
+			} elseif (!empty($selected_tab['icon']) || !empty($tab_context['icon'])) {
+							echo '<img src="', $settings['images_url'], '/icons/', !empty($selected_tab['icon']) ? $selected_tab['icon'] : $tab_context['icon'], '" alt="" class="icon">';
+			}
 
-			if (!empty($selected_tab['help']) || !empty($tab_context['help']))
-				echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>';
+			if (!empty($selected_tab['help']) || !empty($tab_context['help'])) {
+							echo '<a href="', $scripturl, '?action=helpadmin;help=', !empty($selected_tab['help']) ? $selected_tab['help'] : $tab_context['help'], '" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>';
+			}
 
 			echo $tab_context['title'];
-		}
-		else
+		} else
 		{
 			echo '
 							', $tab_context['title'];
@@ -237,11 +248,12 @@ 
 	}
 
 	// Shall we use the tabs? Yes, it's the only known way!
-	if (!empty($selected_tab['description']) || !empty($tab_context['description']))
-		echo '
+	if (!empty($selected_tab['description']) || !empty($tab_context['description'])) {
+			echo '
 					<p class="information">
 						', !empty($selected_tab['description']) ? $selected_tab['description'] : $tab_context['description'], '
 					</p>';
+	}
 
 	// Print out all the items in this tab (if any).
 	if (!empty($context['tabs']))
@@ -253,8 +265,9 @@ 
 
 		foreach ($tab_context['tabs'] as $sa => $tab)
 		{
-			if (!empty($tab['disabled']))
-				continue;
+			if (!empty($tab['disabled'])) {
+							continue;
+			}
 
 			if (!empty($tab['is_selected']))
 			{
@@ -262,12 +275,12 @@ 
 							<li>
 								<a class="active" href="', isset($tab['url']) ? $tab['url'] : $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], isset($tab['add_params']) ? $tab['add_params'] : '', '">', $tab['label'], '</a>
 							</li>';
-			}
-			else
-				echo '
+			} else {
+							echo '
 							<li>
 								<a href="', isset($tab['url']) ? $tab['url'] : $menu_context['base_url'] . ';area=' . $menu_context['current_area'] . ';sa=' . $sa, $menu_context['extra_parameters'], isset($tab['add_params']) ? $tab['add_params'] : '', '">', $tab['label'], '</a>
 							</li>';
+			}
 		}
 
 		// the end of tabs

Sources/Groups.php

Braces +80 added lines, -59 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point function, permission checks, admin bars, etc.
@@ -99,27 +100,27 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 							if (allowedTo('manage_membergroups'))
 							{
 								$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
-							}
-							else
+							} else
 							{
 								$group_name = sprintf('<a href="%1$s?action=groups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 							}
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -198,8 +199,9 @@ 
 	$_REQUEST['group'] = isset($_REQUEST['group']) ? (int) $_REQUEST['group'] : 0;
 
 	// No browsing of guests, membergroup 0 or moderators.
-	if (in_array($_REQUEST['group'], array(-1, 0, 3)))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (in_array($_REQUEST['group'], array(-1, 0, 3))) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// Load up the group details.
 	$request = $smcFunc['db_query']('', '
@@ -214,8 +216,9 @@ 
 		)
 	);
 	// Doesn't exist?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$context['group'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -248,21 +251,25 @@ 
 			'name' => $row['real_name']
 		);
 
-		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1)
-			$context['group']['can_moderate'] = true;
+		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1) {
+					$context['group']['can_moderate'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// If this group is hidden then it can only "exists" if the user can moderate it!
-	if ($context['group']['hidden'] && !$context['group']['can_moderate'])
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($context['group']['hidden'] && !$context['group']['can_moderate']) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// You can only assign membership if you are the moderator and/or can manage groups!
-	if (!$context['group']['can_moderate'])
-		$context['group']['assignable'] = 0;
+	if (!$context['group']['can_moderate']) {
+			$context['group']['assignable'] = 0;
+	}
 	// Non-admins cannot assign admins.
-	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum'))
-		$context['group']['assignable'] = 0;
+	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum')) {
+			$context['group']['assignable'] = 0;
+	}
 
 	// Removing member from group?
 	if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $context['group']['assignable'])
@@ -271,8 +278,9 @@ 
 		validateToken('mod-mgm');
 
 		// Make sure we're dealing with integers only.
-		foreach ($_REQUEST['rem'] as $key => $group)
-			$_REQUEST['rem'][$key] = (int) $group;
+		foreach ($_REQUEST['rem'] as $key => $group) {
+					$_REQUEST['rem'][$key] = (int) $group;
+		}
 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		removeMembersFromGroups($_REQUEST['rem'], $_REQUEST['group'], true);
@@ -295,16 +303,18 @@ 
 		{
 			$member_names[$index] = trim($smcFunc['strtolower']($member_names[$index]));
 
-			if (strlen($member_names[$index]) == 0)
-				unset($member_names[$index]);
+			if (strlen($member_names[$index]) == 0) {
+							unset($member_names[$index]);
+			}
 		}
 
 		// Any passed by ID?
 		$member_ids = array();
-		if (!empty($_REQUEST['member_add']))
-			foreach ($_REQUEST['member_add'] as $id)
+		if (!empty($_REQUEST['member_add'])) {
+					foreach ($_REQUEST['member_add'] as $id)
 				if ($id > 0)
 					$member_ids[] = (int) $id;
+		}
 
 		// Construct the query pelements.
 		if (!empty($member_ids))
@@ -332,8 +342,9 @@ 
 					'id_group' => $_REQUEST['group'],
 				))
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$members[] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$members[] = $row['id_member'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -372,10 +383,11 @@ 
 	$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
 
 	// The where on the query is interesting. Non-moderators should only see people who are in this group as primary.
-	if ($context['group']['can_moderate'])
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
-	else
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	if ($context['group']['can_moderate']) {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
+	} else {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	}
 
 	// Count members of the group.
 	$request = $smcFunc['db_query']('', '
@@ -416,8 +428,9 @@ 
 		$last_online = empty($row['last_login']) ? $txt['never'] : timeformat($row['last_login']);
 
 		// Italicize the online note if they aren't activated.
-		if ($row['is_activated'] % 10 != 1)
-			$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		if ($row['is_activated'] % 10 != 1) {
+					$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		}
 
 		$context['members'][] = array(
 			'id' => $row['id_member'],
@@ -437,9 +450,10 @@ 
 	$context['page_title'] = $txt['membergroups_members_title'] . ': ' . $context['group']['name'];
 	createToken('mod-mgm');
 
-	if ($context['group']['assignable'])
-		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
-}
+	if ($context['group']['assignable']) {
+			loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	}
+	}
 
 /**
  * Show and manage all group requests.
@@ -453,16 +467,18 @@ 
 	$context['sub_template'] = 'show_list';
 
 	// Verify we can be here.
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Normally, we act normally...
 	$where = ($user_info['mod_cache']['gq'] == '1=1' || $user_info['mod_cache']['gq'] == '0=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']);
 
-	if (isset($_GET['closed']))
-		$where .= ' AND lgr.status != {int:status_open}';
-	else
-		$where .= ' AND lgr.status = {int:status_open}';
+	if (isset($_GET['closed'])) {
+			$where .= ' AND lgr.status != {int:status_open}';
+	} else {
+			$where .= ' AND lgr.status = {int:status_open}';
+	}
 
 	$where_parameters = array(
 		'status_open' => 0,
@@ -475,8 +491,9 @@ 
 		validateToken('mod-gr');
 
 		// Clean the values.
-		foreach ($_POST['groupr'] as $k => $request)
-			$_POST['groupr'][$k] = (int) $request;
+		foreach ($_POST['groupr'] as $k => $request) {
+					$_POST['groupr'][$k] = (int) $request;
+		}
 
 		$log_changes = array();
 
@@ -513,8 +530,8 @@ 
 			$request_list = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!isset($log_changes[$row['id_request']]))
-					$log_changes[$row['id_request']] = array(
+				if (!isset($log_changes[$row['id_request']])) {
+									$log_changes[$row['id_request']] = array(
 						'id_request' => $row['id_request'],
 						'status' => $_POST['req_action'] == 'approve' ? 1 : 2, // 1 = approved, 2 = rejected
 						'id_member_acted' => $user_info['id'],
@@ -522,6 +539,7 @@ 
 						'time_acted' => time(),
 						'act_reason' => $_POST['req_action'] != 'approve' && !empty($_POST['groupreason']) && !empty($_POST['groupreason'][$row['id_request']]) ? $smcFunc['htmlspecialchars']($_POST['groupreason'][$row['id_request']], ENT_QUOTES) : '',
 					);
+				}
 				$request_list[] = $row['id_request'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -744,21 +762,24 @@ 
 	$group_requests = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['reason']))
-			$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
-		else
-			$reason = censorText($row['reason']);
+		if (empty($row['reason'])) {
+					$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
+		} else {
+					$reason = censorText($row['reason']);
+		}
 
 		if (isset($_GET['closed']))
 		{
-			if ($row['status'] == 1)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
-			elseif ($row['status'] == 2)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			if ($row['status'] == 1) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
+			} elseif ($row['status'] == 2) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			}
 
 				$reason .= ' (' . timeformat($row['time_acted']) . ')';
-			if (!empty($row['act_reason']))
-				$reason .= '<br><br>' . censorText($row['act_reason']);
+			if (!empty($row['act_reason'])) {
+							$reason .= '<br><br>' . censorText($row['act_reason']);
+			}
 		}
 
 		$group_requests[] = array(

Sources/Post.php

Spacing +2 added lines, -2 removed lines

@@ -259,8 +259,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
 		);
 

Braces +659 added lines, -511 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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']);
@@ -55,8 +58,9 @@ 
 	$context['auto_notify'] = !empty($context['notify_prefs']['msg_auto_notify']);
 
 	// You must be posting to *some* board.
-	if (empty($board) && !$context['make_event'])
-		fatal_lang_error('no_board', false);
+	if (empty($board) && !$context['make_event']) {
+			fatal_lang_error('no_board', false);
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -79,10 +83,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);
 	}
 
@@ -109,33 +114,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');
@@ -147,18 +155,19 @@ 
 		$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
 	{
 		$context['becomes_approved'] = true;
 		if ((!$context['make_event'] || !empty($board)))
 		{
-			if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics'))
-				$context['becomes_approved'] = false;
-			else
-				isAllowedTo('post_new');
+			if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics')) {
+							$context['becomes_approved'] = false;
+			} else {
+							isAllowedTo('post_new');
+			}
 		}
 
 		$locked = 0;
@@ -194,20 +203,24 @@ 
 	}
 	
 	// 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');
+		}
 
 		require_once($sourcedir . '/Subs-Members.php');
 		$allowedVoteGroups = groupsAllowedTo('poll_vote', $board);
@@ -236,8 +249,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();
@@ -251,10 +265,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'),
@@ -276,8 +291,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');
@@ -285,15 +299,18 @@ 
 			$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);
+			}
 
 			// Get a list of boards they can post in.
 			$boards = boardsAllowedTo('post_new');
-			if (empty($boards))
-				fatal_lang_error('cannot_post_new', 'user');
+			if (empty($boards)) {
+							fatal_lang_error('cannot_post_new', 'user');
+			}
 
 			// Load a list of boards for this event in the context.
 			require_once($sourcedir . '/Subs-MessageIndex.php');
@@ -412,10 +429,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';
 
@@ -427,9 +445,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'];
@@ -442,8 +460,9 @@ 
 	// 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']))
@@ -451,15 +470,17 @@ 
 			// 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']);
@@ -475,8 +496,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']))
 		{
@@ -488,8 +510,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++,
@@ -551,13 +574,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.
@@ -596,29 +620,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']))
 			{
@@ -642,8 +669,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'],
@@ -713,29 +741,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']))
 		{
@@ -762,15 +793,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);
@@ -832,14 +865,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);
@@ -852,10 +887,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);
@@ -864,8 +900,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]';
@@ -877,15 +914,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 = '';
@@ -903,13 +940,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']))
 		{
@@ -918,9 +957,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();
@@ -934,8 +974,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']))
 						{
@@ -945,20 +986,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;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;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>';
@@ -970,8 +1012,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;
@@ -979,16 +1020,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')
 				{
@@ -1003,15 +1047,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;
 				}
 
@@ -1024,8 +1070,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>',
@@ -1053,8 +1100,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
@@ -1071,52 +1119,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);
@@ -1160,8 +1212,9 @@ 
 	// Message icons - customized icons are off?
 	$context['icons'] = getMessageIcons($board);
 
-	if (!empty($context['icons']))
-		$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	if (!empty($context['icons'])) {
+			$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	}
 
 	// Are we starting a poll? if set the poll icon as selected if its available
 	if (isset($_REQUEST['poll']))
@@ -1181,8 +1234,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']))
 	{
@@ -1196,8 +1250,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'])
@@ -1208,12 +1263,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']);
+		}
 			}
 	}
 
@@ -1247,8 +1303,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'] . ',
@@ -1257,6 +1313,7 @@ 
 		type: '. JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') . ',
 		thumbID: '. (!empty($mock['thumb']) ? $mock['thumb'] : 0) . '
 	});', true);
+		}
 	}
 
 	// File Upload.
@@ -1301,8 +1358,9 @@ 
 	var current_board = '. (empty($context['current_board']) ? 'null' : $context['current_board']) . ';', false);
 
 	// Finally, load the template.
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Post');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Post');
+	}
 
 	call_integration_hook('integrate_post_end');
 }
@@ -1323,13 +1381,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;
@@ -1341,8 +1400,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)))
@@ -1352,33 +1412,38 @@ 
 			'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');
 	loadLanguage('Post');
 
 	// 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']);
@@ -1420,24 +1485,28 @@ 
 		$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');
+		}
 	}
 
 	// Replying to a topic?
 	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']);
+		if (isset($_REQUEST['poll']) && $topic_info['id_poll'] > 0) {
+					unset($_REQUEST['poll']);
+		}
 
 		// Do the permissions and approval stuff...
 		$becomesApproved = true;
@@ -1453,44 +1522,43 @@ 
 
 			// Set a nice session var...
 			$_SESSION['becomesUnapproved'] = true;
-		}
-
-		elseif ($topic_info['id_member_started'] != $user_info['id'])
+		} 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_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'])) || (!empty($_POST['lock']) && !empty($topic_info['locked'])))
-				unset($_POST['lock']);
+			if ((empty($topic_info['locked']) && empty($_POST['lock'])) || (!empty($_POST['lock']) && !empty($topic_info['locked']))) {
+							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
@@ -1498,19 +1566,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
@@ -1537,26 +1607,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']))
@@ -1581,31 +1656,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
@@ -1613,44 +1694,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
@@ -1687,20 +1770,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.
@@ -1716,75 +1803,89 @@ 
 	}
 
 	// 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']);
 
 		// 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';
+		}
+	}
+	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']))
@@ -1815,8 +1916,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);
@@ -1829,32 +1931,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;
@@ -1863,16 +1969,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']);
@@ -1886,13 +1995,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')
@@ -1921,12 +2032,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']))
 			{
@@ -1938,14 +2050,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']);
@@ -1986,24 +2100,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.
@@ -2044,8 +2158,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);
 	}
@@ -2054,8 +2169,9 @@ 
 	{
 		createPost($msgOptions, $topicOptions, $posterOptions);
 
-		if (isset($topicOptions['id']))
-			$topic = $topicOptions['id'];
+		if (isset($topicOptions['id'])) {
+					$topic = $topicOptions['id'];
+		}
 	}
 
 	// Assign the previously uploaded attachments to the brand new message.
@@ -2067,8 +2183,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))
@@ -2087,8 +2204,7 @@ 
 			'member' => $user_info['id'],
 		);
 		insertEvent($eventOptions);
-	}
-	elseif (isset($_POST['calendar']))
+	} elseif (isset($_POST['calendar']))
 	{
 		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
 
@@ -2116,14 +2232,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
 		{
@@ -2165,9 +2282,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}',
@@ -2176,16 +2292,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']))
@@ -2204,26 +2324,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']))
-		redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
+	if (!empty($_POST['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).
@@ -2241,8 +2366,9 @@ 
 
 	validateSession();
 
-	if (empty($topic))
-		fatal_lang_error('topic_gone', false);
+	if (empty($topic)) {
+			fatal_lang_error('topic_gone', false);
+	}
 
 	loadLanguage('Post');
 	loadTemplate('Post');
@@ -2269,8 +2395,9 @@ 
 	global $txt, $context, $topic, $board, $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))
@@ -2313,8 +2440,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.
@@ -2356,16 +2484,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']('', '
@@ -2411,12 +2542,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();
@@ -2435,8 +2567,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'];
 
@@ -2464,8 +2597,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);
 
@@ -2475,9 +2609,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.
@@ -2490,12 +2625,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']('', '
@@ -2533,8 +2669,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);
 }
@@ -2551,8 +2688,9 @@ 
 	global $sourcedir, $smcFunc;
 
 	loadLanguage('Post');
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Post');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Post');
+	}
 
 	include_once($sourcedir . '/Subs-Post.php');
 
@@ -2583,8 +2721,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))
 	{
@@ -2617,8 +2756,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";
 
@@ -2644,14 +2784,14 @@ 
 				'time' => '',
 			),
 		);
-	}
-	else
-		$context['quote'] = array(
+	} else {
+			$context['quote'] = array(
 			'xml' => '',
 			'mozilla' => '',
 			'text' => '',
 		);
-}
+	}
+	}
 
 /**
  * Used to edit the body or subject of a message inline
@@ -2663,8 +2803,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');
@@ -2690,31 +2831,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'];
@@ -2726,10 +2871,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']);
@@ -2741,13 +2886,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);
 
@@ -2763,31 +2906,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))
@@ -2824,8 +2970,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);
 
@@ -2843,9 +2990,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'];
@@ -2867,8 +3014,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']))
@@ -2909,8 +3057,7 @@ 
 			);
 
 			censorText($context['message']['subject']);
-		}
-		else
+		} else
 		{
 			$context['message'] = array(
 				'id' => $row['id_msg'],
@@ -2922,15 +3069,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/LogInOut.php

Braces +164 added lines, -128 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Ask them for their login information. (shows a page for the user to type
@@ -29,8 +30,9 @@ 
 	global $txt, $context, $scripturl, $user_info;
 
 	// You are already logged in, go take a tour of the boards
-	if (!empty($user_info['id']))
-		redirectexit();
+	if (!empty($user_info['id'])) {
+			redirectexit();
+	}
 
 	// We need to load the Login template/language file.
 	loadLanguage('Login');
@@ -57,10 +59,11 @@ 
 	);
 
 	// Set the login URL - will be used when the login process is done (but careful not to send us to an attachment).
-	if (isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'dlattach') === false && preg_match('~(board|topic)[=,]~', $_SESSION['old_url']) != 0)
-		$_SESSION['login_url'] = $_SESSION['old_url'];
-	elseif (isset($_SESSION['login_url']) && strpos($_SESSION['login_url'], 'dlattach') !== false)
-		unset($_SESSION['login_url']);
+	if (isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'dlattach') === false && preg_match('~(board|topic)[=,]~', $_SESSION['old_url']) != 0) {
+			$_SESSION['login_url'] = $_SESSION['old_url'];
+	} elseif (isset($_SESSION['login_url']) && strpos($_SESSION['login_url'], 'dlattach') !== false) {
+			unset($_SESSION['login_url']);
+	}
 
 	// Create a one time token.
 	createToken('login');
@@ -83,8 +86,9 @@ 
 	global $cookiename, $modSettings, $context, $sourcedir, $maintenance;
 
 	// Check to ensure we're forcing SSL for authentication
-	if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-		fatal_lang_error('login_ssl_required');
+	if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+			fatal_lang_error('login_ssl_required');
+	}
 
 	// Load cookie authentication stuff.
 	require_once($sourcedir . '/Subs-Auth.php');
@@ -102,19 +106,20 @@ 
 			list (,, $timeout) = smf_json_decode($_COOKIE[$cookiename], true);
 
 			// That didn't work... Maybe it's using serialize?
-			if (is_null($timeout))
-				list (,, $timeout) = safe_unserialize($_COOKIE[$cookiename]);
-		}
-		elseif (isset($_SESSION['login_' . $cookiename]))
+			if (is_null($timeout)) {
+							list (,, $timeout) = safe_unserialize($_COOKIE[$cookiename]);
+			}
+		} elseif (isset($_SESSION['login_' . $cookiename]))
 		{
 			list (,, $timeout) = smf_json_decode($_SESSION['login_' . $cookiename]);
 
 			// Try for old format
-			if (is_null($timeout))
-				list (,, $timeout) = safe_unserialize($_SESSION['login_' . $cookiename]);
+			if (is_null($timeout)) {
+							list (,, $timeout) = safe_unserialize($_SESSION['login_' . $cookiename]);
+			}
+		} else {
+					trigger_error('Login2(): Cannot be logged in without a session or cookie', E_USER_ERROR);
 		}
-		else
-			trigger_error('Login2(): Cannot be logged in without a session or cookie', E_USER_ERROR);
 
 		$user_settings['password_salt'] = substr(md5(mt_rand()), 0, 4);
 		updateMemberData($user_info['id'], array('password_salt' => $user_settings['password_salt']));
@@ -125,16 +130,18 @@ 
 			$tfadata = smf_json_decode($_COOKIE[$cookiename . '_tfa'], true);
 
 			// If that didn't work, try unserialize instead...
-			if (is_null($tfadata))
-				$tfadata = safe_unserialize($_COOKIE[$cookiename . '_tfa']);
+			if (is_null($tfadata)) {
+							$tfadata = safe_unserialize($_COOKIE[$cookiename . '_tfa']);
+			}
 
 			list ($tfamember, $tfasecret, $exp, $state, $preserve) = $tfadata;
 
 			// If we're preserving the cookie, reset it with updated salt
-			if ($preserve && time() < $exp)
-				setTFACookie(3153600, $user_info['password_salt'], hash_salt($user_settings['tfa_backup'], $user_settings['password_salt']), true);
-			else
-				setTFACookie(-3600, 0, '');
+			if ($preserve && time() < $exp) {
+							setTFACookie(3153600, $user_info['password_salt'], hash_salt($user_settings['tfa_backup'], $user_settings['password_salt']), true);
+			} else {
+							setTFACookie(-3600, 0, '');
+			}
 		}
 
 		setLoginCookie($timeout - time(), $user_info['id'], hash_salt($user_settings['passwd'], $user_settings['password_salt']));
@@ -145,20 +152,20 @@ 
 	elseif (isset($_GET['sa']) && $_GET['sa'] == 'check')
 	{
 		// Strike!  You're outta there!
-		if ($_GET['member'] != $user_info['id'])
-			fatal_lang_error('login_cookie_error', false);
+		if ($_GET['member'] != $user_info['id']) {
+					fatal_lang_error('login_cookie_error', false);
+		}
 
 		$user_info['can_mod'] = allowedTo('access_mod_center') || (!$user_info['is_guest'] && ($user_info['mod_cache']['gq'] != '0=1' || $user_info['mod_cache']['bq'] != '0=1' || ($modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']))));
 
 		// Some whitelisting for login_url...
-		if (empty($_SESSION['login_url']))
-			redirectexit(empty($user_settings['tfa_secret']) ? '' : 'action=logintfa');
-		elseif (!empty($_SESSION['login_url']) && (strpos($_SESSION['login_url'], 'http://') === false && strpos($_SESSION['login_url'], 'https://') === false))
+		if (empty($_SESSION['login_url'])) {
+					redirectexit(empty($user_settings['tfa_secret']) ? '' : 'action=logintfa');
+		} elseif (!empty($_SESSION['login_url']) && (strpos($_SESSION['login_url'], 'http://') === false && strpos($_SESSION['login_url'], 'https://') === false))
 		{
 			unset ($_SESSION['login_url']);
 			redirectexit(empty($user_settings['tfa_secret']) ? '' : 'action=logintfa');
-		}
-		else
+		} else
 		{
 			// Best not to clutter the session data too much...
 			$temp = $_SESSION['login_url'];
@@ -169,8 +176,9 @@ 
 	}
 
 	// Beyond this point you are assumed to be a guest trying to login.
-	if (!$user_info['is_guest'])
-		redirectexit();
+	if (!$user_info['is_guest']) {
+			redirectexit();
+	}
 
 	// Are you guessing with a script?
 	checkSession();
@@ -178,18 +186,21 @@ 
 	spamProtection('login');
 
 	// Set the login_url if it's not already set (but careful not to send us to an attachment).
-	if ((empty($_SESSION['login_url']) && isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'dlattach') === false && preg_match('~(board|topic)[=,]~', $_SESSION['old_url']) != 0) || (isset($_GET['quicklogin']) && isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'login') === false))
-		$_SESSION['login_url'] = $_SESSION['old_url'];
+	if ((empty($_SESSION['login_url']) && isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'dlattach') === false && preg_match('~(board|topic)[=,]~', $_SESSION['old_url']) != 0) || (isset($_GET['quicklogin']) && isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'login') === false)) {
+			$_SESSION['login_url'] = $_SESSION['old_url'];
+	}
 
 	// Been guessing a lot, haven't we?
-	if (isset($_SESSION['failed_login']) && $_SESSION['failed_login'] >= $modSettings['failed_login_threshold'] * 3)
-		fatal_lang_error('login_threshold_fail', 'critical');
+	if (isset($_SESSION['failed_login']) && $_SESSION['failed_login'] >= $modSettings['failed_login_threshold'] * 3) {
+			fatal_lang_error('login_threshold_fail', 'critical');
+	}
 
 	// Set up the cookie length.  (if it's invalid, just fall through and use the default.)
-	if (isset($_POST['cookieneverexp']) || (!empty($_POST['cookielength']) && $_POST['cookielength'] == -1))
-		$modSettings['cookieTime'] = 3153600;
-	elseif (!empty($_POST['cookielength']) && ($_POST['cookielength'] >= 1 && $_POST['cookielength'] <= 525600))
-		$modSettings['cookieTime'] = (int) $_POST['cookielength'];
+	if (isset($_POST['cookieneverexp']) || (!empty($_POST['cookielength']) && $_POST['cookielength'] == -1)) {
+			$modSettings['cookieTime'] = 3153600;
+	} elseif (!empty($_POST['cookielength']) && ($_POST['cookielength'] >= 1 && $_POST['cookielength'] <= 525600)) {
+			$modSettings['cookieTime'] = (int) $_POST['cookielength'];
+	}
 
 	loadLanguage('Login');
 	// Load the template stuff.
@@ -309,8 +320,9 @@ 
 			$other_passwords[] = crypt(md5($_POST['passwrd']), md5($_POST['passwrd']));
 
 			// Snitz style - SHA-256.  Technically, this is a downgrade, but most PHP configurations don't support sha256 anyway.
-			if (strlen($user_settings['passwd']) == 64 && function_exists('mhash') && defined('MHASH_SHA256'))
-				$other_passwords[] = bin2hex(mhash(MHASH_SHA256, $_POST['passwrd']));
+			if (strlen($user_settings['passwd']) == 64 && function_exists('mhash') && defined('MHASH_SHA256')) {
+							$other_passwords[] = bin2hex(mhash(MHASH_SHA256, $_POST['passwrd']));
+			}
 
 			// phpBB3 users new hashing.  We now support it as well ;).
 			$other_passwords[] = phpBB3_password_check($_POST['passwrd'], $user_settings['passwd']);
@@ -330,27 +342,29 @@ 
 			// Some common md5 ones.
 			$other_passwords[] = md5($user_settings['password_salt'] . $_POST['passwrd']);
 			$other_passwords[] = md5($_POST['passwrd'] . $user_settings['password_salt']);
-		}
-		elseif (strlen($user_settings['passwd']) == 40)
+		} elseif (strlen($user_settings['passwd']) == 40)
 		{
 			// Maybe they are using a hash from before the password fix.
 			// This is also valid for SMF 1.1 to 2.0 style of hashing, changed to bcrypt in SMF 2.1
 			$other_passwords[] = sha1(strtolower($user_settings['member_name']) . un_htmlspecialchars($_POST['passwrd']));
 
 			// BurningBoard3 style of hashing.
-			if (!empty($modSettings['enable_password_conversion']))
-				$other_passwords[] = sha1($user_settings['password_salt'] . sha1($user_settings['password_salt'] . sha1($_POST['passwrd'])));
+			if (!empty($modSettings['enable_password_conversion'])) {
+							$other_passwords[] = sha1($user_settings['password_salt'] . sha1($user_settings['password_salt'] . sha1($_POST['passwrd'])));
+			}
 
 			// Perhaps we converted to UTF-8 and have a valid password being hashed differently.
 			if ($context['character_set'] == 'UTF-8' && !empty($modSettings['previousCharacterSet']) && $modSettings['previousCharacterSet'] != 'utf8')
 			{
 				// Try iconv first, for no particular reason.
-				if (function_exists('iconv'))
-					$other_passwords['iconv'] = sha1(strtolower(iconv('UTF-8', $modSettings['previousCharacterSet'], $user_settings['member_name'])) . un_htmlspecialchars(iconv('UTF-8', $modSettings['previousCharacterSet'], $_POST['passwrd'])));
+				if (function_exists('iconv')) {
+									$other_passwords['iconv'] = sha1(strtolower(iconv('UTF-8', $modSettings['previousCharacterSet'], $user_settings['member_name'])) . un_htmlspecialchars(iconv('UTF-8', $modSettings['previousCharacterSet'], $_POST['passwrd'])));
+				}
 
 				// Say it aint so, iconv failed!
-				if (empty($other_passwords['iconv']) && function_exists('mb_convert_encoding'))
-					$other_passwords[] = sha1(strtolower(mb_convert_encoding($user_settings['member_name'], 'UTF-8', $modSettings['previousCharacterSet'])) . un_htmlspecialchars(mb_convert_encoding($_POST['passwrd'], 'UTF-8', $modSettings['previousCharacterSet'])));
+				if (empty($other_passwords['iconv']) && function_exists('mb_convert_encoding')) {
+									$other_passwords[] = sha1(strtolower(mb_convert_encoding($user_settings['member_name'], 'UTF-8', $modSettings['previousCharacterSet'])) . un_htmlspecialchars(mb_convert_encoding($_POST['passwrd'], 'UTF-8', $modSettings['previousCharacterSet'])));
+				}
 			}
 		}
 
@@ -380,8 +394,9 @@ 
 			$_SESSION['failed_login'] = isset($_SESSION['failed_login']) ? ($_SESSION['failed_login'] + 1) : 1;
 
 			// Hmm... don't remember it, do you?  Here, try the password reminder ;).
-			if ($_SESSION['failed_login'] >= $modSettings['failed_login_threshold'])
-				redirectexit('action=reminder');
+			if ($_SESSION['failed_login'] >= $modSettings['failed_login_threshold']) {
+							redirectexit('action=reminder');
+			}
 			// We'll give you another chance...
 			else
 			{
@@ -392,8 +407,7 @@ 
 				return;
 			}
 		}
-	}
-	elseif (!empty($user_settings['passwd_flood']))
+	} elseif (!empty($user_settings['passwd_flood']))
 	{
 		// Let's be sure they weren't a little hacker.
 		validatePasswordFlood($user_settings['id_member'], $user_settings['passwd_flood'], true);
@@ -410,8 +424,9 @@ 
 	}
 
 	// Check their activation status.
-	if (!checkActivation())
-		return;
+	if (!checkActivation()) {
+			return;
+	}
 
 	DoLogin();
 }
@@ -423,8 +438,9 @@ 
 {
 	global $sourcedir, $txt, $context, $user_info, $modSettings, $scripturl;
 
-	if (!$user_info['is_guest'] || empty($context['tfa_member']) || empty($modSettings['tfa_mode']))
-		fatal_lang_error('no_access', false);
+	if (!$user_info['is_guest'] || empty($context['tfa_member']) || empty($modSettings['tfa_mode'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	loadLanguage('Profile');
 	require_once($sourcedir . '/Class-TOTP.php');
@@ -432,8 +448,9 @@ 
 	$member = $context['tfa_member'];
 
 	// Prevent replay attacks by limiting at least 2 minutes before they can log in again via 2FA
-	if (time() - $member['last_login'] < 120)
-		fatal_lang_error('tfa_wait', false);
+	if (time() - $member['last_login'] < 120) {
+			fatal_lang_error('tfa_wait', false);
+	}
 
 	$totp = new \TOTP\Auth($member['tfa_secret']);
 	$totp->setRange(1);
@@ -447,8 +464,9 @@ 
 	if (!empty($_POST['tfa_code']) && empty($_POST['tfa_backup']))
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+					fatal_lang_error('login_ssl_required');
+		}
 
 		$code = $_POST['tfa_code'];
 
@@ -458,20 +476,19 @@ 
 
 			setTFACookie(3153600, $member['id_member'], hash_salt($member['tfa_backup'], $member['password_salt']), !empty($_POST['tfa_preserve']));
 			redirectexit();
-		}
-		else
+		} else
 		{
 			validatePasswordFlood($member['id_member'], $member['passwd_flood'], false, true);
 
 			$context['tfa_error'] = true;
 			$context['tfa_value'] = $_POST['tfa_code'];
 		}
-	}
-	elseif (!empty($_POST['tfa_backup']))
+	} elseif (!empty($_POST['tfa_backup']))
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+					fatal_lang_error('login_ssl_required');
+		}
 
 		$backup = $_POST['tfa_backup'];
 
@@ -485,8 +502,7 @@ 
 			));
 			setTFACookie(3153600, $member['id_member'], hash_salt($member['tfa_backup'], $member['password_salt']));
 			redirectexit('action=profile;area=tfasetup;backup');
-		}
-		else
+		} else
 		{
 			validatePasswordFlood($member['id_member'], $member['passwd_flood'], false, true);
 
@@ -509,8 +525,9 @@ 
 {
 	global $context, $txt, $scripturl, $user_settings, $modSettings;
 
-	if (!isset($context['login_errors']))
-		$context['login_errors'] = array();
+	if (!isset($context['login_errors'])) {
+			$context['login_errors'] = array();
+	}
 
 	// What is the true activation status of this account?
 	$activation_status = $user_settings['is_activated'] > 10 ? $user_settings['is_activated'] - 10 : $user_settings['is_activated'];
@@ -522,8 +539,9 @@ 
 		return false;
 	}
 	// Awaiting approval still?
-	elseif ($activation_status == 3)
-		fatal_lang_error('still_awaiting_approval', 'user');
+	elseif ($activation_status == 3) {
+			fatal_lang_error('still_awaiting_approval', 'user');
+	}
 	// Awaiting deletion, changed their mind?
 	elseif ($activation_status == 4)
 	{
@@ -531,8 +549,7 @@ 
 		{
 			updateMemberData($user_settings['id_member'], array('is_activated' => 1));
 			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 0 ? $modSettings['unapprovedMembers'] - 1 : 0)));
-		}
-		else
+		} else
 		{
 			$context['disable_login_hashing'] = true;
 			$context['login_errors'][] = $txt['awaiting_delete_account'];
@@ -573,8 +590,9 @@ 
 	setLoginCookie(60 * $modSettings['cookieTime'], $user_settings['id_member'], hash_salt($user_settings['passwd'], $user_settings['password_salt']));
 
 	// Reset the login threshold.
-	if (isset($_SESSION['failed_login']))
-		unset($_SESSION['failed_login']);
+	if (isset($_SESSION['failed_login'])) {
+			unset($_SESSION['failed_login']);
+	}
 
 	$user_info['is_guest'] = false;
 	$user_settings['additional_groups'] = explode(',', $user_settings['additional_groups']);
@@ -596,16 +614,18 @@ 
 			'id_member' => $user_info['id'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 1)
-		$_SESSION['first_login'] = true;
-	else
-		unset($_SESSION['first_login']);
+	if ($smcFunc['db_num_rows']($request) == 1) {
+			$_SESSION['first_login'] = true;
+	} else {
+			unset($_SESSION['first_login']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// You've logged in, haven't you?
 	$update = array('member_ip' => $user_info['ip'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']);
-	if (empty($user_settings['tfa_secret']))
-		$update['last_login'] = time();
+	if (empty($user_settings['tfa_secret'])) {
+			$update['last_login'] = time();
+	}
 	updateMemberData($user_info['id'], $update);
 
 	// Get rid of the online entry for that old guest....
@@ -619,8 +639,8 @@ 
 	$_SESSION['log_time'] = 0;
 
 	// Log this entry, only if we have it enabled.
-	if (!empty($modSettings['loginHistoryDays']))
-		$smcFunc['db_insert']('insert',
+	if (!empty($modSettings['loginHistoryDays'])) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}member_logins',
 			array(
 				'id_member' => 'int', 'time' => 'int', 'ip' => 'inet', 'ip2' => 'inet',
@@ -632,13 +652,15 @@ 
 				'id_member', 'time'
 			)
 		);
+	}
 
 	// Just log you back out if it's in maintenance mode and you AREN'T an admin.
-	if (empty($maintenance) || allowedTo('admin_forum'))
-		redirectexit('action=login2;sa=check;member=' . $user_info['id'], $context['server']['needs_login_fix']);
-	else
-		redirectexit('action=logout;' . $context['session_var'] . '=' . $context['session_id'], $context['server']['needs_login_fix']);
-}
+	if (empty($maintenance) || allowedTo('admin_forum')) {
+			redirectexit('action=login2;sa=check;member=' . $user_info['id'], $context['server']['needs_login_fix']);
+	} else {
+			redirectexit('action=logout;' . $context['session_var'] . '=' . $context['session_id'], $context['server']['needs_login_fix']);
+	}
+	}
 
 /**
  * Logs the current user out of their account.
@@ -654,13 +676,15 @@ 
 	global $sourcedir, $user_info, $user_settings, $context, $smcFunc, $cookiename, $modSettings;
 
 	// Make sure they aren't being auto-logged out.
-	if (!$internal)
-		checkSession('get');
+	if (!$internal) {
+			checkSession('get');
+	}
 
 	require_once($sourcedir . '/Subs-Auth.php');
 
-	if (isset($_SESSION['pack_ftp']))
-		$_SESSION['pack_ftp'] = null;
+	if (isset($_SESSION['pack_ftp'])) {
+			$_SESSION['pack_ftp'] = null;
+	}
 
 	// It won't be first login anymore.
 	unset($_SESSION['first_login']);
@@ -688,24 +712,27 @@ 
 
 	// And some other housekeeping while we're at it.
 	$salt = substr(md5(mt_rand()), 0, 4);
-	if (!empty($user_info['id']))
-		updateMemberData($user_info['id'], array('password_salt' => $salt));
+	if (!empty($user_info['id'])) {
+			updateMemberData($user_info['id'], array('password_salt' => $salt));
+	}
 
 	if (!empty($modSettings['tfa_mode']) && !empty($user_info['id']) && !empty($_COOKIE[$cookiename . '_tfa']))
 	{
 		$tfadata = smf_json_decode($_COOKIE[$cookiename . '_tfa'], true);
 
 		// If that failed, try the old method
-		if (is_null($tfadata))
-			$tfadata = safe_unserialize($_COOKIE[$cookiename . '_tfa']);
+		if (is_null($tfadata)) {
+					$tfadata = safe_unserialize($_COOKIE[$cookiename . '_tfa']);
+		}
 
 		list ($tfamember, $tfasecret, $exp, $state, $preserve) = $tfadata;
 
 		// If we're preserving the cookie, reset it with updated salt
-		if ($preserve && time() < $exp)
-			setTFACookie(3153600, $user_info['id'], hash_salt($user_settings['tfa_backup'], $salt), true);
-		else
-			setTFACookie(-3600, 0, '');
+		if ($preserve && time() < $exp) {
+					setTFACookie(3153600, $user_info['id'], hash_salt($user_settings['tfa_backup'], $salt), true);
+		} else {
+					setTFACookie(-3600, 0, '');
+		}
 	}
 
 	session_destroy();
@@ -713,14 +740,13 @@ 
 	// Off to the merry board index we go!
 	if ($redirect)
 	{
-		if (empty($_SESSION['logout_url']))
-			redirectexit('', $context['server']['needs_login_fix']);
-		elseif (!empty($_SESSION['logout_url']) && (strpos($_SESSION['logout_url'], 'http://') === false && strpos($_SESSION['logout_url'], 'https://') === false))
+		if (empty($_SESSION['logout_url'])) {
+					redirectexit('', $context['server']['needs_login_fix']);
+		} elseif (!empty($_SESSION['logout_url']) && (strpos($_SESSION['logout_url'], 'http://') === false && strpos($_SESSION['logout_url'], 'https://') === false))
 		{
 			unset ($_SESSION['logout_url']);
 			redirectexit();
-		}
-		else
+		} else
 		{
 			$temp = $_SESSION['logout_url'];
 			unset($_SESSION['logout_url']);
@@ -753,8 +779,9 @@ 
 function phpBB3_password_check($passwd, $passwd_hash)
 {
 	// Too long or too short?
-	if (strlen($passwd_hash) != 34)
-		return;
+	if (strlen($passwd_hash) != 34) {
+			return;
+	}
 
 	// Range of characters allowed.
 	$range = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
@@ -766,8 +793,9 @@ 
 	$salt = substr($passwd_hash, 4, 8);
 
 	$hash = md5($salt . $passwd, true);
-	for (; $count != 0; --$count)
-		$hash = md5($hash . $passwd, true);
+	for (; $count != 0; --$count) {
+			$hash = md5($hash . $passwd, true);
+	}
 
 	$output = substr($passwd_hash, 0, 12);
 	$i = 0;
@@ -776,21 +804,25 @@ 
 		$value = ord($hash[$i++]);
 		$output .= $range[$value & 0x3f];
 
-		if ($i < 16)
-			$value |= ord($hash[$i]) << 8;
+		if ($i < 16) {
+					$value |= ord($hash[$i]) << 8;
+		}
 
 		$output .= $range[($value >> 6) & 0x3f];
 
-		if ($i++ >= 16)
-			break;
+		if ($i++ >= 16) {
+					break;
+		}
 
-		if ($i < 16)
-			$value |= ord($hash[$i]) << 16;
+		if ($i < 16) {
+					$value |= ord($hash[$i]) << 16;
+		}
 
 		$output .= $range[($value >> 12) & 0x3f];
 
-		if ($i++ >= 16)
-			break;
+		if ($i++ >= 16) {
+					break;
+		}
 
 		$output .= $range[($value >> 18) & 0x3f];
 	}
@@ -821,8 +853,9 @@ 
 		require_once($sourcedir . '/Subs-Auth.php');
 		setLoginCookie(-3600, 0);
 
-		if (isset($_SESSION['login_' . $cookiename]))
-			unset($_SESSION['login_' . $cookiename]);
+		if (isset($_SESSION['login_' . $cookiename])) {
+					unset($_SESSION['login_' . $cookiename]);
+		}
 	}
 
 	// We need a member!
@@ -836,8 +869,9 @@ 
 	}
 
 	// Right, have we got a flood value?
-	if ($password_flood_value !== false)
-		@list ($time_stamp, $number_tries) = explode('|', $password_flood_value);
+	if ($password_flood_value !== false) {
+			@list ($time_stamp, $number_tries) = explode('|', $password_flood_value);
+	}
 
 	// Timestamp or number of tries invalid?
 	if (empty($number_tries) || empty($time_stamp))
@@ -853,15 +887,17 @@ 
 		$number_tries = $time_stamp < time() - 20 ? 2 : $number_tries;
 
 		// They are trying too fast, make them wait longer
-		if ($time_stamp < time() - 10)
-			$time_stamp = time();
+		if ($time_stamp < time() - 10) {
+					$time_stamp = time();
+		}
 	}
 
 	$number_tries++;
 
 	// Broken the law?
-	if ($number_tries > 5)
-		fatal_lang_error('login_threshold_brute_fail', 'critical');
+	if ($number_tries > 5) {
+			fatal_lang_error('login_threshold_brute_fail', 'critical');
+	}
 
 	// Otherwise set the members data. If they correct on their first attempt then we actually clear it, otherwise we set it!
 	updateMemberData($id_member, array('passwd_flood' => $was_correct && $number_tries == 1 ? '' : $time_stamp . '|' . $number_tries));

Sources/DbExtra-mysql.php

Braces +66 added lines, -46 removed lines

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

Sources/Likes.php

Braces +106 added lines, -77 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class Likes
@@ -108,8 +109,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;
+		}
 	}
 
 	/**
@@ -143,8 +145,9 @@ 
 			$call = $this->_sa;
 
 			// Guest can only view likes.
-			if ($call != 'view')
-				is_not_guest();
+			if ($call != 'view') {
+							is_not_guest();
+			}
 
 			checkSession('get');
 
@@ -182,15 +185,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.
@@ -209,12 +214,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.
@@ -224,9 +231,7 @@ 
 			$this->_validLikes['can_see'] = allowedTo('likes_view') ? true : 'cannot_view_likes';
 
 			$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.
@@ -244,8 +249,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'];
@@ -256,17 +262,20 @@ 
 				}
 			}
 
-			if (!$found)
-				return $this->_error = 'cannot_';
+			if (!$found) {
+							return $this->_error = 'cannot_';
+			}
 		}
 
 		// Does the user can see this?
-		if (isset($this->_validLikes['can_see']) && is_string($this->_validLikes['can_see']))
-			return $this->_error = $this->_validLikes['can_see'];
+		if (isset($this->_validLikes['can_see']) && is_string($this->_validLikes['can_see'])) {
+					return $this->_error = $this->_validLikes['can_see'];
+		}
 
 		// 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'];
+			}
 	}
 
 	/**
@@ -291,8 +300,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__;
+		}
 	}
 
 	/**
@@ -322,8 +332,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', json_encode(array(
@@ -335,10 +345,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__;
+		}
 	}
 
 	/**
@@ -364,8 +376,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;
+		}
 	}
 
 	/**
@@ -378,8 +391,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']('', '
@@ -397,26 +411,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.
@@ -425,8 +441,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(
@@ -450,8 +467,9 @@ 
 	{
 		global $smcFunc;
 
-		if ($this->_type !== 'msg')
-			return;
+		if ($this->_type !== 'msg') {
+					return;
+		}
 
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
@@ -492,8 +510,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']);
@@ -501,8 +520,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)
@@ -544,12 +564,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');
@@ -559,8 +581,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)
@@ -570,8 +593,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;
 		}
@@ -580,8 +604,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');
@@ -612,8 +637,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;
 		}
@@ -649,33 +675,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/Packages.php

Braces +599 added lines, -484 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the notoriously defunct package manager..... :/.
@@ -57,10 +58,11 @@ 
 	);
 
 	// Work out exactly who it is we are calling.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
-	else
-		$context['sub_action'] = 'browse';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	} else {
+			$context['sub_action'] = 'browse';
+	}
 
 	// Set up some tabs...
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -82,8 +84,9 @@ 
 		),
 	);
 
-	if ($context['sub_action'] == 'browse')
-		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	if ($context['sub_action'] == 'browse') {
+			loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
+	}
 
 	call_integration_hook('integrate_manage_packages', array(&$subActions));
 
@@ -99,8 +102,9 @@ 
 	global $boarddir, $txt, $context, $scripturl, $sourcedir, $packagesdir, $modSettings, $smcFunc, $settings;
 
 	// You have to specify a file!!
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 	$context['filename'] = preg_replace('~[\.]+~', '.', $_REQUEST['package']);
 
 	// Do we have an existing id, for uninstalls and the like.
@@ -112,8 +116,9 @@ 
 	create_chmod_control();
 
 	// Make sure temp directory exists and is empty.
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	}
 
 	if (!mktree($packagesdir . '/temp', 0755))
 	{
@@ -124,8 +129,9 @@ 
 			create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'], 'crash_on_error' => true));
 
 			deltree($packagesdir . '/temp', false);
-			if (!mktree($packagesdir . '/temp', 0777))
-				fatal_lang_error('package_cant_download', false);
+			if (!mktree($packagesdir . '/temp', 0777)) {
+							fatal_lang_error('package_cant_download', false);
+			}
 		}
 	}
 
@@ -151,25 +157,26 @@ 
 	{
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 
-		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml'))
-			foreach ($context['extracted_files'] as $file)
+		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) {
+					foreach ($context['extracted_files'] as $file)
 				if (basename($file['filename']) == 'package-info.xml')
 				{
 					$context['base_path'] = dirname($file['filename']) . '/';
+		}
 					break;
 				}
 
-		if (!isset($context['base_path']))
-			$context['base_path'] = '';
-	}
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
+		if (!isset($context['base_path'])) {
+					$context['base_path'] = '';
+		}
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
 	{
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
 		$context['base_path'] = '';
+	} else {
+			fatal_lang_error('no_access', false);
 	}
-	else
-		fatal_lang_error('no_access', false);
 
 	// Load up any custom themes we may want to install into...
 	$request = $smcFunc['db_query']('', '
@@ -185,15 +192,17 @@ 
 		)
 	);
 	$theme_paths = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get the package info...
 	$packageInfo = getPackageInfo($context['filename']);
 
-	if (!is_array($packageInfo))
-		fatal_lang_error($packageInfo);
+	if (!is_array($packageInfo)) {
+			fatal_lang_error($packageInfo);
+	}
 
 	$packageInfo['filename'] = $context['filename'];
 	$context['package_name'] = isset($packageInfo['name']) ? $packageInfo['name'] : $context['filename'];
@@ -227,18 +236,19 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$context['database_changes'] = array();
-	if (isset($packageInfo['uninstall']['database']))
-		$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
-	elseif (!empty($db_changes))
+	if (isset($packageInfo['uninstall']['database'])) {
+			$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
+	} elseif (!empty($db_changes))
 	{
 		foreach ($db_changes as $change)
 		{
-			if (isset($change[2]) && isset($txt['package_db_' . $change[0]]))
-				$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
-			elseif (isset($txt['package_db_' . $change[0]]))
-				$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
-			else
-				$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
+			if (isset($change[2]) && isset($txt['package_db_' . $change[0]])) {
+							$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
+			} elseif (isset($txt['package_db_' . $change[0]])) {
+							$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
+			} else {
+							$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
+			}
 		}
 	}
 
@@ -265,31 +275,33 @@ 
 		$context['themes_locked'] = true;
 
 		// Only let them uninstall themes it was installed into.
-		foreach ($theme_paths as $id => $data)
-			if ($id != 1 && !in_array($id, $old_themes))
+		foreach ($theme_paths as $id => $data) {
+					if ($id != 1 && !in_array($id, $old_themes))
 				unset($theme_paths[$id]);
-	}
-	elseif (isset($old_version) && $old_version != $packageInfo['version'])
+		}
+	} elseif (isset($old_version) && $old_version != $packageInfo['version'])
 	{
 		// Look for an upgrade...
 		$actions = parsePackageInfo($packageInfo['xml'], true, 'upgrade', $old_version);
 
 		// There was no upgrade....
-		if (empty($actions))
-			$context['is_installed'] = true;
-		else
+		if (empty($actions)) {
+					$context['is_installed'] = true;
+		} else
 		{
 			// Otherwise they can only upgrade themes from the first time around.
-			foreach ($theme_paths as $id => $data)
-				if ($id != 1 && !in_array($id, $old_themes))
+			foreach ($theme_paths as $id => $data) {
+							if ($id != 1 && !in_array($id, $old_themes))
 					unset($theme_paths[$id]);
+			}
 		}
+	} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
+			$context['is_installed'] = true;
 	}
-	elseif (isset($old_version) && $old_version == $packageInfo['version'])
-		$context['is_installed'] = true;
 
-	if (!isset($old_version) || $context['is_installed'])
-		$actions = parsePackageInfo($packageInfo['xml'], true, 'install');
+	if (!isset($old_version) || $context['is_installed']) {
+			$actions = parsePackageInfo($packageInfo['xml'], true, 'install');
+	}
 
 	$context['actions'] = array();
 	$context['ftp_needed'] = false;
@@ -297,8 +309,9 @@ 
 	$chmod_files = array();
 
 	// no actions found, return so we can display an error
-	if (empty($actions))
-		return;
+	if (empty($actions)) {
+			return;
+	}
 
 	// This will hold data about anything that can be installed in other themes.
 	$themeFinds = array(
@@ -317,14 +330,14 @@ 
 		{
 			$chmod_files[] = $action['filename'];
 			continue;
-		}
-		elseif ($action['type'] == 'readme' || $action['type'] == 'license')
+		} elseif ($action['type'] == 'readme' || $action['type'] == 'license')
 		{
 			$type = 'package_' . $action['type'];
-			if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r"));
-			elseif (file_exists($action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r"));
+			} elseif (file_exists($action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			}
 
 			if (!empty($action['parse_bbc']))
 			{
@@ -332,24 +345,24 @@ 
 				$context[$type] = preg_replace('~\[[/]?html\]~i', '', $context[$type]);
 				preparsecode($context[$type]);
 				$context[$type] = parse_bbc($context[$type]);
+			} else {
+							$context[$type] = nl2br($context[$type]);
 			}
-			else
-				$context[$type] = nl2br($context[$type]);
 
 			continue;
 		}
 		// Don't show redirects.
-		elseif ($action['type'] == 'redirect')
-			continue;
-		elseif ($action['type'] == 'error')
+		elseif ($action['type'] == 'redirect') {
+					continue;
+		} elseif ($action['type'] == 'error')
 		{
 			$context['has_failure'] = true;
-			if (isset($action['error_msg']) && isset($action['error_var']))
-				$context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']);
-			elseif (isset($action['error_msg']))
-				$context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg'];
-		}
-		elseif ($action['type'] == 'modification')
+			if (isset($action['error_msg']) && isset($action['error_var'])) {
+							$context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']);
+			} elseif (isset($action['error_msg'])) {
+							$context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg'];
+			}
+		} elseif ($action['type'] == 'modification')
 		{
 			if (!file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
 			{
@@ -361,52 +374,54 @@ 
 					'description' => $txt['package_action_missing'],
 					'failed' => true,
 				);
-			}
-			else
+			} else
 			{
 
-				if ($action['boardmod'])
-					$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
-				else
-					$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
+				if ($action['boardmod']) {
+									$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
+				} else {
+									$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
+				}
 
-				if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-')
-					$mod_actions[0]['filename'] = $action['filename'];
+				if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') {
+									$mod_actions[0]['filename'] = $action['filename'];
+				}
 
 				foreach ($mod_actions as $key => $mod_action)
 				{
 					// Lets get the last section of the file name.
-					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
-						$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
-					elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
-						$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
-					else
-						$actual_filename = $key;
-
-					if ($mod_action['type'] == 'opened')
-						$failed = false;
-					elseif ($mod_action['type'] == 'failure')
+					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
+											$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
+					} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
+											$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
+					} else {
+											$actual_filename = $key;
+					}
+
+					if ($mod_action['type'] == 'opened') {
+											$failed = false;
+					} elseif ($mod_action['type'] == 'failure')
 					{
-						if (empty($mod_action['is_custom']))
-							$context['has_failure'] = true;
+						if (empty($mod_action['is_custom'])) {
+													$context['has_failure'] = true;
+						}
 						$failed = true;
-					}
-					elseif ($mod_action['type'] == 'chmod')
+					} elseif ($mod_action['type'] == 'chmod')
 					{
 						$chmod_files[] = $mod_action['filename'];
-					}
-					elseif ($mod_action['type'] == 'saved')
+					} elseif ($mod_action['type'] == 'saved')
 					{
 						if (!empty($mod_action['is_custom']))
 						{
-							if (!isset($context['theme_actions'][$mod_action['is_custom']]))
-								$context['theme_actions'][$mod_action['is_custom']] = array(
+							if (!isset($context['theme_actions'][$mod_action['is_custom']])) {
+															$context['theme_actions'][$mod_action['is_custom']] = array(
 									'name' => $theme_paths[$mod_action['is_custom']]['name'],
 									'actions' => array(),
 									'has_failure' => $failed,
 								);
-							else
-								$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed;
+							} else {
+															$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed;
+							}
 
 							$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename] = array(
 								'type' => $txt['execute_modification'],
@@ -414,8 +429,7 @@ 
 								'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'],
 								'failed' => $failed,
 							);
-						}
-						elseif (!isset($context['actions'][$actual_filename]))
+						} elseif (!isset($context['actions'][$actual_filename]))
 						{
 							$context['actions'][$actual_filename] = array(
 								'type' => $txt['execute_modification'],
@@ -423,22 +437,19 @@ 
 								'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'],
 								'failed' => $failed,
 							);
-						}
-						else
+						} else
 						{
 								$context['actions'][$actual_filename]['failed'] |= $failed;
 								$context['actions'][$actual_filename]['description'] = $context['actions'][$actual_filename]['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'];
 						}
-					}
-					elseif ($mod_action['type'] == 'skipping')
+					} elseif ($mod_action['type'] == 'skipping')
 					{
 						$context['actions'][$actual_filename] = array(
 							'type' => $txt['execute_modification'],
 							'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 							'description' => $txt['package_action_skipping']
 						);
-					}
-					elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom']))
+					} elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom']))
 					{
 						$context['has_failure'] = true;
 						$context['actions'][$actual_filename] = array(
@@ -447,32 +458,33 @@ 
 							'description' => $txt['package_action_missing'],
 							'failed' => true,
 						);
-					}
-					elseif ($mod_action['type'] == 'error')
-						$context['actions'][$actual_filename] = array(
+					} elseif ($mod_action['type'] == 'error') {
+											$context['actions'][$actual_filename] = array(
 							'type' => $txt['execute_modification'],
 							'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 							'description' => $txt['package_action_error'],
 							'failed' => true,
 						);
+					}
 				}
 
 				// We need to loop again just to get the operations down correctly.
 				foreach ($mod_actions as $operation_key => $mod_action)
 				{
 					// Lets get the last section of the file name.
-					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
-						$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
-					elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
-						$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
-					else
-						$actual_filename = $key;
+					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
+											$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
+					} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
+											$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
+					} else {
+											$actual_filename = $key;
+					}
 
 					// We just need it for actual parse changes.
 					if (!in_array($mod_action['type'], array('error', 'result', 'opened', 'saved', 'end', 'missing', 'skipping', 'chmod')))
 					{
-						if (empty($mod_action['is_custom']))
-							$context['actions'][$actual_filename]['operations'][] = array(
+						if (empty($mod_action['is_custom'])) {
+													$context['actions'][$actual_filename]['operations'][] = array(
 								'type' => $txt['execute_modification'],
 								'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 								'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'],
@@ -483,10 +495,11 @@ 
 								'failed' => $mod_action['failed'],
 								'ignore_failure' => !empty($mod_action['ignore_failure']),
 							);
+						}
 
 						// Themes are under the saved type.
-						if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']]))
-							$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array(
+						if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']])) {
+													$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array(
 								'type' => $txt['execute_modification'],
 								'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
 								'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'],
@@ -497,59 +510,55 @@ 
 								'failed' => $mod_action['failed'],
 								'ignore_failure' => !empty($mod_action['ignore_failure']),
 							);
+						}
 					}
 				}
 			}
-		}
-		elseif ($action['type'] == 'code')
+		} elseif ($action['type'] == 'code')
 		{
 			$thisAction = array(
 				'type' => $txt['execute_code'],
 				'action' => $smcFunc['htmlspecialchars']($action['filename']),
 			);
-		}
-		elseif ($action['type'] == 'database')
+		} elseif ($action['type'] == 'database')
 		{
 			$thisAction = array(
 				'type' => $txt['execute_database_changes'],
 				'action' => $smcFunc['htmlspecialchars']($action['filename']),
 			);
-		}
-		elseif (in_array($action['type'], array('create-dir', 'create-file')))
+		} elseif (in_array($action['type'], array('create-dir', 'create-file')))
 		{
 			$thisAction = array(
 				'type' => $txt['package_create'] . ' ' . ($action['type'] == 'create-dir' ? $txt['package_tree'] : $txt['package_file']),
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
-		}
-		elseif ($action['type'] == 'hook')
+		} elseif ($action['type'] == 'hook')
 		{
 			$action['description'] = !isset($action['hook'], $action['function']) ? $txt['package_action_failure'] : $txt['package_action_success'];
 
-			if (!isset($action['hook'], $action['function']))
-				$context['has_failure'] = true;
+			if (!isset($action['hook'], $action['function'])) {
+							$context['has_failure'] = true;
+			}
 
 			$thisAction = array(
 				'type' => $action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'],
 				'action' => sprintf($txt['execute_hook_action' . ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])),
 			);
-		}
-		elseif ($action['type'] == 'credits')
+		} elseif ($action['type'] == 'credits')
 		{
 			$thisAction = array(
 				'type' => $txt['execute_credits_add'],
 				'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])),
 			);
-		}
-		elseif ($action['type'] == 'requires')
+		} elseif ($action['type'] == 'requires')
 		{
 			$installed = false;
 			$version = true;
 
 			// package missing required values?
-			if (!isset($action['id']))
-				$context['has_failure'] = true;
-			else
+			if (!isset($action['id'])) {
+							$context['has_failure'] = true;
+			} else
 			{
 				// See if this dependancy is installed
 				$request = $smcFunc['db_query']('', '
@@ -565,8 +574,9 @@ 
 					)
 				);
 				$installed = ($smcFunc['db_num_rows']($request) !== 0);
-				if ($installed)
-					list ($version) = $smcFunc['db_fetch_row']($request);
+				if ($installed) {
+									list ($version) = $smcFunc['db_fetch_row']($request);
+				}
 				$smcFunc['db_free_result']($request);
 
 				// do a version level check (if requested) in the most basic way
@@ -581,8 +591,7 @@ 
 				'type' => $txt['package_requires'],
 				'action' => $txt['package_check_for'] . ' ' . $action['id'] . (isset($action['version']) ? (' / ' . ($version ? $action['version'] : '<span class="error">' . $action['version'] . '</span>')) : ''),
 			);
-		}
-		elseif (in_array($action['type'], array('require-dir', 'require-file')))
+		} elseif (in_array($action['type'], array('require-dir', 'require-file')))
 		{
 			// Do this one...
 			$thisAction = array(
@@ -596,26 +605,29 @@ 
 				// Is the action already stated?
 				$theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], array('no', 'yes', 'auto')) ? $action['theme_action'] : 'auto';
 				// If it's not auto do we think we have something we can act upon?
-				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
-					$theme_action = '';
+				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) {
+									$theme_action = '';
+				}
 				// ... or if it's auto do we even want to do anything?
-				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
-					$theme_action = '';
+				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
+									$theme_action = '';
+				}
 
 				// So, we still want to do something?
-				if ($theme_action != '')
-					$themeFinds['candidates'][] = $action;
+				if ($theme_action != '') {
+									$themeFinds['candidates'][] = $action;
+				}
 				// Otherwise is this is going into another theme record it.
-				elseif ($matches[1] == 'themes_dir')
-					$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename']));
+				elseif ($matches[1] == 'themes_dir') {
+									$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename']));
+				}
 			}
-		}
-		elseif (in_array($action['type'], array('move-dir', 'move-file')))
-			$thisAction = array(
+		} elseif (in_array($action['type'], array('move-dir', 'move-file'))) {
+					$thisAction = array(
 				'type' => $txt['package_move'] . ' ' . ($action['type'] == 'move-dir' ? $txt['package_tree'] : $txt['package_file']),
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['source'], array($boarddir => '.'))) . ' => ' . $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
-		elseif (in_array($action['type'], array('remove-dir', 'remove-file')))
+		} elseif (in_array($action['type'], array('remove-dir', 'remove-file')))
 		{
 			$thisAction = array(
 				'type' => $txt['package_delete'] . ' ' . ($action['type'] == 'remove-dir' ? $txt['package_tree'] : $txt['package_file']),
@@ -631,30 +643,36 @@ 
 				$action['unparsed_destination'] = $action['unparsed_filename'];
 
 				// If it's not auto do we think we have something we can act upon?
-				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
-					$theme_action = '';
+				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) {
+									$theme_action = '';
+				}
 				// ... or if it's auto do we even want to do anything?
-				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
-					$theme_action = '';
+				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
+									$theme_action = '';
+				}
 
 				// So, we still want to do something?
-				if ($theme_action != '')
-					$themeFinds['candidates'][] = $action;
+				if ($theme_action != '') {
+									$themeFinds['candidates'][] = $action;
+				}
 				// Otherwise is this is going into another theme record it.
-				elseif ($matches[1] == 'themes_dir')
-					$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename']));
+				elseif ($matches[1] == 'themes_dir') {
+									$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename']));
+				}
 			}
 		}
 
-		if (empty($thisAction))
-			continue;
+		if (empty($thisAction)) {
+					continue;
+		}
 
 		if (!in_array($action['type'], array('hook', 'credits')))
 		{
-			if ($context['uninstalling'])
-				$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
-			else
-				$file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
+			if ($context['uninstalling']) {
+							$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
+			} else {
+							$file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
+			}
 		}
 
 		// Don't fail if a file/directory we're trying to create doesn't exist...
@@ -669,8 +687,9 @@ 
 		}
 
 		// @todo None given?
-		if (empty($thisAction['description']))
-			$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+		if (empty($thisAction['description'])) {
+					$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+		}
 
 		$context['actions'][] = $thisAction;
 	}
@@ -683,18 +702,21 @@ 
 			// Get the part of the file we'll be dealing with.
 			preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir)(\\|/)*(.+)*~i', $action_data['unparsed_destination'], $matches);
 
-			if ($matches[1] == 'imagesdir')
-				$path = '/' . basename($settings['default_images_url']);
-			elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir')
-				$path = '/languages';
-			else
-				$path = '';
+			if ($matches[1] == 'imagesdir') {
+							$path = '/' . basename($settings['default_images_url']);
+			} elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') {
+							$path = '/languages';
+			} else {
+							$path = '';
+			}
 
-			if (!empty($matches[3]))
-				$path .= $matches[3];
+			if (!empty($matches[3])) {
+							$path .= $matches[3];
+			}
 
-			if (!$context['uninstalling'])
-				$path .= '/' . basename($action_data['filename']);
+			if (!$context['uninstalling']) {
+							$path .= '/' . basename($action_data['filename']);
+			}
 
 			// Loop through each custom theme to note it's candidacy!
 			foreach ($theme_paths as $id => $theme_data)
@@ -710,36 +732,40 @@ 
 						if (!mktree(dirname($real_path), false))
 						{
 							$temp = dirname($real_path);
-							while (!file_exists($temp) && strlen($temp) > 1)
-								$temp = dirname($temp);
+							while (!file_exists($temp) && strlen($temp) > 1) {
+															$temp = dirname($temp);
+							}
 							$chmod_files[] = $temp;
 						}
 
-						if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path))))
-							$chmod_files[] = $real_path;
+						if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) {
+													$chmod_files[] = $real_path;
+						}
 
-						if (!isset($context['theme_actions'][$id]))
-							$context['theme_actions'][$id] = array(
+						if (!isset($context['theme_actions'][$id])) {
+													$context['theme_actions'][$id] = array(
 								'name' => $theme_data['name'],
 								'actions' => array(),
 							);
+						}
 
-						if ($context['uninstalling'])
-							$context['theme_actions'][$id]['actions'][] = array(
+						if ($context['uninstalling']) {
+													$context['theme_actions'][$id]['actions'][] = array(
 								'type' => $txt['package_delete'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
 								'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')),
 								'description' => '',
 								'value' => base64_encode(json_encode(array('type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id))),
 								'not_mod' => true,
 							);
-						else
-							$context['theme_actions'][$id]['actions'][] = array(
+						} else {
+													$context['theme_actions'][$id]['actions'][] = array(
 								'type' => $txt['package_extract'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
 								'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')),
 								'description' => '',
 								'value' => base64_encode(json_encode(array('type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id))),
 								'not_mod' => true,
 							);
+						}
 					}
 				}
 			}
@@ -749,8 +775,9 @@ 
 	// Trash the cache... which will also check permissions for us!
 	package_flush_cache(true);
 
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
 	if (!empty($chmod_files))
 	{
@@ -775,8 +802,9 @@ 
 	checkSession();
 
 	// If there's no file, what are we installing?
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 	$context['filename'] = $_REQUEST['package'];
 
 	// If this is an uninstall, we'll have an id.
@@ -797,51 +825,55 @@ 
 
 	$context['sub_template'] = 'extract_package';
 
-	if (!file_exists($packagesdir . '/' . $context['filename']))
-		fatal_lang_error('package_no_file', false);
+	if (!file_exists($packagesdir . '/' . $context['filename'])) {
+			fatal_lang_error('package_no_file', false);
+	}
 
 	// Load up the package FTP information?
 	create_chmod_control(array(), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package']));
 
 	// Make sure temp directory exists and is empty!
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
-	else
-		mktree($packagesdir . '/temp', 0777);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	} else {
+			mktree($packagesdir . '/temp', 0777);
+	}
 
 	// Let the unpacker do the work.
 	if (is_file($packagesdir . '/' . $context['filename']))
 	{
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 
-		if (!file_exists($packagesdir . '/temp/package-info.xml'))
-			foreach ($context['extracted_files'] as $file)
+		if (!file_exists($packagesdir . '/temp/package-info.xml')) {
+					foreach ($context['extracted_files'] as $file)
 				if (basename($file['filename']) == 'package-info.xml')
 				{
 					$context['base_path'] = dirname($file['filename']) . '/';
+		}
 					break;
 				}
 
-		if (!isset($context['base_path']))
-			$context['base_path'] = '';
-	}
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
+		if (!isset($context['base_path'])) {
+					$context['base_path'] = '';
+		}
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
 	{
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
 		$context['base_path'] = '';
+	} else {
+			fatal_lang_error('no_access', false);
 	}
-	else
-		fatal_lang_error('no_access', false);
 
 	// Are we installing this into any custom themes?
 	$custom_themes = array(1);
 	$known_themes = explode(',', $modSettings['knownThemes']);
 	if (!empty($_POST['custom_theme']))
 	{
-		foreach ($_POST['custom_theme'] as $tid)
-			if (in_array($tid, $known_themes))
+		foreach ($_POST['custom_theme'] as $tid) {
+					if (in_array($tid, $known_themes))
 				$custom_themes[] = (int) $tid;
+		}
 	}
 
 	// Now load up the paths of the themes that we need to know about.
@@ -858,8 +890,9 @@ 
 	);
 	$theme_paths = array();
 	$themes_installed = array(1);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Are there any theme copying that we want to take place?
@@ -871,11 +904,13 @@ 
 	{
 		foreach ($_POST['theme_changes'] as $change)
 		{
-			if (empty($change))
-				continue;
+			if (empty($change)) {
+							continue;
+			}
 			$theme_data = smf_json_decode(base64_decode($change), true);
-			if (empty($theme_data['type']))
-				continue;
+			if (empty($theme_data['type'])) {
+							continue;
+			}
 
 			$themes_installed[] = $theme_data['id'];
 			$context['theme_copies'][$theme_data['type']][$theme_data['orig']][] = $theme_data['future'];
@@ -884,8 +919,9 @@ 
 
 	// Get the package info...
 	$packageInfo = getPackageInfo($context['filename']);
-	if (!is_array($packageInfo))
-		fatal_lang_error($packageInfo);
+	if (!is_array($packageInfo)) {
+			fatal_lang_error($packageInfo);
+	}
 
 	$packageInfo['filename'] = $context['filename'];
 
@@ -897,8 +933,9 @@ 
 	{
 		$_SESSION['last_backup_for'] = $context['filename'] . ($context['uninstalling'] ? '$$' : '$');
 		$result = package_create_backup(($context['uninstalling'] ? 'backup_' : 'before_') . strtok($context['filename'], '.'));
-		if (!$result)
-			fatal_lang_error('could_not_package_backup', false);
+		if (!$result) {
+					fatal_lang_error('could_not_package_backup', false);
+		}
 	}
 
 	// The mod isn't installed.... unless proven otherwise.
@@ -938,35 +975,38 @@ 
 		$install_log = parsePackageInfo($packageInfo['xml'], false, 'uninstall');
 
 		// Gadzooks!  There's no uninstaller at all!?
-		if (empty($install_log))
-			fatal_lang_error('package_uninstall_cannot', false);
+		if (empty($install_log)) {
+					fatal_lang_error('package_uninstall_cannot', false);
+		}
 
 		// They can only uninstall from what it was originally installed into.
-		foreach ($theme_paths as $id => $data)
-			if ($id != 1 && !in_array($id, $old_themes))
+		foreach ($theme_paths as $id => $data) {
+					if ($id != 1 && !in_array($id, $old_themes))
 				unset($theme_paths[$id]);
-	}
-	elseif (isset($old_version) && $old_version != $packageInfo['version'])
+		}
+	} elseif (isset($old_version) && $old_version != $packageInfo['version'])
 	{
 		// Look for an upgrade...
 		$install_log = parsePackageInfo($packageInfo['xml'], false, 'upgrade', $old_version);
 
 		// There was no upgrade....
-		if (empty($install_log))
-			$context['is_installed'] = true;
-		else
+		if (empty($install_log)) {
+					$context['is_installed'] = true;
+		} else
 		{
 			// Upgrade previous themes only!
-			foreach ($theme_paths as $id => $data)
-				if ($id != 1 && !in_array($id, $old_themes))
+			foreach ($theme_paths as $id => $data) {
+							if ($id != 1 && !in_array($id, $old_themes))
 					unset($theme_paths[$id]);
+			}
 		}
+	} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
+			$context['is_installed'] = true;
 	}
-	elseif (isset($old_version) && $old_version == $packageInfo['version'])
-		$context['is_installed'] = true;
 
-	if (!isset($old_version) || $context['is_installed'])
-		$install_log = parsePackageInfo($packageInfo['xml'], false, 'install');
+	if (!isset($old_version) || $context['is_installed']) {
+			$install_log = parsePackageInfo($packageInfo['xml'], false, 'install');
+	}
 
 	$context['install_finished'] = false;
 
@@ -983,37 +1023,39 @@ 
 
 			if ($action['type'] == 'modification' && !empty($action['filename']))
 			{
-				if ($action['boardmod'])
-					$mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
-				else
-					$mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
+				if ($action['boardmod']) {
+									$mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
+				} else {
+									$mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
+				}
 
 				// Any errors worth noting?
 				foreach ($mod_actions as $key => $action)
 				{
-					if ($action['type'] == 'failure')
-						$failed_steps[] = array(
+					if ($action['type'] == 'failure') {
+											$failed_steps[] = array(
 							'file' => $action['filename'],
 							'large_step' => $failed_count,
 							'sub_step' => $key,
 							'theme' => 1,
 						);
+					}
 
 					// Gather the themes we installed into.
-					if (!empty($action['is_custom']))
-						$themes_installed[] = $action['is_custom'];
+					if (!empty($action['is_custom'])) {
+											$themes_installed[] = $action['is_custom'];
+					}
 				}
-			}
-			elseif ($action['type'] == 'code' && !empty($action['filename']))
+			} elseif ($action['type'] == 'code' && !empty($action['filename']))
 			{
 				// This is just here as reference for what is available.
 				global $txt, $boarddir, $sourcedir, $modSettings, $context, $settings, $forum_version, $smcFunc;
 
 				// Now include the file and be done with it ;).
-				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
-					require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
-			}
-			elseif ($action['type'] == 'credits')
+				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
+									require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
+				}
+			} elseif ($action['type'] == 'credits')
 			{
 				// Time to build the billboard
 				$credits_tag = array(
@@ -1023,13 +1065,13 @@ 
 					'copyright' => $action['copyright'],
 					'title' => $action['title'],
 				);
-			}
-			elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
+			} elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
 			{
-				if ($action['reverse'])
-					remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
-				else
-					add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
+				if ($action['reverse']) {
+									remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
+				} else {
+									add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
+				}
 			}
 			// Only do the database changes on uninstall if requested.
 			elseif ($action['type'] == 'database' && !empty($action['filename']) && (!$context['uninstalling'] || !empty($_POST['do_db_changes'])))
@@ -1042,8 +1084,9 @@ 
 				db_extend('packages');
 
 				// Let the file work its magic ;)
-				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
-					require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
+				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
+									require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
+				}
 			}
 			// Handle a redirect...
 			elseif ($action['type'] == 'redirect' && !empty($action['redirect_url']))
@@ -1125,8 +1168,9 @@ 
 			reloadSettings();
 
 			// Any db changes from older version?
-			if (!empty($old_db_changes))
-				$db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log);
+			if (!empty($old_db_changes)) {
+							$db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log);
+			}
 
 			// If there are some database changes we might want to remove then filter them out.
 			if (!empty($db_package_log))
@@ -1142,22 +1186,24 @@ 
 				 */
 				function sort_table_first($a, $b)
 				{
-					if ($a[0] == $b[0])
-						return 0;
+					if ($a[0] == $b[0]) {
+											return 0;
+					}
 					return $a[0] == 'remove_table' ? -1 : 1;
 				}
 				usort($db_package_log, 'sort_table_first');
 				foreach ($db_package_log as $k => $log)
 				{
-					if ($log[0] == 'remove_table')
-						$tables[] = $log[1];
-					elseif (in_array($log[1], $tables))
-						unset($db_package_log[$k]);
+					if ($log[0] == 'remove_table') {
+											$tables[] = $log[1];
+					} elseif (in_array($log[1], $tables)) {
+											unset($db_package_log[$k]);
+					}
 				}
 				$db_changes = json_encode($db_package_log);
+			} else {
+							$db_changes = '';
 			}
-			else
-				$db_changes = '';
 
 			// What themes did we actually install?
 			$themes_installed = array_unique($themes_installed);
@@ -1206,18 +1252,20 @@ 
 
 		foreach ($db_changes as $change)
 		{
-			if ($change[0] == 'remove_table' && isset($change[1]))
-				$smcFunc['db_drop_table']($change[1]);
-			elseif ($change[0] == 'remove_column' && isset($change[2]))
-				$smcFunc['db_remove_column']($change[1], $change[2]);
-			elseif ($change[0] == 'remove_index' && isset($change[2]))
-				$smcFunc['db_remove_index']($change[1], $change[2]);
+			if ($change[0] == 'remove_table' && isset($change[1])) {
+							$smcFunc['db_drop_table']($change[1]);
+			} elseif ($change[0] == 'remove_column' && isset($change[2])) {
+							$smcFunc['db_remove_column']($change[1], $change[2]);
+			} elseif ($change[0] == 'remove_index' && isset($change[2])) {
+							$smcFunc['db_remove_index']($change[1], $change[2]);
+			}
 		}
 	}
 
 	// Clean house... get rid of the evidence ;).
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
 	// Log what we just did.
 	logAction($context['uninstalling'] ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), array('package' => $smcFunc['htmlspecialchars']($packageInfo['name']), 'version' => $smcFunc['htmlspecialchars']($packageInfo['version'])), 'admin');
@@ -1239,8 +1287,9 @@ 
 	require_once($sourcedir . '/Subs-Package.php');
 
 	// No package?  Show him or her the door.
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin;area=packages;sa=list;package=' . $_REQUEST['package'],
@@ -1253,11 +1302,12 @@ 
 	$context['filename'] = $_REQUEST['package'];
 
 	// Let the unpacker do the work.
-	if (is_file($packagesdir . '/' . $context['filename']))
-		$context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null);
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
-		$context['files'] = listtree($packagesdir . '/' . $context['filename']);
-}
+	if (is_file($packagesdir . '/' . $context['filename'])) {
+			$context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null);
+	} elseif (is_dir($packagesdir . '/' . $context['filename'])) {
+			$context['files'] = listtree($packagesdir . '/' . $context['filename']);
+	}
+	}
 
 /**
  * Display one of the files in a package.
@@ -1269,22 +1319,25 @@ 
 	require_once($sourcedir . '/Subs-Package.php');
 
 	// No package?  Show him or her the door.
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 
 	// No file?  Show him or her the door.
-	if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '')
-		redirectexit('action=admin;area=packages');
+	if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') {
+			redirectexit('action=admin;area=packages');
+	}
 
 	$_REQUEST['package'] = preg_replace('~[\.]+~', '.', strtr($_REQUEST['package'], array('/' => '_', '\\' => '_')));
 	$_REQUEST['file'] = preg_replace('~[\.]+~', '.', $_REQUEST['file']);
 
 	if (isset($_REQUEST['raw']))
 	{
-		if (is_file($packagesdir . '/' . $_REQUEST['package']))
-			echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true);
-		elseif (is_dir($packagesdir . '/' . $_REQUEST['package']))
-			echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']);
+		if (is_file($packagesdir . '/' . $_REQUEST['package'])) {
+					echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true);
+		} elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) {
+					echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']);
+		}
 
 		obExit(false);
 	}
@@ -1301,17 +1354,19 @@ 
 	$context['filename'] = $_REQUEST['file'];
 
 	// Let the unpacker do the work.... but make sure we handle images properly.
-	if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png')))
-		$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">';
-	else
+	if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png'))) {
+			$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">';
+	} else
 	{
-		if (is_file($packagesdir . '/' . $_REQUEST['package']))
-			$context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true));
-		elseif (is_dir($packagesdir . '/' . $_REQUEST['package']))
-			$context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']));
+		if (is_file($packagesdir . '/' . $_REQUEST['package'])) {
+					$context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true));
+		} elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) {
+					$context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']));
+		}
 
-		if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php')
-			$context['filedata'] = highlight_php_code($context['filedata']);
+		if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') {
+					$context['filedata'] = highlight_php_code($context['filedata']);
+		}
 	}
 }
 
@@ -1326,8 +1381,9 @@ 
 	checkSession('get');
 
 	// Ack, don't allow deletion of arbitrary files here, could become a security hole somehow!
-	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups')
-		redirectexit('action=admin;area=packages;sa=browse');
+	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') {
+			redirectexit('action=admin;area=packages;sa=browse');
+	}
 	$_GET['package'] = preg_replace('~[\.]+~', '.', strtr($_GET['package'], array('/' => '_', '\\' => '_')));
 
 	// Can't delete what's not there.
@@ -1335,9 +1391,9 @@ 
 	{
 		create_chmod_control(array($packagesdir . '/' . $_GET['package']), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=remove;package=' . $_GET['package'], 'crash_on_error' => true));
 
-		if (is_dir($packagesdir . '/' . $_GET['package']))
-			deltree($packagesdir . '/' . $_GET['package']);
-		else
+		if (is_dir($packagesdir . '/' . $_GET['package'])) {
+					deltree($packagesdir . '/' . $_GET['package']);
+		} else
 		{
 			smf_chmod($packagesdir . '/' . $_GET['package'], 0777);
 			unlink($packagesdir . '/' . $_GET['package']);
@@ -1385,8 +1441,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return $context['available_' . $type . ''][$package_md5]['sort_id'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return $context['available_' . $type . ''][$package_md5]['sort_id'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1402,8 +1459,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return $context['available_' . $type . ''][$package_md5]['name'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return $context['available_' . $type . ''][$package_md5]['name'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1418,8 +1476,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return $context['available_' . $type . ''][$package_md5]['version'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return $context['available_' . $type . ''][$package_md5]['version'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1434,8 +1493,9 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, $txt, &$context)
 						{
-							if (isset($context['available_' . $type . ''][$package_md5]))
-								return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable'];
+							if (isset($context['available_' . $type . ''][$package_md5])) {
+															return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable'];
+							}
 						},
 						'class' => 'smalltext',
 					),
@@ -1451,28 +1511,30 @@ 
 					'data' => array(
 						'function' => function($package_md5) use ($type, &$context, $scripturl, $txt)
 						{
-							if (!isset($context['available_' . $type . ''][$package_md5]))
-								return '';
+							if (!isset($context['available_' . $type . ''][$package_md5])) {
+															return '';
+							}
 
 							// Rewrite shortcut
 							$package = $context['available_' . $type . ''][$package_md5];
 							$return = '';
 
-							if ($package['can_uninstall'])
-								$return = '
+							if ($package['can_uninstall']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['uninstall'] . '</a>';
-							elseif ($package['can_emulate_uninstall'])
-								$return = '
+							} elseif ($package['can_emulate_uninstall']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;ve=' . $package['can_emulate_uninstall'] . ';package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['package_emulate_uninstall'] . ' ' . $package['can_emulate_uninstall'] . '</a>';
-							elseif ($package['can_upgrade'])
-								$return = '
+							} elseif ($package['can_upgrade']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['package_upgrade'] . '</a>';
-							elseif ($package['can_install'])
-								$return = '
+							} elseif ($package['can_install']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['install_mod'] . '</a>';
-							elseif ($package['can_emulate_install'])
-								$return = '
+							} elseif ($package['can_emulate_install']) {
+															$return = '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;ve=' . $package['can_emulate_install'] . ';package=' . $package['filename'] . '" class="button">' . $txt['package_emulate_install'] . ' ' . $package['can_emulate_install'] . '</a>';
+							}
 
 							return $return . '
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $package['filename'] . '" class="button">' . $txt['list_files'] . '</a>
@@ -1537,12 +1599,14 @@ 
 	static $packages, $installed_mods;
 
 	// Start things up
-	if (!isset($packages[$params]))
-		$packages[$params] = array();
+	if (!isset($packages[$params])) {
+			$packages[$params] = array();
+	}
 
 	// We need the packages directory to be writable for this.
-	if (!@is_writable($packagesdir))
-		create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
+	if (!@is_writable($packagesdir)) {
+			create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
+	}
 
 	$the_version = strtr($forum_version, array('SMF ' => ''));
 
@@ -1550,41 +1614,44 @@ 
 	if (isset($_GET['version_emulate']) && strtr($_GET['version_emulate'], array('SMF ' => '')) == $the_version)
 	{
 		unset($_SESSION['version_emulate']);
-	}
-	elseif (isset($_GET['version_emulate']))
+	} elseif (isset($_GET['version_emulate']))
 	{
-		if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate']))
-			unset($_SESSION['version_emulate']);
-		elseif ($_GET['version_emulate'] !== 0)
-			$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => ''));
+		if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate'])) {
+					unset($_SESSION['version_emulate']);
+		} elseif ($_GET['version_emulate'] !== 0) {
+					$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => ''));
+		}
 	}
 	if (!empty($_SESSION['version_emulate']))
 	{
 		$context['forum_version'] = 'SMF ' . $_SESSION['version_emulate'];
 		$the_version = $_SESSION['version_emulate'];
 	}
-	if (isset($_SESSION['single_version_emulate']))
-		unset($_SESSION['single_version_emulate']);
+	if (isset($_SESSION['single_version_emulate'])) {
+			unset($_SESSION['single_version_emulate']);
+	}
 
 	if (empty($installed_mods))
 	{
 		$instmods = loadInstalledPackages();
 		$installed_mods = array();
 		// Look through the list of installed mods...
-		foreach ($instmods as $installed_mod)
-			$installed_mods[$installed_mod['package_id']] = array(
+		foreach ($instmods as $installed_mod) {
+					$installed_mods[$installed_mod['package_id']] = array(
 				'id' => $installed_mod['id'],
 				'version' => $installed_mod['version'],
 				'time_installed' => $installed_mod['time_installed'],
 			);
+		}
 
 		// Get a list of all the ids installed, so the latest packages won't include already installed ones.
 		$context['installed_mods'] = array_keys($installed_mods);
 	}
 
-	if (empty($packages))
-		foreach ($context['modification_types'] as $type)
+	if (empty($packages)) {
+			foreach ($context['modification_types'] as $type)
 			$packages[$type] = array();
+	}
 
 	if ($dir = @opendir($packagesdir))
 	{
@@ -1600,50 +1667,56 @@ 
 
 		while ($package = readdir($dir))
 		{
-			if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
-				continue;
+			if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
+							continue;
+			}
 
 			$skip = false;
-			foreach ($context['modification_types'] as $type)
-				if (isset($context['available_' . $type][md5($package)]))
+			foreach ($context['modification_types'] as $type) {
+							if (isset($context['available_' . $type][md5($package)]))
 					$skip = true;
+			}
 
-			if ($skip)
-				continue;
+			if ($skip) {
+							continue;
+			}
 
 			// Skip directories or files that are named the same.
 			if (is_dir($packagesdir . '/' . $package))
 			{
-				if (in_array($package, $dirs))
-					continue;
+				if (in_array($package, $dirs)) {
+									continue;
+				}
 				$dirs[] = $package;
-			}
-			elseif (substr(strtolower($package), -7) == '.tar.gz')
+			} elseif (substr(strtolower($package), -7) == '.tar.gz')
 			{
-				if (in_array(substr($package, 0, -7), $dirs))
-					continue;
+				if (in_array(substr($package, 0, -7), $dirs)) {
+									continue;
+				}
 				$dirs[] = substr($package, 0, -7);
-			}
-			elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz')
+			} elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz')
 			{
-				if (in_array(substr($package, 0, -4), $dirs))
-					continue;
+				if (in_array(substr($package, 0, -4), $dirs)) {
+									continue;
+				}
 				$dirs[] = substr($package, 0, -4);
 			}
 
 			$packageInfo = getPackageInfo($package);
-			if (!is_array($packageInfo))
-				continue;
+			if (!is_array($packageInfo)) {
+							continue;
+			}
 
 			if (!empty($packageInfo))
 			{
 				$packageInfo['installed_id'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['id'] : 0;
 				$packageInfo['time_installed'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['time_installed'] : 0;
 
-				if (!isset($sort_id[$packageInfo['type']]))
-					$packageInfo['sort_id'] = $sort_id['unknown'];
-				else
-					$packageInfo['sort_id'] = $sort_id[$packageInfo['type']];
+				if (!isset($sort_id[$packageInfo['type']])) {
+									$packageInfo['sort_id'] = $sort_id['unknown'];
+				} else {
+									$packageInfo['sort_id'] = $sort_id[$packageInfo['type']];
+				}
 
 				$packageInfo['is_installed'] = isset($installed_mods[$packageInfo['id']]);
 				$packageInfo['is_current'] = $packageInfo['is_installed'] && ($installed_mods[$packageInfo['id']]['version'] == $packageInfo['version']);
@@ -1692,10 +1765,11 @@ 
 					foreach ($upgrades as $upgrade)
 					{
 						// Even if it is for this SMF, is it for the installed version of the mod?
-						if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for')))
-							if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
+						if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for'))) {
+													if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
 							{
 								$packageInfo['can_upgrade'] = true;
+						}
 								break;
 							}
 					}
@@ -1772,10 +1846,11 @@ 
 
 	if (isset($_GET['type']) && $_GET['type'] == $params)
 	{
-		if (isset($_GET['desc']))
-			krsort($packages[$params]);
-		else
-			ksort($packages[$params]);
+		if (isset($_GET['desc'])) {
+					krsort($packages[$params]);
+		} else {
+					ksort($packages[$params]);
+		}
 	}
 
 	return $packages[$params];
@@ -1804,10 +1879,11 @@ 
 		redirectexit('action=admin;area=packages;sa=options');
 	}
 
-	if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match))
-		$default_username = $match[1];
-	else
-		$default_username = '';
+	if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) {
+			$default_username = $match[1];
+	} else {
+			$default_username = '';
+	}
 
 	$context['page_title'] = $txt['package_settings'];
 	$context['sub_template'] = 'install_options';
@@ -1836,8 +1912,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// We need to know the operation key for the search and replace, mod file looking at, is it a board mod?
-	if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key']))
-		fatal_lang_error('operation_invalid', 'general');
+	if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) {
+			fatal_lang_error('operation_invalid', 'general');
+	}
 
 	// Load the required file.
 	require_once($sourcedir . '/Subs-Package.php');
@@ -1853,18 +1930,19 @@ 
 	{
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 
-		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml'))
-			foreach ($context['extracted_files'] as $file)
+		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) {
+					foreach ($context['extracted_files'] as $file)
 				if (basename($file['filename']) == 'package-info.xml')
 				{
 					$context['base_path'] = dirname($file['filename']) . '/';
+		}
 					break;
 				}
 
-		if (!isset($context['base_path']))
-			$context['base_path'] = '';
-	}
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
+		if (!isset($context['base_path'])) {
+					$context['base_path'] = '';
+		}
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
 	{
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
@@ -1885,8 +1963,9 @@ 
 		)
 	);
 	$theme_paths = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we're viewing uninstall operations, only consider themes that
@@ -1911,19 +1990,21 @@ 
 				list ($old_themes) = $smcFunc['db_fetch_row']($request);
 				$old_themes = explode(',', $old_themes);
 
-				foreach ($theme_paths as $id => $data)
-					if ($id != 1 && !in_array($id, $old_themes))
+				foreach ($theme_paths as $id => $data) {
+									if ($id != 1 && !in_array($id, $old_themes))
 						unset($theme_paths[$id]);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
 
 	// Boardmod?
-	if (isset($_REQUEST['boardmod']))
-		$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
-	else
-		$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
+	if (isset($_REQUEST['boardmod'])) {
+			$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
+	} else {
+			$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
+	}
 
 	// Ok lets get the content of the file.
 	$context['operations'] = array(
@@ -1979,9 +2060,9 @@ 
 			'path' => $detect_path,
 			'form_elements_only' => true,
 		);
+	} else {
+			$context['ftp_connected'] = true;
 	}
-	else
-		$context['ftp_connected'] = true;
 
 	// Define the template.
 	$context['page_title'] = $txt['package_file_perms'];
@@ -2094,18 +2175,19 @@ 
 	{
 		unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']);
 
-		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);
+		}
 
 		// @todo Should we suggest non-current directories be read only?
-		foreach ($modSettings['attachmentUploadDir'] as $dir)
-			$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
+		foreach ($modSettings['attachmentUploadDir'] as $dir) {
+					$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
 			'type' => 'dir',
 			'writable_on' => 'restrictive',
 		);
+		}
 
-	}
-	elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir)
+	} elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir)
 	{
 		unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']);
 		$context['file_tree'][strtr($modSettings['attachmentUploadDir'], array('\\' => '/'))] = array(
@@ -2155,8 +2237,8 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes'))
-			$context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array(
+		if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes')) {
+					$context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array(
 				'type' => 'dir_recursive',
 				'list_contents' => true,
 				'contents' => array(
@@ -2166,7 +2248,7 @@ 
 					),
 				),
 			);
-		else
+		} else
 		{
 			$context['file_tree'][strtr($row['value'], array('\\' => '/'))] = array(
 				'type' => 'dir_recursive',
@@ -2183,28 +2265,33 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If we're submitting then let's move on to another function to keep things cleaner..
-	if (isset($_POST['action_changes']))
-		return PackagePermissionsAction();
+	if (isset($_POST['action_changes'])) {
+			return PackagePermissionsAction();
+	}
 
 	$context['look_for'] = array();
 	// Are we looking for a particular tree - normally an expansion?
-	if (!empty($_REQUEST['find']))
-		$context['look_for'][] = base64_decode($_REQUEST['find']);
+	if (!empty($_REQUEST['find'])) {
+			$context['look_for'][] = base64_decode($_REQUEST['find']);
+	}
 	// Only that tree?
 	$context['only_find'] = isset($_GET['xml']) && !empty($_REQUEST['onlyfind']) ? $_REQUEST['onlyfind'] : '';
-	if ($context['only_find'])
-		$context['look_for'][] = $context['only_find'];
+	if ($context['only_find']) {
+			$context['look_for'][] = $context['only_find'];
+	}
 
 	// Have we got a load of back-catalogue trees to expand from a submit etc?
 	if (!empty($_GET['back_look']))
 	{
 		$potententialTrees = smf_json_decode(base64_decode($_GET['back_look']), true);
-		foreach ($potententialTrees as $tree)
-			$context['look_for'][] = $tree;
+		foreach ($potententialTrees as $tree) {
+					$context['look_for'][] = $tree;
+		}
 	}
 	// ... maybe posted?
-	if (!empty($_POST['back_look']))
-		$context['only_find'] = array_merge($context['only_find'], $_POST['back_look']);
+	if (!empty($_POST['back_look'])) {
+			$context['only_find'] = array_merge($context['only_find'], $_POST['back_look']);
+	}
 
 	$context['back_look_data'] = base64_encode(json_encode(array_slice($context['look_for'], 0, 15)));
 
@@ -2243,9 +2330,9 @@ 
 				'chmod' => @is_writable($path),
 				'perms' => @fileperms($path),
 			);
+		} else {
+					unset($context['file_tree'][$path]);
 		}
-		else
-			unset($context['file_tree'][$path]);
 	}
 
 	// Is this actually xml?
@@ -2269,22 +2356,25 @@ 
 	global $context;
 
 	$isLikelyPath = false;
-	foreach ($context['look_for'] as $possiblePath)
-		if (substr($possiblePath, 0, strlen($path)) == $path)
+	foreach ($context['look_for'] as $possiblePath) {
+			if (substr($possiblePath, 0, strlen($path)) == $path)
 			$isLikelyPath = true;
+	}
 
 	// Is this where we stop?
-	if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath)
-		return;
-	elseif ($level > $context['default_level'] && !$isLikelyPath)
-		return;
+	if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath) {
+			return;
+	} elseif ($level > $context['default_level'] && !$isLikelyPath) {
+			return;
+	}
 
 	// Are we actually interested in saving this data?
 	$save_data = empty($context['only_find']) || $context['only_find'] == $path;
 
 	// @todo Shouldn't happen - but better error message?
-	if (!is_dir($path))
-		fatal_lang_error('no_access', false);
+	if (!is_dir($path)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// This is where we put stuff we've found for sorting.
 	$foundData = array(
@@ -2299,11 +2389,13 @@ 
 		if (is_file($path . '/' . $entry))
 		{
 			// Are we listing PHP files in this directory?
-			if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php')
-				$foundData['files'][$entry] = true;
+			if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') {
+							$foundData['files'][$entry] = true;
+			}
 			// A file we were looking for.
-			elseif ($save_data && isset($data['contents'][$entry]))
-				$foundData['files'][$entry] = true;
+			elseif ($save_data && isset($data['contents'][$entry])) {
+							$foundData['files'][$entry] = true;
+			}
 		}
 		// It's a directory - we're interested one way or another, probably...
 		elseif ($entry != '.' && $entry != '..')
@@ -2311,32 +2403,36 @@ 
 			// Going further?
 			if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive'))))
 			{
-				if (!isset($data['contents'][$entry]))
-					$foundData['folders'][$entry] = 'dir_recursive';
-				else
-					$foundData['folders'][$entry] = true;
+				if (!isset($data['contents'][$entry])) {
+									$foundData['folders'][$entry] = 'dir_recursive';
+				} else {
+									$foundData['folders'][$entry] = true;
+				}
 
 				// If this wasn't expected inherit the recusiveness...
-				if (!isset($data['contents'][$entry]))
-					// We need to do this as we will be going all recursive.
+				if (!isset($data['contents'][$entry])) {
+									// We need to do this as we will be going all recursive.
 					$data['contents'][$entry] = array(
 						'type' => 'dir_recursive',
 					);
+				}
 
 				// Actually do the recursive stuff...
 				fetchPerms__recursive($path . '/' . $entry, $data['contents'][$entry], $level + 1);
 			}
 			// Maybe it is a folder we are not descending into.
-			elseif (isset($data['contents'][$entry]))
-				$foundData['folders'][$entry] = true;
+			elseif (isset($data['contents'][$entry])) {
+							$foundData['folders'][$entry] = true;
+			}
 			// Otherwise we stop here.
 		}
 	}
 	closedir($dh);
 
 	// Nothing to see here?
-	if (!$save_data)
-		return;
+	if (!$save_data) {
+			return;
+	}
 
 	// Now actually add the data, starting with the folders.
 	ksort($foundData['folders']);
@@ -2348,8 +2444,9 @@ 
 				'perms' => @fileperms($path . '/' . $folder),
 			),
 		);
-		if ($type !== true)
-			$additional_data['type'] = $type;
+		if ($type !== true) {
+					$additional_data['type'] = $type;
+		}
 
 		// If there's an offset ignore any folders in XML mode.
 		if (isset($_GET['xml']) && $context['file_offset'] == 0)
@@ -2368,13 +2465,13 @@ 
 				),
 				'value' => $folder,
 			);
-		}
-		elseif (!isset($_GET['xml']))
+		} elseif (!isset($_GET['xml']))
 		{
-			if (isset($data['contents'][$folder]))
-				$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
-			else
-				$data['contents'][$folder] = $additional_data;
+			if (isset($data['contents'][$folder])) {
+							$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
+			} else {
+							$data['contents'][$folder] = $additional_data;
+			}
 		}
 	}
 
@@ -2386,11 +2483,13 @@ 
 		$counter++;
 
 		// Have we reached our offset?
-		if ($context['file_offset'] > $counter)
-			continue;
+		if ($context['file_offset'] > $counter) {
+					continue;
+		}
 		// Gone too far?
-		if ($counter > ($context['file_offset'] + $context['file_limit']))
-			continue;
+		if ($counter > ($context['file_offset'] + $context['file_limit'])) {
+					continue;
+		}
 
 		$additional_data = array(
 			'perms' => array(
@@ -2416,13 +2515,13 @@ 
 				),
 				'value' => $file,
 			);
-		}
-		elseif ($counter != ($context['file_offset'] + $context['file_limit']))
+		} elseif ($counter != ($context['file_offset'] + $context['file_limit']))
 		{
-			if (isset($data['contents'][$file]))
-				$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
-			else
-				$data['contents'][$file] = $additional_data;
+			if (isset($data['contents'][$file])) {
+							$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
+			} else {
+							$data['contents'][$file] = $additional_data;
+			}
 		}
 	}
 }
@@ -2444,8 +2543,9 @@ 
 	$context['back_look_data'] = isset($_POST['back_look']) ? $_POST['back_look'] : array();
 
 	// Skipping use of FTP?
-	if (empty($package_ftp))
-		$context['skip_ftp'] = true;
+	if (empty($package_ftp)) {
+			$context['skip_ftp'] = true;
+	}
 
 	// We'll start off in a good place, security. Make sure that if we're dealing with individual files that they seem in the right place.
 	if ($context['method'] == 'individual')
@@ -2455,8 +2555,9 @@ 
 		$context['custom_value'] = (int) $_POST['custom_value'];
 
 		// Continuing?
-		if (isset($_POST['toProcess']))
-			$_POST['permStatus'] = smf_json_decode(base64_decode($_POST['toProcess']), true);
+		if (isset($_POST['toProcess'])) {
+					$_POST['permStatus'] = smf_json_decode(base64_decode($_POST['toProcess']), true);
+		}
 
 		if (isset($_POST['permStatus']))
 		{
@@ -2465,22 +2566,27 @@ 
 			foreach ($_POST['permStatus'] as $path => $status)
 			{
 				// Nothing to see here?
-				if ($status == 'no_change')
-					continue;
+				if ($status == 'no_change') {
+									continue;
+				}
 				$legal = false;
-				foreach ($legal_roots as $root)
-					if (substr($path, 0, strlen($root)) == $root)
+				foreach ($legal_roots as $root) {
+									if (substr($path, 0, strlen($root)) == $root)
 						$legal = true;
+				}
 
-				if (!$legal)
-					continue;
+				if (!$legal) {
+									continue;
+				}
 
 				// Check it exists.
-				if (!file_exists($path))
-					continue;
+				if (!file_exists($path)) {
+									continue;
+				}
 
-				if ($status == 'custom')
-					$validate_custom = true;
+				if ($status == 'custom') {
+									$validate_custom = true;
+				}
 
 				// Now add it.
 				$context['to_process'][$path] = $status;
@@ -2490,17 +2596,20 @@ 
 			// Make sure the chmod status is valid?
 			if ($validate_custom)
 			{
-				if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false)
-					fatal_error($txt['chmod_value_invalid']);
+				if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false) {
+									fatal_error($txt['chmod_value_invalid']);
+				}
 			}
 
 			// Nothing to do?
-			if (empty($context['to_process']))
-				redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode(json_encode($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
+			if (empty($context['to_process'])) {
+							redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode(json_encode($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
+			}
 		}
 		// Should never get here,
-		else
-			fatal_lang_error('no_access', false);
+		else {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Setup the custom value.
 		$custom_value = octdec('0' . $context['custom_value']);
@@ -2508,26 +2617,27 @@ 
 		// Start processing items.
 		foreach ($context['to_process'] as $path => $status)
 		{
-			if (in_array($status, array('execute', 'writable', 'read')))
-				package_chmod($path, $status);
-			elseif ($status == 'custom' && !empty($custom_value))
+			if (in_array($status, array('execute', 'writable', 'read'))) {
+							package_chmod($path, $status);
+			} elseif ($status == 'custom' && !empty($custom_value))
 			{
 				// Use FTP if we have it.
 				if (!empty($package_ftp) && !empty($_SESSION['pack_ftp']))
 				{
 					$ftp_file = strtr($path, array($_SESSION['pack_ftp']['root'] => ''));
 					$package_ftp->chmod($ftp_file, $custom_value);
+				} else {
+									smf_chmod($path, $custom_value);
 				}
-				else
-					smf_chmod($path, $custom_value);
 			}
 
 			// This fish is fried...
 			unset($context['to_process'][$path]);
 
 			// See if we're out of time?
-			if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit)
-				return false;
+			if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit) {
+							return false;
+			}
 		}
 	}
 	// If predefined this is a little different.
@@ -2595,23 +2705,27 @@ 
 			{
 				global $context;
 
-				if (!empty($data['writable_on']))
-					if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
+				if (!empty($data['writable_on'])) {
+									if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
 						$context['special_files'][$path] = 1;
+				}
 
-				if (!empty($data['contents']))
-					foreach ($data['contents'] as $name => $contents)
+				if (!empty($data['contents'])) {
+									foreach ($data['contents'] as $name => $contents)
 						build_special_files__recursive($path . '/' . $name, $contents);
+				}
 			}
 
-			foreach ($context['file_tree'] as $path => $data)
-				build_special_files__recursive($path, $data);
+			foreach ($context['file_tree'] as $path => $data) {
+							build_special_files__recursive($path, $data);
+			}
 		}
 		// Free doesn't need special files.
-		elseif ($context['predefined_type'] == 'free')
-			$context['special_files'] = array();
-		else
-			$context['special_files'] = smf_json_decode(base64_decode($_POST['specialFiles']), true);
+		elseif ($context['predefined_type'] == 'free') {
+					$context['special_files'] = array();
+		} else {
+					$context['special_files'] = smf_json_decode(base64_decode($_POST['specialFiles']), true);
+		}
 
 		// Now we definitely know where we are, we need to go through again doing the chmod!
 		foreach ($context['directory_list'] as $path => $dummy)
@@ -2656,8 +2770,9 @@ 
 			unset($context['directory_list'][$path]);
 
 			// See if we're out of time?
-			if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit)
-				return false;
+			if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit) {
+							return false;
+			}
 		}
 	}
 

Sources/MessageIndex.php

Braces +264 added lines, -197 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Show the list of topics in this board, along with any child boards.
@@ -56,8 +57,9 @@ 
 
 	$context['name'] = $board_info['name'];
 	$context['description'] = $board_info['description'];
-	if (!empty($board_info['description']))
-		$context['meta_description'] = strip_tags($board_info['description']);
+	if (!empty($board_info['description'])) {
+			$context['meta_description'] = strip_tags($board_info['description']);
+	}
 
 	// How many topics do we have in total?
 	$board_info['total_topics'] = allowedTo('approve_posts') ? $board_info['num_topics'] + $board_info['unapproved_topics'] : $board_info['num_topics'] + $board_info['unapproved_user_topics'];
@@ -73,12 +75,14 @@ 
 		$session_name = session_name();
 		foreach ($_GET as $k => $v)
 		{
-			if (!in_array($k, array('board', 'start', $session_name)))
-				$context['robot_no_index'] = true;
+			if (!in_array($k, array('board', 'start', $session_name))) {
+							$context['robot_no_index'] = true;
+			}
 		}
 	}
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
-		$context['robot_no_index'] = true;
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// If we can view unapproved messages and there are some build up a list.
 	if (allowedTo('approve_posts') && ($board_info['unapproved_topics'] || $board_info['unapproved_posts']))
@@ -89,14 +93,16 @@ 
 	}
 
 	// We only know these.
-	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post')))
-		$_REQUEST['sort'] = 'last_post';
+	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post'))) {
+			$_REQUEST['sort'] = 'last_post';
+	}
 
 	// Make sure the starting place makes sense and construct the page index.
-	if (isset($_REQUEST['sort']))
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
-	else
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
+	if (isset($_REQUEST['sort'])) {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
+	} else {
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $maxindex, true);
+	}
 	$context['start'] = &$_REQUEST['start'];
 
 	// Set a canonical URL for this page.
@@ -132,14 +138,16 @@ 
 	$context['link_moderators'] = array();
 	if (!empty($board_info['moderators']))
 	{
-		foreach ($board_info['moderators'] as $mod)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		foreach ($board_info['moderators'] as $mod) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		}
 	}
 	if (!empty($board_info['moderator_groups']))
 	{
 		// By default just tack the moderator groups onto the end of the members
-		foreach ($board_info['moderator_groups'] as $mod_group)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		foreach ($board_info['moderator_groups'] as $mod_group) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		}
 	}
 
 	// Now we tack the info onto the end of the linktree
@@ -191,20 +199,24 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['id_member']))
-				continue;
+			if (empty($row['id_member'])) {
+							continue;
+			}
 
-			if (!empty($row['online_color']))
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-			else
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			if (!empty($row['online_color'])) {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+			} else {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
-			if ($is_buddy)
-				$link = '<strong>' . $link . '</strong>';
+			if ($is_buddy) {
+							$link = '<strong>' . $link . '</strong>';
+			}
 
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			}
 			// @todo why are we filling this array of data that are just counted (twice) and discarded? ???
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
 				'id' => $row['id_member'],
@@ -217,8 +229,9 @@ 
 				'hidden' => empty($row['show_online']),
 			);
 
-			if (empty($row['show_online']))
-				$context['view_num_hidden']++;
+			if (empty($row['show_online'])) {
+							$context['view_num_hidden']++;
+			}
 		}
 		$context['view_num_guests'] = $smcFunc['db_num_rows']($request) - count($context['view_members']);
 		$smcFunc['db_free_result']($request);
@@ -257,8 +270,9 @@ 
 	$context['sort_direction'] = $ascending ? 'up' : 'down';
 	$txt['starter'] = $txt['started_by'];
 
-	foreach ($sort_methods as $key => $val)
-		$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	foreach ($sort_methods as $key => $val) {
+			$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
+	}
 
 	// Calculate the fastest way to get the topics.
 	$start = (int) $_REQUEST['start'];
@@ -268,14 +282,15 @@ 
 		$fake_ascending = true;
 		$maxindex = $board_info['total_topics'] < $start + $maxindex + 1 ? $board_info['total_topics'] - $start : $maxindex;
 		$start = $board_info['total_topics'] < $start + $maxindex + 1 ? 0 : $board_info['total_topics'] - $start - $maxindex;
+	} else {
+			$fake_ascending = false;
 	}
-	else
-		$fake_ascending = false;
 
 	// Setup the default topic icons...
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$topic_ids = array();
 	$context['topics'] = array();
@@ -306,8 +321,9 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 	}
 
 	// Grab the appropriate topic information...
@@ -363,11 +379,13 @@ 
 		// Begin 'printing' the message index for current board.
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-				continue;
+			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+							continue;
+			}
 
-			if (!$pre_query)
-				$topic_ids[] = $row['id_topic'];
+			if (!$pre_query) {
+							$topic_ids[] = $row['id_topic'];
+			}
 
 			// Reference the main color class.
 			$colorClass = 'windowbg';
@@ -377,8 +395,9 @@ 
 			{
 				// Limit them to $modSettings['preview_characters'] characters
 				$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters'])
-					$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters']) {
+									$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
+				}
 
 				// Censor the subject and message preview.
 				censorText($row['first_subject']);
@@ -389,27 +408,27 @@ 
 				{
 					$row['last_subject'] = $row['first_subject'];
 					$row['last_body'] = $row['first_body'];
-				}
-				else
+				} else
 				{
 					$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters'])
-						$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters']) {
+											$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
+					}
 
 					censorText($row['last_subject']);
 					censorText($row['last_body']);
 				}
-			}
-			else
+			} else
 			{
 				$row['first_body'] = '';
 				$row['last_body'] = '';
 				censorText($row['first_subject']);
 
-				if ($row['id_first_msg'] == $row['id_last_msg'])
-					$row['last_subject'] = $row['first_subject'];
-				else
-					censorText($row['last_subject']);
+				if ($row['id_first_msg'] == $row['id_last_msg']) {
+									$row['last_subject'] = $row['first_subject'];
+				} else {
+									censorText($row['last_subject']);
+				}
 			}
 
 			// Decide how many pages the topic should have.
@@ -420,42 +439,50 @@ 
 				$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, $context['messages_per_page'], true, false);
 
 				// If we can use all, show all.
-				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages'])
-					$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages']) {
+									$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+				}
+			} else {
+							$pages = '';
 			}
-			else
-				$pages = '';
 
 			// We need to check the topic icons exist...
 			if (!empty($modSettings['messageIconChecks_enable']))
 			{
-				if (!isset($context['icon_sources'][$row['first_icon']]))
-					$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-				if (!isset($context['icon_sources'][$row['last_icon']]))
-					$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-			}
-			else
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
+									$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+				}
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
+									$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+				}
+			} else
 			{
-				if (!isset($context['icon_sources'][$row['first_icon']]))
-					$context['icon_sources'][$row['first_icon']] = 'images_url';
-				if (!isset($context['icon_sources'][$row['last_icon']]))
-					$context['icon_sources'][$row['last_icon']] = 'images_url';
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
+									$context['icon_sources'][$row['first_icon']] = 'images_url';
+				}
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
+									$context['icon_sources'][$row['last_icon']] = 'images_url';
+				}
 			}
 
-			if (!empty($board_info['recycle']))
-				$row['first_icon'] = 'recycled';
+			if (!empty($board_info['recycle'])) {
+							$row['first_icon'] = 'recycled';
+			}
 
 			// Is this topic pending approval, or does it have any posts pending approval?
-			if ($context['can_approve_posts'] && $row['unapproved_posts'])
-				$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+			if ($context['can_approve_posts'] && $row['unapproved_posts']) {
+							$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+			}
 
 			// Sticky topics should get a different color, too.
-			if ($row['is_sticky'])
-				$colorClass .= ' sticky';
+			if ($row['is_sticky']) {
+							$colorClass .= ' sticky';
+			}
 
 			// Locked topics get special treatment as well.
-			if ($row['locked'])
-				$colorClass .= ' locked';
+			if ($row['locked']) {
+							$colorClass .= ' locked';
+			}
 
 			// 'Print' the topic info.
 			$context['topics'][$row['id_topic']] = array_merge($row, array(
@@ -536,8 +563,9 @@ 
 		$smcFunc['db_free_result']($result);
 
 		// Fix the sequence of topics if they were retrieved in the wrong order. (for speed reasons...)
-		if ($fake_ascending)
-			$context['topics'] = array_reverse($context['topics'], true);
+		if ($fake_ascending) {
+					$context['topics'] = array_reverse($context['topics'], true);
+		}
 
 		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'] && !empty($topic_ids))
 		{
@@ -554,8 +582,9 @@ 
 					'limit' => count($topic_ids),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($result))
-				$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			while ($row = $smcFunc['db_fetch_assoc']($result)) {
+							$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			}
 			$smcFunc['db_free_result']($result);
 		}
 	}
@@ -580,9 +609,9 @@ 
 		// Can we restore topics?
 		$context['can_restore'] = allowedTo('move_any') && !empty($board_info['recycle']);
 
-		if ($user_info['is_admin'] || $modSettings['topic_move_any'])
-			$context['can_move_any'] = true;
-		else
+		if ($user_info['is_admin'] || $modSettings['topic_move_any']) {
+					$context['can_move_any'] = true;
+		} else
 		{
 			// We'll use this in a minute
 			$boards_allowed = boardsAllowedTo('post_new');
@@ -609,11 +638,13 @@ 
 		}
 
 		// Can we use quick moderation checkboxes?
-		if ($options['display_quick_mod'] == 1)
-			$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		if ($options['display_quick_mod'] == 1) {
+					$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+		}
 		// Or the icons?
-		else
-			$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		else {
+					$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+		}
 	}
 
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
@@ -647,13 +678,15 @@ 
 			);
 
 			// We've seen all these boards now!
-			foreach ($board_info['parent_boards'] as $k => $dummy)
-				if (isset($_SESSION['topicseen_cache'][$k]))
+			foreach ($board_info['parent_boards'] as $k => $dummy) {
+							if (isset($_SESSION['topicseen_cache'][$k]))
 					unset($_SESSION['topicseen_cache'][$k]);
+			}
 		}
 
-		if (isset($_SESSION['topicseen_cache'][$board]))
-			unset($_SESSION['topicseen_cache'][$board]);
+		if (isset($_SESSION['topicseen_cache'][$board])) {
+					unset($_SESSION['topicseen_cache'][$board]);
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_topic, id_board, sent
@@ -675,8 +708,9 @@ 
 				$context['is_marked_notify'] = true;
 				$board_sent = $row['sent'];
 			}
-			if (!empty($row['id_topic']))
-				$context['topics'][$row['id_topic']]['is_watched'] = true;
+			if (!empty($row['id_topic'])) {
+							$context['topics'][$row['id_topic']]['is_watched'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -700,8 +734,7 @@ 
 		$pref = !empty($pref[$user_info['id']]) ? $pref[$user_info['id']] : array();
 		$pref = isset($pref['board_notify_' . $board]) ? $pref['board_notify_' . $board] : (!empty($pref['board_notify']) ? $pref['board_notify'] : 0);
 		$context['board_notification_mode'] = !$context['is_marked_notify'] ? 1 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
-	}
-	else
+	} else
 	{
 		$context['is_marked_notify'] = false;
 		$context['board_notification_mode'] = 1;
@@ -714,23 +747,27 @@ 
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
 
 	// Don't want to show this forever...
-	if ($context['becomesUnapproved'])
-		unset($_SESSION['becomesUnapproved']);
+	if ($context['becomesUnapproved']) {
+			unset($_SESSION['becomesUnapproved']);
+	}
 
 	// Build the message index button array.
 	$context['normal_buttons'] = array();
 	
-	if ($context['can_post_new'])
-		$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	if ($context['can_post_new']) {
+			$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
+	}
 	
-	if ($context['can_post_poll'])
-		$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	if ($context['can_post_poll']) {
+			$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
+	}
 	
-	if (!$context['user']['is_logged'])
-		$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	if (!$context['user']['is_logged']) {
+			$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_mark_notify'])
-		$context['normal_buttons']['notify'] = array(
+	if ($context['can_mark_notify']) {
+			$context['normal_buttons']['notify'] = array(
 			'lang' => true,
 			'text' => 'notify_board_' . $context['board_notification_mode'],
 			'sub_buttons' => array(
@@ -748,6 +785,7 @@ 
 				),
 			),
 		);
+	}
 
 	// Javascript for inline editing.
 	loadJavaScriptFile('topic.js', array('defer' => false), 'smf_topic');
@@ -769,18 +807,21 @@ 
 	checkSession('request');
 
 	// Lets go straight to the restore area.
-	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics']))
-		redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics'])) {
+			redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if (isset($_SESSION['topicseen_cache']))
-		$_SESSION['topicseen_cache'] = array();
+	if (isset($_SESSION['topicseen_cache'])) {
+			$_SESSION['topicseen_cache'] = array();
+	}
 
 	// This is going to be needed to send off the notifications and for updateLastMessages().
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Remember the last board they moved things to.
-	if (isset($_REQUEST['move_to']))
-		$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	if (isset($_REQUEST['move_to'])) {
+			$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+	}
 
 	// Only a few possible actions.
 	$possibleActions = array();
@@ -800,8 +841,7 @@ 
 		);
 
 		$redirect_url = 'board=' . $board . '.' . $_REQUEST['start'];
-	}
-	else
+	} else
 	{
 		/**
 		 * @todo Ugly. There's no getting around this, is there?
@@ -819,8 +859,7 @@ 
 		if (!empty($board))
 		{
 			$boards_can['post_new'] = array_diff(boardsAllowedTo('post_new'), array($board));
-		}
-		else
+		} else
 		{
 			$boards_can['post_new'] = boardsAllowedTo('post_new');
 		}
@@ -831,55 +870,67 @@ 
 		}
 	}
 
-	if (!$user_info['is_guest'])
-		$possibleActions[] = 'markread';
-	if (!empty($boards_can['make_sticky']))
-		$possibleActions[] = 'sticky';
-	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own']))
-		$possibleActions[] = 'move';
-	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own']))
-		$possibleActions[] = 'remove';
-	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own']))
-		$possibleActions[] = 'lock';
-	if (!empty($boards_can['merge_any']))
-		$possibleActions[] = 'merge';
-	if (!empty($boards_can['approve_posts']))
-		$possibleActions[] = 'approve';
+	if (!$user_info['is_guest']) {
+			$possibleActions[] = 'markread';
+	}
+	if (!empty($boards_can['make_sticky'])) {
+			$possibleActions[] = 'sticky';
+	}
+	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own'])) {
+			$possibleActions[] = 'move';
+	}
+	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own'])) {
+			$possibleActions[] = 'remove';
+	}
+	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own'])) {
+			$possibleActions[] = 'lock';
+	}
+	if (!empty($boards_can['merge_any'])) {
+			$possibleActions[] = 'merge';
+	}
+	if (!empty($boards_can['approve_posts'])) {
+			$possibleActions[] = 'approve';
+	}
 
 	// Two methods: $_REQUEST['actions'] (id_topic => action), and $_REQUEST['topics'] and $_REQUEST['qaction'].
 	// (if action is 'move', $_REQUEST['move_to'] or $_REQUEST['move_tos'][$topic] is used.)
 	if (!empty($_REQUEST['topics']))
 	{
 		// If the action isn't valid, just quit now.
-		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions))
-			redirectexit($redirect_url);
+		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions)) {
+					redirectexit($redirect_url);
+		}
 
 		// Merge requires all topics as one parameter and can be done at once.
 		if ($_REQUEST['qaction'] == 'merge')
 		{
 			// Merge requires at least two topics.
-			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2)
-				redirectexit($redirect_url);
+			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2) {
+							redirectexit($redirect_url);
+			}
 
 			require_once($sourcedir . '/SplitTopics.php');
 			return MergeExecute($_REQUEST['topics']);
 		}
 
 		// Just convert to the other method, to make it easier.
-		foreach ($_REQUEST['topics'] as $topic)
-			$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		foreach ($_REQUEST['topics'] as $topic) {
+					$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+		}
 	}
 
 	// Weird... how'd you get here?
-	if (empty($_REQUEST['actions']))
-		redirectexit($redirect_url);
+	if (empty($_REQUEST['actions'])) {
+			redirectexit($redirect_url);
+	}
 
 	// Validate each action.
 	$temp = array();
 	foreach ($_REQUEST['actions'] as $topic => $action)
 	{
-		if (in_array($action, $possibleActions))
-			$temp[(int) $topic] = $action;
+		if (in_array($action, $possibleActions)) {
+					$temp[(int) $topic] = $action;
+		}
 	}
 	$_REQUEST['actions'] = $temp;
 
@@ -900,27 +951,31 @@ 
 		{
 			if (!empty($board))
 			{
-				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts')))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-			}
-			else
+				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts'))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
+			} else
 			{
 				// Don't allow them to act on unapproved posts they can't see...
-				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// Goodness, this is fun.  We need to validate the action.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky']))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky'])) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// @todo $locked is not set, what are you trying to do? (taking the change it is supposed to be $row['locked'])
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 				// If the topic is approved then you need permission to approve the posts within.
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))))
-					unset($_REQUEST['actions'][$row['id_topic']]);
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])))) {
+									unset($_REQUEST['actions'][$row['id_topic']]);
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -938,11 +993,11 @@ 
 	{
 		$topic = (int) $topic;
 
-		if ($action == 'markread')
-			$markCache[] = $topic;
-		elseif ($action == 'sticky')
-			$stickyCache[] = $topic;
-		elseif ($action == 'move')
+		if ($action == 'markread') {
+					$markCache[] = $topic;
+		} elseif ($action == 'sticky') {
+					$stickyCache[] = $topic;
+		} elseif ($action == 'move')
 		{
 			require_once($sourcedir . '/MoveTopic.php');
 			moveTopicConcurrence();
@@ -950,23 +1005,25 @@ 
 			// $moveCache[0] is the topic, $moveCache[1] is the board to move to.
 			$moveCache[1][$topic] = (int) (isset($_REQUEST['move_tos'][$topic]) ? $_REQUEST['move_tos'][$topic] : $_REQUEST['move_to']);
 
-			if (empty($moveCache[1][$topic]))
-				continue;
+			if (empty($moveCache[1][$topic])) {
+							continue;
+			}
 
 			$moveCache[0][] = $topic;
+		} elseif ($action == 'remove') {
+					$removeCache[] = $topic;
+		} elseif ($action == 'lock') {
+					$lockCache[] = $topic;
+		} elseif ($action == 'approve') {
+					$approveCache[] = $topic;
 		}
-		elseif ($action == 'remove')
-			$removeCache[] = $topic;
-		elseif ($action == 'lock')
-			$lockCache[] = $topic;
-		elseif ($action == 'approve')
-			$approveCache[] = $topic;
 	}
 
-	if (empty($board))
-		$affectedBoards = array();
-	else
-		$affectedBoards = array($board => array(0, 0));
+	if (empty($board)) {
+			$affectedBoards = array();
+	} else {
+			$affectedBoards = array($board => array(0, 0));
+	}
 
 	// Do all the stickies...
 	if (!empty($stickyCache))
@@ -1026,14 +1083,16 @@ 
 		{
 			$to = $moveCache[1][$row['id_topic']];
 
-			if (empty($to))
-				continue;
+			if (empty($to)) {
+							continue;
+			}
 
 			// Does this topic's board count the posts or not?
 			$countPosts[$row['id_topic']] = empty($row['count_posts']);
 
-			if (!isset($moveTos[$to]))
-				$moveTos[$to] = array();
+			if (!isset($moveTos[$to])) {
+							$moveTos[$to] = array();
+			}
 
 			$moveTos[$to][] = $row['id_topic'];
 
@@ -1047,8 +1106,9 @@ 
 		require_once($sourcedir . '/MoveTopic.php');
 
 		// Do the actual moves...
-		foreach ($moveTos as $to => $topics)
-			moveTopics($topics, $to);
+		foreach ($moveTos as $to => $topics) {
+					moveTopics($topics, $to);
+		}
 
 		// Does the post counts need to be updated?
 		if (!empty($moveTos))
@@ -1097,20 +1157,23 @@ 
 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
 				{
-					if (!isset($members[$row['id_member']]))
-						$members[$row['id_member']] = 0;
+					if (!isset($members[$row['id_member']])) {
+											$members[$row['id_member']] = 0;
+					}
 
-					if ($topicRecounts[$row['id_topic']] === '+')
-						$members[$row['id_member']] += 1;
-					else
-						$members[$row['id_member']] -= 1;
+					if ($topicRecounts[$row['id_topic']] === '+') {
+											$members[$row['id_member']] += 1;
+					} else {
+											$members[$row['id_member']] -= 1;
+					}
 				}
 
 				$smcFunc['db_free_result']($request);
 
 				// And now update them member's post counts
-				foreach ($members as $id_member => $post_adj)
-					updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				foreach ($members as $id_member => $post_adj) {
+									updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				}
 
 			}
 		}
@@ -1190,8 +1253,9 @@ 
 			approveTopics($approveCache);
 
 			// Time for some logging!
-			foreach ($approveCache as $topic)
-				logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			foreach ($approveCache as $topic) {
+							logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
+			}
 		}
 	}
 
@@ -1226,8 +1290,7 @@ 
 				$lockStatus[$row['id_topic']] = empty($row['locked']);
 			}
 			$smcFunc['db_free_result']($result);
-		}
-		else
+		} else
 		{
 			$result = $smcFunc['db_query']('', '
 				SELECT id_topic, locked, id_board
@@ -1277,13 +1340,15 @@ 
 			)
 		);
 		$logged_topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['unwatched'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$logged_topics[$row['id_topic']] = $row['unwatched'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$markArray = array();
-		foreach ($markCache as $topic)
-			$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		foreach ($markCache as $topic) {
+					$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -1296,8 +1361,9 @@ 
 	foreach ($moveCache as $topic)
 	{
 		// Didn't actually move anything!
-		if (!isset($topic[0]))
-			break;
+		if (!isset($topic[0])) {
+					break;
+		}
 
 		logAction('move', array('topic' => $topic[0], 'board_from' => $topic[1], 'board_to' => $topic[2]));
 		sendNotifications($topic[0], 'move');
@@ -1319,8 +1385,9 @@ 
 		'calendar_updated' => time(),
 	));
 
-	if (!empty($affectedBoards))
-		updateLastMessages(array_keys($affectedBoards));
+	if (!empty($affectedBoards)) {
+			updateLastMessages(array_keys($affectedBoards));
+	}
 
 	redirectexit($redirect_url);
 }

Sources/MoveTopic.php

Braces +101 added lines, -72 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function allows to move a topic, making sure to ask the moderator
@@ -32,8 +33,9 @@ 
 {
 	global $txt, $board, $topic, $user_info, $context, $language, $scripturl, $smcFunc, $modSettings, $sourcedir;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT t.id_member_started, ms.subject, t.approved
@@ -49,8 +51,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it - if not approved?
-	if ($modSettings['postmod_active'] && !$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Permission check!
 	// @todo
@@ -59,9 +62,9 @@ 
 		if ($id_member_started == $user_info['id'])
 		{
 			isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
 		}
-		else
-			isAllowedTo('move_any');
 	}
 
 	$context['move_any'] = $user_info['is_admin'] || $modSettings['topic_move_any'];
@@ -83,11 +86,13 @@ 
 		'not_redirection' => true,
 	);
 
-	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board)
-		$options['selected_board'] = $_SESSION['move_to_topic'];
+	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board) {
+			$options['selected_board'] = $_SESSION['move_to_topic'];
+	}
 
-	if (!$context['move_any'])
-		$options['included_boards'] = $boards;
+	if (!$context['move_any']) {
+			$options['included_boards'] = $boards;
+	}
 
 	require_once($sourcedir . '/Subs-MessageIndex.php');
 	$context['categories'] = getBoardList($options);
@@ -138,12 +143,14 @@ 
 	global $txt, $board, $topic, $scripturl, $sourcedir, $modSettings, $context;
 	global $board, $language, $user_info, $smcFunc;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// You can't choose to have a redirection topic and use an empty reason.
-	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == ''))
-		fatal_lang_error('movetopic_no_reason', false);
+	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == '')) {
+			fatal_lang_error('movetopic_no_reason', false);
+	}
 
 	moveTopicConcurrence();
 
@@ -163,16 +170,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it?
-	if (!$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if (!$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Can they move topics on this board?
 	if (!allowedTo('move_any'))
 	{
-		if ($id_member_started == $user_info['id'])
-			isAllowedTo('move_own');
-		else
-			isAllowedTo('move_any');
+		if ($id_member_started == $user_info['id']) {
+					isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
+		}
 	}
 
 	checkSession();
@@ -197,8 +206,9 @@ 
 			'blank_redirect' => '',
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	list ($pcounter, $board_name, $subject) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -210,8 +220,9 @@ 
 	{
 		$_POST['custom_subject'] = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
 		// Keep checking the length.
-		if ($smcFunc['strlen']($_POST['custom_subject']) > 100)
-			$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		if ($smcFunc['strlen']($_POST['custom_subject']) > 100) {
+					$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		}
 
 		// If it's still valid move onwards and upwards.
 		if ($_POST['custom_subject'] != '')
@@ -221,9 +232,9 @@ 
 				// Get a response prefix, but in the forum's default 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'];
@@ -263,8 +274,9 @@ 
 	if (isset($_POST['postRedirect']))
 	{
 		// Should be in the boardwide language.
-		if ($user_info['language'] != $language)
-			loadLanguage('index', $language);
+		if ($user_info['language'] != $language) {
+					loadLanguage('index', $language);
+		}
 
 		$_POST['reason'] = $smcFunc['htmlspecialchars']($_POST['reason'], ENT_QUOTES);
 		preparsecode($_POST['reason']);
@@ -328,8 +340,9 @@ 
 		$posters = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($posters[$row['id_member']]))
-				$posters[$row['id_member']] = 0;
+			if (!isset($posters[$row['id_member']])) {
+							$posters[$row['id_member']] = 0;
+			}
 
 			$posters[$row['id_member']]++;
 		}
@@ -338,11 +351,13 @@ 
 		foreach ($posters as $id_member => $posts)
 		{
 			// The board we're moving from counted posts, but not to.
-			if (empty($pcounter_from))
-				updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			if (empty($pcounter_from)) {
+							updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			}
 			// The reverse: from didn't, to did.
-			else
-				updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			else {
+							updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			}
 		}
 	}
 
@@ -350,17 +365,19 @@ 
 	moveTopics($topic, $_POST['toboard']);
 
 	// Log that they moved this topic.
-	if (!allowedTo('move_own') || $id_member_started != $user_info['id'])
-		logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	if (!allowedTo('move_own') || $id_member_started != $user_info['id']) {
+			logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	}
 	// Notify people that this topic has been moved?
 	sendNotifications($topic, 'move');
 
 	// Why not go back to the original board in case they want to keep moving?
-	if (!isset($_REQUEST['goback']))
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.0');
-}
+	if (!isset($_REQUEST['goback'])) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.0');
+	}
+	}
 
 /**
  * Moves one or more topics to a specific board. (doesn't check permissions.)
@@ -376,18 +393,21 @@ 
 	global $sourcedir, $user_info, $modSettings, $smcFunc;
 
 	// Empty array?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$fromBoards = array();
 
 	// Destination board empty or equal to 0?
-	if (empty($toBoard))
-		return;
+	if (empty($toBoard)) {
+			return;
+	}
 
 	// Are we moving to the recycle board?
 	$isRecycleDest = !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $toBoard;
@@ -395,8 +415,9 @@ 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsMoved'))
-		$searchAPI->topicsMoved($topics, $toBoard);
+	if ($searchAPI->supportsMethod('topicsMoved')) {
+			$searchAPI->topicsMoved($topics, $toBoard);
+	}
 
 	// Determine the source boards...
 	$request = $smcFunc['db_query']('', '
@@ -410,8 +431,9 @@ 
 		)
 	);
 	// Num of rows = 0 -> no topics found. Num of rows > 1 -> topics are on multiple boards.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return;
+	}
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		if (!isset($fromBoards[$row['id_board']]['num_posts']))
@@ -429,10 +451,11 @@ 
 		$fromBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// Add the topics to the right type.
-		if ($row['approved'])
-			$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		if ($row['approved']) {
+					$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -558,13 +581,14 @@ 
 			)
 		);
 		$approval_msgs = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$approval_msgs[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$approval_msgs[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Empty the approval queue for these, as we're going to approve them next.
-		if (!empty($approval_msgs))
-			$smcFunc['db_query']('', '
+		if (!empty($approval_msgs)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg IN ({array_int:message_list})
 					AND id_attach = {int:id_attach}',
@@ -573,6 +597,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 
 		// Get all the current max and mins.
 		$request = $smcFunc['db_query']('', '
@@ -606,8 +631,8 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If not, update.
-			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max'])
-				$smcFunc['db_query']('', '
+			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET id_first_msg = {int:first_msg}, id_last_msg = {int:last_msg}
 					WHERE id_topic = {int:selected_topic}',
@@ -617,6 +642,7 @@ 
 						'selected_topic' => $row['id_topic'],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -675,9 +701,10 @@ 
 	}
 
 	// Update the cache?
-	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
-		foreach ($topics as $topic_id)
+	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3) {
+			foreach ($topics as $topic_id)
 			cache_put_data('topic_board-' . $topic_id, null, 120);
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -701,15 +728,17 @@ 
 {
 	global $board, $topic, $smcFunc, $scripturl;
 
-	if (isset($_GET['current_board']))
-		$move_from = (int) $_GET['current_board'];
+	if (isset($_GET['current_board'])) {
+			$move_from = (int) $_GET['current_board'];
+	}
 
-	if (empty($move_from) || empty($board) || empty($topic))
-		return true;
+	if (empty($move_from) || empty($board) || empty($topic)) {
+			return true;
+	}
 
-	if ($move_from == $board)
-		return true;
-	else
+	if ($move_from == $board) {
+			return true;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT m.subject, b.name