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 +664 added lines, -515 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;
@@ -196,20 +205,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);
@@ -238,8 +251,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();
@@ -253,10 +267,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'),
@@ -278,8 +293,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');
@@ -287,15 +301,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');
@@ -414,10 +431,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';
 
@@ -429,9 +447,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'];
@@ -444,8 +462,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']))
@@ -453,15 +472,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']);
@@ -477,8 +498,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']))
 		{
@@ -490,8 +512,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++,
@@ -553,13 +576,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.
@@ -598,29 +622,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']))
 			{
@@ -644,8 +671,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'],
@@ -715,29 +743,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']))
 		{
@@ -764,15 +795,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);
@@ -834,14 +867,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);
@@ -854,10 +889,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);
@@ -866,8 +902,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]';
@@ -879,15 +916,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 = '';
@@ -905,13 +942,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']))
 		{
@@ -920,9 +959,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();
@@ -936,8 +976,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']))
 						{
@@ -947,20 +988,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>';
@@ -972,8 +1014,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;
@@ -981,16 +1022,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')
 				{
@@ -1005,15 +1049,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;
 				}
 
@@ -1026,8 +1072,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>',
@@ -1055,8 +1102,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
@@ -1073,52 +1121,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);
@@ -1162,8 +1214,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']))
@@ -1183,8 +1236,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']))
 	{
@@ -1198,8 +1252,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'])
@@ -1210,15 +1265,17 @@ 
 		$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]))
 			{
 				$context['attachment_restrictions'][] = sprintf($txt['attach_restrict_' . $type . ($modSettings[$type] >= 1024 ? '_MB' : '')], comma_format($modSettings[$type], 0));
+		}
 				// Show some numbers. If they exist.
-				if ($type == 'attachmentNumPerPostLimit' && $context['attachments']['quantity'] > 0)
-					$context['attachment_restrictions'][] = sprintf($txt['attach_remaining'], $modSettings['attachmentNumPerPostLimit'] - $context['attachments']['quantity']);
-				elseif ($type == 'attachmentPostLimit' && $context['attachments']['total_size'] > 0)
-					$context['attachment_restrictions'][] = sprintf($txt['attach_available'], comma_format(round(max($modSettings['attachmentPostLimit'] - ($context['attachments']['total_size'] / 1024), 0)), 0));
+				if ($type == 'attachmentNumPerPostLimit' && $context['attachments']['quantity'] > 0) {
+									$context['attachment_restrictions'][] = sprintf($txt['attach_remaining'], $modSettings['attachmentNumPerPostLimit'] - $context['attachments']['quantity']);
+				} elseif ($type == 'attachmentPostLimit' && $context['attachments']['total_size'] > 0) {
+									$context['attachment_restrictions'][] = sprintf($txt['attach_available'], comma_format(round(max($modSettings['attachmentPostLimit'] - ($context['attachments']['total_size'] / 1024), 0)), 0));
+				}
 			}
 	}
 
@@ -1252,8 +1309,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'] . ',
@@ -1262,6 +1319,7 @@ 
 		type: '. JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') . ',
 		thumbID: '. (!empty($mock['thumb']) ? $mock['thumb'] : 0) . '
 	});', true);
+		}
 	}
 
 	// File Upload.
@@ -1306,8 +1364,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');
 }
@@ -1328,13 +1387,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;
@@ -1346,8 +1406,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)))
@@ -1357,33 +1418,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']);
@@ -1425,24 +1491,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;
@@ -1458,44 +1528,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
@@ -1503,19 +1572,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
@@ -1542,26 +1613,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']))
@@ -1586,31 +1662,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
@@ -1618,44 +1700,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
@@ -1692,20 +1776,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.
@@ -1721,75 +1809,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']))
@@ -1820,8 +1922,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);
@@ -1834,32 +1937,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;
@@ -1868,16 +1975,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']);
@@ -1891,13 +2001,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')
@@ -1926,12 +2038,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']))
 			{
@@ -1943,14 +2056,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']);
@@ -1991,24 +2106,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.
@@ -2049,8 +2164,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);
 	}
@@ -2059,8 +2175,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.
@@ -2072,8 +2189,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))
@@ -2092,8 +2210,7 @@ 
 			'member' => $user_info['id'],
 		);
 		insertEvent($eventOptions);
-	}
-	elseif (isset($_POST['calendar']))
+	} elseif (isset($_POST['calendar']))
 	{
 		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
 
@@ -2121,14 +2238,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
 		{
@@ -2170,9 +2288,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}',
@@ -2181,16 +2298,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']))
@@ -2209,26 +2330,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).
@@ -2246,8 +2372,9 @@ 
 
 	validateSession();
 
-	if (empty($topic))
-		fatal_lang_error('topic_gone', false);
+	if (empty($topic)) {
+			fatal_lang_error('topic_gone', false);
+	}
 
 	loadLanguage('Post');
 	loadTemplate('Post');
@@ -2274,8 +2401,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))
@@ -2318,8 +2446,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.
@@ -2361,16 +2490,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']('', '
@@ -2416,12 +2548,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();
@@ -2440,8 +2573,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'];
 
@@ -2469,8 +2603,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);
 
@@ -2480,9 +2615,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.
@@ -2495,12 +2631,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']('', '
@@ -2538,8 +2675,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);
 }
@@ -2556,8 +2694,9 @@ 
 	global $sourcedir, $smcFunc;
 
 	loadLanguage('Post');
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Post');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Post');
+	}
 
 	include_once($sourcedir . '/Subs-Post.php');
 
@@ -2588,8 +2727,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))
 	{
@@ -2622,8 +2762,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";
 
@@ -2649,14 +2790,14 @@ 
 				'time' => '',
 			),
 		);
