SimpleMachines / SMF2.1

Sources/RepairBoards.php

Braces +119 added lines, -85 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Finds or repairs errors in the database to fix possible problems.
@@ -50,8 +51,9 @@ 
 	);
 
 	// Start displaying errors without fixing them.
-	if (isset($_GET['fixErrors']))
-		checkSession('get');
+	if (isset($_GET['fixErrors'])) {
+			checkSession('get');
+	}
 
 	// Will want this.
 	loadForumTests();
@@ -69,14 +71,14 @@ 
 			$_SESSION['repairboards_to_fix'] = $context['to_fix'];
 			$_SESSION['repairboards_to_fix2'] = null;
 
-			if (empty($context['repair_errors']))
-				$context['repair_errors'][] = '???';
+			if (empty($context['repair_errors'])) {
+							$context['repair_errors'][] = '???';
+			}
 		}
 
 		// Need a token here.
 		createToken('admin-repairboards', 'request');
-	}
-	else
+	} else
 	{
 		// Validate the token, create a new one and tell the not done template.
 		validateToken('admin-repairboards', 'request');
@@ -134,16 +136,19 @@ 
 
 	// More time, I 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();
+	}
 
 	// Errr, wait.  How much time has this taken already?
-	if (!$force && (time() - $time_start) < 3)
-		return;
+	if (!$force && (time() - $time_start) < 3) {
+			return;
+	}
 
 	// Restore the query cache if interested.
-	if (!empty($db_temp_cache))
-		$db_cache = $db_temp_cache;
+	if (!empty($db_temp_cache)) {
+			$db_cache = $db_temp_cache;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=repairboards' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -152,10 +157,11 @@ 
 	$context['sub_template'] = 'not_done';
 
 	// Change these two if more steps are added!
-	if (empty($max_substep))
-		$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
-	else
-		$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	if (empty($max_substep)) {
+			$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
+	} else {
+			$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	}
 
 	// Never more than 100%!
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -624,8 +630,9 @@ 
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
 
 				// Not really a problem?
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
+									return false;
+				}
 
 				$memberStartedID = (int) getMsgMemberID($row['myid_first_msg']);
 				$memberUpdatedID = (int) getMsgMemberID($row['myid_last_msg']);
@@ -649,15 +656,19 @@ 
 			'message_function' => function ($row) use ($txt, &$context)
 			{
 				// A pretend error?
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
+									return false;
+				}
 
-				if ($row['id_first_msg'] != $row['myid_first_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
-				if ($row['id_last_msg'] != $row['myid_last_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
-				if ($row['approved'] != $row['firstmsg_approved'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				if ($row['id_first_msg'] != $row['myid_first_msg']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
+				}
+				if ($row['id_last_msg'] != $row['myid_last_msg']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
+				}
+				if ($row['approved'] != $row['firstmsg_approved']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				}
 
 				return true;
 			},
@@ -686,8 +697,9 @@ 
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
 
 				// Not really a problem?
-				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				if ($row['my_num_replies'] == $row['num_replies']) {
+									return false;
+				}
 
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
@@ -704,11 +716,13 @@ 
 				global $txt, $context;
 
 				// Just joking?
-				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				if ($row['my_num_replies'] == $row['num_replies']) {
+									return false;
+				}
 
-				if ($row['num_replies'] != $row['my_num_replies'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				if ($row['num_replies'] != $row['my_num_replies']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				}
 
 				return true;
 			},
@@ -1280,8 +1294,9 @@ 
 				$inserts = array();
 				while ($row = $smcFunc['db_fetch_assoc']($result))
 				{
-					foreach (text2words($row['subject']) as $word)
-						$inserts[] = array($word, $row['id_topic']);
+					foreach (text2words($row['subject']) as $word) {
+											$inserts[] = array($word, $row['id_topic']);
+					}
 					if (count($inserts) > 500)
 					{
 						$smcFunc['db_insert']('ignore',
@@ -1294,13 +1309,14 @@ 
 					}
 				}
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_subjects',
 						array('word' => 'string', 'id_topic' => 'int'),
 						$inserts,
 						array('word', 'id_topic')
 					);
+				}
 			},
 			'message_function' => function ($row)
 			{
@@ -1559,8 +1575,9 @@ 
 		$current_step++;
 
 		// Already done this?
-		if ($_GET['step'] > $current_step)
-			continue;
+		if ($_GET['step'] > $current_step) {
+					continue;
+		}
 
 		// If we're fixing it but it ain't broke why try?
 		if ($do_fix && !in_array($error_type, $to_fix))
@@ -1589,14 +1606,16 @@ 
 		while (!$done)
 		{
 			// Make sure there's at least one ID to test.
-			if (isset($test['substeps']) && empty($step_max))
-				break;
+			if (isset($test['substeps']) && empty($step_max)) {
+							break;
+			}
 
 			// What is the testing query (Changes if we are testing or fixing)
-			if (!$do_fix)
-				$test_query = 'check_query';
-			else
-				$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			if (!$do_fix) {
+							$test_query = 'check_query';
+			} else {
+							$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			}
 
 			// Do the test...
 			$request = $smcFunc['db_query']('',
@@ -1606,10 +1625,11 @@ 
 			);
 
 			// Does it need a fix?
-			if (!empty($test['check_type']) && $test['check_type'] == 'count')
-				list ($needs_fix) = $smcFunc['db_fetch_row']($request);
-			else
-				$needs_fix = $smcFunc['db_num_rows']($request);
+			if (!empty($test['check_type']) && $test['check_type'] == 'count') {
+							list ($needs_fix) = $smcFunc['db_fetch_row']($request);
+			} else {
+							$needs_fix = $smcFunc['db_num_rows']($request);
+			}
 
 			$total_queries++;
 
@@ -1621,8 +1641,9 @@ 
 					// Assume need to fix.
 					$found_errors = true;
 
-					if (isset($test['message']))
-						$context['repair_errors'][] = $txt[$test['message']];
+					if (isset($test['message'])) {
+											$context['repair_errors'][] = $txt[$test['message']];
+					}
 
 					// One per row!
 					elseif (isset($test['messages']))
@@ -1632,10 +1653,11 @@ 
 							$variables = $test['messages'];
 							foreach ($variables as $k => $v)
 							{
-								if ($k == 0 && isset($txt[$v]))
-									$variables[$k] = $txt[$v];
-								elseif ($k > 0 && isset($row[$v]))
-									$variables[$k] = $row[$v];
+								if ($k == 0 && isset($txt[$v])) {
+																	$variables[$k] = $txt[$v];
+								} elseif ($k > 0 && isset($row[$v])) {
+																	$variables[$k] = $row[$v];
+								}
 							}
 							$context['repair_errors'][] = call_user_func_array('sprintf', $variables);
 						}
@@ -1646,13 +1668,15 @@ 
 					{
 						// Find out if there are actually errors.
 						$found_errors = false;
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$found_errors |= $test['message_function']($row);
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$found_errors |= $test['message_function']($row);
+						}
 					}
 
 					// Actually have something to fix?
-					if ($found_errors)
-						$to_fix[] = $error_type;
+					if ($found_errors) {
+											$to_fix[] = $error_type;
+					}
 				}
 
 				// We want to fix, we need to fix - so work out what exactly to do!
@@ -1662,8 +1686,9 @@ 
 					if (isset($test['fix_collect']))
 					{
 						$ids = array();
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$ids[] = $row[$test['fix_collect']['index']];
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$ids[] = $row[$test['fix_collect']['index']];
+						}
 						if (!empty($ids))
 						{
 							// Fix it!
@@ -1672,30 +1697,34 @@ 
 					}
 
 					// Simply executing a fix it query?
-					elseif (isset($test['fix_it_query']))
-						$smcFunc['db_query']('',
+					elseif (isset($test['fix_it_query'])) {
+											$smcFunc['db_query']('',
 							$test['fix_it_query'],
 							array(
 							)
 						);
+					}
 
 					// Do we have some processing to do?
 					elseif (isset($test['fix_processing']))
 					{
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$test['fix_processing']($row);
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$test['fix_processing']($row);
+						}
 					}
 
 					// What about the full set of processing?
-					elseif (isset($test['fix_full_processing']))
-						$test['fix_full_processing']($request);
+					elseif (isset($test['fix_full_processing'])) {
+											$test['fix_full_processing']($request);
+					}
 
 					// Do we have other things we need to fix as a result?
 					if (!empty($test['force_fix']))
 					{
-						foreach ($test['force_fix'] as $item)
-							if (!in_array($item, $to_fix))
+						foreach ($test['force_fix'] as $item) {
+													if (!in_array($item, $to_fix))
 								$to_fix[] = $item;
+						}
 					}
 				}
 			}
@@ -1713,16 +1742,17 @@ 
 				if ($_GET['substep'] <= $step_max)
 				{
 					pauseRepairProcess($to_fix, $error_type, $step_max);
+				} else {
+									$done = true;
 				}
-				else
-					$done = true;
+			} else {
+							$done = true;
 			}
-			else
-				$done = true;
 
 			// Don't allow more than 1000 queries at a time.
-			if ($total_queries >= 1000)
-				pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			if ($total_queries >= 1000) {
+							pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			}
 		}
 
 		// Keep going.
@@ -1735,8 +1765,9 @@ 
 		if ($do_fix)
 		{
 			$key = array_search($error_type, $to_fix);
-			if ($key !== false && isset($to_fix[$key]))
-				unset($to_fix[$key]);
+			if ($key !== false && isset($to_fix[$key])) {
+							unset($to_fix[$key]);
+			}
 		}
 
 		// Are we done?
@@ -1759,10 +1790,11 @@ 
 	static $createOnce = false;
 
 	// Have we already created it?
-	if ($createOnce)
-		return;
-	else
-		$createOnce = true;
+	if ($createOnce) {
+			return;
+	} else {
+			$createOnce = true;
+	}
 
 	// Back to the forum's default language.
 	loadLanguage('Admin', $language);
@@ -1777,8 +1809,9 @@ 
 			'cat_name' => $txt['salvaged_category_name'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
 	if (empty($salvageCatID))
@@ -1810,8 +1843,9 @@ 
 			'board_name' => $txt['salvaged_board_name'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
 	if (empty($salvageBoardID))

Themes/default/Admin.template.php

Braces +182 added lines, -130 removed lines

@@ -61,9 +61,10 @@ 
 										', implode(', ', $context['administrators']);
 
 	// If we have lots of admins... don't show them all.
-	if (!empty($context['more_admins_link']))
-		echo '
+	if (!empty($context['more_admins_link'])) {
+			echo '
 										(', $context['more_admins_link'], ')';
+	}
 
 	echo '
 									</div><!-- #version_details -->
@@ -80,17 +81,19 @@ 
 		foreach ($area['areas'] as $item_id => $item)
 		{
 			// No point showing the 'home' page here, we're already on it!
-			if ($area_id == 'forum' && $item_id == 'index')
-				continue;
+			if ($area_id == 'forum' && $item_id == 'index') {
+							continue;
+			}
 
 			$url = isset($item['url']) ? $item['url'] : $scripturl . '?action=admin;area=' . $item_id . (!empty($context[$context['admin_menu_name']]['extra_parameters']) ? $context[$context['admin_menu_name']]['extra_parameters'] : '');
 
-			if (!empty($item['icon_file']))
-				echo '
+			if (!empty($item['icon_file'])) {
+							echo '
 							<a href="', $url, '" class="admin_group', !empty($item['inactive']) ? ' inactive' : '', '"><img class="large_admin_menu_icon_file" src="', $item['icon_file'], '" alt="">', $item['label'], '</a>';
-			else
-				echo '
+			} else {
+							echo '
 							<a href="', $url, '"><span class="large_', $item['icon_class'], !empty($item['inactive']) ? ' inactive' : '', '"></span>', $item['label'], '</a>';
+			}
 		}
 
 		echo '
@@ -98,10 +101,11 @@ 
 	}
 
 	// The below functions include all the scripts needed from the simplemachines.org site. The language and format are passed for internationalization.
-	if (empty($modSettings['disable_smf_js']))
-		echo '
+	if (empty($modSettings['disable_smf_js'])) {
+			echo '
 					<script src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 					<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
+	}
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
@@ -178,9 +182,10 @@ 
 							<em>', $version['version'], '</em>';
 
 		// more details for this item, show them a link
-		if ($context['can_admin'] && isset($version['more']))
-			echo
+		if ($context['can_admin'] && isset($version['more'])) {
+					echo
 							' <a href="', $scripturl, $version['more'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['version_check_more'], '</a>';
+		}
 		echo '
 							<br>';
 	}
@@ -211,21 +216,23 @@ 
 
 	foreach ($context['credits'] as $section)
 	{
-		if (isset($section['pretext']))
-			echo '
+		if (isset($section['pretext'])) {
+					echo '
 							<p>', $section['pretext'], '</p>
 							<hr>';
+		}
 
 		echo '
 							<dl>';
 
 		foreach ($section['groups'] as $group)
 		{
-			if (isset($group['title']))
-				echo '
+			if (isset($group['title'])) {
+							echo '
 								<dt>
 									<strong>', $group['title'], ':</strong>
 								</dt>';
+			}
 
 			echo '
 								<dd>', implode(', ', $group['members']), '</dd>';
@@ -234,10 +241,11 @@ 
 		echo '
 							</dl>';
 
-		if (isset($section['posttext']))
-			echo '
+		if (isset($section['posttext'])) {
+					echo '
 							<hr>
 							<p>', $section['posttext'], '</p>';
+		}
 	}
 
 	echo '
@@ -252,9 +260,10 @@ 
 						smfSupportVersions.forum = "', $context['forum_version'], '";';
 
 	// Don't worry, none of this is logged, it's just used to give information that might be of use.
-	foreach ($context['current_versions'] as $variable => $version)
-		echo '
+	foreach ($context['current_versions'] as $variable => $version) {
+			echo '
 						smfSupportVersions.', $variable, ' = "', $version['version'], '";';
+	}
 
 	// Now we just have to include the script and wait ;).
 	echo '
@@ -350,8 +359,8 @@ 
 								<tbody>';
 
 	// Loop through every source file displaying its version - using javascript.
-	foreach ($context['file_versions'] as $filename => $version)
-		echo '
+	foreach ($context['file_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -363,6 +372,7 @@ 
 											<em id="currentSources', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Default template files.
 	echo '
@@ -388,8 +398,8 @@ 
 							<table id="Default" class="table_grid">
 								<tbody>';
 
-	foreach ($context['default_template_versions'] as $filename => $version)
-		echo '
+	foreach ($context['default_template_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -401,6 +411,7 @@ 
 											<em id="currentDefault', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Now the language files...
 	echo '
@@ -428,8 +439,8 @@ 
 
 	foreach ($context['default_language_versions'] as $language => $files)
 	{
-		foreach ($files as $filename => $version)
-			echo '
+		foreach ($files as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '.<em>', $language, '</em>.php
@@ -441,6 +452,7 @@ 
 											<em id="current', $filename, '.', $language, '">??</em>
 										</td>
 									</tr>';
+		}
 	}
 
 	echo '
@@ -470,8 +482,8 @@ 
 							<table id="Templates" class="table_grid">
 								<tbody>';
 
-		foreach ($context['template_versions'] as $filename => $version)
-			echo '
+		foreach ($context['template_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -483,6 +495,7 @@ 
 											<em id="currentTemplates', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -512,8 +525,8 @@ 
 							<table id="Tasks" class="table_grid">
 								<tbody>';
 
-		foreach ($context['tasks_versions'] as $filename => $version)
-			echo '
+		foreach ($context['tasks_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -525,6 +538,7 @@ 
 											<em id="currentTasks', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -565,9 +579,10 @@ 
 {
 	global $context, $scripturl, $txt, $modSettings;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// First section is for adding/removing words from the censored list.
 	echo '
@@ -581,11 +596,12 @@ 
 								<p>', $txt['admin_censored_where'], '</p>';
 
 	// Show text boxes for censoring [bad   ] => [good  ].
-	foreach ($context['censored_words'] as $vulgar => $proper)
-		echo '
+	foreach ($context['censored_words'] as $vulgar => $proper) {
+			echo '
 								<div class="block">
 									<input type="text" name="censor_vulgar[]" value="', $vulgar, '" size="30"> =&gt; <input type="text" name="censor_proper[]" value="', $proper, '" size="30">
 								</div>';
+	}
 
 	// Now provide a way to censor more words.
 	echo '
@@ -658,27 +674,30 @@ 
 						<div class="windowbg">
 							', $txt['not_done_reason'];
 
-	if (!empty($context['continue_percent']))
-		echo '
+	if (!empty($context['continue_percent'])) {
+			echo '
 							<div class="progress_bar">
 								<span>', $context['continue_percent'], '%</span>
 								<div class="bar" style="width: ', $context['continue_percent'], '%;"></div>
 							</div>';
+	}
 
-	if (!empty($context['substep_enabled']))
-		echo '
+	if (!empty($context['substep_enabled'])) {
+			echo '
 							<div class="progress_bar progress_blue">
 								<span>', $context['substep_title'], ' (', $context['substep_continue_percent'], '%)</span>
 								<div class="bar" style="width: ', $context['substep_continue_percent'], '%;"></div>
 							</div>';
+	}
 
 	echo '
 							<form action="', $scripturl, $context['continue_get_data'], '" method="post" accept-charset="', $context['character_set'], '" name="autoSubmit" id="autoSubmit">';
 
 	// Do we have a token?
-	if (isset($context['not_done_token']) && isset($context[$context['not_done_token'] . '_token'], $context[$context['not_done_token'] . '_token_var']))
-		echo '
+	if (isset($context['not_done_token']) && isset($context[$context['not_done_token'] . '_token'], $context[$context['not_done_token'] . '_token_var'])) {
+			echo '
 							<input type="hidden" name="', $context[$context['not_done_token'] . '_token_var'], '" value="', $context[$context['not_done_token'] . '_token'], '">';
+	}
 
 	echo '
 								<input type="submit" name="cont" value="', $txt['not_done_continue'], '" class="button">
@@ -711,34 +730,39 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 					<div class="errorbox">', sprintf($txt['settings_not_saved'], $context['saved_failed']), '</div>';
+	}
 
-	if (!empty($context['settings_pre_javascript']))
-		echo '
+	if (!empty($context['settings_pre_javascript'])) {
+			echo '
 					<script>', $context['settings_pre_javascript'], '</script>';
+	}
 
-	if (!empty($context['settings_insert_above']))
-		echo $context['settings_insert_above'];
+	if (!empty($context['settings_insert_above'])) {
+			echo $context['settings_insert_above'];
+	}
 
 	echo '
 						<form id="admin_form_wrapper" action="', $context['post_url'], '" method="post" accept-charset="', $context['character_set'], '"', !empty($context['force_form_onsubmit']) ? ' onsubmit="' . $context['force_form_onsubmit'] . '"' : '', '>';
 
 	// Is there a custom title?
-	if (isset($context['settings_title']))
-		echo '
+	if (isset($context['settings_title'])) {
+			echo '
 							<div class="cat_bar">
 								<h3 class="catbg">', $context['settings_title'], '</h3>
 							</div>';
+	}
 
 	// Have we got a message to display?
-	if (!empty($context['settings_message']))
-		echo '
+	if (!empty($context['settings_message'])) {
+			echo '
 							<div class="information">', $context['settings_message'], '</div>';
+	}
 
 	// Now actually loop through all the variables.
 	$is_open = false;
@@ -791,8 +815,9 @@ 
 		// Hang about? Are you pulling my leg - a callback?!
 		if (is_array($config_var) && $config_var['type'] == 'callback')
 		{
-			if (function_exists('template_callback_' . $config_var['name']))
-				call_user_func('template_callback_' . $config_var['name']);
+			if (function_exists('template_callback_' . $config_var['name'])) {
+							call_user_func('template_callback_' . $config_var['name']);
+			}
 
 			continue;
 		}
@@ -822,9 +847,10 @@ 
 				$text_types = array('color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time');
 
 				// Show the [?] button.
-				if ($config_var['help'])
-					echo '
+				if ($config_var['help']) {
+									echo '
 										<a id="setting_', $config_var['name'], '_help" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqOverlayDiv(this.href);"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ';
+				}
 
 				echo '
 										<a id="setting_', $config_var['name'], '"></a> <span', ($config_var['disabled'] ? ' style="color: #777777;"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>
@@ -833,23 +859,26 @@ 
 										$config_var['preinput'];
 
 				// Show a check box.
-				if ($config_var['type'] == 'check')
-					echo '
+				if ($config_var['type'] == 'check') {
+									echo '
 										<input type="checkbox"', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '"', ($config_var['value'] ? ' checked' : ''), ' value="1">';
+				}
 				// Escape (via htmlspecialchars.) the text box.
-				elseif ($config_var['type'] == 'password')
-					echo '
+				elseif ($config_var['type'] == 'password') {
+									echo '
 										<input type="password"', $disabled, $javascript, ' name="', $config_var['name'], '[0]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' value="*#fakepass#*" onfocus="this.value = \'\'; this.form.', $config_var['name'], '.disabled = false;"><br>
 										<input type="password" disabled id="', $config_var['name'], '" name="', $config_var['name'], '[1]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), '>';
+				}
 				// Show a selection box.
 				elseif ($config_var['type'] == 'select')
 				{
 					echo '
 										<select name="', $config_var['name'], '" id="', $config_var['name'], '" ', $javascript, $disabled, (!empty($config_var['multiple']) ? ' multiple="multiple"' : ''), (!empty($config_var['multiple']) && !empty($config_var['size']) ? ' size="' . $config_var['size'] . '"' : ''), '>';
 
-					foreach ($config_var['data'] as $option)
-						echo '
+					foreach ($config_var['data'] as $option) {
+											echo '
 											<option value="', $option[0], '"', (!empty($config_var['value']) && ($option[0] == $config_var['value'] || (!empty($config_var['multiple']) && in_array($option[0], $config_var['value']))) ? ' selected' : ''), '>', $option[1], '</option>';
+					}
 					echo '
 										</select>';
 				}
@@ -866,16 +895,18 @@ 
 
 					foreach ($context['board_list'] as $id_cat => $cat)
 					{
-						if (!$first)
-							echo '
+						if (!$first) {
+													echo '
 											<hr>';
+						}
 						echo '
 											<strong>', $cat['name'], '</strong>
 											<ul>';
 
-						foreach ($cat['boards'] as $id_board => $brd)
-							echo '
+						foreach ($cat['boards'] as $id_board => $brd) {
+													echo '
 												<li><label><input type="checkbox" name="', $config_var['name'], '[', $brd['id'], ']" value="1"', in_array($brd['id'], $config_var['value']) ? ' checked' : '', '> ', $brd['child_level'] > 0 ? str_repeat('&nbsp; &nbsp;', $brd['child_level']) : '', $brd['name'], '</label></li>';
+						}
 
 						echo '
 											</ul>';
@@ -885,12 +916,14 @@ 
 										</fieldset>';
 				}
 				// Text area?
-				elseif ($config_var['type'] == 'large_text')
-					echo '
+				elseif ($config_var['type'] == 'large_text') {
+									echo '
 										<textarea rows="', (!empty($config_var['size']) ? $config_var['size'] : (!empty($config_var['rows']) ? $config_var['rows'] : 4)), '" cols="', (!empty($config_var['cols']) ? $config_var['cols'] : 30), '" ', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '">', $config_var['value'], '</textarea>';
+				}
 				// Permission group?
-				elseif ($config_var['type'] == 'permissions')
-					theme_inline_permissions($config_var['name']);
+				elseif ($config_var['type'] == 'permissions') {
+									theme_inline_permissions($config_var['name']);
+				}
 
 				// BBC selection?
 				elseif ($config_var['type'] == 'bbc')
@@ -902,22 +935,24 @@ 
 
 					foreach ($context['bbc_columns'] as $bbcColumn)
 					{
-						foreach ($bbcColumn as $bbcTag)
-							echo '
+						foreach ($bbcColumn as $bbcTag) {
+													echo '
 												<li class="list_bbc floatleft">
 													<input type="checkbox" name="', $config_var['name'], '_enabledTags[]" id="tag_', $config_var['name'], '_', $bbcTag['tag'], '" value="', $bbcTag['tag'], '"', !in_array($bbcTag['tag'], $context['bbc_sections'][$config_var['name']]['disabled']) ? ' checked' : '', '> <label for="tag_', $config_var['name'], '_', $bbcTag['tag'], '">', $bbcTag['tag'], '</label>', $bbcTag['show_help'] ? ' (<a href="' . $scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" onclick="return reqOverlayDiv(this.href);">?</a>)' : '', '
 												</li>';
+						}
 					}
 					echo '					</ul>
 											<input type="checkbox" id="bbc_', $config_var['name'], '_select_all" onclick="invertAll(this, this.form, \'', $config_var['name'], '_enabledTags\');"', $context['bbc_sections'][$config_var['name']]['all_selected'] ? ' checked' : '', '> <label for="bbc_', $config_var['name'], '_select_all"><em>', $txt['bbcTagsToUse_select_all'], '</em></label>
 										</fieldset>';
 				}
 				// A simple message?
-				elseif ($config_var['type'] == 'var_message')
-					echo '
+				elseif ($config_var['type'] == 'var_message') {
+									echo '
 										<div', !empty($config_var['name']) ? ' id="' . $config_var['name'] . '"' : '', '>
 											', $config_var['var_message'], '
 										</div>';
+				}
 				// Assume it must be a text box
 				else
 				{
@@ -942,61 +977,69 @@ 
 											' . $config_var['postinput'] : '','
 									</dd>';
 			}
-		}
-		else
+		} else
 		{
 			// Just show a separator.
-			if ($config_var == '')
-				echo '
+			if ($config_var == '') {
+							echo '
 								</dl>
 								<hr>
 								<dl class="settings">';
-			else
-				echo '
+			} else {
+							echo '
 									<dd>
 										<strong>' . $config_var . '</strong>
 									</dd>';
+			}
 		}
 	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 								</dl>';
+	}
 
-	if (empty($context['settings_save_dont_show']))
-		echo '
+	if (empty($context['settings_save_dont_show'])) {
+			echo '
 								<input type="submit" value="', $txt['save'], '"', (!empty($context['save_disabled']) ? ' disabled' : ''), (!empty($context['settings_save_onclick']) ? ' onclick="' . $context['settings_save_onclick'] . '"' : ''), ' class="button">';
+	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 							</div><!-- .windowbg -->';
+	}
 
 
 	// At least one token has to be used!
-	if (isset($context['admin-ssc_token']))
-		echo '
+	if (isset($context['admin-ssc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-ssc_token_var'], '" value="', $context['admin-ssc_token'], '">';
+	}
 
-	if (isset($context['admin-dbsc_token']))
-		echo '
+	if (isset($context['admin-dbsc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-dbsc_token_var'], '" value="', $context['admin-dbsc_token'], '">';
+	}
 
-	if (isset($context['admin-mp_token']))
-		echo '
+	if (isset($context['admin-mp_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-mp_token_var'], '" value="', $context['admin-mp_token'], '">';
+	}
 
 	echo '
 							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 						</form>';
 
-	if (!empty($context['settings_post_javascript']))
-		echo '
+	if (!empty($context['settings_post_javascript'])) {
+			echo '
 					<script>
 						', $context['settings_post_javascript'], '
 					</script>';
+	}
 
-	if (!empty($context['settings_insert_below']))
-		echo $context['settings_insert_below'];
+	if (!empty($context['settings_insert_below'])) {
+			echo $context['settings_insert_below'];
+	}
 
 	// We may have added a board listing. If we did, we need to make it work.
 	addInlineJavascript('
@@ -1019,9 +1062,10 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// Standard fields.
 	template_show_list('standard_profile_fields');
@@ -1055,11 +1099,12 @@ 
 	{
 		loadLanguage('Errors');
 
-		if (isset($txt['custom_option_' . $_GET['msg']]))
-			echo '
+		if (isset($txt['custom_option_' . $_GET['msg']])) {
+					echo '
 					<div class="errorbox">',
 						$txt['custom_option_' . $_GET['msg']], '
 					</div>';
+		}
 	}
 
 	echo '
@@ -1125,9 +1170,10 @@ 
 										<dd>
 											<select name="placement" id="placement">';
 
-	foreach ($context['cust_profile_fields_placement'] as $order => $name)
-		echo '
+	foreach ($context['cust_profile_fields_placement'] as $order => $name) {
+			echo '
 												<option value="', $order, '"', $context['field']['placement'] == $order ? ' selected' : '', '>', $txt['custom_profile_placement_' . $name], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1151,9 +1197,10 @@ 
 										<dd>
 											<select name="field_type" id="field_type" onchange="updateInputBoxes();">';
 
-	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type)
-		echo '
+	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type) {
+			echo '
 												<option value="', $field_type, '"', $context['field']['type'] == $field_type ? ' selected' : '', '>', $txt['custom_profile_type_' . $field_type], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1185,9 +1232,10 @@ 
 										</dt>
 										<dd id="options_dd">';
 
-	foreach ($context['field']['options'] as $k => $option)
-		echo '
+	foreach ($context['field']['options'] as $k => $option) {
+			echo '
 											', $k == 0 ? '' : '<br>', '<input type="radio" name="default_select" value="', $k, '"', $context['field']['default_select'] == $option ? ' checked' : '', '><input type="text" name="select_option[', $k, ']" value="', $option, '">';
+	}
 
 	echo '
 											<span id="addopt"></span>
@@ -1251,9 +1299,10 @@ 
 								</fieldset>
 								<input type="submit" name="save" value="', $txt['save'], '" class="button">';
 
-	if ($context['fid'])
-		echo '
+	if ($context['fid']) {
+			echo '
 								<input type="submit" name="delete" value="', $txt['delete'], '" data-confirm="', $txt['custom_edit_delete_sure'], '" class="button you_sure">';
+	}
 
 	echo '
 							</div><!-- .windowbg -->
@@ -1299,8 +1348,7 @@ 
 							<p class="centertext">
 								<strong>', $txt['admin_search_results_none'], '</strong>
 							</p>';
-	}
-	else
+	} else
 	{
 		echo '
 							<ol class="search_results">';
@@ -1327,9 +1375,10 @@ 
 								<li>
 									<a href="', $result['url'], '"><strong>', $result['name'], '</strong></a> [', isset($txt['admin_search_section_' . $result['type']]) ? $txt['admin_search_section_' . $result['type']] : $result['type'], ']';
 
-				if ($result['help'])
-					echo '
+				if ($result['help']) {
+									echo '
 									<p class="double_height">', $result['help'], '</p>';
+				}
 
 				echo '
 								</li>';
@@ -1369,10 +1418,11 @@ 
 									<strong>', $txt['setup_verification_answer'], '</strong>
 								</dd>';
 
-		if (!empty($context['qa_by_lang'][$lang_id]))
-			foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+		if (!empty($context['qa_by_lang'][$lang_id])) {
+					foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 			{
 				$question = $context['question_answers'][$q_id];
+		}
 
 				echo '
 								<dt>
@@ -1380,9 +1430,10 @@ 
 								</dt>
 								<dd>';
 
-				foreach ($question['answers'] as $answer)
-					echo '
+				foreach ($question['answers'] as $answer) {
+									echo '
 									<input type="text" name="answer[', $lang_id, '][', $q_id, '][]" value="', $answer, '" size="50" class="verification_answer">';
+				}
 
 				echo '
 									<div class="qa_add_answer"><a href="javascript:void(0);">[ ', $txt['setup_verification_add_answer'], ' ]</a></div>
@@ -1420,11 +1471,12 @@ 
 							', $txt['errors_found'], ':
 							<ul>';
 
-			foreach ($context['repair_errors'] as $error)
-				echo '
+			foreach ($context['repair_errors'] as $error) {
+							echo '
 								<li>
 									', $error, '
 								</li>';
+			}
 
 			echo '
 							</ul>
@@ -1434,15 +1486,14 @@ 
 							<p class="padding">
 								<strong><a href="', $scripturl, '?action=admin;area=repairboards;fixErrors;', $context['session_var'], '=', $context['session_id'], ';', $context['admin-repairboards_token_var'], '=', $context['admin-repairboards_token'], '">', $txt['yes'], '</a> - <a href="', $scripturl, '?action=admin;area=maintain">', $txt['no'], '</a></strong>
 							</p>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 							<p>', $txt['maintain_no_errors'], '</p>
 							<p class="padding">
 								<a href="', $scripturl, '?action=admin;area=maintain;sa=routine">', $txt['maintain_return'], '</a>
 							</p>';
-	}
-	else
+		}
+	} else
 	{
 		if (!empty($context['redirect_to_recount']))
 		{
@@ -1455,8 +1506,7 @@ 
 								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 								<input type="submit" name="recount" id="recount_now" value="', $txt['errors_recount_now'], '">
 							</form>';
-		}
-		else
+		} else
 		{
 			echo '
 							<p>', $txt['errors_fixed'], '</p>
@@ -1546,9 +1596,10 @@ 
 								<tr class="windowbg">
 									<td class="equal_table">', $key, '</td>';
 
-				foreach ($setting as $key_lm => $value)
-					echo '
+				foreach ($setting as $key_lm => $value) {
+									echo '
 									<td class="equal_table">', $value, '</td>';
+				}
 
 				echo '
 								</tr>';
@@ -1608,8 +1659,8 @@ 
 {
 	global $context, $txt;
 
-	if ($context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_admin']) {
+			echo '
 								<span class="floatright admin_search">
 									<span class="generic_icons filter centericon"></span>
 									<input type="search" name="search_term" placeholder="', $txt['admin_search'], '">
@@ -1620,6 +1671,7 @@ 
 									</select>
 									<input type="submit" name="search_go" id="search_go" value="', $txt['admin_search_go'], '" class="button">
 								</span>';
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Themes/default/MessageIndex.template.php

Braces +103 added lines, -72 removed lines

@@ -18,11 +18,12 @@ 
 	global $context, $settings, $options, $scripturl, $modSettings, $txt;
 
 	// Let them know why their message became unapproved.
-	if ($context['becomesUnapproved'])
-		echo '
+	if ($context['becomesUnapproved']) {
+			echo '
 	<div class="noticebox">
 		', $txt['post_becomesUnapproved'], '
 	</div>';
+	}
 
 	if (!empty($context['boards']) && (!empty($options['show_children']) || $context['start'] == 0))
 	{
@@ -46,17 +47,19 @@ 
 				</a>';
 
 			// Has it outstanding posts for approval?
-			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics']))
-				echo '
+			if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics'])) {
+							echo '
 				<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link">(!)</a>';
+			}
 
 			echo '
 				<p class="board_description">', $board['description'], '</p>';
 
 			// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
-			if (!empty($board['moderators']) || !empty($board['moderator_groups']))
-				echo '
+			if (!empty($board['moderators']) || !empty($board['moderator_groups'])) {
+							echo '
 				<p class="moderators">', count($board['link_moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>';
+			}
 
 			// Show some basic information about the number of posts, etc.
 			echo '
@@ -67,9 +70,10 @@ 
 			</div>
 			<div class="lastpost ', !empty($board['last_post']['id']) ? 'lpr_border' : 'hidden', '">';
 
-			if (!empty($board['last_post']['id']))
-				echo '
+			if (!empty($board['last_post']['id'])) {
+							echo '
 				<p>', $board['last_post']['last_post_message'], '</p>';
+			}
 
 			echo '
 			</div>';
@@ -83,14 +87,16 @@ 
 					id, name, description, new (is it new?), topics (#), posts (#), href, link, and last_post. */
 				foreach ($board['children'] as $child)
 				{
-					if (!$child['is_redirect'])
-						$child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>';
-					else
-						$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+					if (!$child['is_redirect']) {
+											$child['link'] = ''. ($child['new'] ? '<a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')" class="new_posts">' . $txt['new'] . '</a>' : '') . '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . '</a>';
+					} else {
+											$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+					}
 
 					// Has it posts awaiting approval?
-					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics']))
-						$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+					if ($child['can_approve_posts'] && ($child['unapproved_posts'] | $child['unapproved_topics'])) {
+											$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link">(!)</a>';
+					}
 
 					$children[] = $child['new'] ? '<span class="strong">' . $child['link'] . '</span>' : '<span>' . $child['link'] . '</span>';
 				}
@@ -112,11 +118,12 @@ 
 	if (!$context['no_topic_listing'])
 	{
 		// Mobile action buttons (top)
-		if (!empty($context['normal_buttons']))
-		echo '
+		if (!empty($context['normal_buttons'])) {
+				echo '
 	<div class="mobile_buttons floatright">
 		<a class="button mobile_act">', $txt['mobile_action'], '</a>
 	</div>';
+		}
 
 		echo '
 	<div class="pagesection">
@@ -135,13 +142,15 @@ 
 		<h3>', $context['name'], '</h3>
 		<p>';
 
-			if ($context['description'] != '')
-				echo '
+			if ($context['description'] != '') {
+							echo '
 			', $context['description'];
+			}
 
-			if (!empty($context['moderators']))
-				echo '
+			if (!empty($context['moderators'])) {
+							echo '
 			', count($context['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $context['link_moderators']), '.';
+			}
 
 			echo '
 		</p>
@@ -149,9 +158,10 @@ 
 		}
 
 		// If Quick Moderation is enabled start the form.
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
+					echo '
 	<form action="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], '" method="post" accept-charset="', $context['character_set'], '" class="clear" name="quickModForm" id="quickModForm">';
+		}
 
 		echo '
 		<div id="messageindex">';
@@ -161,11 +171,11 @@ 
 			echo '
 			<div class="information">';
 
-			if ($settings['display_who_viewing'] == 1)
-				echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
-
-			else
-				echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+			if ($settings['display_who_viewing'] == 1) {
+							echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
+			} else {
+							echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+			}
 			echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_board'];
 
 		echo '
@@ -185,32 +195,36 @@ 
 				<div class="lastpost">', $context['topics_headers']['last_post'], '</div>';
 
 			// Show a "select all" box for quick moderation?
-			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
-				echo '
+			if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1) {
+							echo '
 				<div class="moderation">
 					<input type="checkbox" onclick="invertAll(this, this.form, \'topics[]\');">
 				</div>';
+			}
 
 			// If it's on in "image" mode, don't show anything but the column.
-			elseif (!empty($context['can_quick_mod']))
-				echo '
+			elseif (!empty($context['can_quick_mod'])) {
+							echo '
 				<div class="moderation"></div>';
+			}
 		}
 
 		// No topics... just say, "sorry bub".
-		else
-			echo '
+		else {
+					echo '
 				<h3 class="titlebg">', $txt['topic_alert_none'], '</h3>';
+		}
 
 		echo '
 			</div><!-- #topic_header -->';
 
 		// If this person can approve items and we have some awaiting approval tell them.
-		if (!empty($context['unapproved_posts_message']))
-			echo '
+		if (!empty($context['unapproved_posts_message'])) {
+					echo '
 			<div class="information">
 				<span class="alert">!</span> ', $context['unapproved_posts_message'], '
 			</div>';
+		}
 
 		// Contain the topic list
 		echo '
@@ -231,25 +245,30 @@ 
 			echo '
 							<div class="icons floatright">';
 
-			if ($topic['is_watched'])
-				echo '
+			if ($topic['is_watched']) {
+							echo '
 								<span class="generic_icons watch" title="', $txt['watching_this_topic'], '"></span>';
+			}
 
-			if ($topic['is_locked'])
-				echo '
+			if ($topic['is_locked']) {
+							echo '
 								<span class="generic_icons lock"></span>';
+			}
 
-			if ($topic['is_sticky'])
-				echo '
+			if ($topic['is_sticky']) {
+							echo '
 								<span class="generic_icons sticky"></span>';
+			}
 
-			if ($topic['is_redirect'])
-				echo '
+			if ($topic['is_redirect']) {
+							echo '
 								<span class="generic_icons move"></span>';
+			}
 
-			if ($topic['is_poll'])
-				echo '
+			if ($topic['is_poll']) {
+							echo '
 								<span class="generic_icons poll"></span>';
+			}
 
 			echo '
 							</div>';
@@ -281,26 +300,31 @@ 
 				echo '
 					<div class="moderation">';
 
-				if ($options['display_quick_mod'] == 1)
-					echo '
+				if ($options['display_quick_mod'] == 1) {
+									echo '
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '">';
-				else
+				} else
 				{
 					// Check permissions on each and show only the ones they are allowed to use.
-					if ($topic['quick_mod']['remove'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+					if ($topic['quick_mod']['remove']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons delete" title="', $txt['remove_topic'], '"></span></a>';
+					}
 
-					if ($topic['quick_mod']['lock'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+					if ($topic['quick_mod']['lock']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons lock" title="', $topic['is_locked'] ? $txt['set_unlock'] : $txt['set_lock'], '"></span></a>';
+					}
 
-					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
-						echo '<br>';
+					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove']) {
+											echo '<br>';
+					}
 
-					if ($topic['quick_mod']['sticky'])
-						echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+					if ($topic['quick_mod']['sticky']) {
+											echo '<a href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" class="you_sure"><span class="generic_icons sticky" title="', $topic['is_sticky'] ? $txt['set_nonsticky'] : $txt['set_sticky'], '"></span></a>';
+					}
 
-					if ($topic['quick_mod']['move'])
-						echo '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+					if ($topic['quick_mod']['move']) {
+											echo '<a href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0"><span class="generic_icons move" title="', $txt['move_topic'], '"></span></a>';
+					}
 				}
 				echo '
 					</div><!-- .moderation -->';
@@ -318,18 +342,20 @@ 
 				<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 					<option value="">--------</option>';
 
-			foreach ($context['qmod_actions'] as $qmod_action)
-				if ($context['can_' . $qmod_action])
+			foreach ($context['qmod_actions'] as $qmod_action) {
+							if ($context['can_' . $qmod_action])
 					echo '
 					<option value="' . $qmod_action . '">' . $txt['quick_mod_' . $qmod_action] . '</option>';
+			}
 
 			echo '
 				</select>';
 
 			// Show a list of boards they can move the topic to.
-			if ($context['can_move'])
-				echo '
+			if ($context['can_move']) {
+							echo '
 				<span id="quick_mod_jump_to"></span>';
+			}
 
 			echo '
 				<input type="submit" value="', $txt['quick_mod_go'], '" onclick="return document.forms.quickModForm.qaction.value != \'\' &amp;&amp; confirm(\'', $txt['quickmod_confirm'], '\');" class="button qaction">
@@ -340,17 +366,19 @@ 
 		</div><!-- #messageindex -->';
 
 		// Finish off the form - again.
-		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics'])) {
+					echo '
 		<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 	</form>';
+		}
 
 		// Mobile action buttons (bottom)
-		if (!empty($context['normal_buttons']))
-		echo '
+		if (!empty($context['normal_buttons'])) {
+				echo '
 	<div class="mobile_buttons floatright">
 		<a class="button mobile_act">', $txt['mobile_action'], '</a>
 	</div>';
+		}
 
 		echo '
 	<div class="pagesection">
@@ -366,8 +394,8 @@ 
 	// Show breadcrumbs at the bottom too.
 	theme_linktree();
 
-	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move']) {
+			echo '
 	<script>
 		if (typeof(window.XMLHttpRequest) != "undefined")
 			aJumpTo[aJumpTo.length] = new JumpTo({
@@ -386,6 +414,7 @@ 
 				sCustomName: "move_to"
 			});
 	</script>';
+	}
 
 	// Javascript for inline editing.
 	echo '
@@ -422,8 +451,8 @@ 
 		<div class="information">
 			<p class="floatright" id="message_index_jump_to"></p>';
 
-	if (empty($context['no_topic_listing']))
-		echo '
+	if (empty($context['no_topic_listing'])) {
+			echo '
 			<p class="floatleft">', !empty($modSettings['enableParticipation']) && $context['user']['is_logged'] ? '
 				<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="" class="centericon"> ' . $txt['participation_caption'] . '<br>' : '', '
 				'. ($modSettings['pollMode'] == '1' ? '<span class="generic_icons poll centericon"></span> ' . $txt['poll'] : '') . '<br>
@@ -433,9 +462,10 @@ 
 				<span class="generic_icons lock centericon"></span> ' . $txt['locked_topic'] . '<br>
 				<span class="generic_icons sticky centericon"></span> ' . $txt['sticky_topic'] . '<br>
 			</p>';
+	}
 
-	if (!empty($context['jump_to']))
-		echo '
+	if (!empty($context['jump_to'])) {
+			echo '
 			<script>
 				if (typeof(window.XMLHttpRequest) != "undefined")
 					aJumpTo[aJumpTo.length] = new JumpTo({
@@ -451,6 +481,7 @@ 
 						sGoButtonLabel: "', $txt['quick_mod_go'], '"
 					});
 			</script>';
+	}
 
 	echo '
 			<br class="clear">

Sources/Subs-Post.php

Braces +526 added lines, -393 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Takes a message and parses it, returning nothing.
@@ -31,8 +32,9 @@ 
 	global $user_info, $modSettings, $context, $sourcedir;
 
 	// This line makes all languages *theoretically* work even with the wrong charset ;).
-	if (empty($context['utf8']))
-		$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
+	if (empty($context['utf8'])) {
+			$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
+	}
 
 	// Clean up after nobbc ;).
 	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function($a)
@@ -47,17 +49,19 @@ 
 	$message = preg_replace('~\.{100,}~', '...', $message);
 
 	// Trim off trailing quotes - these often happen by accident.
-	while (substr($message, -7) == '[quote]')
-		$message = substr($message, 0, -7);
-	while (substr($message, 0, 8) == '[/quote]')
-		$message = substr($message, 8);
+	while (substr($message, -7) == '[quote]') {
+			$message = substr($message, 0, -7);
+	}
+	while (substr($message, 0, 8) == '[/quote]') {
+			$message = substr($message, 8);
+	}
 
 	// Find all code blocks, work out whether we'd be parsing them, then ensure they are all closed.
 	$in_tag = false;
 	$had_tag = false;
 	$codeopen = 0;
-	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches))
-		foreach ($matches[0] as $index => $dummy)
+	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches)) {
+			foreach ($matches[0] as $index => $dummy)
 		{
 			// Closing?
 			if (!empty($matches[2][$index]))
@@ -65,6 +69,7 @@ 
 				// If it's closing and we're not in a tag we need to open it...
 				if (!$in_tag)
 					$codeopen = true;
+	}
 				// Either way we ain't in one any more.
 				$in_tag = false;
 			}
@@ -73,17 +78,20 @@ 
 			{
 				$had_tag = true;
 				// If we're in a tag don't do nought!
-				if (!$in_tag)
-					$in_tag = true;
+				if (!$in_tag) {
+									$in_tag = true;
+				}
 			}
 		}
 
 	// If we have an open tag, close it.
-	if ($in_tag)
-		$message .= '[/code]';
+	if ($in_tag) {
+			$message .= '[/code]';
+	}
 	// Open any ones that need to be open, only if we've never had a tag.
-	if ($codeopen && !$had_tag)
-		$message = '[code]' . $message;
+	if ($codeopen && !$had_tag) {
+			$message = '[code]' . $message;
+	}
 
 	// Replace code BBC with placeholders. We'll restore them at the end.
 	$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -108,23 +116,26 @@ 
 	fixTags($message);
 
 	// Replace /me.+?\n with [me=name]dsf[/me]\n.
-	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false)
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
-	else
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false) {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
+	} else {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	}
 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