-	}
-	else
-		$context['quote'] = array(
+	} else {
+			$context['quote'] = array(
 			'xml' => '',
 			'mozilla' => '',
 			'text' => '',
 		);
-}
+	}
+	}
 
 /**
  * Used to edit the body or subject of a message inline
@@ -2668,8 +2809,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');
@@ -2695,31 +2837,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'];
@@ -2731,10 +2877,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']);
@@ -2746,13 +2892,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);
 
@@ -2768,31 +2912,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))
@@ -2829,8 +2976,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);
 
@@ -2848,9 +2996,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'];
@@ -2872,8 +3020,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']))
@@ -2914,8 +3063,7 @@ 
 			);
 
 			censorText($context['message']['subject']);
-		}
-		else
+		} else
 		{
 			$context['message'] = array(
 				'id' => $row['id_msg'],
@@ -2927,15 +3075,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/ManageSearch.php

Braces +109 added lines, -90 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main entry point for the admin search settings screen.
@@ -107,11 +108,13 @@ 
 	// Perhaps the search method wants to add some settings?
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'searchSettings')))
-		call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	if (is_callable(array($searchAPI, 'searchSettings'))) {
+			call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['search_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -126,8 +129,9 @@ 
 
 		call_integration_hook('integrate_save_search_settings');
 
-		if (empty($_POST['search_results_per_page']))
-			$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		if (empty($_POST['search_results_per_page'])) {
+					$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		}
 		saveDBSettings($config_vars);
 		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=managesearch;sa=settings;' . $context['session_var'] . '=' . $context['session_id']);
@@ -177,17 +181,20 @@ 
 		call_integration_hook('integrate_save_search_weights');
 
 		$changes = array();
-		foreach ($factors as $factor)
-			$changes[$factor] = (int) $_POST[$factor];
+		foreach ($factors as $factor) {
+					$changes[$factor] = (int) $_POST[$factor];
+		}
 		updateSettings($changes);
 	}
 
 	$context['relative_weights'] = array('total' => 0);
-	foreach ($factors as $factor)
-		$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	foreach ($factors as $factor) {
+			$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	}
 
-	foreach ($factors as $factor)
-		$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	foreach ($factors as $factor) {
+			$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	}
 
 	createToken('admin-msw');
 }
@@ -215,8 +222,9 @@ 
 	$context['search_apis'] = loadSearchAPIs();
 
 	// Detect whether a fulltext index is set.
-	if ($context['supports_fulltext'])
-		detectFulltextIndex();
+	if ($context['supports_fulltext']) {
+			detectFulltextIndex();
+	}
 
 	if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'createfulltext')
 	{
@@ -252,8 +260,7 @@ 
 					'language' => $language_ftx
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Make sure it's gone before creating it.
 			$smcFunc['db_query']('', '
@@ -273,8 +280,7 @@ 
 		}
 
 		$context['fulltext_index'] = 'body';
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -291,12 +297,12 @@ 
 		$context['fulltext_index'] = '';
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
+		}
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -318,12 +324,12 @@ 
 		));
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (isset($_POST['save']))
+		}
+	} elseif (isset($_POST['save']))
 	{
 		checkSession();
 		validateToken('admin-msmpost');
@@ -345,8 +351,8 @@ 
 	// Get some info about the messages table, to show its size and index size.
 	if ($db_type == 'mysql' || $db_type == 'mysqli')
 	{
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -355,14 +361,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -374,8 +381,8 @@ 
 		}
 
 		// Now check the custom index table, if it exists at all.
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -384,14 +391,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'log_search_words',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'log_search_words',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -400,8 +408,7 @@ 
 			$context['table_info']['custom_index_length'] = $row['Data_length'] + $row['Index_length'];
 			$smcFunc['db_free_result']($request);
 		}
-	}
-	elseif ($db_type == 'postgresql')
+	} elseif ($db_type == 'postgresql')
 	{
 		// In order to report the sizes correctly we need to perform vacuum (optimize) on the tables we will be using.
 		//db_extend();
@@ -443,38 +450,38 @@ 
 					$context['table_info']['data_length'] = (int) $row['table_size'];
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['fulltext_length'] = (int) $row['index_size'];
-				}
-				elseif ($row['indexname'] == $db_prefix . 'log_search_words')
+				} elseif ($row['indexname'] == $db_prefix . 'log_search_words')
 				{
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['custom_index_length'] = (int) $row['index_size'];
 				}
 			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
-			// Didn't work for some reason...
+		} else {
+					// Didn't work for some reason...
 			$context['table_info'] = array(
 				'data_length' => $txt['not_applicable'],
 				'index_length' => $txt['not_applicable'],
 				'fulltext_length' => $txt['not_applicable'],
 				'custom_index_length' => $txt['not_applicable'],
 			);
-	}
-	else
-		$context['table_info'] = array(
+		}
+	} else {
+			$context['table_info'] = array(
 			'data_length' => $txt['not_applicable'],
 			'index_length' => $txt['not_applicable'],
 			'fulltext_length' => $txt['not_applicable'],
 			'custom_index_length' => $txt['not_applicable'],
 		);
+	}
 
 	// Format the data and index length in kilobytes.
 	foreach ($context['table_info'] as $type => $size)
 	{
 		// If it's not numeric then just break.  This database engine doesn't support size.
-		if (!is_numeric($size))
-			break;
+		if (!is_numeric($size)) {
+					break;
+		}
 
 		$context['table_info'][$type] = comma_format($context['table_info'][$type] / 1024) . ' ' . $txt['search_method_kilobytes'];
 	}
@@ -503,8 +510,9 @@ 
 
 	// Scotty, we need more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'method';
 	$context['page_title'] = $txt['search_index_custom'];
@@ -534,8 +542,7 @@ 
 		$context['start'] = (int) $context['index_settings']['resume_at'];
 		unset($context['index_settings']['resume_at']);
 		$context['step'] = 1;
-	}
-	else
+	} else
 	{
 		$context['index_settings'] = array(
 			'bytes_per_word' => isset($_REQUEST['bytes_per_word']) && isset($index_properties[$_REQUEST['bytes_per_word']]) ? (int) $_REQUEST['bytes_per_word'] : 2,
@@ -544,12 +551,14 @@ 
 		$context['step'] = isset($_REQUEST['step']) ? (int) $_REQUEST['step'] : 0;
 
 		// admin timeouts are painful when building these long indexes - but only if we actually have such things enabled
-		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1)
-			$_SESSION['admin_time'] = time();
+		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1) {
+					$_SESSION['admin_time'] = time();
+		}
 	}
 
-	if ($context['step'] !== 0)
-		checkSession('request');
+	if ($context['step'] !== 0) {
+			checkSession('request');
+	}
 
 	// Step 0: let the user determine how they like their index.
 	if ($context['step'] === 0)
@@ -578,12 +587,14 @@ 
 			$smcFunc['db_create_word_search']($index_properties[$context['index_settings']['bytes_per_word']]['column_definition']);
 
 			// Temporarily switch back to not using a search index.
-			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-				updateSettings(array('search_index' => ''));
+			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+							updateSettings(array('search_index' => ''));
+			}
 
 			// Don't let simultanious processes be updating the search index.
-			if (!empty($modSettings['search_custom_index_config']))
-				updateSettings(array('search_custom_index_config' => ''));
+			if (!empty($modSettings['search_custom_index_config'])) {
+							updateSettings(array('search_custom_index_config' => ''));
+			}
 		}
 
 		$num_messages = array(
@@ -599,16 +610,16 @@ 
 				'starting_id' => $context['start'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		}
 
 		if (empty($num_messages['todo']))
 		{
 			$context['step'] = 2;
 			$context['percentage'] = 80;
 			$context['start'] = 0;
-		}
-		else
+		} else
 		{
 			// Number of seconds before the next step.
 			$stop = time() + 3;
@@ -649,21 +660,22 @@ 
 
 				$context['start'] += $forced_break ? $number_processed : $messages_per_batch;
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_words',
 						array('id_word' => 'int', 'id_msg' => 'int'),
 						$inserts,
 						array('id_word', 'id_msg')
 					);
+				}
 				if ($num_messages['todo'] === 0)
 				{
 					$context['step'] = 2;
 					$context['start'] = 0;
 					break;
+				} else {
+									updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 				}
-				else
-					updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 			}
 
 			// Since there are still two steps to go, 80% is the maximum here.
@@ -674,9 +686,9 @@ 
 	// Step 2: removing the words that occur too often and are of no use.
 	elseif ($context['step'] === 2)
 	{
-		if ($context['index_settings']['bytes_per_word'] < 4)
-			$context['step'] = 3;
-		else
+		if ($context['index_settings']['bytes_per_word'] < 4) {
+					$context['step'] = 3;
+		} else
 		{
 			$stop_words = $context['start'] === 0 || empty($modSettings['search_stopwords']) ? array() : explode(',', $modSettings['search_stopwords']);
 			$stop = time() + 3;
@@ -697,20 +709,22 @@ 
 						'minimum_messages' => $max_messages,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$stop_words[] = $row['id_word'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$stop_words[] = $row['id_word'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				updateSettings(array('search_stopwords' => implode(',', $stop_words)));
 
-				if (!empty($stop_words))
-					$smcFunc['db_query']('', '
+				if (!empty($stop_words)) {
+									$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_search_words
 						WHERE id_word in ({array_int:stop_words})',
 						array(
 							'stop_words' => $stop_words,
 						)
 					);
+				}
 
 				$context['start'] += $index_properties[$context['index_settings']['bytes_per_word']]['step_size'];
 				if ($context['start'] > $index_properties[$context['index_settings']['bytes_per_word']]['max_size'])
@@ -771,8 +785,9 @@ 
 					$searchAPI = new $search_class_name();
 
 					// No Support?  NEXT!
-					if (!$searchAPI->is_supported)
-						continue;
+					if (!$searchAPI->is_supported) {
+											continue;
+					}
 
 					$apis[$index_name] = array(
 						'filename' => $file,
@@ -819,10 +834,10 @@ 
 				'messages_ftx' => $db_prefix . 'messages_ftx',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['fulltext_index'][] = $row['indexname'];
-	}
-	else
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['fulltext_index'][] = $row['indexname'];
+		}
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SHOW INDEX
@@ -833,17 +848,19 @@ 
 		$context['fulltext_index'] = '';
 		if ($request !== false || $smcFunc['db_num_rows']($request) != 0)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
 				$context['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (is_array($context['fulltext_index']))
-				$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			if (is_array($context['fulltext_index'])) {
+							$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			}
 		}
 
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			FROM {string:database_name}
 			LIKE {string:table_name}',
@@ -852,20 +869,22 @@ 
 				'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 			)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			LIKE {string:table_name}',
 			array(
 				'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 			)
 			);
+		}
 
 		if ($request !== false)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
 				$context['cannot_create_fulltext'] = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}

Sources/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/ReportedContent.php

Braces +61 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Sets and call a function based on the given subaction. Acts as a dispatcher function.
@@ -54,8 +55,9 @@ 
 	);
 
 	// This comes under the umbrella of moderating posts.
-	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1')
-		isAllowedTo('moderate_forum');
+	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1') {
+			isAllowedTo('moderate_forum');
+	}
 
 	$subActions = array(
 		'show' => 'ShowReports',
@@ -70,11 +72,11 @@ 
 	call_integration_hook('integrate_reported_' . $context['report_type'], array(&$subActions));
 
 	// By default we call the open sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
-
-	else
-		$context['sub_action'] = 'show';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
+	} else {
+			$context['sub_action'] = 'show';
+	}
 
 	// Hi Ho Silver Away!
 	call_helper($subActions[$context['sub_action']]);
@@ -116,11 +118,13 @@ 
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
-		if (!empty($toClose))
-			updateReport('closed', 1, $toClose);
+		if (!empty($toClose)) {
+					updateReport('closed', 1, $toClose);
+		}
 
 		// Set the confirmation message.
 		$_SESSION['rc_confirmation'] = 'close_all';
@@ -178,8 +182,9 @@ 
 	$reportComments = array();
 
 	// Have to at least give us something to work with.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please
 	$report_id = (int) $_REQUEST['rid'];
@@ -187,8 +192,9 @@ 
 	// Get the report details.
 	$report = getReportDetails($report_id);
 
-	if (!$report)
-		fatal_lang_error('mc_no_modreport_found');
+	if (!$report) {
+			fatal_lang_error('mc_no_modreport_found');
+	}
 
 	// Build the report data - basic details first, then extra stuff based on the type
 	$context['report'] = array(
@@ -214,8 +220,7 @@ 
 				'href' => $scripturl . '?action=profile;u=' . $report['id_user'],
 			),
 		);
-	}
-	else
+	} else
 	{
 		$extraDetails = array(
 			'topic_id' => $report['id_topic'],
@@ -238,8 +243,9 @@ 
 
 	$reportComments = getReportComments($report_id);
 
-	if (!empty($reportComments))
-		$context['report'] = array_merge($context['report'], $reportComments);
+	if (!empty($reportComments)) {
+			$context['report'] = array_merge($context['report'], $reportComments);
+	}
 
 	// What have the other moderators done to this message?
 	require_once($sourcedir . '/Modlog.php');
@@ -260,8 +266,7 @@ 
 			1,
 			true,
 		);
-	}
-	else
+	} else
 	{
 		$params = array(
 			'lm.id_topic = {int:id_topic}
@@ -361,16 +366,16 @@ 
 	createList($listOptions);
 
 	// Make sure to get the correct tab selected.
-	if ($context['report']['closed'])
-		$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	if ($context['report']['closed']) {
+			$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	}
 
 	// Finally we are done :P
 	if ($context['report_type'] == 'members')
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmemberreport'], $context['report']['user']['name']);
 		$context['sub_template'] = 'viewmemberreport';
-	}
-	else
+	} else
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmodreport'], $context['report']['subject'], $context['report']['author']['name']);
 		$context['sub_template'] = 'viewmodreport';
@@ -395,8 +400,9 @@ 
 	$comment = array();
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please.
 	$report_id = (int) $_REQUEST['rid'];
@@ -421,8 +427,9 @@ 
 		checkSession('get');
 		validateToken('mod-reportC-delete', 'get');
 
-		if (empty($_REQUEST['mid']))
-			fatal_lang_error('mc_reportedp_comment_none_found');
+		if (empty($_REQUEST['mid'])) {
+					fatal_lang_error('mc_reportedp_comment_none_found');
+		}
 
 		$comment_id = (int) $_REQUEST['mid'];
 
@@ -430,15 +437,17 @@ 
 		$comment = getCommentModDetails($comment_id);
 
 		// Perhaps somebody else already deleted this fine gem...
-		if (empty($comment))
-			fatal_lang_error('report_action_message_delete_issue');
+		if (empty($comment)) {
+					fatal_lang_error('report_action_message_delete_issue');
+		}
 
 		// Can you actually do this?
 		$comment_owner = $user_info['id'] == $comment['id_member'];
 
 		// Nope! sorry.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_delete_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_delete_cannot');
+		}
 
 		// All good!
 		deleteModComment($comment_id);
@@ -465,11 +474,13 @@ 
 	checkSession(isset($_REQUEST['save']) ? 'post' : 'get');
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
-	if (empty($_REQUEST['mid']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($_REQUEST['mid'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Integers only please.
 	$context['report_id'] = (int) $_REQUEST['rid'];
@@ -477,8 +488,9 @@ 
 
 	$context['comment'] = getCommentModDetails($context['comment_id']);
 
-	if (empty($context['comment']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($context['comment'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Set up the comforting bits...
 	$context['page_title'] = $txt['mc_reported_posts'];
@@ -489,15 +501,17 @@ 
 		validateToken('mod-reportC-edit');
 
 		// Make sure there is some data to edit on the DB.
-		if (empty($context['comment']))
-			fatal_lang_error('report_action_message_edit_issue');
+		if (empty($context['comment'])) {
+					fatal_lang_error('report_action_message_edit_issue');
+		}
 
 		// Still there, good, now lets see if you can actually edit it...
 		$comment_owner = $user_info['id'] == $context['comment']['id_member'];
 
 		// So, you aren't neither an admin or the comment owner huh? that's too bad.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_edit_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_edit_cannot');
+		}
 
 		// All good!
 		$edited_comment = trim($smcFunc['htmlspecialchars']($_POST['mod_comment']));
@@ -523,8 +537,9 @@ 
 	checkSession('get');
 
 	// We need to do something!
-	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed'])))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed']))) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// What are we gonna do?
 	$action = isset($_GET['ignore']) ? 'ignore' : 'closed';

Sources/Subs-Attachments.php

Braces +294 added lines, -222 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Check if the current directory is still valid or not.
@@ -28,22 +29,24 @@ 
 	global $boarddir, $modSettings, $context;
 
 	// Not pretty, but since we don't want folders created for every post. It'll do unless a better solution can be found.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
-		$doit = true;
-	elseif (empty($modSettings['automanage_attachments']))
-		return;
-	elseif (!isset($_FILES))
-		return;
-	elseif (isset($_FILES['attachment']))
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin') {
+			$doit = true;
+	} elseif (empty($modSettings['automanage_attachments'])) {
+			return;
+	} elseif (!isset($_FILES)) {
+			return;
+	} elseif (isset($_FILES['attachment'])) {
+			foreach ($_FILES['attachment']['tmp_name'] as $dummy)
 			if (!empty($dummy))
 			{
 				$doit = true;
+	}
 				break;
 			}
 
-	if (!isset($doit))
-		return;
+	if (!isset($doit)) {
+			return;
+	}
 
 	$year = date('Y');
 	$month = date('m');
@@ -55,21 +58,25 @@ 
 
 	if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments']))
 	{
-			if (!is_array($modSettings['attachment_basedirectories']))
-				$modSettings['attachment_basedirectories'] = smf_json_decode($modSettings['attachment_basedirectories'], true);
+			if (!is_array($modSettings['attachment_basedirectories'])) {
+							$modSettings['attachment_basedirectories'] = smf_json_decode($modSettings['attachment_basedirectories'], true);
+			}
 			$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	if ($modSettings['automanage_attachments'] == 1)
 	{
-		if (!isset($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = array();
-		if (!is_array($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = smf_json_decode($modSettings['last_attachments_directory'], true);
-		if (!isset($modSettings['last_attachments_directory'][$base_dir]))
-			$modSettings['last_attachments_directory'][$base_dir] = 0;
+		if (!isset($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = array();
+		}
+		if (!is_array($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = smf_json_decode($modSettings['last_attachments_directory'], true);
+		}
+		if (!isset($modSettings['last_attachments_directory'][$base_dir])) {
+					$modSettings['last_attachments_directory'][$base_dir] = 0;
+		}
 	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
@@ -98,12 +105,14 @@ 
 			$updir = '';
 	}
 
-	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
-	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir))
-		$outputCreation = automanage_attachments_create_directory($updir);
-	elseif (in_array($updir, $modSettings['attachmentUploadDir']))
-		$outputCreation = true;
+	if (!is_array($modSettings['attachmentUploadDir'])) {
+			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+	}
+	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir)) {
+			$outputCreation = automanage_attachments_create_directory($updir);
+	} elseif (in_array($updir, $modSettings['attachmentUploadDir'])) {
+			$outputCreation = true;
+	}
 
 	if ($outputCreation)
 	{
@@ -140,8 +149,9 @@ 
 		$count = count($tree);
 
 		$directory = attachments_init_dir($tree, $count);
-		if ($directory === false)
-			return false;
+		if ($directory === false) {
+					return false;
+		}
 	}
 
 	$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
@@ -169,8 +179,9 @@ 
 	}
 
 	// Everything seems fine...let's create the .htaccess
-	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
-		secureDirectory($updir, true);
+	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess')) {
+			secureDirectory($updir, true);
+	}
 
 	$sep = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? '\/' : DIRECTORY_SEPARATOR;
 	$updir = rtrim($updir, $sep);
@@ -202,8 +213,9 @@ 
 {
 	global $modSettings, $boarddir;
 
-	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1))
-		return;
+	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1)) {
+			return;
+	}
 
 	$basedirectory = !empty($modSettings['use_subdirectories_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : $boarddir;
 	// Just to be sure: I don't want directory separators at the end
@@ -215,13 +227,14 @@ 
 	{
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 		$base_dir = !empty($modSettings['automanage_attachments']) ? $base_dir : 0;
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	// Get the last attachment directory for that base directory
-	if (empty($modSettings['last_attachments_directory'][$base_dir]))
-		$modSettings['last_attachments_directory'][$base_dir] = 0;
+	if (empty($modSettings['last_attachments_directory'][$base_dir])) {
+			$modSettings['last_attachments_directory'][$base_dir] = 0;
+	}
 	// And increment it.
 	$modSettings['last_attachments_directory'][$base_dir]++;
 
@@ -236,10 +249,10 @@ 
 		$modSettings['last_attachments_directory'] = smf_json_decode($modSettings['last_attachments_directory'], true);
 
 		return true;
+	} else {
+			return false;
+	}
 	}
-	else
-		return false;
-}
 
 /**
  * Split a path into a list of all directories and subdirectories
@@ -257,12 +270,13 @@ 
 			* in Windows we need to explode for both \ and /
 			* while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR)
 	*/