-		if (allowedTo('admin_forum'))
-			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
+		if (allowedTo('admin_forum')) {
+					$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
 				return '[html]' . strtr(un_htmlspecialchars($m[1]), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
+		}
 			}, $message);
 
 		// We should edit them out, or else if an admin edits the message they will get shown...
 		else
 		{
-			while (strpos($message, '[html]') !== false)
-				$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			while (strpos($message, '[html]') !== false) {
+							$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			}
 		}
 	}
 
@@ -146,10 +157,12 @@ 
 
 	$list_open = substr_count($message, '[list]') + substr_count($message, '[list ');
 	$list_close = substr_count($message, '[/list]');
-	if ($list_close - $list_open > 0)
-		$message = str_repeat('[list]', $list_close - $list_open) . $message;
-	if ($list_open - $list_close > 0)
-		$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	if ($list_close - $list_open > 0) {
+			$message = str_repeat('[list]', $list_close - $list_open) . $message;
+	}
+	if ($list_open - $list_close > 0) {
+			$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	}
 
 	$mistake_fixes = array(
 		// Find [table]s not followed by [tr].
@@ -198,8 +211,9 @@ 
 	);
 
 	// Fix up some use of tables without [tr]s, etc. (it has to be done more than once to catch it all.)
-	for ($j = 0; $j < 3; $j++)
-		$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	for ($j = 0; $j < 3; $j++) {
+			$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	}
 
 	// Remove empty bbc from the sections outside the code tags
 	$allowedEmpty = array(
@@ -210,24 +224,28 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	$alltags = array();
-	foreach (($codes = parse_bbc(false)) as $code)
-		if (!in_array($code['tag'], $allowedEmpty))
+	foreach (($codes = parse_bbc(false)) as $code) {
+			if (!in_array($code['tag'], $allowedEmpty))
 			$alltags[] = $code['tag'];
+	}
 
 	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
 
-	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message))
-		$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message)) {
+			$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	}
 
 	// Restore code blocks
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Restore white space entities
-	if (!$previewing)
-		$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
-	else
-		$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	if (!$previewing) {
+			$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	} else {
+			$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	}
 
 	// Now let's quickly clean up things that will slow our parser (which are common in posted code.)
 	$message = strtr($message, array('[]' => '&#91;]', '[&#039;' => '&#91;&#039;'));
@@ -270,8 +288,9 @@ 
 		return "[time]" . timeformat("$m[1]", false) . "[/time]";
 	}, $message);
 
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Change breaks back to \n's and &nsbp; back to spaces.
 	return preg_replace('~<br( /)?' . '>~', "\n", str_replace('&nbsp;', ' ', $message));
@@ -352,8 +371,9 @@ 
 	);
 
 	// Fix each type of tag.
-	foreach ($fixArray as $param)
-		fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	foreach ($fixArray as $param) {
+			fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	}
 
 	// Now fix possible security problems with images loading links automatically...
 	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function($m)
@@ -378,10 +398,11 @@ 
 {
 	global $boardurl, $scripturl;
 
-	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0)
-		$domain_url = $match[1];
-	else
-		$domain_url = $boardurl . '/';
+	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0) {
+			$domain_url = $match[1];
+	} else {
+			$domain_url = $boardurl . '/';
+	}
 
 	$replaces = array();
 
@@ -389,11 +410,11 @@ 
 	{
 		$quoted = preg_match('~\[(' . $myTag . ')=&quot;~', $message);
 		preg_match_all('~\[(' . $myTag . ')=' . ($quoted ? '&quot;(.*?)&quot;' : '([^\]]*?)') . '\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} elseif ($hasEqualSign) {
+			preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} else {
+			preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 	}
-	elseif ($hasEqualSign)
-		preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
-	else
-		preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 
 	foreach ($matches[0] as $k => $dummy)
 	{
@@ -406,49 +427,53 @@ 
 		foreach ($protocols as $protocol)
 		{
 			$found = strncasecmp($replace, $protocol . '://', strlen($protocol) + 3) === 0;
-			if ($found)
-				break;
+			if ($found) {
+							break;
+			}
 		}
 
 		if (!$found && $protocols[0] == 'http')
 		{
-			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//')
-				$replace = $domain_url . $replace;
-			elseif (substr($replace, 0, 1) == '?')
-				$replace = $scripturl . $replace;
-			elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
+			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//') {
+							$replace = $domain_url . $replace;
+			} elseif (substr($replace, 0, 1) == '?') {
+							$replace = $scripturl . $replace;
+			} elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
 			{
 				$replace = '#' . preg_replace('~[^A-Za-z0-9_\-#]~', '', substr($replace, 1));
 				$this_tag = 'iurl';
 				$this_close = 'iurl';
+			} elseif (substr($replace, 0, 2) != '//') {
+							$replace = $protocols[0] . '://' . $replace;
 			}
-			elseif (substr($replace, 0, 2) != '//')
-				$replace = $protocols[0] . '://' . $replace;
-		}
-		elseif (!$found && $protocols[0] == 'ftp')
-			$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
-		elseif (!$found)
-			$replace = $protocols[0] . '://' . $replace;
-
-		if ($hasEqualSign && $embeddedUrl)
-			$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
-		elseif ($hasEqualSign)
-			$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
-		elseif ($embeddedUrl)
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
-		else
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		} elseif (!$found && $protocols[0] == 'ftp') {
+					$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
+		} elseif (!$found) {
+					$replace = $protocols[0] . '://' . $replace;
+		}
+
+		if ($hasEqualSign && $embeddedUrl) {
+					$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
+		} elseif ($hasEqualSign) {
+					$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
+		} elseif ($embeddedUrl) {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
+		} else {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		}
 	}
 
 	foreach ($replaces as $k => $v)
 	{
-		if ($k == $v)
-			unset($replaces[$k]);
+		if ($k == $v) {
+					unset($replaces[$k]);
+		}
 	}
 