-	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
-		$tree = preg_split('#[\\\/]#', $directory);
-	else
+	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			$tree = preg_split('#[\\\/]#', $directory);
+	} else
 	{
-		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
-			return false;
+		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) {
+					return false;
+		}
 
 		$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 	}
@@ -286,10 +300,11 @@ 
 		 //Better be sure that the first part of the path is actually a drive letter...
 		 //...even if, I should check this in the admin page...isn't it?
 		 //...NHAAA Let's leave space for users' complains! :P
-		if (preg_match('/^[a-z]:$/i', $tree[0]))
-			$directory = array_shift($tree);
-		else
-			return false;
+		if (preg_match('/^[a-z]:$/i', $tree[0])) {
+					$directory = array_shift($tree);
+		} else {
+					return false;
+		}
 
 		$count--;
 	}
@@ -304,18 +319,20 @@ 
 	global $context, $modSettings, $smcFunc, $txt, $user_info;
 
 	// Make sure we're uploading to the right place.
-	if (!empty($modSettings['automanage_attachments']))
-		automanage_attachments_check_directory();
+	if (!empty($modSettings['automanage_attachments'])) {
+			automanage_attachments_check_directory();
+	}
 
-	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);
+	}
 
 	$context['attach_dir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
 	// Is the attachments folder actualy there?
-	if (!empty($context['dir_creation_error']))
-		$initial_error = $context['dir_creation_error'];
-	elseif (!is_dir($context['attach_dir']))
+	if (!empty($context['dir_creation_error'])) {
+			$initial_error = $context['dir_creation_error'];
+	} elseif (!is_dir($context['attach_dir']))
 	{
 		$initial_error = 'attach_folder_warning';
 		log_error(sprintf($txt['attach_folder_admin_warning'], $context['attach_dir']), 'critical');
@@ -338,12 +355,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 	}
 
 	// Hmm. There are still files in session.
@@ -353,39 +370,44 @@ 
 		// Let's try to keep them. But...
 		$ignore_temp = true;
 		// If new files are being added. We can't ignore those
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
-			if (!empty($dummy))
+		foreach ($_FILES['attachment']['tmp_name'] as $dummy) {
+					if (!empty($dummy))
 			{
 				$ignore_temp = false;
+		}
 				break;
 			}
 
 		// Need to make space for the new files. So, bye bye.
 		if (!$ignore_temp)
 		{
-			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)
 					unlink($attachment['tmp_name']);
+			}
 
 			$context['we_are_history'] = $txt['error_temp_attachments_flushed'];
 			$_SESSION['temp_attachments'] = array();
 		}
 	}
 
-	if (!isset($_FILES['attachment']['name']))
-		$_FILES['attachment']['tmp_name'] = array();
+	if (!isset($_FILES['attachment']['name'])) {
+			$_FILES['attachment']['tmp_name'] = array();
+	}
 
-	if (!isset($_SESSION['temp_attachments']))
-		$_SESSION['temp_attachments'] = array();
+	if (!isset($_SESSION['temp_attachments'])) {
+			$_SESSION['temp_attachments'] = array();
+	}
 
 	// Remember where we are at. If it's anywhere at all.