-	if (!empty($replaces))
-		$message = strtr($message, $replaces);
-}
+	if (!empty($replaces)) {
+			$message = strtr($message, $replaces);
+	}
+	}
 
 /**
  * This function sends an email to the specified recipient(s).
@@ -492,8 +517,9 @@ 
 	}
 
 	// Nothing left? Nothing else to do
-	if (empty($to_array))
-		return true;
+	if (empty($to_array)) {
+			return true;
+	}
 
 	// Once upon a time, Hotmail could not interpret non-ASCII mails.
 	// In honour of those days, it's still called the 'hotmail fix'.
@@ -510,15 +536,17 @@ 
 		}
 
 		// Call this function recursively for the hotmail addresses.
-		if (!empty($hotmail_to))
-			$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		if (!empty($hotmail_to)) {
+					$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		}
 
 		// The remaining addresses no longer need the fix.
 		$hotmail_fix = false;
 
 		// No other addresses left? Return instantly.
-		if (empty($to_array))
-			return $mail_result;
+		if (empty($to_array)) {
+					return $mail_result;
+		}
 	}
 
 	// Get rid of entities.
@@ -543,13 +571,15 @@ 
 	$headers .= 'Return-Path: ' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . $line_break;
 	$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
 
-	if ($message_id !== null && empty($modSettings['mail_no_message_id']))
-		$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	if ($message_id !== null && empty($modSettings['mail_no_message_id'])) {
+			$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	}
 	$headers .= 'X-Mailer: SMF' . $line_break;
 
 	// Pass this to the integration before we start modifying the output -- it'll make it easier later.
-	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true))
-		return false;
+	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true)) {
+			return false;
+	}
 
 	// Save the original message...
 	$orig_message = $message;
@@ -598,17 +628,19 @@ 
 	}
 
 	// Are we using the mail queue, if so this is where we butt in...
-	if ($priority != 0)
-		return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	if ($priority != 0) {
+			return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	}
 
 	// If it's a priority mail, send it now - note though that this should NOT be used for sending many at once.
 	elseif (!empty($modSettings['mail_limit']))
 	{
 		list ($last_mail_time, $mails_this_minute) = @explode('|', $modSettings['mail_recent']);
-		if (empty($mails_this_minute) || time() > $last_mail_time + 60)
-			$new_queue_stat = time() . '|' . 1;
-		else
-			$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		if (empty($mails_this_minute) || time() > $last_mail_time + 60) {
+					$new_queue_stat = time() . '|' . 1;
+		} else {
+					$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		}
 
 		updateSettings(array('mail_recent' => $new_queue_stat));
 	}
@@ -642,8 +674,7 @@ 
 					log_error(sprintf($txt['mail_send_unable'], $to));
 					$mail_result = false;
 				}
-			}
-			catch(ErrorException $e)
+			} catch(ErrorException $e)
 			{
 				log_error($e->getMessage(), 'general', $e->getFile(), $e->getLine());
 				log_error(sprintf($txt['mail_send_unable'], $to));
@@ -653,12 +684,13 @@ 
 
 			// Wait, wait, I'm still sending here!
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 		}
+	} else {
+			$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 	}
-	else
-		$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 
 	// Everything go smoothly?
 	return $mail_result;
@@ -684,8 +716,9 @@ 
 	static $cur_insert = array();
 	static $cur_insert_len = 0;
 
-	if ($cur_insert_len == 0)
-		$cur_insert = array();
+	if ($cur_insert_len == 0) {
+			$cur_insert = array();
+	}
 
 	// If we're flushing, make the final inserts - also if we're near the MySQL length limit!
 	if (($flush || $cur_insert_len > 800000) && !empty($cur_insert))
@@ -760,8 +793,9 @@ 
 	}
 
 	// If they are using SSI there is a good chance obExit will never be called.  So lets be nice and flush it for them.
-	if (SMF === 'SSI' || SMF === 'BACKGROUND')
-		return AddMailQueue(true);
+	if (SMF === 'SSI' || SMF === 'BACKGROUND') {
+			return AddMailQueue(true);
+	}
 
 	return true;
 }
@@ -792,23 +826,26 @@ 
 		'sent' => array()
 	);
 
-	if ($from === null)
-		$from = array(
+	if ($from === null) {
+			$from = array(
 			'id' => $user_info['id'],
 			'name' => $user_info['name'],
 			'username' => $user_info['username']
 		);
+	}
 
 	// This is the one that will go in their inbox.
 	$htmlmessage = $smcFunc['htmlspecialchars']($message, ENT_QUOTES);
 	preparsecode($htmlmessage);
 	$htmlsubject = strtr($smcFunc['htmlspecialchars']($subject), array("\r" => '', "\n" => '', "\t" => ''));
-	if ($smcFunc['strlen']($htmlsubject) > 100)
-		$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	if ($smcFunc['strlen']($htmlsubject) > 100) {
+			$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	}
 
 	// Make sure is an array
-	if (!is_array($recipients))
-		$recipients = array($recipients);
+	if (!is_array($recipients)) {
+			$recipients = array($recipients);
+	}
 
 	// Integrated PMs
 	call_integration_hook('integrate_personal_message', array(&$recipients, &$from, &$subject, &$message));
@@ -836,21 +873,23 @@ 
 				'usernames' => array_keys($usernames),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
 				$usernames[$smcFunc['strtolower']($row['member_name'])] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Replace the usernames with IDs. Drop usernames that couldn't be found.
-		foreach ($recipients as $rec_type => $rec)
-			foreach ($rec as $id => $member)
+		foreach ($recipients as $rec_type => $rec) {
+					foreach ($rec as $id => $member)
 			{
 				if (is_numeric($recipients[$rec_type][$id]))
 					continue;
+		}
 
-				if (!empty($usernames[$member]))
-					$recipients[$rec_type][$id] = $usernames[$member];
-				else
+				if (!empty($usernames[$member])) {
+									$recipients[$rec_type][$id] = $usernames[$member];
+				} else
 				{
 					$log['failed'][$id] = sprintf($txt['pm_error_user_not_found'], $recipients[$rec_type][$id]);
 					unset($recipients[$rec_type][$id]);
@@ -888,8 +927,9 @@ 
 		$delete = false;
 		foreach ($criteria as $criterium)
 		{
-			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false))
-				$delete = true;
+			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false)) {
+							$delete = true;
+			}
 			// If we're adding and one criteria don't match then we stop!
 			elseif (!$row['is_or'])
 			{
@@ -897,8 +937,9 @@ 
 				break;
 			}
 		}
-		if ($delete)
-			$deletes[$row['id_member']] = 1;
+		if ($delete) {
+					$deletes[$row['id_member']] = 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -913,8 +954,9 @@ 
 			array(
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -922,8 +964,9 @@ 
 	require_once($sourcedir . '/Subs-Members.php');
 	$pmReadGroups = groupsAllowedTo('pm_read');
 
-	if (empty($modSettings['permission_enable_deny']))
-		$pmReadGroups['denied'] = array();
+	if (empty($modSettings['permission_enable_deny'])) {
+			$pmReadGroups['denied'] = array();
+	}
 
 	// Load their alert preferences
 	require_once($sourcedir . '/Subs-Notify.php');
@@ -955,8 +998,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Don't do anything for members to be deleted!
-		if (isset($deletes[$row['id_member']]))
-			continue;
+		if (isset($deletes[$row['id_member']])) {
+					continue;
+		}
 
 		// Load the preferences for this member (if any)
 		$prefs = !empty($notifyPrefs[$row['id_member']]) ? $notifyPrefs[$row['id_member']] : array();
@@ -977,8 +1021,9 @@ 
 		{
 			foreach ($groups as $id)
 			{
-				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id])
-					$message_limit = $message_limit_cache[$id];
+				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id]) {
+									$message_limit = $message_limit_cache[$id];
+				}
 			}
 
 			if ($message_limit > 0 && $message_limit <= $row['instant_messages'])
@@ -1026,8 +1071,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Only 'send' the message if there are any recipients left.
-	if (empty($all_to))
-		return $log;
+	if (empty($all_to)) {
+			return $log;
+	}
 
 	// Insert the message itself and then grab the last insert id.
 	$id_pm = $smcFunc['db_insert']('',
@@ -1048,8 +1094,8 @@ 
 	if (!empty($id_pm))
 	{
 		// If this is new we need to set it part of it's own conversation.
-		if (empty($pm_head))
-			$smcFunc['db_query']('', '
+		if (empty($pm_head)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}personal_messages
 				SET id_pm_head = {int:id_pm_head}
 				WHERE id_pm = {int:id_pm_head}',
@@ -1057,6 +1103,7 @@ 
 					'id_pm_head' => $id_pm,
 				)
 			);
+		}
 
 		// Some people think manually deleting personal_messages is fun... it's not. We protect against it though :)
 		$smcFunc['db_query']('', '
@@ -1072,8 +1119,9 @@ 
 		foreach ($all_to as $to)
 		{
 			$insertRows[] = array($id_pm, $to, in_array($to, $recipients['bcc']) ? 1 : 0, isset($deletes[$to]) ? 1 : 0, 1);
-			if (!in_array($to, $recipients['bcc']))
-				$to_list[] = $to;
+			if (!in_array($to, $recipients['bcc'])) {
+							$to_list[] = $to;
+			}
 		}
 
 		$smcFunc['db_insert']('insert',
@@ -1091,9 +1139,9 @@ 
 	{
 		censorText($message);
 		$message = trim(un_htmlspecialchars(strip_tags(strtr(parse_bbc($smcFunc['htmlspecialchars']($message), false), array('<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']')))));
+	} else {
+			$message = '';
 	}
-	else
-		$message = '';
 
 	$to_names = array();
 	if (count($to_list) > 1)
@@ -1106,8 +1154,9 @@ 
 				'to_members' => $to_list,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$to_names[] = un_htmlspecialchars($row['real_name']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$to_names[] = un_htmlspecialchars($row['real_name']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 	$replacements = array(
@@ -1135,11 +1184,13 @@ 
 	loadLanguage('index+PersonalMessage');
 
 	// Add one to their unread and read message counts.
-	foreach ($all_to as $k => $id)
-		if (isset($deletes[$id]))
+	foreach ($all_to as $k => $id) {
+			if (isset($deletes[$id]))
 			unset($all_to[$k]);
-	if (!empty($all_to))
-		updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
+	if (!empty($all_to)) {
+			updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
 
 	return $log;
 }
@@ -1169,15 +1220,17 @@ 
 		// Let's, for now, assume there are only &#021;'ish characters.
 		$simple = true;
 
-		foreach ($matches[1] as $entity)
-			if ($entity > 128)
+		foreach ($matches[1] as $entity) {
+					if ($entity > 128)
 				$simple = false;
+		}
 		unset($matches);
 
-		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
+		if ($simple) {
+					$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
 			{
 				return chr("$m[1]");
+		}
 			}, $string);
 		else
 		{
@@ -1185,8 +1238,9 @@ 
 			if (!$context['utf8'] && function_exists('iconv'))
 			{
 				$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-				if ($newstring)
-					$string = $newstring;
+				if ($newstring) {
+									$string = $newstring;
+				}
 			}
 
 			$string = preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $string);
@@ -1202,23 +1256,25 @@ 
 		if (!$context['utf8'] && function_exists('iconv'))
 		{
 			$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-			if ($newstring)
-				$string = $newstring;
+			if ($newstring) {
+							$string = $newstring;
+			}
 		}
 
 		$entityConvert = function($m)
 		{
 			$c = $m[1];
-			if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
-				return $c;
-			elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF)
-				return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF)
-				return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7)
-				return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
-			else
-				return "";
+			if (strlen($c) === 1 && ord($c[0]) <= 0x7F) {
+							return $c;
+			} elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF) {
+							return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF) {
+							return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7) {
+							return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
+			} else {
+							return "";
+			}
 		};
 
 		// Convert all 'special' characters to HTML entities.
@@ -1232,19 +1288,20 @@ 
 		$string = base64_encode($string);
 
 		// Show the characterset and the transfer-encoding for header strings.
-		if ($with_charset)
-			$string = '=?' . $charset . '?B?' . $string . '?=';
+		if ($with_charset) {
+					$string = '=?' . $charset . '?B?' . $string . '?=';
+		}
 
 		// Break it up in lines (mail body).
-		else
-			$string = chunk_split($string, 76, $line_break);
+		else {
+					$string = chunk_split($string, 76, $line_break);
+		}
 
 		return array($charset, $string, 'base64');
+	} else {
+			return array($charset, $string, '7bit');
+	}
 	}
-
-	else
-		return array($charset, $string, '7bit');
-}
 
 /**
  * Sends mail, like mail() but over SMTP.
@@ -1268,8 +1325,9 @@ 
 	if ($modSettings['mail_type'] == 3 && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
 	{
 		$socket = fsockopen($modSettings['smtp_host'], 110, $errno, $errstr, 2);
-		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.'))
-			$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.')) {
+					$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		}
 
 		if ($socket)
 		{
@@ -1291,11 +1349,13 @@ 
 		if (substr($modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty($modSettings['smtp_port']) || $modSettings['smtp_port'] == 25))
 		{
 			// ssl:hostname can cause fsocketopen to fail with a lookup failure, ensure it exists for this test.
-			if (substr($modSettings['smtp_host'], 0, 6) != 'ssl://')
-				$modSettings['smtp_host'] = str_replace('ssl:', 'ss://', $modSettings['smtp_host']);
+			if (substr($modSettings['smtp_host'], 0, 6) != 'ssl://') {
+							$modSettings['smtp_host'] = str_replace('ssl:', 'ss://', $modSettings['smtp_host']);
+			}
 
-			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3))
-				log_error($txt['smtp_port_ssl']);
+			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3)) {
+							log_error($txt['smtp_port_ssl']);
+			}
 		}
 
 		// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
@@ -1307,20 +1367,23 @@ 
 	}
 
 	// Wait for a response of 220, without "-" continuer.
-	if (!server_parse(null, $socket, '220'))
-		return false;
+	if (!server_parse(null, $socket, '220')) {
+			return false;
+	}
 
 	// Try and determine the servers name, fall back to the mail servers if not found
 	$helo = false;
-	if (function_exists('gethostname') && gethostname() !== false)
-		$helo = gethostname();
-	elseif (function_exists('php_uname'))
-		$helo = php_uname('n');
-	elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME']))
-		$helo = $_SERVER['SERVER_NAME'];
+	if (function_exists('gethostname') && gethostname() !== false) {
+			$helo = gethostname();
+	} elseif (function_exists('php_uname')) {
+			$helo = php_uname('n');
+	} elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME'])) {
+			$helo = $_SERVER['SERVER_NAME'];
+	}
 
-	if (empty($helo))
-		$helo = $modSettings['smtp_host'];
+	if (empty($helo)) {
+			$helo = $modSettings['smtp_host'];
+	}
 
 	// SMTP = 1, SMTP - STARTTLS = 2
 	if (in_array($modSettings['mail_type'], array(1, 2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
@@ -1332,8 +1395,9 @@ 
 			if ($modSettings['mail_type'] == 2 && preg_match("~250( |-)STARTTLS~mi", $response))
 			{
 				// Send STARTTLS to enable encryption
-				if (!server_parse('STARTTLS', $socket, '220'))
-					return false;
+				if (!server_parse('STARTTLS', $socket, '220')) {
+									return false;
+				}
 				// Enable the encryption
 				// php 5.6+ fix
 				$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
@@ -1344,30 +1408,35 @@ 
 					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
 				}
 
-				if (!@stream_socket_enable_crypto($socket, true, $crypto_method))
-					return false;
+				if (!@stream_socket_enable_crypto($socket, true, $crypto_method)) {
+									return false;
+				}
 				// Send the EHLO command again
-				if (!server_parse('EHLO ' . $helo, $socket, null) == '250')
-					return false;
+				if (!server_parse('EHLO ' . $helo, $socket, null) == '250') {
+									return false;
+				}
 			}
 
-			if (!server_parse('AUTH LOGIN', $socket, '334'))
-				return false;
+			if (!server_parse('AUTH LOGIN', $socket, '334')) {
+							return false;
+			}
 			// Send the username and password, encoded.
-			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334'))
-				return false;
+			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334')) {
+							return false;
+			}
 			// The password is already encoded ;)
-			if (!server_parse($modSettings['smtp_password'], $socket, '235'))
-				return false;
+			if (!server_parse($modSettings['smtp_password'], $socket, '235')) {
+							return false;
+			}
+		} elseif (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
 		}
-		elseif (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
-	}
-	else
+	} else
 	{
 		// Just say "helo".
-		if (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
+		if (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
+		}
 	}
 
 	// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
@@ -1380,31 +1449,38 @@ 
 		// Reset the connection to send another email.
 		if ($i != 0)
 		{
-			if (!server_parse('RSET', $socket, '250'))
-				return false;
+			if (!server_parse('RSET', $socket, '250')) {
+							return false;
+			}
 		}
 
 		// From, to, and then start the data...
-		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250'))
-			return false;
-		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
-			return false;
-		if (!server_parse('DATA', $socket, '354'))
-			return false;
+		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('DATA', $socket, '354')) {
+					return false;
+		}
 		fputs($socket, 'Subject: ' . $subject . "\r\n");
-		if (strlen($mail_to) > 0)
-			fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		if (strlen($mail_to) > 0) {
+					fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		}
 		fputs($socket, $headers . "\r\n\r\n");
 		fputs($socket, $message . "\r\n");
 
 		// Send a ., or in other words "end of data".
-		if (!server_parse('.', $socket, '250'))
-			return false;
+		if (!server_parse('.', $socket, '250')) {
+					return false;
+		}
 
 		// Almost done, almost done... don't stop me just yet!
 		@set_time_limit(300);
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 	}
 	fputs($socket, 'QUIT' . "\r\n");
 	fclose($socket);
@@ -1428,8 +1504,9 @@ 
 {
 	global $txt;
 
-	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+	if ($message !== null) {
+			fputs($socket, $message . "\r\n");
+	}
 
 	// No response yet.
 	$server_response = '';
@@ -1445,8 +1522,9 @@ 
 		$response .= $server_response;
 	}
 
-	if ($code === null)
-		return substr($server_response, 0, 3);
+	if ($code === null) {
+			return substr($server_response, 0, 3);
+	}
 
 	if (substr($server_response, 0, 3) != $code)
 	{
@@ -1476,8 +1554,9 @@ 
 	// Create a pspell or enchant dictionary resource
 	$dict = spell_init();
 
-	if (!isset($_POST['spellstring']) || !$dict)
-		die;
+	if (!isset($_POST['spellstring']) || !$dict) {
+			die;
+	}
 
 	// Construct a bit of Javascript code.
 	$context['spell_js'] = '
@@ -1495,8 +1574,9 @@ 
 		$check_word = explode('|', $alphas[$i]);
 
 		// If the word is a known word, or spelled right...
-		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2]))
-			continue;
+		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2])) {
+					continue;
+		}
 
 		// Find the word, and move up the "last occurrence" to here.
 		$found_words = true;
@@ -1510,20 +1590,23 @@ 
 		if (!empty($suggestions))
 		{
 			// But first check they aren't going to be censored - no naughty words!
-			foreach ($suggestions as $k => $word)
-				if ($suggestions[$k] != censorText($word))
+			foreach ($suggestions as $k => $word) {
+							if ($suggestions[$k] != censorText($word))
 					unset($suggestions[$k]);
+			}
 
-			if (!empty($suggestions))
-				$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			if (!empty($suggestions)) {
+							$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			}
 		}
 
 		$context['spell_js'] .= ']),';
 	}
 
 	// If words were found, take off the last comma.
-	if ($found_words)
-		$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	if ($found_words) {
+			$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	}
 
 	$context['spell_js'] .= '
 		);';
@@ -1558,11 +1641,13 @@ 
 	global $user_info, $smcFunc;
 
 	// Can't do it if there's no topics.
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// It must be an array - it must!
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
 	// Get the subject and body...
 	$result = $smcFunc['db_query']('', '
@@ -1610,14 +1695,15 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if (!empty($task_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($task_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			$task_rows,
 			array('id_task')
 		);
-}
+	}
+	}
 
 /**
  * Create a post, either as new topic (id_topic = 0) or in an existing one.
@@ -1655,9 +1741,9 @@ 
 	$msgOptions['send_notifications'] = isset($msgOptions['send_notifications']) ? (bool) $msgOptions['send_notifications'] : true;
 
 	// We need to know if the topic is approved. If we're told that's great - if not find out.
-	if (!$modSettings['postmod_active'])
-		$topicOptions['is_approved'] = true;
-	elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
+	if (!$modSettings['postmod_active']) {
+			$topicOptions['is_approved'] = true;
+	} elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT approved
@@ -1680,8 +1766,7 @@ 
 			$posterOptions['id'] = 0;
 			$posterOptions['name'] = $txt['guest_title'];
 			$posterOptions['email'] = '';
-		}
-		elseif ($posterOptions['id'] != $user_info['id'])
+		} elseif ($posterOptions['id'] != $user_info['id'])
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT member_name, email_address
@@ -1699,12 +1784,11 @@ 
 				$posterOptions['id'] = 0;
 				$posterOptions['name'] = $txt['guest_title'];
 				$posterOptions['email'] = '';
+			} else {
+							list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			}
-			else
-				list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$posterOptions['name'] = $user_info['name'];
 			$posterOptions['email'] = $user_info['email'];
@@ -1714,8 +1798,9 @@ 
 	if (!empty($modSettings['enable_mentions']))
 	{
 		$msgOptions['mentioned_members'] = Mentions::getMentionedMembers($msgOptions['body']);
-		if (!empty($msgOptions['mentioned_members']))
-			$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		if (!empty($msgOptions['mentioned_members'])) {
+					$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		}
 	}
 
 	// It's do or die time: forget any user aborts!
@@ -1748,12 +1833,13 @@ 
 	);
 
 	// Something went wrong creating the message...
-	if (empty($msgOptions['id']))
-		return false;
+	if (empty($msgOptions['id'])) {
+			return false;
+	}
 
 	// Fix the attachments.
-	if (!empty($msgOptions['attachments']))
-		$smcFunc['db_query']('', '
+	if (!empty($msgOptions['attachments'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET id_msg = {int:id_msg}
 			WHERE id_attach IN ({array_int:attachment_list})',
@@ -1762,6 +1848,7 @@ 
 				'id_msg' => $msgOptions['id'],
 			)
 		);
+	}
 
 	// What if we want to export new posts out to a CMS?
 	call_integration_hook('integrate_after_create_post', array($msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters));
@@ -1838,20 +1925,23 @@ 
 			'id_topic' => $topicOptions['id'],
 			'counter_increment' => 1,
 		);
-		if ($msgOptions['approved'])
-			$topics_columns = array(
+		if ($msgOptions['approved']) {
+					$topics_columns = array(
 				'id_member_updated = {int:poster_id}',
 				'id_last_msg = {int:id_msg}',
 				'num_replies = num_replies + {int:counter_increment}',
 			);
-		else
-			$topics_columns = array(
+		} else {
+					$topics_columns = array(
 				'unapproved_posts = unapproved_posts + {int:counter_increment}',
 			);
-		if ($topicOptions['lock_mode'] !== null)
-			$topics_columns[] = 'locked = {int:locked}';
-		if ($topicOptions['sticky_mode'] !== null)
-			$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
+		if ($topicOptions['lock_mode'] !== null) {
+					$topics_columns[] = 'locked = {int:locked}';
+		}
+		if ($topicOptions['sticky_mode'] !== null) {
+					$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
 
 		call_integration_hook('integrate_modify_topic', array(&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions));
 
@@ -1880,8 +1970,8 @@ 
 	);
 
 	// Increase the number of posts and topics on the board.
-	if ($msgOptions['approved'])
-		$smcFunc['db_query']('', '
+	if ($msgOptions['approved']) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
 			WHERE id_board = {int:id_board}',
@@ -1889,7 +1979,7 @@ 
 				'id_board' => $topicOptions['board'],
 			)
 		);
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
@@ -1959,8 +2049,8 @@ 
 		}
 	}
 
-	if ($msgOptions['approved'] && empty($topicOptions['is_approved']))
-		$smcFunc['db_insert']('',
+	if ($msgOptions['approved'] && empty($topicOptions['is_approved'])) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array(
@@ -1972,19 +2062,22 @@ 
 			),
 			array('id_task')
 		);
+	}
 
 	// If there's a custom search index, it may need updating...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postCreated')))
-		$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postCreated'))) {
+			$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	// Increase the post counter for the user that created the post.
 	if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved'])
 	{
 		// Are you the one that happened to create this post?
-		if ($user_info['id'] == $posterOptions['id'])
-			$user_info['posts']++;
+		if ($user_info['id'] == $posterOptions['id']) {
+					$user_info['posts']++;
+		}
 		updateMemberData($posterOptions['id'], array('posts' => '+'));
 	}
 
@@ -1992,19 +2085,21 @@ 
 	$_SESSION['last_read_topic'] = 0;
 
 	// Better safe than sorry.
-	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']]))
-		$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']])) {
+			$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	}
 
 	// Update all the stats so everyone knows about this new topic and message.
 	updateStats('message', true, $msgOptions['id']);
 
 	// Update the last message on the board assuming it's approved AND the topic is.
-	if ($msgOptions['approved'])
-		updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	if ($msgOptions['approved']) {
+			updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	}
 
 	// Queue createPost background notification
-	if ($msgOptions['send_notifications'] && $msgOptions['approved'])
-		$smcFunc['db_insert']('',
+	if ($msgOptions['send_notifications'] && $msgOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array('$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', $smcFunc['json_encode'](array(
@@ -2015,6 +2110,7 @@ 
 			)), 0),
 			array('id_task')
 		);
+	}
 
 	// Alright, done now... we can abort now, I guess... at least this much is done.
 	ignore_user_abort($previous_ignore_user_abort);
@@ -2041,14 +2137,18 @@ 
 
 	// This is longer than it has to be, but makes it so we only set/change what we have to.
 	$messages_columns = array();
-	if (isset($posterOptions['name']))
-		$messages_columns['poster_name'] = $posterOptions['name'];
-	if (isset($posterOptions['email']))
-		$messages_columns['poster_email'] = $posterOptions['email'];
-	if (isset($msgOptions['icon']))
-		$messages_columns['icon'] = $msgOptions['icon'];
-	if (isset($msgOptions['subject']))
-		$messages_columns['subject'] = $msgOptions['subject'];
+	if (isset($posterOptions['name'])) {
+			$messages_columns['poster_name'] = $posterOptions['name'];
+	}
+	if (isset($posterOptions['email'])) {
+			$messages_columns['poster_email'] = $posterOptions['email'];
+	}
+	if (isset($msgOptions['icon'])) {
+			$messages_columns['icon'] = $msgOptions['icon'];
+	}
+	if (isset($msgOptions['subject'])) {
+			$messages_columns['subject'] = $msgOptions['subject'];
+	}
 	if (isset($msgOptions['body']))
 	{
 		$messages_columns['body'] = $msgOptions['body'];
@@ -2075,8 +2175,9 @@ 
 		$messages_columns['modified_reason'] = $msgOptions['modify_reason'];
 		$messages_columns['id_msg_modified'] = $modSettings['maxMsgID'];
 	}
-	if (isset($msgOptions['smileys_enabled']))
-		$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	if (isset($msgOptions['smileys_enabled'])) {
+			$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	}
 
 	// Which columns need to be ints?
 	$messageInts = array('modified_time', 'id_msg_modified', 'smileys_enabled');
@@ -2087,8 +2188,9 @@ 
 	// Update search api
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('postRemoved'))
-		$searchAPI->postRemoved($msgOptions['id']);
+	if ($searchAPI->supportsMethod('postRemoved')) {
+			$searchAPI->postRemoved($msgOptions['id']);
+	}
 
 	if (!empty($modSettings['enable_mentions']) && isset($msgOptions['body']))
 	{
@@ -2100,23 +2202,27 @@ 
 		{
 			preg_match_all('/\[member\=([0-9]+)\]([^\[]*)\[\/member\]/U', $msgOptions['old_body'], $match);
 
-			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2]))
-				foreach ($match[1] as $i => $oldID)
+			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2])) {
+							foreach ($match[1] as $i => $oldID)
 					$oldmentions[$oldID] = array('id' => $oldID, 'real_name' => $match[2][$i]);
+			}
 
-			if (empty($modSettings['search_custom_index_config']))
-				unset($msgOptions['old_body']);
+			if (empty($modSettings['search_custom_index_config'])) {
+							unset($msgOptions['old_body']);
+			}
 		}
 
 		$mentions = Mentions::getMentionedMembers($msgOptions['body']);
 		$messages_columns['body'] = $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $mentions);
 
 		// Remove the poster.
-		if (isset($mentions[$user_info['id']]))
-			unset($mentions[$user_info['id']]);
+		if (isset($mentions[$user_info['id']])) {
+					unset($mentions[$user_info['id']]);
+		}
 
-		if (isset($oldmentions[$user_info['id']]))
-			unset($oldmentions[$user_info['id']]);
+		if (isset($oldmentions[$user_info['id']])) {
+					unset($oldmentions[$user_info['id']]);
+		}
 
 		if (is_array($mentions) && is_array($oldmentions) && count(array_diff_key($mentions, $oldmentions)) > 0 && count($mentions) > count($oldmentions))
 		{
@@ -2146,8 +2252,9 @@ 
 	}
 
 	// Nothing to do?
-	if (empty($messages_columns))
-		return true;
+	if (empty($messages_columns)) {
+			return true;
+	}
 
 	// Change the post.
 	$smcFunc['db_query']('', '
@@ -2208,8 +2315,9 @@ 
 	// If there's a custom search index, it needs to be modified...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postModified')))
-		$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postModified'))) {
+			$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	if (isset($msgOptions['subject']))
 	{
@@ -2223,14 +2331,16 @@ 
 				'id_first_msg' => $msgOptions['id'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 1)
-			updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		if ($smcFunc['db_num_rows']($request) == 1) {
+					updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Finally, if we are setting the approved state we need to do much more work :(
-	if ($modSettings['postmod_active'] && isset($msgOptions['approved']))
-		approvePosts($msgOptions['id'], $msgOptions['approved']);
+	if ($modSettings['postmod_active'] && isset($msgOptions['approved'])) {
+			approvePosts($msgOptions['id'], $msgOptions['approved']);
+	}
 
 	return true;
 }
@@ -2247,11 +2357,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
-	if (empty($msgs))
-		return false;
+	if (empty($msgs)) {
+			return false;
+	}
 
 	// May as well start at the beginning, working out *what* we need to change.
 	$request = $smcFunc['db_query']('', '
@@ -2283,20 +2395,22 @@ 
 		$topics[] = $row['id_topic'];
 
 		// Ensure our change array exists already.
-		if (!isset($topic_changes[$row['id_topic']]))
-			$topic_changes[$row['id_topic']] = array(
+		if (!isset($topic_changes[$row['id_topic']])) {
+					$topic_changes[$row['id_topic']] = array(
 				'id_last_msg' => $row['id_last_msg'],
 				'approved' => $row['topic_approved'],
 				'replies' => 0,
 				'unapproved_posts' => 0,
 			);
-		if (!isset($board_changes[$row['id_board']]))
-			$board_changes[$row['id_board']] = array(
+		}
+		if (!isset($board_changes[$row['id_board']])) {
+					$board_changes[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0,
 			);
+		}
 
 		// If it's the first message then the topic state changes!
 		if ($row['id_msg'] == $row['id_first_msg'])
@@ -2317,14 +2431,13 @@ 
 				'poster' => $row['id_member'],
 				'new_topic' => true,
 			);
-		}
-		else
+		} else
 		{
 			$topic_changes[$row['id_topic']]['replies'] += $approve ? 1 : -1;
 
 			// This will be a post... but don't notify unless it's not followed by approved ones.
-			if ($row['id_msg'] > $row['id_last_msg'])
-				$notification_posts[$row['id_topic']] = array(
+			if ($row['id_msg'] > $row['id_last_msg']) {
+							$notification_posts[$row['id_topic']] = array(
 					'id' => $row['id_msg'],
 					'body' => $row['body'],
 					'subject' => $row['subject'],
@@ -2335,28 +2448,33 @@ 
 					'new_topic' => false,
 					'msg' => $row['id_msg'],
 				);
+			}
 		}
 
 		// If this is being approved and id_msg is higher than the current id_last_msg then it changes.
-		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg'])
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg']) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		}
 		// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
-		elseif (!$approve)
-			// Default to the first message and then we'll override in a bit ;)
+		elseif (!$approve) {
+					// Default to the first message and then we'll override in a bit ;)
 			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
+		}
 
 		$topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['posts'] += $approve ? 1 : -1;
 
 		// Post count for the user?
-		if ($row['id_member'] && empty($row['count_posts']))
-			$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		if ($row['id_member'] && empty($row['count_posts'])) {
+					$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($msgs))
-		return;
+	if (empty($msgs)) {
+			return;
+	}
 
 	// Now we have the differences make the changes, first the easy one.
 	$smcFunc['db_query']('', '
@@ -2383,14 +2501,15 @@ 
 				'approved' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// ... next the topics...
-	foreach ($topic_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($topic_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET approved = {int:approved}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_replies = num_replies + {int:num_replies}, id_last_msg = {int:id_last_msg}
@@ -2403,10 +2522,11 @@ 
 				'id_topic' => $id,
 			)
 		);
+	}
 
 	// ... finally the boards...
-	foreach ($board_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($board_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + {int:num_posts}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_topics = num_topics + {int:num_topics}, unapproved_topics = unapproved_topics + {int:unapproved_topics}
@@ -2419,13 +2539,14 @@ 
 				'id_board' => $id,
 			)
 		);
+	}
 
 	// Finally, least importantly, notifications!
 	if ($approve)
 	{
 		$task_rows = array();
-		foreach (array_merge($notification_topics, $notification_posts) as $topic)
-			$task_rows[] = array(
+		foreach (array_merge($notification_topics, $notification_posts) as $topic) {
+					$task_rows[] = array(
 				'$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', $smcFunc['json_encode'](array(
 					'msgOptions' => array(
 						'id' => $topic['msg'],
@@ -2443,14 +2564,16 @@ 
 					'type' => $topic['new_topic'] ? 'topic' : 'reply',
 				)), 0
 			);
+		}
 
-		if ($notify)
-			$smcFunc['db_insert']('',
+		if ($notify) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}background_tasks',
 				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 				$task_rows,
 				array('id_task')
 			);
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}approval_queue
@@ -2466,8 +2589,9 @@ 
 	else
 	{
 		$msgInserts = array();
-		foreach ($msgs as $msg)
-			$msgInserts[] = array($msg);
+		foreach ($msgs as $msg) {
+					$msgInserts[] = array($msg);
+		}
 
 		$smcFunc['db_insert']('ignore',
 			'{db_prefix}approval_queue',
@@ -2481,9 +2605,10 @@ 
 	updateLastMessages(array_keys($board_changes));
 
 	// Post count for the members?
-	if (!empty($member_post_changes))
-		foreach ($member_post_changes as $id_member => $count_change)
+	if (!empty($member_post_changes)) {
+			foreach ($member_post_changes as $id_member => $count_change)
 			updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+	}
 
 	return true;
 }
@@ -2500,11 +2625,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
-	if (empty($topics))
-		return false;
+	if (empty($topics)) {
+			return false;
+	}
 
 	$approve_type = $approve ? 0 : 1;
 
@@ -2520,8 +2647,9 @@ 
 		)
 	);
 	$msgs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$msgs[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$msgs[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return approvePosts($msgs, $approve);
@@ -2544,11 +2672,13 @@ 
 	global $board_info, $board, $smcFunc;
 
 	// Please - let's be sane.
-	if (empty($setboards))
-		return false;
+	if (empty($setboards)) {
+			return false;
+	}
 
-	if (!is_array($setboards))
-		$setboards = array($setboards);
+	if (!is_array($setboards)) {
+			$setboards = array($setboards);
+	}
 
 	// If we don't know the id_msg we need to find it.
 	if (!$id_msg)
@@ -2566,15 +2696,16 @@ 
 			)
 		);
 		$lastMsg = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$lastMsg[$row['id_board']] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$lastMsg[$row['id_board']] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Just to note - there should only be one board passed if we are doing this.
-		foreach ($setboards as $id_board)
-			$lastMsg[$id_board] = $id_msg;
+		foreach ($setboards as $id_board) {
+					$lastMsg[$id_board] = $id_msg;
+		}
 	}
 
 	$parent_boards = array();
@@ -2589,10 +2720,11 @@ 
 			$lastModified[$id_board] = 0;
 		}
 
-		if (!empty($board) && $id_board == $board)
-			$parents = $board_info['parent_boards'];
-		else
-			$parents = getBoardParents($id_board);
+		if (!empty($board) && $id_board == $board) {
+					$parents = $board_info['parent_boards'];
+		} else {
+					$parents = getBoardParents($id_board);
+		}
 
 		// Ignore any parents on the top child level.
 		// @todo Why?
@@ -2601,10 +2733,11 @@ 
 			if ($parent['level'] != 0)
 			{
 				// If we're already doing this one as a board, is this a higher last modified?
-				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id])
-					$lastModified[$id] = $lastModified[$id_board];
-				elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board]))
-					$parent_boards[$id] = $lastModified[$id_board];
+				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id]) {
+									$lastModified[$id] = $lastModified[$id_board];
+				} elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board])) {
+									$parent_boards[$id] = $lastModified[$id_board];
+				}
 			}
 		}
 	}
@@ -2617,23 +2750,24 @@ 
 	// Finally, to save on queries make the changes...
 	foreach ($parent_boards as $id => $msg)
 	{
-		if (!isset($parent_updates[$msg]))
-			$parent_updates[$msg] = array($id);
-		else
-			$parent_updates[$msg][] = $id;
+		if (!isset($parent_updates[$msg])) {
+					$parent_updates[$msg] = array($id);
+		} else {
+					$parent_updates[$msg][] = $id;
+		}
 	}
 
 	foreach ($lastMsg as $id => $msg)
 	{
-		if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		if (!isset($board_updates[$msg . '-' . $lastModified[$id]])) {
+					$board_updates[$msg . '-' . $lastModified[$id]] = array(
 				'id' => $msg,
 				'updated' => $lastModified[$id],
 				'boards' => array($id)
 			);
-
-		else
-			$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		} else {
+					$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		}
 	}
 
 	// Now commit the changes!
@@ -2725,11 +2859,13 @@ 
 	global $txt, $mbname, $scripturl, $settings;
 
 	// First things first, load up the email templates language file, if we need to.
-	if ($loadLang)
-		loadLanguage('EmailTemplates', $lang);
+	if ($loadLang) {
+			loadLanguage('EmailTemplates', $lang);
+	}
 
-	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body']))
-		fatal_lang_error('email_no_template', 'template', array($template));
+	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body'])) {
+			fatal_lang_error('email_no_template', 'template', array($template));
+	}
 
 	$ret = array(
 		'subject' => $txt[$template . '_subject'],
@@ -2779,17 +2915,18 @@ 
 function user_info_callback($matches)
 {
 	global $user_info;
-	if (empty($matches[1]))
-		return '';
+	if (empty($matches[1])) {
+			return '';
+	}
 
 	$use_ref = true;
 	$ref = &$user_info;
 
 	foreach (explode('.', $matches[1]) as $index)
 	{
-		if ($use_ref && isset($ref[$index]))
-			$ref = &$ref[$index];
-		else
+		if ($use_ref && isset($ref[$index])) {
+					$ref = &$ref[$index];
+		} else
 		{
 			$use_ref = false;
 			break;
@@ -2826,8 +2963,7 @@ 
 		if (!empty($lang_locale) && enchant_broker_dict_exists($context['enchant_broker'], $lang_locale))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $lang_locale);
-		}
-		elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
+		} elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $txt['lang_dictionary']);
 		}
@@ -2837,8 +2973,7 @@ 
 		{
 			$context['provider'] = 'enchant';
 			return $enchant_link;
-		}
-		else
+		} else
 		{
 			// Free up any resources used...
 			@enchant_broker_free($context['enchant_broker']);
@@ -2859,8 +2994,9 @@ 
 		$pspell_link = pspell_new($txt['lang_dictionary'], $txt['lang_spelling'], '', strtr($context['character_set'], array('iso-' => 'iso', 'ISO-' => 'iso')), PSPELL_FAST | PSPELL_RUN_TOGETHER);
 
 		// Most people don't have anything but English installed... So we use English as a last resort.
-		if (!$pspell_link)
-			$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		if (!$pspell_link) {
+					$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		}
 
 		error_reporting($old);
 		ob_end_clean();
@@ -2900,8 +3036,7 @@ 
 			$word = iconv($txt['lang_character_set'], 'UTF-8', $word);
 		}
 		return enchant_dict_check($dict, $word);
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_check($dict, $word);
 	}
@@ -2937,13 +3072,11 @@ 
 			}
 
 			return $suggestions;
-		}
-		else
+		} else
 		{
 			return enchant_dict_suggest($dict, $word);
 		}
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_suggest($dict, $word);
 	}

Sources/Errors.php

Braces +127 added lines, -90 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Log an error, if the error logging is enabled.
@@ -39,10 +40,11 @@ 
 	$error_call++;
 
 	// Collect a backtrace
-	if (!isset($db_show_debug) || $db_show_debug === false)
-		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-	else
-		$backtrace = debug_backtrace();
+	if (!isset($db_show_debug) || $db_show_debug === false) {
+			$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+	} else {
+			$backtrace = debug_backtrace();
+	}
 
 	// are we in a loop?
 	if($error_call > 2)
@@ -52,8 +54,9 @@ 
 	}
 
 	// Check if error logging is actually on.
-	if (empty($modSettings['enableErrorLogging']))
-		return $error_message;
+	if (empty($modSettings['enableErrorLogging'])) {
+			return $error_message;
+	}
 
 	// Basically, htmlspecialchars it minus &. (for entities!)
 	$error_message = strtr($error_message, array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));
@@ -61,33 +64,39 @@ 
 
 	// Add a file and line to the error message?
 	// Don't use the actual txt entries for file and line but instead use %1$s for file and %2$s for line
-	if ($file == null)
-		$file = '';
-	else
-		// Window style slashes don't play well, lets convert them to the unix style.
+	if ($file == null) {
+			$file = '';
+	} else {
+			// Window style slashes don't play well, lets convert them to the unix style.
 		$file = str_replace('\\', '/', $file);
+	}
 
-	if ($line == null)
-		$line = 0;
-	else
-		$line = (int) $line;
+	if ($line == null) {
+			$line = 0;
+	} else {
+			$line = (int) $line;
+	}
 
 	// Just in case there's no id_member or IP set yet.
-	if (empty($user_info['id']))
-		$user_info['id'] = 0;
-	if (empty($user_info['ip']))
-		$user_info['ip'] = '';
+	if (empty($user_info['id'])) {
+			$user_info['id'] = 0;
+	}
+	if (empty($user_info['ip'])) {
+			$user_info['ip'] = '';
+	}
 
 	// Find the best query string we can...
 	$query_string = empty($_SERVER['QUERY_STRING']) ? (empty($_SERVER['REQUEST_URL']) ? '' : str_replace($scripturl, '', $_SERVER['REQUEST_URL'])) : $_SERVER['QUERY_STRING'];
 
 	// Don't log the session hash in the url twice, it's a waste.
-	if (!empty($smcFunc['htmlspecialchars']))
-		$query_string = $smcFunc['htmlspecialchars']((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string));
+	if (!empty($smcFunc['htmlspecialchars'])) {
+			$query_string = $smcFunc['htmlspecialchars']((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string));
+	}
 
 	// Just so we know what board error messages are from.
-	if (isset($_POST['board']) && !isset($_GET['board']))
-		$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	if (isset($_POST['board']) && !isset($_GET['board'])) {
+			$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	}
 
 	// What types of categories do we have?
 	$known_error_types = array(
@@ -140,9 +149,9 @@ 
 
 			list($context['num_errors']) = $smcFunc['db_fetch_row']($query);
 			$smcFunc['db_free_result']($query);
+		} else {
+					$context['num_errors']++;
 		}
-		else
-			$context['num_errors']++;
 	}
 
 	// reset error call
@@ -164,12 +173,14 @@ 
 	global $txt;
 
 	// Send the appropriate HTTP status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// We don't have $txt yet, but that's okay...
-	if (empty($txt))
-		die($error);
+	if (empty($txt)) {
+			die($error);
+	}
 
 	log_error_online($error, false);
 	setup_fatal_error_context($log ? log_error($error, $log) : $error);
@@ -196,8 +207,9 @@ 
 	static $fatal_error_called = false;
 
 	// Send the status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// Try to load a theme if we don't have one.
 	if (empty($context['theme_loaded']) && empty($fatal_error_called))
@@ -207,8 +219,9 @@ 
 	}
 
 	// If we have no theme stuff we can't have the language file...
-	if (empty($context['theme_loaded']))
-		die($error);
+	if (empty($context['theme_loaded'])) {
+			die($error);
+	}
 
 	$reload_lang_file = true;
 	// Log the error in the forum's language, but don't waste the time if we aren't logging
@@ -244,8 +257,9 @@ 
 	global $settings, $modSettings, $db_show_debug;
 
 	// Ignore errors if we're ignoring them or they are strict notices from PHP 5
-	if (error_reporting() == 0)
-		return;
+	if (error_reporting() == 0) {
+			return;
+	}
 
 	if (strpos($file, 'eval()') !== false && !empty($settings['current_include_filename']))
 	{
@@ -253,19 +267,22 @@ 
 		$count = count($array);
 		for ($i = 0; $i < $count; $i++)
 		{
-			if ($array[$i]['function'] != 'loadSubTemplate')
-				continue;
+			if ($array[$i]['function'] != 'loadSubTemplate') {
+							continue;
+			}
 
 			// This is a bug in PHP, with eval, it seems!
-			if (empty($array[$i]['args']))
-				$i++;
+			if (empty($array[$i]['args'])) {
+							$i++;
+			}
 			break;
 		}
 
-		if (isset($array[$i]) && !empty($array[$i]['args']))
-			$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
-		else
-			$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		if (isset($array[$i]) && !empty($array[$i]['args'])) {
+					$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
+		} else {
+					$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		}
 	}
 
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -274,8 +291,9 @@ 
 		if ($error_level % 255 != E_ERROR)
 		{
 			$temporary = ob_get_contents();
-			if (substr($temporary, -2) == '="')
-				echo '"';
+			if (substr($temporary, -2) == '="') {
+							echo '"';
+			}
 		}
 
 		// Debugging!  This should look like a PHP error message.
@@ -291,23 +309,27 @@ 
 	call_integration_hook('integrate_output_error', array($message, $error_type, $error_level, $file, $line));
 
 	// Dying on these errors only causes MORE problems (blank pages!)
-	if ($file == 'Unknown')
-		return;
+	if ($file == 'Unknown') {
+			return;
+	}
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		obExit(false);
-	else
-		return;
+	if ($error_level % 255 == E_ERROR) {
+			obExit(false);
+	} else {
+			return;
+	}
 
 	// If this is an E_ERROR, E_USER_ERROR, E_WARNING, or E_USER_WARNING.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING)
-		fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING) {
+			fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	}
 
 	// We should NEVER get to this point.  Any fatal error MUST quit, or very bad things can happen.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * It is called by {@link fatal_error()} and {@link fatal_lang_error()}.
@@ -323,24 +345,28 @@ 
 
 	// Attempt to prevent a recursive loop.
 	++$level;
-	if ($level > 1)
-		return false;
+	if ($level > 1) {
+			return false;
+	}
 
 	// Maybe they came from dlattach or similar?
-	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded']))
-		loadTheme();
+	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded'])) {
+			loadTheme();
+	}
 
 	// Don't bother indexing errors mate...
 	$context['robot_no_index'] = true;
 
-	if (!isset($context['error_title']))
-		$context['error_title'] = $txt['error_occured'];
+	if (!isset($context['error_title'])) {
+			$context['error_title'] = $txt['error_occured'];
+	}
 	$context['error_message'] = isset($context['error_message']) ? $context['error_message'] : $error_message;
 
 	$context['error_code'] = isset($error_code) ? 'id="' . $error_code . '" ' : '';
 
-	if (empty($context['page_title']))
-		$context['page_title'] = $context['error_title'];
+	if (empty($context['page_title'])) {
+			$context['page_title'] = $context['error_title'];
+	}
 
 	loadTemplate('Errors');
 	$context['sub_template'] = 'fatal_error';
@@ -348,23 +374,26 @@ 
 	// If this is SSI, what do they want us to do?
 	if (SMF == 'SSI')
 	{
-		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method))
-			$ssi_on_error_method();
-		elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			loadSubTemplate('fatal_error');
+		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method)) {
+					$ssi_on_error_method();
+		} elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					loadSubTemplate('fatal_error');
+		}
 
 		// No layers?
-		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			exit;
+		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					exit;
+		}
 	}
 	// Alternatively from the cron call?
 	elseif (SMF == 'BACKGROUND')
 	{
 		// We can't rely on even having language files available.
-		if (defined('FROM_CLI') && FROM_CLI)
-			echo 'cron error: ', $context['error_message'];
-		else
-			echo 'An error occurred. More information may be available in your logs.';
+		if (defined('FROM_CLI') && FROM_CLI) {
+					echo 'cron error: ', $context['error_message'];
+		} else {
+					echo 'An error occurred. More information may be available in your logs.';
+		}
 		exit;
 	}
 
@@ -392,8 +421,8 @@ 
 
 	set_fatal_error_headers();
 
-	if (!empty($maintenance))
-		echo '<!DOCTYPE html>
+	if (!empty($maintenance)) {
+			echo '<!DOCTYPE html>
 <html>
 	<head>
 		<meta name="robots" content="noindex">
@@ -404,6 +433,7 @@ 
 		', $mmessage, '
 	</body>
 </html>';
+	}
 
 	die();
 }
@@ -425,15 +455,17 @@ 
 	// For our purposes, we're gonna want this on if at all possible.
 	$modSettings['cache_enable'] = '1';
 
-	if (($temp = cache_get_data('db_last_error', 600)) !== null)
-		$db_last_error = max($db_last_error, $temp);
+	if (($temp = cache_get_data('db_last_error', 600)) !== null) {
+			$db_last_error = max($db_last_error, $temp);
+	}
 
 	if ($db_last_error < time() - 3600 * 24 * 3 && empty($maintenance) && !empty($db_error_send))
 	{
 		// Avoid writing to the Settings.php file if at all possible; use shared memory instead.
 		cache_put_data('db_last_error', time(), 600);
-		if (($temp = cache_get_data('db_last_error', 600)) === null)
-			logLastDatabaseError();
+		if (($temp = cache_get_data('db_last_error', 600)) === null) {
+					logLastDatabaseError();
+		}
 
 		// Language files aren't loaded yet :(.
 		$db_error = @$smcFunc['db_error']($db_connection);
@@ -490,8 +522,9 @@ 
  */
 function set_fatal_error_headers()
 {
-	if (headers_sent())
-		return;
+	if (headers_sent()) {
+			return;
+	}
 
 	// Don't cache this page!
 	header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -517,12 +550,14 @@ 
 	global $smcFunc, $user_info, $modSettings;
 
 	// Don't bother if Who's Online is disabled.
-	if (empty($modSettings['who_enabled']))
-		return;
+	if (empty($modSettings['who_enabled'])) {
+			return;
+	}
 
 	// Maybe they came from SSI or similar where sessions are not recorded?
-	if (SMF == 'SSI' || SMF == 'BACKGROUND')
-		return;
+	if (SMF == 'SSI' || SMF == 'BACKGROUND') {
+			return;
+	}
 
 	$session_id = !empty($user_info['is_guest']) ? 'ip' . $user_info['ip'] : session_id();
 
@@ -548,11 +583,13 @@ 
 		$url = $smcFunc['json_decode']($url, true);
 		$url['error'] = $error;
 		// Url field got a max length of 1024 in db
-		if (strlen($url['error']) > 500)
-			$url['error'] = substr($url['error'],0,500);
+		if (strlen($url['error']) > 500) {
+					$url['error'] = substr($url['error'],0,500);
+		}
 
-		if (!empty($sprintf))
-			$url['error_params'] = $sprintf;
+		if (!empty($sprintf)) {
+					$url['error_params'] = $sprintf;
+		}
 
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_online

Sources/Security.php

Braces +255 added lines, -197 removed lines

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

Sources/Display.php

Braces +298 added lines, -219 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The central part of the board - topic display.
@@ -34,8 +35,9 @@ 
 	global $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']('', '
@@ -365,9 +370,10 @@ 
 		list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']);
 		$sig_limits = explode(',', $sig_limits);
 
-		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
-			addInlineCss('
+		if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
+					addInlineCss('
 	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
+		}
 	}
 
 	// Censor the title...
@@ -405,21 +411,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'],
@@ -431,8 +441,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 ;).
@@ -446,11 +457,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);
@@ -487,8 +500,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.
@@ -504,14 +518,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']))
@@ -542,9 +558,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'];
@@ -576,8 +592,9 @@ 
 			list($start, $end, $allday, $span, $tz, $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'],
@@ -626,8 +643,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.
@@ -651,9 +669,9 @@ 
 	}
 
 	// Create the poll info if it exists and is valid.
-	if ($context['is_poll'] && empty($pollinfo))
-		$context['is_poll'] = false;
-	elseif ($context['is_poll'])
+	if ($context['is_poll'] && empty($pollinfo)) {
+			$context['is_poll'] = false;
+	} elseif ($context['is_poll'])
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT COUNT(DISTINCT id_member) AS total
@@ -696,8 +714,9 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Got we multi choice?
-		if ($pollinfo['max_votes'] > 1)
-			$realtotal = $pollinfo['total'];
+		if ($pollinfo['max_votes'] > 1) {
+					$realtotal = $pollinfo['total'];
+		}
 
 		// If this is a guest we need to do our best to work out if they have voted, and what they voted for.
 		if ($user_info['is_guest'] && $pollinfo['guest_vote'] && allowedTo('poll_vote'))
@@ -710,20 +729,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]);
@@ -837,23 +857,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');
@@ -889,9 +915,9 @@ 
 	{
 		$start_char = 'C';
 		$page_id = $ascending ? $context['topicinfo']['id_first_msg'] : $context['topicinfo']['id_last_msg'];
+	} else {
+			$start_char = null;
 	}
-	else
-		$start_char = null;
 
 	$limit = $context['messages_per_page'];
 
@@ -905,17 +931,17 @@ 
 		{
 			$ascending_seek = true;
 			$page_operator = $ascending ? '>=' : '<=';
-		}
-		else
+		} else
 		{
 			$ascending_seek = false;
 			$page_operator = $ascending ? '<=' : '>=';
 		}
 