-	if (!$ignore_temp)
-		$_SESSION['temp_attachments']['post'] = array(
+	if (!$ignore_temp) {
+			$_SESSION['temp_attachments']['post'] = array(
 			'msg' => !empty($_REQUEST['msg']) ? $_REQUEST['msg'] : 0,
 			'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0,
 			'topic' => !empty($topic) ? $topic : 0,
 			'board' => !empty($board) ? $board : 0,
 		);
+	}
 
 	// If we have an initial error, lets just display it.
 	if (!empty($initial_error))
@@ -393,9 +415,10 @@ 
 		$_SESSION['temp_attachments']['initial_error'] = $initial_error;
 
 		// And delete the files 'cos they ain't going nowhere.
-		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 				unlink($_FILES['attachment']['tmp_name'][$n]);
+		}
 
 		$_FILES['attachment']['tmp_name'] = array();
 	}
@@ -403,21 +426,24 @@ 
 	// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 	foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 	{
-		if ($_FILES['attachment']['name'][$n] == '')
-			continue;
+		if ($_FILES['attachment']['name'][$n] == '') {
+					continue;
+		}
 
 		// First, let's first check for PHP upload errors.
 		$errors = array();
 		if (!empty($_FILES['attachment']['error'][$n]))
 		{
-			if ($_FILES['attachment']['error'][$n] == 2)
-				$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-			elseif ($_FILES['attachment']['error'][$n] == 6)
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
-			else
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
-			if (empty($errors))
-				$errors[] = 'attach_php_error';
+			if ($_FILES['attachment']['error'][$n] == 2) {
+							$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+			} elseif ($_FILES['attachment']['error'][$n] == 6) {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+			} else {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+			}
+			if (empty($errors)) {
+							$errors[] = 'attach_php_error';
+			}
 		}
 
 		// Try to move and rename the file before doing any more checks on it.
@@ -435,16 +461,16 @@ 
 			);
 
 			// Move the file to the attachments folder with a temp name for now.
-			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-				smf_chmod($destName, 0644);
-			else
+			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+							smf_chmod($destName, 0644);
+			} else
 			{
 				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$_SESSION['temp_attachments'][$attachID] = array(
 				'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -452,12 +478,14 @@ 
 				'errors' => $errors,
 			);
 
-			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-				unlink($_FILES['attachment']['tmp_name'][$n]);
+			if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+							unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 		}
 		// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-		if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-			attachmentChecks($attachID);
+		if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+					attachmentChecks($attachID);
+		}
 	}
 	// Mod authors, finally a hook to hang an alternate attachment upload system upon
 	// Upload to the current attachment folder with the file name $attachID or 'post_tmp_' . $user_info['id'] . '_' . md5(mt_rand())
@@ -484,21 +512,20 @@ 
 	global $modSettings, $context, $sourcedir, $smcFunc;
 
 	// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
-	if (empty($_SESSION['temp_attachments'][$attachID]))
-		$error = '$_SESSION[\'temp_attachments\'][$attachID]';
-
-	elseif (empty($attachID))
-		$error = '$attachID';
-
-	elseif (empty($context['attachments']))
-		$error = '$context[\'attachments\']';
-
-	elseif (empty($context['attach_dir']))
-		$error = '$context[\'attach_dir\']';
+	if (empty($_SESSION['temp_attachments'][$attachID])) {
+			$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	} elseif (empty($attachID)) {
+			$error = '$attachID';
+	} elseif (empty($context['attachments'])) {
+			$error = '$context[\'attachments\']';
+	} elseif (empty($context['attach_dir'])) {
+			$error = '$context[\'attach_dir\']';
+	}
 
 	// Let's get their attention.
-	if (!empty($error))
-		fatal_lang_error('attach_check_nag', 'debug', array($error));
+	if (!empty($error)) {
+			fatal_lang_error('attach_check_nag', 'debug', array($error));
+	}
 
 	// Just in case this slipped by the first checks, we stop it here and now
 	if ($_SESSION['temp_attachments'][$attachID]['size'] == 0)
@@ -527,8 +554,9 @@ 
 			$size = @getimagesize($_SESSION['temp_attachments'][$attachID]['tmp_name']);
 			if (!(empty($size)) && ($size[2] != $old_format))
 			{
-				if (isset($context['validImageTypes'][$size[2]]))
-					$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				if (isset($context['validImageTypes'][$size[2]])) {
+									$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				}
 			}
 		}
 	}
@@ -582,42 +610,48 @@ 
 				// Or, let the user know that it ain't gonna happen.
 				else
 				{
-					if (isset($context['dir_creation_error']))
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
-					else
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					if (isset($context['dir_creation_error'])) {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
+					} else {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					}
 				}
+			} else {
+							$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 			}
-			else
-				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 		}
 	}
 
 	// Is the file too big?
 	$context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size'];
-	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	}
 
 	// Check the total upload size for this post...
-	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	}
 
 	// Have we reached the maximum number of files we are allowed?
 	$context['attachments']['quantity']++;
 
 	// Set a max limit if none exists
-	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50)
-		$modSettings['attachmentNumPerPostLimit'] = 50;
+	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50) {
+			$modSettings['attachmentNumPerPostLimit'] = 50;
+	}
 
-	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit'])
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit']) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	}
 
 	// File extension check
 	if (!empty($modSettings['attachmentCheckExtensions']))
 	{
 		$allowed = explode(',', strtolower($modSettings['attachmentExtensions']));
-		foreach ($allowed as $k => $dummy)
-			$allowed[$k] = trim($dummy);
+		foreach ($allowed as $k => $dummy) {
+					$allowed[$k] = trim($dummy);
+		}
 
 		if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed))
 		{
@@ -629,10 +663,12 @@ 
 	// Undo the math if there's an error
 	if (!empty($_SESSION['temp_attachments'][$attachID]['errors']))
 	{
-		if (isset($context['dir_size']))
-			$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
-		if (isset($context['dir_files']))
-			$context['dir_files']--;
+		if (isset($context['dir_size'])) {
+					$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		}
+		if (isset($context['dir_files'])) {
+					$context['dir_files']--;
+		}
 		$context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
 		$context['attachments']['quantity']--;
 		return false;
@@ -664,12 +700,14 @@ 
 	if (empty($attachmentOptions['mime_type']) && $attachmentOptions['width'])
 	{
 		// Got a proper mime type?
-		if (!empty($size['mime']))
-			$attachmentOptions['mime_type'] = $size['mime'];
+		if (!empty($size['mime'])) {
+					$attachmentOptions['mime_type'] = $size['mime'];
+		}
 
 		// Otherwise a valid one?
-		elseif (isset($context['validImageTypes'][$size[2]]))
-			$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		elseif (isset($context['validImageTypes'][$size[2]])) {
+					$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		}
 	}
 
 	// It is possible we might have a MIME type that isn't actually an image but still have a size.
@@ -681,15 +719,17 @@ 
 	}
 
 	// Get the hash if no hash has been given yet.
-	if (empty($attachmentOptions['file_hash']))
-		$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	if (empty($attachmentOptions['file_hash'])) {
+			$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	}
 
 	// Assuming no-one set the extension let's take a look at it.
 	if (empty($attachmentOptions['fileext']))
 	{
 		$attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : '');
-		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name'])
-			$attachmentOptions['fileext'] = '';
+		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name']) {
+					$attachmentOptions['fileext'] = '';
+		}
 	}
 
 	// Last chance to change stuff!
@@ -698,8 +738,9 @@ 
 	// Make sure the folder is valid...
 	$tmp = is_array($modSettings['attachmentUploadDir']) ? $modSettings['attachmentUploadDir'] : smf_json_decode($modSettings['attachmentUploadDir'], true);
 	$folders = array_keys($tmp);
-	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders))
-		$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders)) {
+			$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}attachments',
@@ -730,8 +771,8 @@ 
 	rename($attachmentOptions['tmp_name'], $attachmentOptions['destination']);
 
 	// If it's not approved then add to the approval queue.
-	if (!$attachmentOptions['approved'])
-		$smcFunc['db_insert']('',
+	if (!$attachmentOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}approval_queue',
 			array(
 				'id_attach' => 'int', 'id_msg' => 'int',
@@ -741,9 +782,11 @@ 
 			),
 			array()
 		);
+	}
 
-	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height'])))
-		return true;
+	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height']))) {
+			return true;
+	}
 
 	// Like thumbnails, do we?
 	if (!empty($modSettings['attachmentThumbWidth']) && !empty($modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > $modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > $modSettings['attachmentThumbHeight']))
@@ -754,13 +797,15 @@ 
 			$size = @getimagesize($attachmentOptions['destination'] . '_thumb');
 			list ($thumb_width, $thumb_height) = $size;
 
-			if (!empty($size['mime']))
-				$thumb_mime = $size['mime'];
-			elseif (isset($context['validImageTypes'][$size[2]]))
-				$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			if (!empty($size['mime'])) {
+							$thumb_mime = $size['mime'];
+			} elseif (isset($context['validImageTypes'][$size[2]])) {
+							$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			}
 			// Lord only knows how this happened...
-			else
-				$thumb_mime = '';
+			else {
+							$thumb_mime = '';
+			}
 
 			$thumb_filename = $attachmentOptions['name'] . '_thumb';
 			$thumb_size = filesize($attachmentOptions['destination'] . '_thumb');
@@ -840,15 +885,17 @@ 
 	global $smcFunc;
 
 	// Oh, come on!
-	if (empty($attachIDs) || empty($msgID))
-		return false;
+	if (empty($attachIDs) || empty($msgID)) {
+			return false;
+	}
 
 	// "I see what is right and approve, but I do what is wrong."
 	call_integration_hook('integrate_assign_attachments', array(&$attachIDs, &$msgID));
 
 	// One last check
-	if (empty($attachIDs))
-		return false;
+	if (empty($attachIDs)) {
+			return false;
+	}
 
 	// Perform.
 	$smcFunc['db_query']('', '
@@ -880,8 +927,9 @@ 
 	$externalParse = false;
 
 	// Meh...
-	if (empty($attachID))
-		return 'attachments_no_data_loaded';
+	if (empty($attachID)) {
+			return 'attachments_no_data_loaded';
+	}
 
 	// Make it easy.
 	$msgID = !empty($_REQUEST['msg']) ? (int) $_REQUEST['msg'] : 0;
@@ -890,20 +938,23 @@ 
 	$externalParse = call_integration_hook('integrate_pre_parseAttachBBC', array($attachID, $msgID));
 
 	// "I am innocent of the blood of this just person: see ye to it."
-	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse)))
-		return $externalParse;
+	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse))) {
+			return $externalParse;
+	}
 
 	//Are attachments enable?
-	if (empty($modSettings['attachmentEnable']))
-		return 'attachments_not_enable';
+	if (empty($modSettings['attachmentEnable'])) {
+			return 'attachments_not_enable';
+	}
 
 	// Previewing much? no msg ID has been set yet.
 	if (!empty($context['preview_message']))
 	{
 		$allAttachments = getAttachsByMsg(0);
 
-		if (empty($allAttachments[0][$attachID]))
-			return 'attachments_no_data_loaded';
+		if (empty($allAttachments[0][$attachID])) {
+					return 'attachments_no_data_loaded';
+		}
 
 		$attachContext = $allAttachments[0][$attachID];
 		$attachLoaded = loadAttachmentContext(0, $allAttachments);
@@ -916,57 +967,66 @@ 
 		$attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview' . (empty($attachContext['is_image']) ? ';file' : '') . '">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>';
 
 		// Fix the thumbnail too, if the image has one.
-		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb']))
-			$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb'])) {
+					$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		}
 
 		return $attachContext;
 	}
 
 	// There is always the chance someone else has already done our dirty work...
 	// If so, all pertinent checks were already done. Hopefully...
-	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID]))
-		return $context['current_attachments'][$attachID];
+	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID])) {
+			return $context['current_attachments'][$attachID];
+	}
 
 	// If we are lucky enough to be in $board's scope then check it!
-	if (!empty($board) && !allowedTo('view_attachments', $board))
-		return 'attachments_not_allowed_to_see';
+	if (!empty($board) && !allowedTo('view_attachments', $board)) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Get the message info associated with this particular attach ID.
 	$attachInfo = getAttachMsgInfo($attachID);
 
 	// There is always the chance this attachment no longer exists or isn't associated to a message anymore...
-	if (empty($attachInfo) || empty($attachInfo['msg']))
-		return 'attachments_no_msg_associated';
+	if (empty($attachInfo) || empty($attachInfo['msg'])) {
+			return 'attachments_no_msg_associated';
+	}
 
 	// Hold it! got the info now check if you can see this attachment.
-	if (!allowedTo('view_attachments', $attachInfo['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachInfo['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	$allAttachments = getAttachsByMsg($attachInfo['msg']);
 	$attachContext = $allAttachments[$attachInfo['msg']][$attachID];
 
 	// No point in keep going further.
-	if (!allowedTo('view_attachments', $attachContext['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachContext['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Load this particular attach's context.
-	if (!empty($attachContext))
-		$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	if (!empty($attachContext)) {
+			$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	}
 
 	// One last check, you know, gotta be paranoid...
-	else
-		return 'attachments_no_data_loaded';
+	else {
+			return 'attachments_no_data_loaded';
+	}
 
 	// This is the last "if" I promise!
-	if (empty($attachLoaded))
-		return 'attachments_no_data_loaded';
-
-	else
-		$attachContext = $attachLoaded[$attachID];
+	if (empty($attachLoaded)) {
+			return 'attachments_no_data_loaded';
+	} else {
+			$attachContext = $attachLoaded[$attachID];
+	}
 
 	// You may or may not want to show this under the post.
-	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID]))
-		$context['show_attach_under_post'][$attachID] = $attachID;
+	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID])) {
+			$context['show_attach_under_post'][$attachID] = $attachID;
+	}
 
 	// Last minute changes?
 	call_integration_hook('integrate_post_parseAttachBBC', array(&$attachContext));
@@ -986,8 +1046,9 @@ 
 {
 	global $smcFunc, $modSettings;
 
-	if (empty($attachIDs))
-		return array();
+	if (empty($attachIDs)) {
+			return array();
+	}
 
 	$return = array();
 
@@ -1003,11 +1064,12 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[$row['id_attach']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[$row['id_attach']] = array(
 			'name' => $smcFunc['htmlspecialchars']($row['filename']),
 			'size' => $row['size'],
 			'attachID' => $row['id_attach'],
@@ -1016,6 +1078,7 @@ 
 			'mime_type' => $row['mime_type'],
 			'thumb' => $row['id_thumb'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $return;
@@ -1032,8 +1095,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($attachID))
-		return array();
+	if (empty($attachID)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT a.id_msg AS msg, m.id_topic AS topic, m.id_board AS board
@@ -1046,8 +1110,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1088,8 +1153,9 @@ 
 		$temp = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
-				continue;
+			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
+							continue;
+			}
 
 			$temp[$row['id_attach']] = $row;
 		}
@@ -1118,8 +1184,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $sourcedir, $smcFunc;
 
-	if (empty($attachments) || empty($attachments[$id_msg]))
-		return array();
+	if (empty($attachments) || empty($attachments[$id_msg])) {
+			return array();
+	}
 
 	// Set up the attachment info - based on code by Meriadoc.
 	$attachmentData = array();
@@ -1143,11 +1210,13 @@ 
 			);
 
 			// If something is unapproved we'll note it so we can sort them.
-			if (!$attachment['approved'])
-				$have_unapproved = true;
+			if (!$attachment['approved']) {
+							$have_unapproved = true;
+			}
 
-			if (!$attachmentData[$i]['is_image'])
-				continue;
+			if (!$attachmentData[$i]['is_image']) {
+							continue;
+			}
 
 			$attachmentData[$i]['real_width'] = $attachment['width'];
 			$attachmentData[$i]['width'] = $attachment['width'];
@@ -1168,12 +1237,12 @@ 
 						// So what folder are we putting this image in?
 						if (!empty($modSettings['currentAttachmentUploadDir']))
 						{
-							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);
+							}
 							$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 							$id_folder_thumb = $modSettings['currentAttachmentUploadDir'];
-						}
-						else
+						} else
 						{
 							$path = $modSettings['attachmentUploadDir'];
 							$id_folder_thumb = 1;
@@ -1188,10 +1257,11 @@ 
 						$thumb_ext = isset($context['validImageTypes'][$size[2]]) ? $context['validImageTypes'][$size[2]] : '';
 
 						// Figure out the mime type.
-						if (!empty($size['mime']))
-							$thumb_mime = $size['mime'];
-						else
-							$thumb_mime = 'image/' . $thumb_ext;
+						if (!empty($size['mime'])) {
+													$thumb_mime = $size['mime'];
+						} else {
+													$thumb_mime = 'image/' . $thumb_ext;
+						}
 
 						$thumb_filename = $attachment['filename'] . '_thumb';
 						$thumb_hash = getAttachmentFilename($thumb_filename, false, null, true);
@@ -1238,11 +1308,12 @@ 
 				}
 			}
 
-			if (!empty($attachment['id_thumb']))
-				$attachmentData[$i]['thumbnail'] = array(
+			if (!empty($attachment['id_thumb'])) {
+							$attachmentData[$i]['thumbnail'] = array(
 					'id' => $attachment['id_thumb'],
 					'href' => $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_thumb'] . ';image',
 				);
+			}
 			$attachmentData[$i]['thumbnail']['has_thumb'] = !empty($attachment['id_thumb']);
 
 			// If thumbnails are disabled, check the maximum size of the image.
@@ -1252,30 +1323,31 @@ 
 				{
 					$attachmentData[$i]['width'] = $modSettings['max_image_width'];
 					$attachmentData[$i]['height'] = floor($attachment['height'] * $modSettings['max_image_width'] / $attachment['width']);
-				}
-				elseif (!empty($modSettings['max_image_width']))
+				} elseif (!empty($modSettings['max_image_width']))
 				{
 					$attachmentData[$i]['width'] = floor($attachment['width'] * $modSettings['max_image_height'] / $attachment['height']);
 					$attachmentData[$i]['height'] = $modSettings['max_image_height'];
 				}
-			}
-			elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
+			} elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
 			{
 				// If the image is too large to show inline, make it a popup.
-				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height'])))
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
-				else
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height']))) {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
+				} else {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				}
 			}
 
-			if (!$attachmentData[$i]['thumbnail']['has_thumb'])
-				$attachmentData[$i]['downloads']++;
+			if (!$attachmentData[$i]['thumbnail']['has_thumb']) {
+							$attachmentData[$i]['downloads']++;
+			}
 		}
 	}
 
 	// Do we need to instigate a sort?
-	if ($have_unapproved)
-		usort($attachmentData, 'approved_attach_sort');
+	if ($have_unapproved) {
+			usort($attachmentData, 'approved_attach_sort');
+	}
 
 	return $attachmentData;
 }

Sources/Display.php

Braces +333 added lines, -249 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The central part of the board - topic display.
@@ -34,8 +35,9 @@ 
 	global $attachments, $messages_request, $language, $smcFunc;
 
 	// What are you gonna display if these are empty?!
-	if (empty($topic))
-		fatal_lang_error('no_board', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_board', false);
+	}
 
 	// Load the proper template.
 	loadTemplate('Display');