-		if ($start_char === 'C')
-			$limit_seek = $limit;
-		else
-			$limit_seek  = $limit + 1;
+		if ($start_char === 'C') {
+					$limit_seek = $limit;
+		} else {
+					$limit_seek  = $limit + 1;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_msg, id_member, approved
@@ -938,21 +964,23 @@ 
 		$found_msg = false;
 
 		// Fallback
-		if ($smcFunc['db_num_rows']($request) < 1)
-			unset($start_char);
-		else
+		if ($smcFunc['db_num_rows']($request) < 1) {
+					unset($start_char);
+		} else
 		{
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// Check if the start msg is in our result
-				if ($row['id_msg'] == $page_id)
-					$found_msg = true;
+				if ($row['id_msg'] == $page_id) {
+									$found_msg = true;
+				}
 
 				// Skip the the start msg if we not in mode C
 				if ($start_char === 'C' || $row['id_msg'] != $page_id)
 				{
-					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'];
 				}
@@ -968,8 +996,9 @@ 
 		}
 
 		// Before Page bring in the right order
-		if (!empty($start_char) && $start_char === 'L')
-			krsort($messages);
+		if (!empty($start_char) && $start_char === 'L') {
+					krsort($messages);
+		}
 	}
 
 	// Jump to page
@@ -1004,14 +1033,16 @@ 
 
 		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'];
 		}
 
 		// Sort the messages into the correct display order