@@ -52,15 +54,17 @@ 
 	$context['messages_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Let's do some work on what to search index.
-	if (count($_GET) > 2)
-		foreach ($_GET as $k => $v)
+	if (count($_GET) > 2) {
+			foreach ($_GET as $k => $v)
 		{
 			if (!in_array($k, array('topic', '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;
+	}
 
 	// Find the previous or next topic.  Make a fuss if there are no more.
 	if (isset($_REQUEST['prev_next']) && ($_REQUEST['prev_next'] == 'prev' || $_REQUEST['prev_next'] == 'next'))
@@ -172,8 +176,9 @@ 
 			$topic_parameters
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('not_a_topic', false, 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('not_a_topic', false, 404);
+	}
 	$context['topicinfo'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -210,8 +215,9 @@ 
 	$context['topic_unwatched'] = isset($context['topicinfo']['unwatched']) ? $context['topicinfo']['unwatched'] : 0;
 
 	// Add up unapproved replies to get real number of replies...
-	if ($modSettings['postmod_active'] && $approve_posts)
-		$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
+	if ($modSettings['postmod_active'] && $approve_posts) {
+			$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
+	}
 
 	// If this topic has unapproved posts, we need to work out how many posts the user can see, for page indexing.
 	if ($modSettings['postmod_active'] && $context['topicinfo']['unapproved_posts'] && !$user_info['is_guest'] && !$approve_posts)
@@ -231,11 +237,11 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$context['total_visible_posts'] = $context['num_replies'] + $myUnapprovedPosts + ($context['topicinfo']['approved'] ? 1 : 0);
+	} elseif ($user_info['is_guest']) {
+			$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
+	} else {
+			$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
 	}
-	elseif ($user_info['is_guest'])
-		$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
-	else
-		$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
 
 	// The start isn't a number; it's information about what to do, where to go.
 	if (!is_numeric($_REQUEST['start']))
@@ -248,8 +254,7 @@ 
 			{
 				$context['start_from'] = $context['total_visible_posts'] - 1;
 				$_REQUEST['start'] = empty($options['view_newest_first']) ? $context['start_from'] : 0;
-			}
-			else
+			} else
 			{
 				// Find the earliest unread message in the topic. (the use of topics here is just for both tables.)
 				$request = $smcFunc['db_query']('', '
@@ -277,9 +282,9 @@ 
 		if (substr($_REQUEST['start'], 0, 4) == 'from')
 		{
 			$timestamp = (int) substr($_REQUEST['start'], 4);
-			if ($timestamp === 0)
-				$_REQUEST['start'] = 0;
-			else
+			if ($timestamp === 0) {
+							$_REQUEST['start'] = 0;
+			} else
 			{
 				// Find the number of messages posted before said time...
 				$request = $smcFunc['db_query']('', '
@@ -307,11 +312,11 @@ 
 		elseif (substr($_REQUEST['start'], 0, 3) == 'msg')
 		{
 			$virtual_msg = (int) substr($_REQUEST['start'], 3);
-			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg'])
-				$context['start_from'] = $context['total_visible_posts'] - 1;
-			elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg'])
-				$context['start_from'] = 0;
-			else
+			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg']) {
+							$context['start_from'] = $context['total_visible_posts'] - 1;
+			} elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg']) {
+							$context['start_from'] = 0;
+			} else
 			{
 				// Find the start value for that message......
 				$request = $smcFunc['db_query']('', '
@@ -394,21 +399,25 @@ 
 		);
 		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>';
+			}
 
 			// Add them both to the list and to the more detailed list.
-			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;
+			}
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
 				'id' => $row['id_member'],
 				'username' => $row['member_name'],
@@ -420,8 +429,9 @@ 
 				'hidden' => empty($row['show_online']),
 			);
 
-			if (empty($row['show_online']))
-				$context['view_num_hidden']++;
+			if (empty($row['show_online'])) {
+							$context['view_num_hidden']++;
+			}
 		}
 
 		// The number of guests is equal to the rows minus the ones we actually used ;).
@@ -435,11 +445,13 @@ 
 
 	// If all is set, but not allowed... just unset it.
 	$can_show_all = !empty($modSettings['enableAllMessages']) && $context['total_visible_posts'] > $context['messages_per_page'] && $context['total_visible_posts'] < $modSettings['enableAllMessages'];
-	if (isset($_REQUEST['all']) && !$can_show_all)
-		unset($_REQUEST['all']);
+	if (isset($_REQUEST['all']) && !$can_show_all) {
+			unset($_REQUEST['all']);
+	}
 	// Otherwise, it must be allowed... so pretend start was -1.
-	elseif (isset($_REQUEST['all']))
-		$_REQUEST['start'] = -1;
+	elseif (isset($_REQUEST['all'])) {
+			$_REQUEST['start'] = -1;
+	}
 
 	// Construct the page index, allowing for the .START method...
 	$context['page_index'] = constructPageIndex($scripturl . '?topic=' . $topic . '.%1$d', $_REQUEST['start'], $context['total_visible_posts'], $context['messages_per_page'], true);
@@ -476,8 +488,9 @@ 
 			$_REQUEST['start'] = 0;
 		}
 		// They aren't using it, but the *option* is there, at least.
-		else
-			$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
+		else {
+					$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
+		}
 	}
 
 	// Build the link tree.
@@ -493,14 +506,16 @@ 
 	if (!empty($board_info['moderators']))
 	{
 		// Add a link for each moderator...
-		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']))
 	{
 		// Add a link for each moderator group as well...
-		foreach ($board_info['moderator_groups'] as $mod_group)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=viewmemberes;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=viewmemberes;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		}
 	}
 
 	if (!empty($context['link_moderators']))
@@ -531,9 +546,9 @@ 
 	// For quick reply we need a response prefix in the default forum language.
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix', 600)))
 	{
-		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'];
@@ -565,8 +580,9 @@ 
 			list($start, $end, $allday, $span, $tz_abbrev) = buildEventDatetimes($row);
 
 			// Sanity check
-			if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-				continue;
+			if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+							continue;
+			}
 
 			$linked_calendar_event = array(
 				'id' => $row['id_event'],
@@ -615,8 +631,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($context['linked_calendar_events']))
-			$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
+		if (!empty($context['linked_calendar_events'])) {
+					$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
+		}
 	}
 
 	// Create the poll info if it exists.
@@ -689,20 +706,21 @@ 
 				foreach ($guestinfo as $i => $guestvoted)
 				{
 					$guestvoted = explode(',', $guestvoted);
-					if ($guestvoted[0] == $context['topicinfo']['id_poll'])
-						break;
+					if ($guestvoted[0] == $context['topicinfo']['id_poll']) {
+											break;
+					}
 				}
 				// Has the poll been reset since guest voted?
 				if ($pollinfo['reset_poll'] > $guestvoted[1])
 				{
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
-					if (!empty($guestinfo))
-						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-					else
-						unset($_COOKIE['guest_poll_vote']);
-				}
-				else
+					if (!empty($guestinfo)) {
+											$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+					} else {
+											unset($_COOKIE['guest_poll_vote']);
+					}
+				} else
 				{
 					// What did they vote for?
 					unset($guestvoted[0], $guestvoted[1]);
@@ -816,23 +834,29 @@ 
 		// Build the poll moderation button array.
 		$context['poll_buttons'] = array();
 
-		if ($context['allow_return_vote'])
-			$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
+		if ($context['allow_return_vote']) {
+					$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
+		}
 
-		if ($context['show_view_results_button'])
-			$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
+		if ($context['show_view_results_button']) {
+					$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
+		}
 
-		if ($context['allow_change_vote'])
-			$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['allow_change_vote']) {
+					$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
-		if ($context['allow_lock_poll'])
-			$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['allow_lock_poll']) {
+					$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
-		if ($context['allow_edit_poll'])
-			$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
+		if ($context['allow_edit_poll']) {
+					$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
+		}
 
-		if ($context['can_remove_poll'])
-			$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['can_remove_poll']) {
+					$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
 		// Allow mods to add additional buttons here
 		call_integration_hook('integrate_poll_buttons');
@@ -873,8 +897,9 @@ 
 	$all_posters = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!empty($row['id_member']))
-			$all_posters[$row['id_msg']] = $row['id_member'];
+		if (!empty($row['id_member'])) {
+					$all_posters[$row['id_msg']] = $row['id_member'];
+		}
 		$messages[] = $row['id_msg'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -886,8 +911,9 @@ 
 	if (!$user_info['is_guest'] && !empty($messages))
 	{
 		$mark_at_msg = max($messages);
-		if ($mark_at_msg >= $context['topicinfo']['id_last_msg'])
-			$mark_at_msg = $modSettings['maxMsgID'];
+		if ($mark_at_msg >= $context['topicinfo']['id_last_msg']) {
+					$mark_at_msg = $modSettings['maxMsgID'];
+		}
 		if ($mark_at_msg >= $context['topicinfo']['new_from'])
 		{
 			$smcFunc['db_insert']($context['topicinfo']['new_from'] == 0 ? 'ignore' : 'replace',
@@ -919,8 +945,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// Find if this topic is marked for notification...
-			if (!empty($row['id_topic']))
-				$context['is_marked_notify'] = true;
+			if (!empty($row['id_topic'])) {
+							$context['is_marked_notify'] = true;
+			}
 
 			// Only do this once, but mark the notifications as "not sent yet" for next time.
 			if (!empty($row['sent']) && $do_once)
@@ -942,8 +969,9 @@ 
 		}
 
 		// Have we recently cached the number of new topics in this board, and it's still a lot?
-		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5)
-			$_SESSION['topicseen_cache'][$board]--;
+		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5) {
+					$_SESSION['topicseen_cache'][$board]--;
+		}
 		// Mark board as seen if this is the only new topic.
 		elseif (isset($_REQUEST['topicseen']))
 		{
@@ -967,14 +995,16 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// If there're no real new topics in this board, mark the board as seen.
-			if (empty($numNewTopics))
-				$_REQUEST['boardseen'] = true;
-			else
-				$_SESSION['topicseen_cache'][$board] = $numNewTopics;
+			if (empty($numNewTopics)) {
+							$_REQUEST['boardseen'] = true;
+			} else {
+							$_SESSION['topicseen_cache'][$board] = $numNewTopics;
+			}
 		}
 		// Probably one less topic - maybe not, but even if we decrease this too fast it will only make us look more often.
-		elseif (isset($_SESSION['topicseen_cache'][$board]))
-			$_SESSION['topicseen_cache'][$board]--;
+		elseif (isset($_SESSION['topicseen_cache'][$board])) {
+					$_SESSION['topicseen_cache'][$board]--;
+		}
 
 		// Mark board as seen if we came using last post link from BoardIndex. (or other places...)
 		if (isset($_REQUEST['boardseen']))
@@ -1031,23 +1061,26 @@ 
 			$temp = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
-					continue;
+				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
+									continue;
+				}
 
 				$temp[$row['id_attach']] = $row;
 				$temp[$row['id_attach']]['topic'] = $topic;
 				$temp[$row['id_attach']]['board'] = $board;
 
-				if (!isset($context['loaded_attachments'][$row['id_msg']]))
-					$context['loaded_attachments'][$row['id_msg']] = array();
+				if (!isset($context['loaded_attachments'][$row['id_msg']])) {
+									$context['loaded_attachments'][$row['id_msg']] = array();
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
 			// This is better than sorting it with the query...
 			ksort($temp);
 
-			foreach ($temp as $row)
-				$context['loaded_attachments'][$row['id_msg']][] = $row;
+			foreach ($temp as $row) {
+							$context['loaded_attachments'][$row['id_msg']][] = $row;
+			}
 		}
 
 		$msg_parameters = array(
@@ -1074,21 +1107,23 @@ 
 		);
 
 		// And the likes
-		if (!empty($modSettings['enable_likes']))
-			$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
+		if (!empty($modSettings['enable_likes'])) {
+					$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
+		}
 
 		// Go to the last message if the given time is beyond the time of the last message.
-		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies'])
-			$context['start_from'] = $context['topicinfo']['num_replies'];
+		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies']) {
+					$context['start_from'] = $context['topicinfo']['num_replies'];
+		}
 
 		// Since the anchor information is needed on the top of the page we load these variables beforehand.
 		$context['first_message'] = isset($messages[$firstIndex]) ? $messages[$firstIndex] : $messages[0];
-		if (empty($options['view_newest_first']))
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
-		else
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
-	}
-	else
+		if (empty($options['view_newest_first'])) {
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
+		} else {
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
+		}
+	} else
 	{
 		$messages_request = false;
 		$context['first_message'] = 0;
@@ -1124,8 +1159,9 @@ 
 		'can_see_likes' => 'likes_view',
 		'can_like' => 'likes_like',
 	);
-	foreach ($common_permissions as $contextual => $perm)
-		$context[$contextual] = allowedTo($perm);
+	foreach ($common_permissions as $contextual => $perm) {
+			$context[$contextual] = allowedTo($perm);
+	}
 
 	// Permissions with _any/_own versions.  $context[YYY] => ZZZ_any/_own.
 	$anyown_permissions = array(
@@ -1138,8 +1174,9 @@ 
 		'can_reply_unapproved' => 'post_unapproved_replies',
 		'can_view_warning' => 'profile_warning',
 	);
-	foreach ($anyown_permissions as $contextual => $perm)
-		$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+	foreach ($anyown_permissions as $contextual => $perm) {
+			$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+	}
 
 	if (!$user_info['is_admin'] && !$modSettings['topic_move_any'])
 	{
@@ -1185,8 +1222,9 @@ 
 	// Check if the draft functions are enabled and that they have permission to use them (for quick reply.)
 	$context['drafts_save'] = !empty($modSettings['drafts_post_enabled']) && allowedTo('post_draft') && $context['can_reply'];
 	$context['drafts_autosave'] = !empty($context['drafts_save']) && !empty($modSettings['drafts_autosave_enabled']);
-	if (!empty($context['drafts_save']))
-		loadLanguage('Drafts');
+	if (!empty($context['drafts_save'])) {
+			loadLanguage('Drafts');
+	}
 
 	// When was the last time this topic was replied to?  Should we warn them about it?
 	if (!empty($modSettings['oldTopicDays']) && ($context['can_reply'] || $context['can_reply_unapproved']) && empty($context['topicinfo']['is_sticky']))
@@ -1247,26 +1285,31 @@ 
 	// 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;
+	}
 
 	// Build the normal button array.
 	$context['normal_buttons'] = array();
 
-	if ($context['can_reply'])
-		$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
+	if ($context['can_reply']) {
+			$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
+	}
 
-	if ($context['can_add_poll'])
-		$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
+	if ($context['can_add_poll']) {
+			$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
+	}
 
-	if ($context['can_mark_unread'])
-		$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_mark_unread']) {
+			$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_print'])
-		$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
+	if ($context['can_print']) {
+			$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
+	}
 
-	if ($context['can_set_notify'])
-		$context['normal_buttons']['notify'] = array(
+	if ($context['can_set_notify']) {
+			$context['normal_buttons']['notify'] = array(
 			'text' => 'notify_topic_' . $context['topic_notification_mode'],
 			'sub_buttons' => array(
 				array(
@@ -1288,38 +1331,47 @@ 
 				),
 			),
 		);
+	}
 
 	// Build the mod button array
 	$context['mod_buttons'] = array();
 
-	if ($context['can_move'])
-		$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
+	if ($context['can_move']) {
+			$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
+	}
 
-	if ($context['can_delete'])
-		$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_delete']) {
+			$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_lock'])
-		$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_lock']) {
+			$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_sticky'])
-		$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_sticky']) {
+			$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_merge'])
-		$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
+	if ($context['can_merge']) {
+			$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
+	}
 
-	if ($context['calendar_post'])
-		$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
+	if ($context['calendar_post']) {
+			$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
+	}
 
 	// Restore topic. eh?  No monkey business.
-	if ($context['can_restore_topic'])
-		$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_restore_topic']) {
+			$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Show a message in case a recently posted message became unapproved.
 	$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']);
+	}
 
 	// Allow adding new mod buttons easily.
 	// Note: $context['normal_buttons'] and $context['mod_buttons'] are added for backward compatibility with 2.0, but are deprecated and should not be used
@@ -1328,12 +1380,14 @@ 
 	call_integration_hook('integrate_mod_buttons', array(&$context['mod_buttons']));
 
 	// Load the drafts js file
-	if ($context['drafts_autosave'])
-		loadJavaScriptFile('drafts.js', array('defer' => false), 'smf_drafts');
+	if ($context['drafts_autosave']) {
+			loadJavaScriptFile('drafts.js', array('defer' => false), 'smf_drafts');
+	}
 
 	// Spellcheck
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	}
 
 	// topic.js
 	loadJavaScriptFile('topic.js', array('defer' => false), 'smf_topic');
@@ -1367,16 +1421,19 @@ 
 	static $counter = null;
 
 	// If the query returned false, bail.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Remember which message this is.  (ie. reply #83)
-	if ($counter === null || $reset)
-		$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
+	if ($counter === null || $reset) {
+			$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
+	}
 
 	// Start from the beginning...
-	if ($reset)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Attempt to get the next message.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
@@ -1390,19 +1447,21 @@ 
 	if (empty($context['icon_sources']))
 	{
 		$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';
+		}
 	}
 
 	// Message Icon Management... check the images exist.
 	if (empty($modSettings['messageIconChecks_disable']))
 	{
 		// If the current icon isn't known, then we need to do something...
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+	} elseif (!isset($context['icon_sources'][$message['icon']])) {
+			$context['icon_sources'][$message['icon']] = 'images_url';
 	}
-	elseif (!isset($context['icon_sources'][$message['icon']]))
-		$context['icon_sources'][$message['icon']] = 'images_url';
 
 	// If you're a lazy bum, you probably didn't give a subject...
 	$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -1427,8 +1486,7 @@ 
 		$memberContext[$message['id_member']]['email'] = $message['poster_email'];
 		$memberContext[$message['id_member']]['show_email'] = allowedTo('moderate_forum');
 		$memberContext[$message['id_member']]['is_guest'] = true;
-	}
-	else
+	} else
 	{
 		// Define this here to make things a bit more readable
 		$can_view_warning = $context['user']['can_mod'] || allowedTo('view_warning_any') || ($message['id_member'] == $user_info['id'] && allowedTo('view_warning_own'));
@@ -1451,8 +1509,9 @@ 
 	$message['body'] = parse_bbc($message['body'], $message['smileys_enabled'], $message['id_msg']);
 
 	// If it's in the recycle bin we need to override whatever icon we did have.
-	if (!empty($board_info['recycle']))
-		$message['icon'] = 'recycled';
+	if (!empty($board_info['recycle'])) {
+			$message['icon'] = 'recycled';
+	}
 
 	require_once($sourcedir . '/Subs-Attachments.php');
 
@@ -1496,32 +1555,36 @@ 
 	}
 
 	// Are likes enable?