-		if (!$ascending)
-			sort($messages);
+		if (!$ascending) {
+					sort($messages);
+		}
 	}
 
 	// Remember the paging data for next time
@@ -1031,8 +1062,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',
@@ -1064,8 +1096,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)
@@ -1087,8 +1120,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']))
 		{
@@ -1112,14 +1146,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']))
@@ -1176,23 +1212,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(
@@ -1219,21 +1258,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;
@@ -1268,8 +1309,9 @@ 
 		'can_restore_msg' => 'move_any',
 		'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(
@@ -1282,8 +1324,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'] && $context['can_move'] && !$modSettings['topic_move_any'])
 	{
@@ -1329,8 +1372,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']))
@@ -1391,26 +1435,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(
@@ -1432,38 +1481,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'] . ';sa=' . ($context['is_locked'] ? 'unlock' : 'lock') . ';' . $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'] . ';sa=' . ($context['is_locked'] ? 'unlock' : 'lock') . ';' . $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'] . ';sa=' . ($context['is_sticky'] ? 'nonsticky' : 'sticky') . ';' . $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'] . ';sa=' . ($context['is_sticky'] ? 'nonsticky' : 'sticky') . ';' . $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
@@ -1472,12 +1530,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, 'minimize' => true), 'smf_drafts');
+	if ($context['drafts_autosave']) {
+			loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
+	}
 
 	// Spellcheck
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+	}
 
 	// topic.js
 	loadJavaScriptFile('topic.js', array('defer' => false, 'minimize' => true), 'smf_topic');
@@ -1511,16 +1571,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);
@@ -1534,19 +1597,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'];
@@ -1571,8 +1636,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'));
@@ -1595,8 +1659,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');
 
@@ -1640,32 +1705,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));
 
@@ -1691,8 +1760,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;
 }
@@ -1709,16 +1779,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']('', '
@@ -1737,8 +1810,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'))
 	{
@@ -1755,13 +1829,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']('', '
@@ -1781,8 +1856,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']);
 	}
@@ -1805,17 +1881,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']);

Themes/default/Memberlist.template.php

Braces +30 added lines, -20 removed lines

@@ -27,9 +27,10 @@ 
 			<h3 class="catbg">
 				<span class="floatleft">', $txt['members_list'], '</span>';
 
-	if (!isset($context['old_search']))
-		echo '
+	if (!isset($context['old_search'])) {
+			echo '
 				<span class="floatright">', $context['letter_links'], '</span>';
+	}
 	echo '
 			</h3>
 		</div>';
@@ -44,20 +45,23 @@ 
 	foreach ($context['columns'] as $key => $column)
 	{
 		// @TODO maybe find something nicer?
-		if ($key == 'email_address' && !$context['can_send_email'])
-			continue;
+		if ($key == 'email_address' && !$context['can_send_email']) {
+					continue;
+		}
 
 		// This is a selected column, so underline it or some such.
-		if ($column['selected'])
-			echo '
+		if ($column['selected']) {
+					echo '
 						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', ' selected" style="width: auto;"' . (isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '') . '>
 							<a href="' . $column['href'] . '" rel="nofollow">' . $column['label'] . '</a><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></th>';
+		}
 
 		// This is just some column... show the link and be done with it.
-		else
-			echo '
+		else {
+					echo '
 						<th scope="col" class="', $key, isset($column['class']) ? ' ' . $column['class'] : '', '"', isset($column['width']) ? ' style="width: ' . $column['width'] . '"' : '', isset($column['colspan']) ? ' colspan="' . $column['colspan'] . '"' : '', '>
 						', $column['link'], '</th>';
+		}
 	}
 
 	echo '
@@ -77,9 +81,10 @@ 
 						</td>
 						<td class="real_name lefttext">', $member['link'], '</td>';
 
-			if (!isset($context['disabled_fields']['website']))
-				echo '
+			if (!isset($context['disabled_fields']['website'])) {
+							echo '
 						<td class="website_url centertext">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" rel="noopener"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
+			}
 
 			// Group and date.
 			echo '
@@ -91,33 +96,36 @@ 
 				echo '
 						<td class="post_count centertext">';
 
-				if (!empty($member['post_percent']))
-					echo '
+				if (!empty($member['post_percent'])) {
+									echo '
 							<div class="generic_bar">
 								<div class="bar" style="width: ', $member['post_percent'], '%;"></div>
 								<span>', $member['posts'], '</span>
 							</div>';
+				}
 
 				echo '
 						</td>';
 			}
 
 			// Show custom fields marked to be shown here
-			if (!empty($context['custom_profile_fields']['columns']))
-				foreach ($context['custom_profile_fields']['columns'] as $key => $column)
+			if (!empty($context['custom_profile_fields']['columns'])) {
+							foreach ($context['custom_profile_fields']['columns'] as $key => $column)
 					echo '
 						<td class="' , $key , ' centertext">', $member['options'][$key], '</td>';
+			}
 
 			echo '
 					</tr>';
 		}
 	}
 	// No members?
-	else
-		echo '
+	else {
+			echo '
 					<tr>
 						<td colspan="', $context['colspan'], '" class="windowbg">', $txt['search_no_results'], '</td>
 					</tr>';
+	}
 
 	echo '
 				</tbody>
@@ -130,11 +138,12 @@ 
 			<div class="pagelinks floatleft">', $context['page_index'], '</div>';
 
 	// If it is displaying the result of a search show a "search again" link to edit their criteria.
-	if (isset($context['old_search']))
-		echo '
+	if (isset($context['old_search'])) {
+			echo '
 			<div class="buttonlist floatright">
 				<a class="button" href="', $scripturl, '?action=mlist;sa=search;search=', $context['old_search_value'], '">', $txt['mlist_search_again'], '</a>
 			</div>';
+	}
 	echo '
 		</div>
 	</div><!-- #memberlist -->';
@@ -174,12 +183,13 @@ 
 					<dd>
 						<ul>';
 
-	foreach ($context['search_fields'] as $id => $title)
-		echo '
+	foreach ($context['search_fields'] as $id => $title) {
+			echo '
 							<li>
 								<input type="checkbox" name="fields[]" id="fields-', $id, '" value="', $id, '"', in_array($id, $context['search_defaults']) ? ' checked' : '', '>
 								<label for="fields-', $id, '">', $title, '</label>
 							</li>';
+	}
 
 	echo '
 						</ul>

Sources/tasks/CreatePost-Notify.php

Braces +74 added lines, -54 removed lines

@@ -96,8 +96,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			$groups = array_merge(array($row['id_group'], $row['id_post_group']), (empty($row['additional_groups']) ? array() : explode(',', $row['additional_groups'])));
-			if (!in_array(1, $groups) && count(array_intersect($groups, explode(',', $row['member_groups']))) == 0)
-				continue;
+			if (!in_array(1, $groups) && count(array_intersect($groups, explode(',', $row['member_groups']))) == 0) {
+							continue;
+			}
 
 			$members[] = $row['id_member'];
 			$watched[$row['id_member']] = $row;
@@ -105,8 +106,9 @@ 
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($members))
-			return true;
+		if (empty($members)) {
+					return true;
+		}
 
 		$members = array_unique($members);
 		$prefs = getNotifyPrefs($members, '', true);
@@ -122,8 +124,9 @@ 
 		self::handleQuoteNotifications($msgOptions, $posterOptions, $quotedMembers, $prefs, $done_members, $alert_rows);
 
 		// Save ourselves a bit of work in the big loop below
-		foreach ($done_members as $done_member)
-			unset($watched[$done_member]);
+		foreach ($done_members as $done_member) {
+					unset($watched[$done_member]);
+		}
 
 		// Handle rest of the notifications for watched topics and boards
 		foreach ($watched as $member => $data)
@@ -132,26 +135,31 @@ 
 			$notify_types = !empty($prefs[$member]['msg_notify_type']) ? $prefs[$member]['msg_notify_type'] : self::NOTIFY_TYPE_REPLY_AND_MODIFY;
 
 			// Don't send a notification if the watching member ignored the member who made the action.
-			if (!empty($data['pm_ignore_list']) && in_array($data['id_member_updated'], explode(',', $data['pm_ignore_list'])))
-				continue;
-			if (!in_array($type, array('reply', 'topic')) && $notify_types == self::NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING && $member != $data['id_member_started'])
-				continue;
-			elseif (in_array($type, array('reply', 'topic')) && $member == $posterOptions['id'])
-				continue;
-			elseif (!in_array($type, array('reply', 'topic')) && $notify_types == self::NOTIFY_TYPE_ONLY_REPLIES)
-				continue;
-			elseif ($notify_types == self::NOTIFY_TYPE_NOTHING)
-				continue;
+			if (!empty($data['pm_ignore_list']) && in_array($data['id_member_updated'], explode(',', $data['pm_ignore_list']))) {
+							continue;
+			}
+			if (!in_array($type, array('reply', 'topic')) && $notify_types == self::NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING && $member != $data['id_member_started']) {
+							continue;
+			} elseif (in_array($type, array('reply', 'topic')) && $member == $posterOptions['id']) {
+							continue;
+			} elseif (!in_array($type, array('reply', 'topic')) && $notify_types == self::NOTIFY_TYPE_ONLY_REPLIES) {
+							continue;
+			} elseif ($notify_types == self::NOTIFY_TYPE_NOTHING) {
+							continue;
+			}
 
 			// Don't send a notification if they don't want any...
-			if (in_array($frequency, array(self::FREQUENCY_NOTHING, self::FREQUENCY_DAILY_DIGEST, self::FREQUENCY_WEEKLY_DIGEST)))
-				continue;
+			if (in_array($frequency, array(self::FREQUENCY_NOTHING, self::FREQUENCY_DAILY_DIGEST, self::FREQUENCY_WEEKLY_DIGEST))) {
+							continue;
+			}
 			// ... or if we already sent one and they don't want more...
-			elseif ($frequency === self::FREQUENCY_FIRST_UNREAD_MSG && $data['sent'])
-				continue;
+			elseif ($frequency === self::FREQUENCY_FIRST_UNREAD_MSG && $data['sent']) {
+							continue;
+			}
 			// ... or if they aren't on the bouncer's list.
-			elseif (!empty($this->_details['members_only']) && !in_array($member, $this->_details['members_only']))
-				continue;
+			elseif (!empty($this->_details['members_only']) && !in_array($member, $this->_details['members_only'])) {
+							continue;
+			}
 
 			// Watched topic?
 			if (!empty($data['id_topic']) && $type != 'topic' && !empty($prefs[$member]))
@@ -161,10 +169,12 @@ 
 
 				if ($type == 'reply')
 				{
-					if (!empty($prefs[$member]['msg_receive_body']))
-						$message_type .= '_body';
-					if (!empty($frequency))
-						$message_type .= '_once';
+					if (!empty($prefs[$member]['msg_receive_body'])) {
+											$message_type .= '_body';
+					}
+					if (!empty($frequency)) {
+											$message_type .= '_once';
+					}
 				}
 
 				$content_type = 'topic';
@@ -177,12 +187,14 @@ 
 				$content_type = 'board';
 
 				$message_type = !empty($frequency) ? 'notify_boards_once' : 'notify_boards';
-				if (!empty($prefs[$member]['msg_receive_body']))
-					$message_type .= '_body';
+				if (!empty($prefs[$member]['msg_receive_body'])) {
+									$message_type .= '_body';
+				}
 			}
 			// If neither of the above, this might be a redundent row due to the OR clause in our SQL query, skip
-			else
-				continue;
+			else {
+							continue;
+			}
 
 			// Bitwise check: Receiving a email notification?
 			if ($pref & self::RECEIVE_NOTIFY_EMAIL)
@@ -199,8 +211,9 @@ 
 				$mail_result = sendmail($data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $topicOptions['id'], $emaildata['is_html']);
 
 				// We failed, don't trigger a alert as we don't have a way to attempt to resend just the email currently.
-				if ($mail_result === false)
-					continue;
+				if ($mail_result === false) {
+									continue;
+				}
 			}
 
 			// Bitwise check: Receiving a alert?
@@ -251,14 +264,15 @@ 
 		);
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
-			$smcFunc['db_insert']('',
+		if (!empty($alert_rows)) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}user_alerts',
 				array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 					'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 				$alert_rows,
 				array()
 			);
+		}
 
 		return true;
 	}
@@ -269,8 +283,9 @@ 
 
 		foreach ($quotedMembers as $id => $member)
 		{
-			if (!isset($prefs[$id]) || $id == $posterOptions['id'] || empty($prefs[$id]['msg_quote']))
-				continue;
+			if (!isset($prefs[$id]) || $id == $posterOptions['id'] || empty($prefs[$id]['msg_quote'])) {
+							continue;
+			}
 
 			$done_members[] = $id;
 
@@ -324,32 +339,35 @@ 
 		{
 			if (preg_match('/\[quote(.*)?\]/i', $block, $matches))
 			{
-				if ($quote_level == 0)
-					$message .= '[quote' . $matches[1] . ']';
+				if ($quote_level == 0) {
+									$message .= '[quote' . $matches[1] . ']';
+				}
 				$quote_level++;
-			}
-			elseif (preg_match('/\[\/quote\]/i', $block))
+			} elseif (preg_match('/\[\/quote\]/i', $block))
 			{
-				if ($quote_level <= 1)
-					$message .= '[/quote]';
+				if ($quote_level <= 1) {
+									$message .= '[/quote]';
+				}
 				if ($quote_level >= 1)
 				{
 					$quote_level--;
 					$message .= "\n";
 				}
+			} elseif ($quote_level <= 1) {
+							$message .= $block;
 			}
-			elseif ($quote_level <= 1)
-				$message .= $block;
 		}
 
 		preg_match_all('/\[quote.*?link=msg=([0-9]+).*?\]/i', $message, $matches);
 
 		$id_msgs = $matches[1];
-		foreach ($id_msgs as $k => $id_msg)
-			$id_msgs[$k] = (int) $id_msg;
+		foreach ($id_msgs as $k => $id_msg) {
+					$id_msgs[$k] = (int) $id_msg;
+		}
 
-		if (empty($id_msgs))
-			return array();
+		if (empty($id_msgs)) {
+					return array();
+		}
 
 		// Get the messages
 		$request = $smcFunc['db_query']('', '
@@ -367,8 +385,9 @@ 
 		$members = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($posterOptions['id'] == $row['id_member'])
-				continue;
+			if ($posterOptions['id'] == $row['id_member']) {
+							continue;
+			}
 
 			$members[$row['id_member']] = $row;
 		}
@@ -382,10 +401,11 @@ 
 
 		foreach ($members as $id => $member)
 		{
-			if (!empty($prefs[$id]['msg_mention']))
-				$done_members[] = $id;
-			else
-				continue;
+			if (!empty($prefs[$id]['msg_mention'])) {
+							$done_members[] = $id;
+			} else {
+							continue;
+			}
 
 			// Alerts' emails are always instant
 			if ($prefs[$id]['msg_mention'] & self::RECEIVE_NOTIFY_EMAIL)