-	if (!empty($modSettings['enable_likes']))
-		$output['likes'] = array(
+	if (!empty($modSettings['enable_likes'])) {
+			$output['likes'] = array(
 			'count' => $message['likes'],
 			'you' => in_array($message['id_msg'], $context['my_likes']),
 			'can_like' => !$context['user']['is_guest'] && $message['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 		);
+	}
 
 	// Is this user the message author?
 	$output['is_message_author'] = $message['id_member'] == $user_info['id'];
-	if (!empty($output['modified']['name']))
-		$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
+	if (!empty($output['modified']['name'])) {
+			$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
+	}
 
 	// Did they give a reason for editing?
-	if (!empty($output['modified']['name']) && !empty($output['modified']['reason']))
-		$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
+	if (!empty($output['modified']['name']) && !empty($output['modified']['reason'])) {
+			$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
+	}
 
 	// Any custom profile fields?
-	if (!empty($memberContext[$message['id_member']]['custom_fields']))
-		foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
+	if (!empty($memberContext[$message['id_member']]['custom_fields'])) {
+			foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
-	if (empty($options['view_newest_first']))
-		$counter++;
-
-	else
-		$counter--;
+	if (empty($options['view_newest_first'])) {
+			$counter++;
+	} else {
+			$counter--;
+	}
 
 	call_integration_hook('integrate_prepare_display_context', array(&$output, &$message, $counter));
 
@@ -1547,21 +1610,23 @@ 
 	$context['no_last_modified'] = true;
 
 	// Prevent a preview image from being displayed twice.
-	if (isset($_GET['action']) && $_GET['action'] == 'dlattach' && isset($_GET['type']) && ($_GET['type'] == 'avatar' || $_GET['type'] == 'preview'))
-		return;
+	if (isset($_GET['action']) && $_GET['action'] == 'dlattach' && isset($_GET['type']) && ($_GET['type'] == 'avatar' || $_GET['type'] == 'preview')) {
+			return;
+	}
 
 	// Make sure some attachment was requested!
-	if (!isset($_REQUEST['attach']) && !isset($_REQUEST['id']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['attach']) && !isset($_REQUEST['id'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$_REQUEST['attach'] = isset($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : (int) $_REQUEST['id'];
 
 	// Do we have a hook wanting to use our attachment system? We use $attachRequest to prevent accidental usage of $request.
 	$attachRequest = null;
 	call_integration_hook('integrate_download_request', array(&$attachRequest));
-	if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest))
-		$request = $attachRequest;
-	else
+	if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest)) {
+			$request = $attachRequest;
+	} else
 	{
 		// This checks only the current board for $board/$topic's permissions.
 		isAllowedTo('view_attachments');
@@ -1582,19 +1647,21 @@ 
 		);
 	}
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 
 	list ($id_folder, $real_filename, $file_hash, $file_ext, $id_attach, $attachment_type, $mime_type, $is_approved, $id_member) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// If it isn't yet approved, do they have permission to view it?
-	if (!$is_approved && ($id_member == 0 || $user_info['id'] != $id_member) && ($attachment_type == 0 || $attachment_type == 3))
-		isAllowedTo('approve_posts');
+	if (!$is_approved && ($id_member == 0 || $user_info['id'] != $id_member) && ($attachment_type == 0 || $attachment_type == 3)) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Update the download counter (unless it's a thumbnail).
-	if ($attachment_type != 3)
-		$smcFunc['db_query']('attach_download_increase', '
+	if ($attachment_type != 3) {
+			$smcFunc['db_query']('attach_download_increase', '
 			UPDATE LOW_PRIORITY {db_prefix}attachments
 			SET downloads = downloads + 1
 			WHERE id_attach = {int:id_attach}',
@@ -1602,15 +1669,15 @@ 
 				'id_attach' => $id_attach,
 			)
 		);
+	}
 
 	$filename = getAttachmentFilename($real_filename, $_REQUEST['attach'], $id_folder, false, $file_hash);
 
 	// This is done to clear any output that was made before now.
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']) && @filesize($filename) <= 4194304 && in_array($file_ext, array('txt', 'html', 'htm', 'js', 'doc', 'docx', 'rtf', 'css', 'php', 'log', 'xml', 'sql', 'c', 'java')))
-		@ob_start('ob_gzhandler');
-
-	else
+	if (!empty($modSettings['enableCompressedOutput']) && @filesize($filename) <= 4194304 && in_array($file_ext, array('txt', 'html', 'htm', 'js', 'doc', 'docx', 'rtf', 'css', 'php', 'log', 'xml', 'sql', 'c', 'java'))) {
+			@ob_start('ob_gzhandler');
+	} else
 	{
 		ob_start();
 		header('Content-Encoding: none');
@@ -1653,8 +1720,9 @@ 
 	// Send the attachment headers.
 	header('Pragma: ');
 
-	if (!isBrowser('gecko'))
-		header('Content-Transfer-Encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('Content-Transfer-Encoding: binary');
+	}
 
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($filename)) . ' GMT');
@@ -1663,18 +1731,19 @@ 
 	header('ETag: ' . $eTag);
 
 	// Make sure the mime type warrants an inline display.
-	if (isset($_REQUEST['image']) && !empty($mime_type) && strpos($mime_type, 'image/') !== 0)
-		unset($_REQUEST['image']);
+	if (isset($_REQUEST['image']) && !empty($mime_type) && strpos($mime_type, 'image/') !== 0) {
+			unset($_REQUEST['image']);
+	}
 
 	// Does this have a mime type?
-	elseif (!empty($mime_type) && (isset($_REQUEST['image']) || !in_array($file_ext, array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff'))))
-		header('Content-Type: ' . strtr($mime_type, array('image/bmp' => 'image/x-ms-bmp')));
-
-	else
+	elseif (!empty($mime_type) && (isset($_REQUEST['image']) || !in_array($file_ext, array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff')))) {
+			header('Content-Type: ' . strtr($mime_type, array('image/bmp' => 'image/x-ms-bmp')));
+	} else
 	{
 		header('Content-Type: ' . (isBrowser('ie') || isBrowser('opera') ? 'application/octetstream' : 'application/octet-stream'));
-		if (isset($_REQUEST['image']))
-			unset($_REQUEST['image']);
+		if (isset($_REQUEST['image'])) {
+					unset($_REQUEST['image']);
+		}
 	}
 
 	// Convert the file to UTF-8, cuz most browsers dig that.
@@ -1682,23 +1751,22 @@ 
 	$disposition = !isset($_REQUEST['image']) ? 'attachment' : 'inline';
 
 	// Different browsers like different standards...
-	if (isBrowser('firefox'))
-		header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
-
-	elseif (isBrowser('opera'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
-
-	elseif (isBrowser('ie'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
-
-	else
-		header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	if (isBrowser('firefox')) {
+			header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
+	} elseif (isBrowser('opera')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
+	} elseif (isBrowser('ie')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
+	} else {
+			header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	}
 
 	// If this has an "image extension" - but isn't actually an image - then ensure it isn't cached cause of silly IE.
-	if (!isset($_REQUEST['image']) && in_array($file_ext, array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff')))
-		header('Cache-Control: no-cache');
-	else
-		header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	if (!isset($_REQUEST['image']) && in_array($file_ext, array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff'))) {
+			header('Cache-Control: no-cache');
+	} else {
+			header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	}
 
 	header('Content-Length: ' . filesize($filename));
 
@@ -1708,20 +1776,23 @@ 
 	// Recode line endings for text files, if enabled.
 	if (!empty($modSettings['attachmentRecodeLineEndings']) && !isset($_REQUEST['image']) && in_array($file_ext, array('txt', 'css', 'htm', 'html', 'php', 'xml')))
 	{
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'Windows') !== false)
-			$callback = function($buffer)
+		if (strpos($_SERVER['HTTP_USER_AGENT'], 'Windows') !== false) {
+					$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\r\n", $buffer);
+		}
 			};
-		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false)
-			$callback = function($buffer)
+		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
+					$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\r", $buffer);
+		}
 			};
-		else
-			$callback = function($buffer)
+		else {
+					$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\n", $buffer);
+		}
 			};
 	}
 
@@ -1729,23 +1800,26 @@ 
 	if (filesize($filename) > 4194304)
 	{
 		// Forcibly end any output buffering going on.
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		$fp = fopen($filename, 'rb');
 		while (!feof($fp))
 		{
-			if (isset($callback))
-				echo $callback(fread($fp, 8192));
-			else
-				echo fread($fp, 8192);
+			if (isset($callback)) {
+							echo $callback(fread($fp, 8192));
+			} else {
+							echo fread($fp, 8192);
+			}
 			flush();
 		}
 		fclose($fp);
 	}
 	// On some of the less-bright hosts, readfile() is disabled.  It's just a faster, more byte safe, version of what's in the if.
-	elseif (isset($callback) || @readfile($filename) === null)
-		echo isset($callback) ? $callback(file_get_contents($filename)) : file_get_contents($filename);
+	elseif (isset($callback) || @readfile($filename) === null) {
+			echo isset($callback) ? $callback(file_get_contents($filename)) : file_get_contents($filename);
+	}
 
 	obExit(false);
 }
@@ -1758,8 +1832,9 @@ 
  */
 function approved_attach_sort($a, $b)
 {
-	if ($a['is_approved'] == $b['is_approved'])
-		return 0;
+	if ($a['is_approved'] == $b['is_approved']) {
+			return 0;
+	}
 
 	return $a['is_approved'] > $b['is_approved'] ? -1 : 1;
 }
@@ -1776,16 +1851,19 @@ 
 
 	require_once($sourcedir . '/RemoveTopic.php');
 
-	if (empty($_REQUEST['msgs']))
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	if (empty($_REQUEST['msgs'])) {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
 
 	$messages = array();
-	foreach ($_REQUEST['msgs'] as $dummy)
-		$messages[] = (int) $dummy;
+	foreach ($_REQUEST['msgs'] as $dummy) {
+			$messages[] = (int) $dummy;
+	}
 
 	// We are restoring messages. We handle this in another place.
-	if (isset($_REQUEST['restore_selected']))
-		redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if (isset($_REQUEST['restore_selected'])) {
+			redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 	if (isset($_REQUEST['split_selection']))
 	{
 		$request = $smcFunc['db_query']('', '
@@ -1804,8 +1882,9 @@ 
 	}
 
 	// Allowed to delete any message?
-	if (allowedTo('delete_any'))
-		$allowed_all = true;
+	if (allowedTo('delete_any')) {
+			$allowed_all = true;
+	}
 	// Allowed to delete replies to their messages?
 	elseif (allowedTo('delete_replies'))
 	{
@@ -1822,13 +1901,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$allowed_all = $starter == $user_info['id'];
+	} else {
+			$allowed_all = false;
 	}
-	else
-		$allowed_all = false;
 
 	// Make sure they're allowed to delete their own messages, if not any.
-	if (!$allowed_all)
-		isAllowedTo('delete_own');
+	if (!$allowed_all) {
+			isAllowedTo('delete_own');
+	}
 
 	// Allowed to remove which messages?
 	$request = $smcFunc['db_query']('', '
@@ -1848,8 +1928,9 @@ 
 	$messages = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-			continue;
+		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+					continue;
+		}
 
 		$messages[$row['id_msg']] = array($row['subject'], $row['id_member']);
 	}
@@ -1872,17 +1953,20 @@ 
 	foreach ($messages as $message => $info)
 	{
 		// Just skip the first message - if it's not the last.
-		if ($message == $first_message && $message != $last_message)
-			continue;
+		if ($message == $first_message && $message != $last_message) {
+					continue;
+		}
 		// If the first message is going then don't bother going back to the topic as we're effectively deleting it.
-		elseif ($message == $first_message)
-			$topicGone = true;
+		elseif ($message == $first_message) {
+					$topicGone = true;
+		}
 
 		removeMessage($message);
 
 		// Log this moderation action ;).
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
-			logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
+					logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
+		}
 	}
 
 	redirectexit(!empty($topicGone) ? 'board=' . $board : 'topic=' . $topic . '.' . $_REQUEST['start']);