albertlast / SMF2.1

Themes/default/Packages.template.php

Doc Comments +1 added lines, -1 removed lines

@@ -1096,7 +1096,7 @@
 /**
  * CHMOD control form
  *
- * @return bool False if nothing to do.
+ * @return false|null False if nothing to do.
  */
 function template_control_chmod()
 {

Braces +144 added lines, -104 removed lines

@@ -31,12 +31,13 @@ 
 		</div>
 		<div class="information">';
 
-	if ($context['is_installed'])
-		echo '
+	if ($context['is_installed']) {
+			echo '
 			<strong>', $txt['package_installed_warning1'], '</strong><br>
 			<br>
 			', $txt['package_installed_warning2'], '<br>
 			<br>';
+	}
 
 	echo $txt['package_installed_warning3'], '
 		</div><br>';
@@ -63,8 +64,9 @@ 
 				', $context['package_readme'], '
 				<span class="floatright">', $txt['package_available_readme_language'], '
 					<select name="readme_language" id="readme_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=', $context['uninstalling'] ? 'uninstall' : 'install', ';package=', $context['filename'], ';readme=\' + this.options[this.selectedIndex].value + \';license=\' + get_selected(\'license_language\'));">';
-						foreach ($context['readmes'] as $a => $b)
-							echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_readme_default'] : ucfirst($b), '</option>';
+						foreach ($context['readmes'] as $a => $b) {
+													echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_readme_default'] : ucfirst($b), '</option>';
+						}
 			echo '
 					</select>
 				</span>
@@ -83,8 +85,9 @@ 
 				', $context['package_license'], '
 				<span class="floatright">', $txt['package_available_license_language'], '
 					<select name="license_language" id="license_language" onchange="if (this.options[this.selectedIndex].value) window.location.href = smf_prepareScriptUrl(smf_scripturl + \'', '?action=admin;area=packages;sa=install', ';package=', $context['filename'], ';license=\' + this.options[this.selectedIndex].value + \';readme=\' + get_selected(\'readme_language\'));">';
-						foreach ($context['licenses'] as $a => $b)
-							echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_license_default'] : ucfirst($b), '</option>';
+						foreach ($context['licenses'] as $a => $b) {
+													echo '<option value="', $b, '"', $a === 'selected' ? ' selected' : '', '>', $b == 'default' ? $txt['package_license_default'] : ucfirst($b), '</option>';
+						}
 			echo '
 					</select>
 				</span>
@@ -110,9 +113,10 @@ 
 					', $txt['package_db_uninstall_actions'], ':
 					<ul>';
 
-		foreach ($context['database_changes'] as $change)
-			echo '
+		foreach ($context['database_changes'] as $change) {
+					echo '
 						<li>', $change, '</li>';
+		}
 		echo '
 					</ul>
 				</div>
@@ -122,14 +126,14 @@ 
 	echo '
 			<div class="information">';
 
-	if (empty($context['actions']) && empty($context['database_changes']))
-		echo '
+	if (empty($context['actions']) && empty($context['database_changes'])) {
+			echo '
 				<br>
 				<div class="errorbox">
 					', $txt['corrupt_compatible'], '
 				</div>
 			</div>';
-	else
+	} else
 	{
 		echo '
 					', $txt['perform_actions'], '
@@ -229,9 +233,10 @@ 
 					<tr class="title_bar">
 						<td></td>
 						<td>';
-				if (!empty($context['themes_locked']))
-					echo '
+				if (!empty($context['themes_locked'])) {
+									echo '
 							<input type="hidden" name="custom_theme[]" value="', $id, '">';
+				}
 				echo '
 							<input type="checkbox" name="custom_theme[]" id="custom_theme_', $id, '" value="', $id, '" class="input_check" onclick="', (!empty($theme['has_failure']) ? 'if (this.form.custom_theme_' . $id . '.checked && !confirm(\'' . $txt['package_theme_failure_warning'] . '\')) return false;' : ''), 'invertAll(this, this.form, \'dummy_theme_', $id, '\', true);"', !empty($context['themes_locked']) ? ' disabled checked' : '', '>
 						</td>
@@ -372,14 +377,15 @@ 
 	</script>';
 
 	// And a bit more for database changes.
-	if (!empty($context['database_changes']))
-		echo '
+	if (!empty($context['database_changes'])) {
+			echo '
 	<script>
 		var database_changes_area = document.getElementById(\'db_changes_div\');
 		var db_vis = false;
 		database_changes_area.style.display = "none";
 	</script>';
-}
+	}
+	}
 
 /**
  * Extract package contents
@@ -411,12 +417,12 @@ 
 				<h3 class="catbg">', $context['uninstalling'] ? $txt['uninstall'] : $txt['extracting'], '</h3>
 			</div>
 			<div class="information">', $txt['package_installed_extract'], '</div>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['package_installed_redirecting'], '</h3>
 			</div>';
+	}
 
 	echo '
 		<div class="windowbg">';
@@ -427,25 +433,25 @@ 
 		echo '
 			', $context['redirect_text'], '<br><br>
 			<a href="', $context['redirect_url'], '">', $txt['package_installed_redirect_go_now'], '</a> | <a href="', $scripturl, '?action=admin;area=packages;sa=browse">', $txt['package_installed_redirect_cancel'], '</a>';
-	}
-	elseif ($context['uninstalling'])
-		echo '
+	} elseif ($context['uninstalling']) {
+			echo '
 			', $txt['package_uninstall_done'];
-	elseif ($context['install_finished'])
+	} elseif ($context['install_finished'])
 	{
-		if ($context['extract_type'] == 'avatar')
-			echo '
+		if ($context['extract_type'] == 'avatar') {
+					echo '
 				', $txt['avatars_extracted'];
-		elseif ($context['extract_type'] == 'language')
-			echo '
+		} elseif ($context['extract_type'] == 'language') {
+					echo '
 				', $txt['language_extracted'];
-		else
-			echo '
+		} else {
+					echo '
 				', $txt['package_installed_done'];
-	}
-	else
-		echo '
+		}
+	} else {
+			echo '
 			', $txt['corrupt_compatible'];
+	}
 
 	echo '
 		</div>';
@@ -479,9 +485,10 @@ 
 		<div class="windowbg">
 			<ol>';
 
-	foreach ($context['files'] as $fileinfo)
-		echo '
+	foreach ($context['files'] as $fileinfo) {
+			echo '
 				<li><a href="', $scripturl, '?action=admin;area=packages;sa=examine;package=', $context['filename'], ';file=', $fileinfo['filename'], '" title="', $txt['view'], '">', $fileinfo['filename'], '</a> (', $fileinfo['size'], ' ', $txt['package_bytes'], ')</li>';
+	}
 
 	echo '
 			</ol>
@@ -545,9 +552,10 @@ 
 			</script>
 			<div id="yourVersion" style="display:none">', $context['forum_version'], '</div>';
 
-	if (empty($modSettings['disable_smf_js']))
-		echo '
+	if (empty($modSettings['disable_smf_js'])) {
+			echo '
 			<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
+	}
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
@@ -586,12 +594,13 @@ 
 		}
 	}
 
-	if (!$mods_available)
-		echo '
+	if (!$mods_available) {
+			echo '
 		<div class="noticebox">', $txt['no_packages'], '</div>';
-	else
-		echo '
+	} else {
+			echo '
 		<br>';
+	}
 
 	// the advanced (emulation) box, collapsed by default
 	echo '
@@ -680,11 +689,12 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['package_ftp']['error']))
-			echo '
+	if (!empty($context['package_ftp']['error'])) {
+				echo '
 					<div class="errorbox">
 						<pre>', $context['package_ftp']['error'], '</pre>
 					</div>';
+	}
 
 	echo '
 	<div id="admin_form_wrapper">
@@ -765,13 +775,14 @@ 
 				<fieldset>
 					<legend>' . $txt['package_servers'] . '</legend>
 					<ul class="package_servers">';
-	foreach ($context['servers'] as $server)
-		echo '
+	foreach ($context['servers'] as $server) {
+			echo '
 						<li class="flow_auto">
 							<span class="floatleft">' . $server['name'] . '</span>
 							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=remove;server=' . $server['id'] . ';', $context['session_var'], '=', $context['session_id'], '">[ ' . $txt['delete'] . ' ]</a></span>
 							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $server['id'] . '">[ ' . $txt['package_browse'] . ' ]</a></span>
 						</li>';
+	}
 	echo '
 					</ul>
 				</fieldset>
@@ -858,11 +869,12 @@ 
 		<div class="windowbg2">';
 
 	// No packages, as yet.
-	if (empty($context['package_list']))
-		echo '
+	if (empty($context['package_list'])) {
+			echo '
 			<ul>
 				<li>', $txt['no_packages'], '</li>
 			</ul>';
+	}
 	// List out the packages...
 	else
 	{
@@ -874,11 +886,12 @@ 
 				<li>
 					<strong><span id="ps_img_', $i, '" class="toggle_up" alt="*" style="display: none;"></span> ', $packageSection['title'], '</strong>';
 
-			if (!empty($packageSection['text']))
-				echo '
+			if (!empty($packageSection['text'])) {
+							echo '
 					<div class="sub_bar">
 						<h3 class="subbg">', $packageSection['text'], '</h3>
 					</div>';
+			}
 
 			echo '
 					<', $context['list_type'], ' id="package_section_', $i, '" class="packages">';
@@ -888,13 +901,15 @@ 
 				echo '
 						<li>';
 				// Textual message. Could be empty just for a blank line...
-				if ($package['is_text'])
-					echo '
+				if ($package['is_text']) {
+									echo '
 							', empty($package['name']) ? '&nbsp;' : $package['name'];
+				}
 				// This is supposed to be a rule..
-				elseif ($package['is_line'])
-					echo '
+				elseif ($package['is_line']) {
+									echo '
 						<hr>';
+				}
 				// A remote link.
 				elseif ($package['is_remote'])
 				{
@@ -916,21 +931,25 @@ 
 						<ul id="package_section_', $i, '_pkg_', $id, '" class="package_section">';
 
 					// Show the mod type?
-					if ($package['type'] != '')
-						echo '
+					if ($package['type'] != '') {
+											echo '
 							<li class="package_section">', $txt['package_type'], ':&nbsp; ', $smcFunc['ucwords']($smcFunc['strtolower']($package['type'])), '</li>';
+					}
 					// Show the version number?
-					if ($package['version'] != '')
-						echo '
+					if ($package['version'] != '') {
+											echo '
 							<li class="package_section">', $txt['mod_version'], ':&nbsp; ', $package['version'], '</li>';
+					}
 					// How 'bout the author?
-					if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link']))
-						echo '
+					if (!empty($package['author']) && $package['author']['name'] != '' && isset($package['author']['link'])) {
+											echo '
 							<li class="package_section">', $txt['mod_author'], ':&nbsp; ', $package['author']['link'], '</li>';
+					}
 					// The homepage....
-					if ($package['author']['website']['link'] != '')
-						echo '
+					if ($package['author']['website']['link'] != '') {
+											echo '
 							<li class="package_section">', $txt['author_website'], ':&nbsp; ', $package['author']['website']['link'], '</li>';
+					}
 
 					// Desciption: bleh bleh!
 					// Location of file: http://someplace/.
@@ -983,8 +1002,8 @@ 
 
 				foreach ($ps['items'] as $id => $package)
 				{
-					if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote'])
-						echo '
+					if (!$package['is_text'] && !$package['is_line'] && !$package['is_remote']) {
+											echo '
 				var oPackageToggle_', $section, '_pkg_', $id, ' = new smc_Toggle({
 					bToggleEnabled: true,
 					bCurrentlyCollapsed: true,
@@ -999,6 +1018,7 @@ 
 						}
 					]
 				});';
+					}
 				}
 			}
 			echo '
@@ -1039,9 +1059,10 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 	<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	echo '
 	<div id="admincenter">
@@ -1103,8 +1124,9 @@ 
 	global $context, $txt;
 
 	// Nothing to do? Brilliant!
-	if (empty($context['package_ftp']))
-		return false;
+	if (empty($context['package_ftp'])) {
+			return false;
+	}
 
 	if (empty($context['package_ftp']['form_elements_only']))
 	{
@@ -1113,19 +1135,21 @@ 
 				<div id="need_writable_list" class="smalltext">
 					', $txt['package_ftp_why_file_list'], '
 					<ul style="display: inline;">';
-		if (!empty($context['notwritable_files']))
-			foreach ($context['notwritable_files'] as $file)
+		if (!empty($context['notwritable_files'])) {
+					foreach ($context['notwritable_files'] as $file)
 				echo '
 						<li>', $file, '</li>';
+		}
 
 		echo '
 					</ul>';
 
-		if (!$context['server']['is_windows'])
-			echo '
+		if (!$context['server']['is_windows']) {
+					echo '
 				<hr>
 				', $txt['package_chmod_linux'], '<br />
 				<tt># chmod a+w ', implode(' ', $context['notwritable_files']), '</tt>';
+		}
 
 		echo '
 				</div>';
@@ -1136,9 +1160,10 @@ 
 					<tt id="ftp_error_message">', !empty($context['package_ftp']['error']) ? $context['package_ftp']['error'] : '', '</tt>
 				</div></div>';
 
-	if (!empty($context['package_ftp']['destination']))
-		echo '
+	if (!empty($context['package_ftp']['destination'])) {
+			echo '
 				<form action="', $context['package_ftp']['destination'], '" method="post" accept-charset="', $context['character_set'], '" style="margin: 0;">';
+	}
 
 	echo '
 					<fieldset>
@@ -1171,25 +1196,28 @@ 
 					</dl>
 					</fieldset>';
 
-	if (empty($context['package_ftp']['form_elements_only']))
-		echo '
+	if (empty($context['package_ftp']['form_elements_only'])) {
+			echo '
 
 					<div class="righttext" style="margin: 1ex;">
 						<span id="test_ftp_placeholder_full"></span>
 						<input type="submit" value="', $txt['package_proceed'], '" class="button_submit">
 					</div>';
+	}
 
-	if (!empty($context['package_ftp']['destination']))
-		echo '
+	if (!empty($context['package_ftp']['destination'])) {
+			echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				</form>';
+	}
 
 	// Hide the details of the list.
-	if (empty($context['package_ftp']['form_elements_only']))
-		echo '
+	if (empty($context['package_ftp']['form_elements_only'])) {
+			echo '
 		<script>
 			document.getElementById(\'need_writable_list\').style.display = \'none\';
 		</script>';
+	}
 
 	// Quick generate the test button.
 	echo '
@@ -1545,9 +1573,10 @@ 
 				<tr class="windowbg">
 					<td width="30%"><strong>';
 
-				if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive'))
-					echo '
+				if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
+									echo '
 						<span class="generic_icons folder"></span>';
+				}
 
 				echo '
 						', $name, '
@@ -1564,8 +1593,9 @@ 
 				</tr>
 			';
 
-		if (!empty($dir['contents']))
-			template_permission_show_contents($name, $dir['contents'], 1);
+		if (!empty($dir['contents'])) {
+					template_permission_show_contents($name, $dir['contents'], 1);
+		}
 	}
 
 	echo '
@@ -1601,13 +1631,14 @@ 
 			</fieldset>';
 
 	// Likely to need FTP?
-	if (empty($context['ftp_connected']))
-		echo '
+	if (empty($context['ftp_connected'])) {
+			echo '
 			<p>
 				', $txt['package_file_perms_ftp_details'], ':
 			</p>
 			', template_control_chmod(), '
 			<div class="noticebox">', $txt['package_file_perms_ftp_retain'], '</div>';
+	}
 
 	echo '
 			<span id="test_ftp_placeholder_full"></span>
@@ -1616,9 +1647,10 @@ 
 		</div>';
 
 	// Any looks fors we've already done?
-	foreach ($context['look_for'] as $path)
-		echo '
+	foreach ($context['look_for'] as $path) {
+			echo '
 			<input type="hidden" name="back_look[]" value="', $path, '">';
+	}
 	echo '
 	</form><br>';
 }
@@ -1657,9 +1689,10 @@ 
 				<td class="smalltext" width="30%">' . str_repeat('&nbsp;', $level * 5), '
 					', (!empty($dir['type']) && $dir['type'] == 'dir_recursive') || !empty($dir['list_contents']) ? '<a id="link_' . $cur_ident . '" href="' . $scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident . '/' . $name) . ';back_look=' . $context['back_look_data'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '#fol_' . $cur_ident . '" onclick="return expandFolder(\'' . $cur_ident . '\', \'' . addcslashes($ident . '/' . $name, "'\\") . '\');">' : '';
 
-			if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive'))
-				echo '
+			if (!empty($dir['type']) && ($dir['type'] == 'dir' || $dir['type'] == 'dir_recursive')) {
+							echo '
 						<span class="generic_icons folder"></span>';
+			}
 
 			echo '
 					', $name, '
@@ -1685,14 +1718,15 @@ 
 	}
 
 	// We have more files to show?
-	if ($has_more)
-		echo '
+	if ($has_more) {
+			echo '
 	<tr class="windowbg" id="content_', $js_ident, '_more">
 		<td class="smalltext" width="40%">' . str_repeat('&nbsp;', $level * 5), '
 			&#171; <a href="' . $scripturl . '?action=admin;area=packages;sa=perms;find=' . base64_encode($ident) . ';fileoffset=', ($context['file_offset'] + $context['file_limit']), ';' . $context['session_var'] . '=' . $context['session_id'] . '#fol_' . preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', $ident) . '">', $txt['package_file_perms_more_files'], '</a> &#187;
 		</td>
 		<td colspan="6"></td>
 	</tr>';
+	}
 
 	if ($drawn_div)
 	{
@@ -1700,15 +1734,17 @@ 
 		$isFound = false;
 		foreach ($context['look_for'] as $tree)
 		{
-			if (substr($tree, 0, strlen($ident)) == $ident)
-				$isFound = true;
+			if (substr($tree, 0, strlen($ident)) == $ident) {
+							$isFound = true;
+			}
 		}
 
-		if ($level > 1 && !$isFound)
-			echo '
+		if ($level > 1 && !$isFound) {
+					echo '
 		<script>
 			expandFolder(\'', $js_ident, '\', \'\');
 		</script>';
+		}
 	}
 }
 
@@ -1728,11 +1764,12 @@ 
 				<h3 class="catbg">', $txt['package_file_perms_applying'], '</h3>
 			</div>';
 
-	if (!empty($context['skip_ftp']))
-		echo '
+	if (!empty($context['skip_ftp'])) {
+			echo '
 			<div class="errorbox">
 				', $txt['package_file_perms_skipping_ftp'], '
 			</div>';
+	}
 
 	// How many have we done?
 	$remaining_items = count($context['method'] == 'individual' ? $context['to_process'] : $context['directory_list']);
@@ -1770,28 +1807,31 @@ 
 				<br>';
 
 	// Put out the right hidden data.
-	if ($context['method'] == 'individual')
-		echo '
+	if ($context['method'] == 'individual') {
+			echo '
 				<input type="hidden" name="custom_value" value="', $context['custom_value'], '">
 				<input type="hidden" name="totalItems" value="', $context['total_items'], '">
 				<input type="hidden" name="toProcess" value="', base64_encode(json_encode($context['to_process'])), '">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="hidden" name="predefined" value="', $context['predefined_type'], '">
 				<input type="hidden" name="fileOffset" value="', $context['file_offset'], '">
 				<input type="hidden" name="totalItems" value="', $context['total_items'], '">
 				<input type="hidden" name="dirList" value="', base64_encode(json_encode($context['directory_list'])), '">
 				<input type="hidden" name="specialFiles" value="', base64_encode(json_encode($context['special_files'])), '">';
+	}
 
 	// Are we not using FTP for whatever reason.
-	if (!empty($context['skip_ftp']))
-		echo '
+	if (!empty($context['skip_ftp'])) {
+			echo '
 				<input type="hidden" name="skip_ftp" value="1">';
+	}
 
 	// Retain state.
-	foreach ($context['back_look_data'] as $path)
-		echo '
+	foreach ($context['back_look_data'] as $path) {
+			echo '
 				<input type="hidden" name="back_look[]" value="', $path, '">';
+	}
 
 	echo '
 				<input type="hidden" name="method" value="', $context['method'], '">

Sources/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('Location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/Attachments.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
 		// Just send a generic message.
 		else
 			$this->setResponse(array(
-				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
+				'text' => $this->_sa == 'add' ? 'attach_error_title' : 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
@@ -404,7 +404,7 @@ 
 			// Gotta urlencode the filename.
 			if ($this->_attachResults)
 				foreach ($this->_attachResults as $k => $v)
-					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+					$this->_attachResults[$k]['name'] = urlencode($this->_attachResults[$k]['name']);
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -431,7 +431,7 @@ 
 			ob_start();
 
 		// Set the header.
-		header('Content-Type: application/json; charset='. $context['character_set'] .'');
+		header('Content-Type: application/json; charset=' . $context['character_set'] . '');
 
 		echo json_encode($this->_response ? $this->_response : array());
 

Braces +102 added lines, -75 removed lines

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

Sources/ManagePosts.php

Indentation -1 removed lines

@@ -273,7 +273,6 @@
  * Modify any setting related to topics.
  * Requires the admin_forum permission.
  * Accessed from ?action=admin;area=postsettings;sa=topics.
-
  * @param bool $return_config Whether or not to return the config_vars array (used for admin search)
  * @return void|array Returns nothing or returns $config_vars if $return_config is true
  * @uses Admin template, edit_topic_settings sub-template.

Braces +39 added lines, -29 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the 'Posts and topics' screen.
@@ -98,23 +99,23 @@ 
 		{
 			$_POST['censortext'] = explode("\n", strtr($_POST['censortext'], array("\r" => '')));
 
-			foreach ($_POST['censortext'] as $c)
-				list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
-		}
-		elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
+			foreach ($_POST['censortext'] as $c) {
+							list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
+			}
+		} elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
 		{
 			if (is_array($_POST['censor_vulgar']))
 			{
 				foreach ($_POST['censor_vulgar'] as $i => $value)
 				{
-					if (trim(strtr($value, '*', ' ')) == '')
-						unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					if (trim(strtr($value, '*', ' ')) == '') {
+											unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					}
 				}
 
 				$censored_vulgar = $_POST['censor_vulgar'];
 				$censored_proper = $_POST['censor_proper'];
-			}
-			else
+			} else
 			{
 				$censored_vulgar = explode("\n", strtr($_POST['censor_vulgar'], array("\r" => '')));
 				$censored_proper = explode("\n", strtr($_POST['censor_proper'], array("\r" => '')));
@@ -151,12 +152,14 @@ 
 	$context['censored_words'] = array();
 	for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++)
 	{
-		if (empty($censor_vulgar[$i]))
-			continue;
+		if (empty($censor_vulgar[$i])) {
+					continue;
+		}
 
 		// Skip it, it's either spaces or stars only.
-		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '')
-			continue;
+		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '') {
+					continue;
+		}
 
 		$context['censored_words'][$smcFunc['htmlspecialchars'](trim($censor_vulgar[$i]))] = isset($censor_proper[$i]) ? $smcFunc['htmlspecialchars']($censor_proper[$i]) : '';
 	}
@@ -187,10 +190,11 @@ 
 
 	// Make an inline conditional a little shorter...
 	$can_spell_check = false;
-	if (function_exists('pspell_new'))
-		$can_spell_check = true;
-	elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv')))
-		$can_spell_check = true;
+	if (function_exists('pspell_new')) {
+			$can_spell_check = true;
+	} elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))) {
+			$can_spell_check = true;
+	}
 
 	// All the settings...
 	$config_vars = array(
@@ -221,8 +225,9 @@ 
 
 	call_integration_hook('integrate_modify_post_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -242,17 +247,20 @@ 
 			db_extend('packages');
 
 			$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-			foreach ($colData as $column)
-				if ($column['name'] == 'body')
+			foreach ($colData as $column) {
+							if ($column['name'] == 'body')
 					$body_type = $column['type'];
+			}
 
-			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text')
-				fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text') {
+							fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			}
 		}
 
 		// If we're changing the post preview length let's check its valid
-		if (!empty($_POST['preview_characters']))
-			$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		if (!empty($_POST['preview_characters'])) {
+					$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		}
 
 		call_integration_hook('integrate_save_post_settings');
 
@@ -313,8 +321,9 @@ 
 
 	call_integration_hook('integrate_modify_topic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');
@@ -367,8 +376,9 @@ 
 		array('int', 'drafts_autosave_frequency', 'postinput' => $txt['manageposts_seconds'], 'subtext' => $txt['drafts_autosave_frequency_subnote']),
 	);
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');

Sources/Who.php

Spacing +3 added lines, -3 removed lines

@@ -589,7 +589,7 @@ 
 						'Shitiz "Dragooon" Garg',
 						'Karl "RegularExpression" Benson',
 						'Matthew "Labradoodle-360" Kerle',
-						$user_info['is_admin'] ? 'Matt "Grudge" Wolf': 'Grudge',
+						$user_info['is_admin'] ? 'Matt "Grudge" Wolf' : 'Grudge',
 						'Michael "Thantos" Miller',
 						'Norv',
 						'Peter "Arantor" Spicer',
@@ -813,13 +813,13 @@ 
 			$credit_info = smf_json_decode($row['credits'], true);
 
 			$copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' © ' . $smcFunc['htmlspecialchars']($credit_info['copyright']);
-			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="'. $smcFunc['htmlspecialchars']($credit_info['licenseurl']) .'">'. $smcFunc['htmlspecialchars']($credit_info['license']) .'</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
+			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="' . $smcFunc['htmlspecialchars']($credit_info['licenseurl']) . '">' . $smcFunc['htmlspecialchars']($credit_info['license']) . '</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
 			$version = $txt['credits_version'] . ' ' . $row['version'];
 			$title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version;
 
 			// build this one out and stash it away
 			$mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>';
-			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license  : '') . (!empty($copyright) ? ' | ' . $copyright  : '');
+			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : '');
 		}
 		cache_put_data('mods_credits', $mods, 86400);
 	}

Indentation +1 added lines, -1 removed lines

@@ -673,7 +673,7 @@
 						'Nikola "Dzonny" Novaković',
 						// Localizers
 						'Dr. Deejay',
-                        			'd3vcho',
+									'd3vcho',
 						// Former Localizers
 						'Relyana',
 					),

Braces +126 added lines, -95 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Who's online, and what are they doing?
@@ -35,8 +36,9 @@ 
 	isAllowedTo('who_view');
 
 	// You can't do anything if this is off.
-	if (empty($modSettings['who_enabled']))
-		fatal_lang_error('who_off', false);
+	if (empty($modSettings['who_enabled'])) {
+			fatal_lang_error('who_off', false);
+	}
 
 	// Load the 'Who' template.
 	loadTemplate('Who');
@@ -71,9 +73,9 @@ 
 		$show_methods['spiders'] = '(lo.id_member = 0 AND lo.id_spider > 0)';
 		$show_methods['guests'] = '(lo.id_member = 0 AND lo.id_spider = 0)';
 		$context['show_methods']['spiders'] = $txt['who_show_spiders_only'];
+	} elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders') {
+			unset($_SESSION['who_online_filter']);
 	}
-	elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders')
-		unset($_SESSION['who_online_filter']);
 
 	// Does the user prefer a different sort direction?
 	if (isset($_REQUEST['sort']) && isset($sort_methods[$_REQUEST['sort']]))
@@ -97,20 +99,24 @@ 
 	$context['sort_direction'] = isset($_REQUEST['asc']) || (isset($_REQUEST['sort_dir']) && $_REQUEST['sort_dir'] == 'asc') ? 'up' : 'down';
 
 	$conditions = array();
-	if (!allowedTo('moderate_forum'))
-		$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	if (!allowedTo('moderate_forum')) {
+			$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	}
 
 	// Fallback to top filter?
-	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top']))
-		$_REQUEST['show'] = $_REQUEST['show_top'];
+	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top'])) {
+			$_REQUEST['show'] = $_REQUEST['show_top'];
+	}
 	// Does the user wish to apply a filter?
-	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']]))
-		$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']])) {
+			$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	}
 	// Perhaps we saved a filter earlier in the session?
-	elseif (isset($_SESSION['who_online_filter']))
-		$context['show_by'] = $_SESSION['who_online_filter'];
-	else
-		$context['show_by'] = 'members';
+	elseif (isset($_SESSION['who_online_filter'])) {
+			$context['show_by'] = $_SESSION['who_online_filter'];
+	} else {
+			$context['show_by'] = 'members';
+	}
 
 	$conditions[] = $show_methods[$context['show_by']];
 
@@ -156,8 +162,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$actions = smf_json_decode($row['url'], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// Send the information to the template.
 		$context['members'][$row['session']] = array(
@@ -195,8 +202,8 @@ 
 	$spiderContext = array();
 	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] == 2 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
 	{
-		foreach (smf_json_decode($modSettings['spider_name_cache'], true) as $id => $name)
-			$spiderContext[$id] = array(
+		foreach (smf_json_decode($modSettings['spider_name_cache'], true) as $id => $name) {
+					$spiderContext[$id] = array(
 				'id' => 0,
 				'name' => $name,
 				'group' => $txt['spiders'],
@@ -205,6 +212,7 @@ 
 				'email' => $name,
 				'is_guest' => true
 			);
+		}
 	}
 
 	$url_data = determineActions($url_data);
@@ -219,16 +227,18 @@ 
 	// Put it in the context variables.
 	foreach ($context['members'] as $i => $member)
 	{
-		if ($member['id'] != 0)
-			$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		if ($member['id'] != 0) {
+					$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		}
 
 		// Keep the IP that came from the database.
 		$memberContext[$member['id']]['ip'] = $member['ip'];
 		$context['members'][$i]['action'] = isset($url_data[$i]) ? $url_data[$i] : $txt['who_hidden'];
-		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']]))
-			$context['members'][$i] += $spiderContext[$member['id_spider']];
-		else
-			$context['members'][$i] += $memberContext[$member['id']];
+		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']])) {
+					$context['members'][$i] += $spiderContext[$member['id_spider']];
+		} else {
+					$context['members'][$i] += $memberContext[$member['id']];
+		}
 	}
 
 	// Some people can't send personal messages...
@@ -263,8 +273,9 @@ 
 {
 	global $txt, $user_info, $modSettings, $smcFunc;
 
-	if (!allowedTo('who_view'))
-		return array();
+	if (!allowedTo('who_view')) {
+			return array();
+	}
 	loadLanguage('Who');
 
 	// Actions that require a specific permission level.
@@ -292,10 +303,11 @@ 
 	);
 	call_integration_hook('who_allowed', array(&$allowedActions));
 
-	if (!is_array($urls))
-		$url_list = array(array($urls, $user_info['id']));
-	else
-		$url_list = $urls;
+	if (!is_array($urls)) {
+			$url_list = array(array($urls, $user_info['id']));
+	} else {
+			$url_list = $urls;
+	}
 
 	// These are done to later query these in large chunks. (instead of one by one.)
 	$topic_ids = array();
@@ -307,12 +319,14 @@ 
 	{
 		// Get the request parameters..
 		$actions = smf_json_decode($url[0], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// If it's the admin or moderation center, and there is an area set, use that instead.
-		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area']))
-			$actions['action'] = $actions['area'];
+		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area'])) {
+					$actions['action'] = $actions['area'];
+		}
 
 		// Check if there was no action or the action is display.
 		if (!isset($actions['action']) || $actions['action'] == 'display')
@@ -332,12 +346,14 @@ 
 				$board_ids[$actions['board']][$k] = $txt['who_board'];
 			}
 			// It's the board index!!  It must be!
-			else
-				$data[$k] = $txt['who_index'];
+			else {
+							$data[$k] = $txt['who_index'];
+			}
 		}
 		// Probably an error or some goon?
-		elseif ($actions['action'] == '')
-			$data[$k] = $txt['who_index'];
+		elseif ($actions['action'] == '') {
+					$data[$k] = $txt['who_index'];
+		}
 		// Some other normal action...?
 		else
 		{
@@ -345,23 +361,25 @@ 
 			if ($actions['action'] == 'profile')
 			{
 				// Whose?  Their own?
-				if (empty($actions['u']))
-					$actions['u'] = $url[1];
+				if (empty($actions['u'])) {
+									$actions['u'] = $url[1];
+				}
 
 				$data[$k] = $txt['who_hidden'];
 				$profile_ids[(int) $actions['u']][$k] = $actions['u'] == $url[1] ? $txt['who_viewownprofile'] : $txt['who_viewprofile'];
-			}
-			elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
+			} elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
 			{
 				$data[$k] = $txt['who_hidden'];
 				$board_ids[(int) $actions['board']][$k] = isset($actions['poll']) ? $txt['who_poll'] : $txt['who_post'];
 			}
 			// A subaction anyone can view... if the language string is there, show it.
-			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			}
 			// An action any old fellow can look at. (if ['whoall_' . $action] exists, we know everyone can see it.)
-			elseif (isset($txt['whoall_' . $actions['action']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			elseif (isset($txt['whoall_' . $actions['action']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			}
 			// Viewable if and only if they can see the board...
 			elseif (isset($txt['whotopic_' . $actions['action']]))
 			{
@@ -370,8 +388,7 @@ 
 
 				$data[$k] = $txt['who_hidden'];
 				$topic_ids[$topic][$k] = $txt['whotopic_' . $actions['action']];
-			}
-			elseif (isset($txt['whopost_' . $actions['action']]))
+			} elseif (isset($txt['whopost_' . $actions['action']]))
 			{
 				// Find out what message they are accessing.
 				$msgid = (int) (isset($actions['msg']) ? $actions['msg'] : (isset($actions['quote']) ? $actions['quote'] : 0));
@@ -394,41 +411,46 @@ 
 				$data[$k] = sprintf($txt['whopost_' . $actions['action']], $id_topic, $subject);
 				$smcFunc['db_free_result']($result);
 
-				if (empty($id_topic))
-					$data[$k] = $txt['who_hidden'];
+				if (empty($id_topic)) {
+									$data[$k] = $txt['who_hidden'];
+				}
 			}
 			// Viewable only by administrators.. (if it starts with whoadmin, it's admin only!)
-			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']]))
-				$data[$k] = $txt['whoadmin_' . $actions['action']];
+			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']])) {
+							$data[$k] = $txt['whoadmin_' . $actions['action']];
+			}
 			// Viewable by permission level.
 			elseif (isset($allowedActions[$actions['action']]))
 			{
-				if (allowedTo($allowedActions[$actions['action']]))
-					$data[$k] = $txt['whoallow_' . $actions['action']];
-				elseif (in_array('moderate_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_moderate'];
-				elseif (in_array('admin_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_admin'];
-				else
-					$data[$k] = $txt['who_hidden'];
+				if (allowedTo($allowedActions[$actions['action']])) {
+									$data[$k] = $txt['whoallow_' . $actions['action']];
+				} elseif (in_array('moderate_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_moderate'];
+				} elseif (in_array('admin_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_admin'];
+				} else {
+									$data[$k] = $txt['who_hidden'];
+				}
+			} elseif (!empty($actions['action'])) {
+							$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
+			} else {
+							$data[$k] = $txt['who_unknown'];
 			}
-			elseif (!empty($actions['action']))
-				$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
-			else
-				$data[$k] = $txt['who_unknown'];
 		}
 
 		if (isset($actions['error']))
 		{
-			if (isset($txt[$actions['error']]))
-				$error_message = str_replace('"', '"', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
-			elseif ($actions['error'] == 'guest_login')
-				$error_message = str_replace('"', '"', $txt['who_guest_login']);
-			else
-				$error_message = str_replace('"', '"', $actions['error']);
-
-			if (!empty($error_message))
-				$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			if (isset($txt[$actions['error']])) {
+							$error_message = str_replace('"', '&quot;', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
+			} elseif ($actions['error'] == 'guest_login') {
+							$error_message = str_replace('"', '&quot;', $txt['who_guest_login']);
+			} else {
+							$error_message = str_replace('"', '&quot;', $actions['error']);
+			}
+
+			if (!empty($error_message)) {
+							$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			}
 		}
 
 		// Maybe the action is integrated into another system?
@@ -439,12 +461,15 @@ 
 				if (!empty($integrate_action))
 				{
 					$data[$k] = $integrate_action;
-					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k]))
-						$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
-					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k]))
-						$board_ids[(int) $actions['board']][$k] = $integrate_action;
-					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k]))
-						$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k])) {
+											$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
+					}
+					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k])) {
+											$board_ids[(int) $actions['board']][$k] = $integrate_action;
+					}
+					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k])) {
+											$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					}
 					break;
 				}
 			}
@@ -472,8 +497,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Show the topic's subject for each of the actions.
-			foreach ($topic_ids[$row['id_topic']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			foreach ($topic_ids[$row['id_topic']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -495,8 +521,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Put the board name into the string for each member...
-			foreach ($board_ids[$row['id_board']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			foreach ($board_ids[$row['id_board']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -518,23 +545,26 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// If they aren't allowed to view this person's profile, skip it.
-			if (!$allow_view_any && ($user_info['id'] != $row['id_member']))
-				continue;
+			if (!$allow_view_any && ($user_info['id'] != $row['id_member'])) {
+							continue;
+			}
 
 			// Set their action on each - session/text to sprintf.
-			foreach ($profile_ids[$row['id_member']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			foreach ($profile_ids[$row['id_member']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
 
 	call_integration_hook('whos_online_after', array(&$urls, &$data));
 
-	if (!is_array($urls))
-		return isset($data[0]) ? $data[0] : false;
-	else
-		return $data;
-}
+	if (!is_array($urls)) {
+			return isset($data[0]) ? $data[0] : false;
+	} else {
+			return $data;
+	}
+	}
 
 /**
  * It prepares credit and copyright information for the credits page or the admin page
@@ -710,8 +740,8 @@ 
 	);
 
 	// Give the translators some credit for their hard work.
-	if (!empty($txt['translation_credits']))
-		$context['credits'][] = array(
+	if (!empty($txt['translation_credits'])) {
+			$context['credits'][] = array(
 			'title' => $txt['credits_groups_translation'],
 			'groups' => array(
 				array(
@@ -720,6 +750,7 @@ 
 				),
 			),
 		);
+	}
 
 	$context['credits'][] = array(
 		'title' => $txt['credits_special'],

Sources/Recent.php

Spacing +4 added lines, -4 removed lines

@@ -237,7 +237,7 @@ 
 	else
 	{
 		$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
-					AND b.id_board != {int:recycle_board}' : ''). '
+					AND b.id_board != {int:recycle_board}' : '') . '
 					AND m.id_msg >= {int:max_id_msg}';
 		$query_parameters['max_id_msg'] = max(0, $modSettings['maxMsgID'] - 100 - $_REQUEST['start'] * 6);
 		$query_parameters['recycle_board'] = $modSettings['recycle_board'];
@@ -1124,7 +1124,7 @@ 
 			);
 		else
 			$request = $smcFunc['db_query']('', '
-				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
+				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'] . '
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
 					INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)') . (strpos($_REQUEST['sort'], 'mems.') === false ? '' : '
@@ -1391,7 +1391,7 @@ 
 	if ($is_topics)
 	{
 		$context['recent_buttons'] = array(
-			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'.  $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
+			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
 		if ($context['showCheckboxes'])
@@ -1407,7 +1407,7 @@ 
 	elseif (!$is_topics && isset($context['topics_to_mark']))
 	{
 		$context['recent_buttons'] = array(
-			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read']  .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
+			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
 		if ($context['showCheckboxes'])

Braces +208 added lines, -170 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest post made on the system
@@ -44,8 +45,9 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -54,8 +56,9 @@ 
 	censorText($row['body']);
 
 	$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled']), array('<br>' => '&#10;')));
-	if ($smcFunc['strlen']($row['body']) > 128)
-		$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	if ($smcFunc['strlen']($row['body']) > 128) {
+			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	}
 
 	// Send the data.
 	return array(
@@ -83,15 +86,17 @@ 
 
 	$context['is_redirect'] = false;
 
-	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95)
-		$_REQUEST['start'] = 95;
+	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95) {
+			$_REQUEST['start'] = 95;
+	}
 
 	$query_parameters = array();
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -107,8 +112,9 @@ 
 			list ($name) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($name))
-				fatal_lang_error('no_access', false);
+			if (empty($name)) {
+							fatal_lang_error('no_access', false);
+			}
 
 			$context['linktree'][] = array(
 				'url' => $scripturl . '#c' . (int) $_REQUEST['c'],
@@ -140,8 +146,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -155,12 +162,12 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;c=' . implode(',', $_REQUEST['c']), $_REQUEST['start'], min(100, $total_cat_posts), 10, false);
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts
@@ -184,8 +191,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -199,8 +207,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;boards=' . implode(',', $_REQUEST['boards']), $_REQUEST['start'], min(100, $total_posts), 10, false);
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts, redirect
@@ -233,8 +240,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;board=' . $board . '.%1$d', $_REQUEST['start'], min(100, $total_posts), 10, true);
-	}
-	else
+	} else
 	{
 		$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 					AND b.id_board != {int:recycle_board}' : ''). '
@@ -269,8 +275,9 @@ 
 	);
 
 	// If you selected a redirection board, don't try getting posts for it...
-	if ($context['is_redirect'])
-		$messages = 0;
+	if ($context['is_redirect']) {
+			$messages = 0;
+	}
 
 	$key = 'recent-' . $user_info['id'] . '-' . md5(json_encode(array_diff_key($query_parameters, array('max_id_msg' => 0)))) . '-' . (int) $_REQUEST['start'];
 	if (!$context['is_redirect'] && (empty($modSettings['cache_enable']) || ($messages = cache_get_data($key, 120)) == null))
@@ -301,16 +308,18 @@ 
 				$query_this_board = str_replace('AND m.id_msg >= {int:max_id_msg}', '', $query_this_board);
 				$cache_results = true;
 				unset($query_parameters['max_id_msg']);
+			} else {
+							$done = true;
 			}
-			else
-				$done = true;
 		}
 		$messages = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$messages[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$messages[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-		if (!empty($cache_results))
-			cache_put_data($key, $messages, 120);
+		if (!empty($cache_results)) {
+					cache_put_data($key, $messages, 120);
+		}
 	}
 
 	// Nothing here... Or at least, nothing you can see...
@@ -397,8 +406,9 @@ 
 			'css_class' => 'windowbg',
 		);
 
-		if ($user_info['id'] == $row['id_first_member'])
-			$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		if ($user_info['id'] == $row['id_first_member']) {
+					$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		}
 		$board_ids['any'][$row['id_board']][] = $row['id_msg'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -424,20 +434,23 @@ 
 			$boards = boardsAllowedTo($permission);
 
 			// If 0 is the only thing in the array, they can do it everywhere!
-			if (!empty($boards) && $boards[0] == 0)
-				$boards = array_keys($board_ids[$type]);
+			if (!empty($boards) && $boards[0] == 0) {
+							$boards = array_keys($board_ids[$type]);
+			}
 
 			// Go through the boards, and look for posts they can do this on.
 			foreach ($boards as $board_id)
 			{
 				// Hmm, they have permission, but there are no topics from that board on this page.
-				if (!isset($board_ids[$type][$board_id]))
-					continue;
+				if (!isset($board_ids[$type][$board_id])) {
+									continue;
+				}
 
 				// Okay, looks like they can do it for these posts.
-				foreach ($board_ids[$type][$board_id] as $counter)
-					if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
+				foreach ($board_ids[$type][$board_id] as $counter) {
+									if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
 						$context['posts'][$counter][$allowed] = true;
+				}
 			}
 		}
 	}
@@ -480,17 +493,19 @@ 
 	$context['showing_all_topics'] = isset($_GET['all']);
 	$context['start'] = (int) $_REQUEST['start'];
 	$context['topics_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
-	if ($_REQUEST['action'] == 'unread')
-		$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
-	else
-		$context['page_title'] = $txt['unread_replies'];
+	if ($_REQUEST['action'] == 'unread') {
+			$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
+	} else {
+			$context['page_title'] = $txt['unread_replies'];
+	}
 
-	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread'])
-		fatal_lang_error('loadavg_allunread_disabled', false);
-	elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies'])
-		fatal_lang_error('loadavg_unreadreplies_disabled', false);
-	elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread'])
-		fatal_lang_error('loadavg_unread_disabled', false);
+	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread']) {
+			fatal_lang_error('loadavg_allunread_disabled', false);
+	} elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies']) {
+			fatal_lang_error('loadavg_unreadreplies_disabled', false);
+	} elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread']) {
+			fatal_lang_error('loadavg_unread_disabled', false);
+	}
 
 	// Parameters for the main query.
 	$query_parameters = array();
@@ -503,12 +518,14 @@ 
 		if (!empty($_REQUEST['boards']))
 		{
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $b)
-				$boards[] = (int) $b;
+			foreach ($_REQUEST['boards'] as $b) {
+							$boards[] = (int) $b;
+			}
 		}
 
-		if (!empty($board))
-			$boards[] = (int) $board;
+		if (!empty($board)) {
+					$boards[] = (int) $board;
+		}
 
 		// The easiest thing is to just get all the boards they can see, but since we've specified the top of tree we ignore some of them
 		$request = $smcFunc['db_query']('', '
@@ -525,30 +542,31 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (in_array($row['id_parent'], $boards))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (in_array($row['id_parent'], $boards))
 				$boards[] = $row['id_board'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%d';
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$query_this_board = 'id_board = {int:board}';
 		$query_parameters['board'] = $board;
 		$context['querystring_board_limits'] = ';board=' . $board . '.%1$d';
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board
@@ -560,22 +578,24 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%1$d';
-	}
-	elseif (!empty($_REQUEST['c']))
+	} elseif (!empty($_REQUEST['c']))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		$request = $smcFunc['db_query']('', '
@@ -588,18 +608,19 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';c=' . implode(',', $_REQUEST['c']) . ';start=%1$d';
-	}
-	else
+	} else
 	{
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		// Don't bother to show deleted posts!
@@ -613,12 +634,14 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_available', false);
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_available', false);
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -680,13 +703,14 @@ 
 		'name' => $_REQUEST['action'] == 'unread' ? $txt['unread_topics_visit'] : $txt['unread_replies']
 	);
 
-	if ($context['showing_all_topics'])
-		$context['linktree'][] = array(
+	if ($context['showing_all_topics']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=' . $_REQUEST['action'] . ';all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits'],
 			'name' => $txt['unread_topics_all']
 		);
-	else
-		$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	} else {
+			$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	}
 
 	loadTemplate('Recent');
 	loadTemplate('MessageIndex');
@@ -694,8 +718,9 @@ 
 
 	// Setup the default topic icons... for checking they exist and the like ;)
 	$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';
+	}
 
 	$is_topics = $_REQUEST['action'] == 'unread';
 
@@ -725,8 +750,7 @@ 
 			);
 			list ($earliest_msg) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT MIN(lmr.id_msg)
@@ -742,14 +766,14 @@ 
 		}
 
 		// This is needed in case of topics marked unread.
-		if (empty($earliest_msg))
-			$earliest_msg = 0;
-		else
+		if (empty($earliest_msg)) {
+					$earliest_msg = 0;
+		} else
 		{
 			// Using caching, when possible, to ignore the below slow query.
-			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time())
-				$earliest_msg2 = $_SESSION['cached_log_time'][1];
-			else
+			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time()) {
+							$earliest_msg2 = $_SESSION['cached_log_time'][1];
+			} else
 			{
 				// This query is pretty slow, but it's needed to ensure nothing crucial is ignored.
 				$request = $smcFunc['db_query']('', '
@@ -764,8 +788,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// In theory this could be zero, if the first ever post is unread, so fudge it ;)
-				if ($earliest_msg2 == 0)
-					$earliest_msg2 = -1;
+				if ($earliest_msg2 == 0) {
+									$earliest_msg2 = -1;
+				}
 
 				$_SESSION['cached_log_time'] = array(time(), $earliest_msg2);
 			}
@@ -803,9 +828,9 @@ 
 				'db_error_skip' => true,
 			))
 		) !== false;
+	} else {
+			$have_temp_table = false;
 	}
-	else
-		$have_temp_table = false;
 
 	if ($context['showing_all_topics'] && $have_temp_table)
 	{
@@ -851,14 +876,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%1$d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%1$d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -887,8 +913,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	elseif ($is_topics)
+	} elseif ($is_topics)
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*), MIN(t.id_last_msg)
@@ -939,14 +964,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -976,8 +1002,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	else
+	} else
 	{
 		if ($modSettings['totalMessages'] > 100000)
 		{
@@ -1029,8 +1054,8 @@ 
 			) !== false;
 
 			// If that worked, create a sample of the log_topics table too.
-			if ($have_temp_table)
-				$have_temp_table = $smcFunc['db_query']('', '
+			if ($have_temp_table) {
+							$have_temp_table = $smcFunc['db_query']('', '
 					CREATE TEMPORARY TABLE {db_prefix}log_topics_posted_in (
 						PRIMARY KEY (id_topic)
 					)
@@ -1043,6 +1068,7 @@ 
 						'db_error_skip' => true,
 					)
 				) !== false;
+			}
 		}
 
 		if (!empty($have_temp_table))
@@ -1058,8 +1084,7 @@ 
 			);
 			list ($num_topics) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('unread_fetch_topic_count', '
 				SELECT COUNT(DISTINCT t.id_topic), MIN(t.id_last_msg)
@@ -1100,15 +1125,16 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
-		if (!empty($have_temp_table))
-			$request = $smcFunc['db_query']('', '
+		if (!empty($have_temp_table)) {
+					$request = $smcFunc['db_query']('', '
 				SELECT t.id_topic
 				FROM {db_prefix}topics_posted_in AS t
 					LEFT JOIN {db_prefix}log_topics_posted_in AS lt ON (lt.id_topic = t.id_topic)
@@ -1122,8 +1148,8 @@ 
 					'limit' => $context['topics_per_page'],
 				))
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
@@ -1147,10 +1173,12 @@ 
 					'sort' => $_REQUEST['sort'],
 				))
 			);
+		}
 
 		$topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topics[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Sanity... where have you gone?
@@ -1158,10 +1186,11 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
@@ -1195,8 +1224,9 @@ 
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-			continue;
+		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+					continue;
+		}
 
 		$topic_ids[] = $row['id_topic'];
 
@@ -1204,11 +1234,13 @@ 
 		{
 			// Limit them to 128 characters - do this FIRST because it's a lot of wasted censoring otherwise.
 			$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['first_body']) > 128)
-				$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['first_body']) > 128) {
+							$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			}
 			$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['last_body']) > 128)
-				$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['last_body']) > 128) {
+							$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			}
 
 			// Censor the subject and message preview.
 			censorText($row['first_subject']);
@@ -1219,23 +1251,22 @@ 
 			{
 				$row['last_subject'] = $row['first_subject'];
 				$row['last_body'] = $row['first_body'];
-			}
-			else
+			} else
 			{
 				censorText($row['last_subject']);
 				censorText($row['last_body']);
 			}
-		}
-		else
+		} else
 		{
 			$row['first_body'] = '';
 			$row['last_body'] = '';
 			censorText($row['first_subject']);
 
-			if ($row['id_first_msg'] == $row['id_last_msg'])
-				$row['last_subject'] = $row['first_subject'];
-			else
-				censorText($row['last_subject']);
+			if ($row['id_first_msg'] == $row['id_last_msg']) {
+							$row['last_subject'] = $row['first_subject'];
+			} else {
+							censorText($row['last_subject']);
+			}
 		}
 
 		// Decide how many pages the topic should have.
@@ -1247,22 +1278,24 @@ 
 			$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $topic_length, $messages_per_page, true, false);
 
 			// If we can use all, show all.
-			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages'])
-				$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) {
+							$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			}
+		} else {
+					$pages = '';
 		}
 
-		else
-			$pages = '';
-
 		// We need to check the topic icons exist... you can never be too sure!
 		if (!empty($modSettings['messageIconChecks_enable']))
 		{
 			// First icon first... as you'd expect.
-			if (!isset($context['icon_sources'][$row['first_icon']]))
-				$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			if (!isset($context['icon_sources'][$row['first_icon']])) {
+							$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
 			// Last icon... last... duh.
-			if (!isset($context['icon_sources'][$row['last_icon']]))
-				$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			if (!isset($context['icon_sources'][$row['last_icon']])) {
+							$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
 		}
 
 		// Force the recycling icon if appropriate
@@ -1276,12 +1309,14 @@ 
 		$colorClass = 'windowbg';
 
 		// Sticky topics should get a different color, too.
-		if ($row['is_sticky'])
-			$colorClass .= ' sticky';
+		if ($row['is_sticky']) {
+					$colorClass .= ' sticky';
+		}
 
 		// Locked topics get special treatment as well.
-		if ($row['locked'])
-			$colorClass .= ' locked';
+		if ($row['locked']) {
+					$colorClass .= ' locked';
+		}
 
 		// And build the array.
 		$context['topics'][$row['id_topic']] = array(
@@ -1378,8 +1413,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if (empty($context['topics'][$row['id_topic']]['is_posted_in']))
-				$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			if (empty($context['topics'][$row['id_topic']]['is_posted_in'])) {
+							$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -1394,28 +1430,30 @@ 
 			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'.  $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 
-		if (!empty($context['topics']) && !$context['showing_all_topics'])
-			$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
-	}
-	elseif (!$is_topics && isset($context['topics_to_mark']))
+		if (!empty($context['topics']) && !$context['showing_all_topics']) {
+					$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
+		}
+	} elseif (!$is_topics && isset($context['topics_to_mark']))
 	{
 		$context['recent_buttons'] = array(
 			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read']  .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 	}
 
 	// Allow mods to add additional buttons here

Sources/Subs.php

Indentation -2 removed lines

@@ -5370,7 +5370,6 @@ 
 
 /**
  * Tries different modes to make file/dirs writable. Wrapper function for chmod()
-
  * @param string $file The file/dir full path.
  * @param int $value Not needed, added for legacy reasons.
  * @return boolean  true if the file/dir is already writable or the function was able to make it writable, false if the function couldn't make the file/dir writable.
@@ -5410,7 +5409,6 @@ 
 
 /**
  * Wrapper function for json_decode() with error handling.
-
  * @param string $json The string to decode.
  * @param bool $returnAsArray To return the decoded string as an array or an object, SMF only uses Arrays but to keep on compatibility with json_decode its set to false as default.
  * @param bool $logIt To specify if the error will be logged if theres any.

Doc Comments +2 added lines, -2 removed lines

@@ -676,7 +676,7 @@ 
  * - caches the formatting data from the setting for optimization.
  *
  * @param float $number A number
- * @param bool|int $override_decimal_count If set, will use the specified number of decimal places. Otherwise it's automatically determined
+ * @param integer $override_decimal_count If set, will use the specified number of decimal places. Otherwise it's automatically determined
  * @return string A formatted number
  */
 function comma_format($number, $override_decimal_count = false)
@@ -5527,7 +5527,7 @@ 
  * It assumes the data is already a string.
  * @param string $data The data to print
  * @param string $type The content type. Defaults to Json.
- * @return void
+ * @return false|null
  */
 function smf_serverResponse($data = '', $type = 'Content-Type: application/json')
 {

Spacing +126 added lines, -126 removed lines

@@ -599,7 +599,7 @@ 
 		if (empty($low_id))
 			$pageindex .= $start == 0 ? ' ' : sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
 		else
-			$pageindex .= $start == 0 ? ' ' : sprintf($base_link_page, ($start - $num_per_page), $settings['page_index']['previous_page'], 'L'.$low_id);
+			$pageindex .= $start == 0 ? ' ' : sprintf($base_link_page, ($start - $num_per_page), $settings['page_index']['previous_page'], 'L' . $low_id);
 		
 		// Show all the pages.
 		$display_page = 1;
@@ -608,11 +608,11 @@ 
 
 		// Show the right arrow.
 		$display_page = ($start + $num_per_page) > $max_value ? $max_value : ($start + $num_per_page);
-		if ($start != $counter - $max_value && !$start_invalid){
+		if ($start != $counter - $max_value && !$start_invalid) {
 			if (empty($max_id))
 				$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']);
 			else
-				$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link_page, $display_page , $settings['page_index']['next_page'], 'M'.$max_id);
+				$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link_page, $display_page, $settings['page_index']['next_page'], 'M' . $max_id);
 		}
 			
 	}
@@ -626,7 +626,7 @@ 
 			if (empty($low_id))
 				$pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
 			else
-				$pageindex .= sprintf($base_link_page, $start - $num_per_page, $settings['page_index']['previous_page'], 'L'.$low_id);
+				$pageindex .= sprintf($base_link_page, $start - $num_per_page, $settings['page_index']['previous_page'], 'L' . $low_id);
 		else
 			$pageindex .= '';
 
@@ -648,10 +648,10 @@ 
 			if ($start >= $num_per_page * $nCont)
 			{
 				$tmpStart = $start - $num_per_page * $nCont;
-				if($nCont != 1 || empty($low_id))
+				if ($nCont != 1 || empty($low_id))
 					$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 				else
-					$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'L'.$low_id);
+					$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'L' . $low_id);
 			}
 
 		// Show the current page. (prev page 1 ... 6 7 >[8]< 9 10 ... 15 next page)
@@ -666,10 +666,10 @@ 
 			if ($start + $num_per_page * $nCont <= $tmpMaxPages)
 			{
 				$tmpStart = $start + $num_per_page * $nCont;
-				if($nCont != 1 || empty($max_id))
+				if ($nCont != 1 || empty($max_id))
 					$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
 				else
-					$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'M'.$max_id);
+					$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'M' . $max_id);
 			}
 
 		// Show the '...' part near the end. (prev page 1 ... 6 7 [8] 9 10 >...< 15 next page)
@@ -690,7 +690,7 @@ 
 			if (empty($max_id))
 				$pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']);
 			else
-				$pageindex .= sprintf($base_link_page, $start + $num_per_page, $settings['page_index']['next_page'], 'M'.$max_id);
+				$pageindex .= sprintf($base_link_page, $start + $num_per_page, $settings['page_index']['next_page'], 'M' . $max_id);
 	}
 	$pageindex .= $settings['page_index']['extra_after'];
 
@@ -1125,7 +1125,7 @@ 
 					'height' => array('optional' => true, 'match' => '(\d+)'),
 				),
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
+				'validate' => function(&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
 				{
 					$returnContext = '';
 
@@ -1160,7 +1160,7 @@ 
 						}
 
 						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}']))
-							$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
+							$returnContext .= '<a href="' . $currentAttachment['href'] . ';image" id="link_' . $currentAttachment['id'] . '" onclick="' . $currentAttachment['thumbnail']['javascript'] . '"><img src="' . $currentAttachment['thumbnail']['href'] . '"' . $alt . $title . ' id="thumb_' . $currentAttachment['id'] . '" class="atc_img"></a>';
 						else
 							$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
 					}
@@ -1189,7 +1189,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1226,7 +1226,7 @@ 
 				'type' => 'unparsed_equals_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> ($2) <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1270,7 +1270,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<a href="mailto:$1" class="bbc_email">$1</a>',
 				// @todo Should this respect guest_hideContacts?
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 				},
@@ -1289,7 +1289,7 @@ 
 				'type' => 'unparsed_commas_content',
 				'test' => '\d+,\d+\]',
 				'content' => '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (isset($disabled['url']))
 						$tag['content'] = '$1';
@@ -1305,7 +1305,7 @@ 
 				'test' => '(left|right)(\s+max=\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)?\]',
 				'before' => '<div $1>',
 				'after' => '</div>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"';
 
@@ -1354,7 +1354,7 @@ 
 					'height' => array('optional' => true, 'value' => ' height="$1"', 'match' => '(\d+)'),
 				),
 				'content' => '<img src="$1" alt="{alt}" title="{title}"{width}{height} class="bbc_img resized">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $image_proxy_secret, $boardurl;
 
@@ -1377,7 +1377,7 @@ 
 				'tag' => 'img',
 				'type' => 'unparsed_content',
 				'content' => '<img src="$1" alt="" class="bbc_img">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $image_proxy_secret, $boardurl;
 
@@ -1400,7 +1400,7 @@ 
 				'tag' => 'iurl',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1414,7 +1414,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (substr($data, 0, 1) == '#')
 						$data = '#post_' . substr($data, 1);
@@ -1494,7 +1494,7 @@ 
 				'tag' => 'php',
 				'type' => 'unparsed_content',
 				'content' => '<span class="phpcode">$1</span>',
-				'validate' => isset($disabled['php']) ? null : function (&$tag, &$data, $disabled)
+				'validate' => isset($disabled['php']) ? null : function(&$tag, &$data, $disabled)
 				{
 					if (!isset($disabled['php']))
 					{
@@ -1592,7 +1592,7 @@ 
 				'test' => '[1-7]\]',
 				'before' => '<span style="font-size: $1;" class="bbc_size">',
 				'after' => '</span>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
 					$data = $sizes[$data] . 'em';
@@ -1630,7 +1630,7 @@ 
 				'tag' => 'time',
 				'type' => 'unparsed_content',
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (is_numeric($data))
 						$data = timeformat($data);
@@ -1658,7 +1658,7 @@ 
 				'tag' => 'url',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link" target="_blank">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1672,7 +1672,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link" target="_blank">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if (empty($scheme))
@@ -1698,7 +1698,7 @@ 
 		{
 			if (isset($temp_bbc))
 				$bbc_codes = $temp_bbc;
-			usort($codes, function ($a, $b) {
+			usort($codes, function($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
 			});
 			return $codes;
@@ -1936,7 +1936,7 @@ 
 										# a run of Unicode domain name characters and a dot
 										[\p{L}\p{M}\p{N}\-.:@]+\.
 										# and then a TLD valid in the DNS or the reserved "local" TLD
-										(?:'. $modSettings['tld_regex'] .'|local)
+										(?:'. $modSettings['tld_regex'] . '|local)
 									)
 									# followed by a non-domain character or end of line
 									(?=[^\p{L}\p{N}\-.]|$)
@@ -2004,7 +2004,7 @@ 
 						)?
 						';
 
-						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches) {
+						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function($matches) {
 							$url = array_shift($matches);
 
 							$scheme = parse_url($url, PHP_URL_SCHEME);
@@ -2741,7 +2741,7 @@ 
 		for ($i = 0, $n = count($smileysfrom); $i < $n; $i++)
 		{
 			$specialChars = $smcFunc['htmlspecialchars']($smileysfrom[$i], ENT_QUOTES);
-			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')). '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
+			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
 
 			$smileyPregReplacements[$smileysfrom[$i]] = $smileyCode;
 
@@ -2758,7 +2758,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch,
-		function ($matches) use ($smileyPregReplacements)
+		function($matches) use ($smileyPregReplacements)
 		{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
@@ -2824,13 +2824,13 @@ 
 	{
 		if (defined('SID') && SID != '')
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
-					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : "");
+					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
 		else
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
@@ -3153,7 +3153,7 @@ 
 
 	// Add a generic "Are you sure?" confirmation message.
 	addInlineJavaScript('
-	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';');
+	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) . ';');
 
 	// Now add the capping code for avatars.
 	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize')
@@ -3514,7 +3514,7 @@ 
 
 		else
 			echo '
-	<script src="', $settings['theme_url'] ,'/scripts/minified', ($do_deferred ? '_deferred' : '') ,'.js', $minSeed ,'"></script>';
+	<script src="', $settings['theme_url'], '/scripts/minified', ($do_deferred ? '_deferred' : ''), '.js', $minSeed, '"></script>';
 	}
 
 	// Inline JavaScript - Actually useful some times!
@@ -3592,14 +3592,14 @@ 
 
 		else
 			echo '
-	<link rel="stylesheet" href="', $settings['theme_url'] ,'/css/minified.css', $minSeed ,'">';
+	<link rel="stylesheet" href="', $settings['theme_url'], '/css/minified.css', $minSeed, '">';
 	}
 
 	// Print the rest after the minified files.
 	if (!empty($normal))
 		foreach ($normal as $nf)
 			echo '
-	<link rel="stylesheet" href="', $nf ,'">';
+	<link rel="stylesheet" href="', $nf, '">';
 
 	if ($db_show_debug === true)
 	{
@@ -3615,7 +3615,7 @@ 
 	<style>';
 
 		foreach ($context['css_header'] as $css)
-			echo $css .'
+			echo $css . '
 	';
 
 		echo'
@@ -3644,27 +3644,27 @@ 
 		return false;
 
 	// Did we already did this?
-	$toCache = cache_get_data('minimized_'. $settings['theme_id'] .'_'. $type, 86400);
+	$toCache = cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type, 86400);
 
 	// Already done?
 	if (!empty($toCache))
 		return true;
 
 	// No namespaces, sorry!
-	$classType = 'MatthiasMullie\\Minify\\'. strtoupper($type);
+	$classType = 'MatthiasMullie\\Minify\\' . strtoupper($type);
 
 	// Temp path.
-	$cTempPath = $settings['theme_dir'] .'/'. ($type == 'css' ? 'css' : 'scripts') .'/';
+	$cTempPath = $settings['theme_dir'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/';
 
 	// What kind of file are we going to create?
-	$toCreate = $cTempPath .'minified'. ($do_deferred ? '_deferred' : '') .'.'. $type;
+	$toCreate = $cTempPath . 'minified' . ($do_deferred ? '_deferred' : '') . '.' . $type;
 
 	// File has to exists, if it isn't try to create it.
 	if ((!file_exists($toCreate) && @fopen($toCreate, 'w') === false) || !smf_chmod($toCreate))
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
@@ -3699,14 +3699,14 @@ 
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
 	}
 
 	// And create a long lived cache entry.
-	cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, $toCreate, 86400);
+	cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, $toCreate, 86400);
 
 	return true;
 }
@@ -3766,7 +3766,7 @@ 
 	else
 		$path = $modSettings['attachmentUploadDir'];
 
-	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
+	return $path . '/' . $attachment_id . '_' . $file_hash . '.dat';
 }
 
 /**
@@ -3810,10 +3810,10 @@ 
 		$valid_low = isValidIP($ip_parts[0]);
 		$valid_high = isValidIP($ip_parts[1]);
 		$count = 0;
-		$mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.');
+		$mode = (preg_match('/:/', $ip_parts[0]) > 0 ? ':' : '.');
 		$max = ($mode == ':' ? 'ffff' : '255');
 		$min = 0;
-		if(!$valid_low)
+		if (!$valid_low)
 		{
 			$ip_parts[0] = preg_replace('/\*/', '0', $ip_parts[0]);
 			$valid_low = isValidIP($ip_parts[0]);
@@ -3827,7 +3827,7 @@ 
 		}
 
 		$count = 0;
-		if(!$valid_high)
+		if (!$valid_high)
 		{
 			$ip_parts[1] = preg_replace('/\*/', $max, $ip_parts[1]);
 			$valid_high = isValidIP($ip_parts[1]);
@@ -3840,7 +3840,7 @@ 
 			}
 		}
 
-		if($valid_high && $valid_low)
+		if ($valid_high && $valid_low)
 		{
 			$ip_array['low'] = $ip_parts[0];
 			$ip_array['high'] = $ip_parts[1];
@@ -4022,7 +4022,7 @@ 
 		addInlineJavaScript('
 	var user_menus = new smc_PopupMenu();
 	user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup");
-	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true);
+	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u=' . $context['user']['id'] . '");', true);
 		if ($context['allow_pm'])
 			addInlineJavaScript('
 	user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true);
@@ -4644,7 +4644,7 @@ 
 		// No? try a fallback to $sourcedir
 		else
 		{
-			$absPath = $sourcedir .'/'. $file;
+			$absPath = $sourcedir . '/' . $file;
 
 			if (file_exists($absPath))
 				require_once($absPath);
@@ -4725,15 +4725,15 @@ 
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
-		"\xe2\x80\x9a",	// single low-9 quotation mark
-		"\xe2\x80\x9e",	// double low-9 quotation mark
-		"\xe2\x80\xa6",	// horizontal ellipsis
-		"\xe2\x80\x98",	// left single curly quote
-		"\xe2\x80\x99",	// right single curly quote
-		"\xe2\x80\x9c",	// left double curly quote
-		"\xe2\x80\x9d",	// right double curly quote
-		"\xe2\x80\x93",	// en dash
-		"\xe2\x80\x94",	// em dash
+		"\xe2\x80\x9a", // single low-9 quotation mark
+		"\xe2\x80\x9e", // double low-9 quotation mark
+		"\xe2\x80\xa6", // horizontal ellipsis
+		"\xe2\x80\x98", // left single curly quote
+		"\xe2\x80\x99", // right single curly quote
+		"\xe2\x80\x9c", // left double curly quote
+		"\xe2\x80\x9d", // right double curly quote
+		"\xe2\x80\x93", // en dash
+		"\xe2\x80\x94", // em dash
 	);
 
 	// windows 1252 / iso equivalents
@@ -4751,15 +4751,15 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
-		'-',	// &ndash;
-		'--',	// &mdash;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
+		'-', // &ndash;
+		'--', // &mdash;
 	);
 
 	if ($context['utf8'])
@@ -5177,7 +5177,7 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
+	if (empty($bin))
 		return '';
 
 	global $db_type;
@@ -5208,28 +5208,28 @@ 
  */
 function _safe_serialize($value)
 {
-	if(is_null($value))
+	if (is_null($value))
 		return 'N;';
 
-	if(is_bool($value))
-		return 'b:'. (int) $value .';';
+	if (is_bool($value))
+		return 'b:' . (int) $value . ';';
 
-	if(is_int($value))
-		return 'i:'. $value .';';
+	if (is_int($value))
+		return 'i:' . $value . ';';
 
-	if(is_float($value))
-		return 'd:'. str_replace(',', '.', $value) .';';
+	if (is_float($value))
+		return 'd:' . str_replace(',', '.', $value) . ';';
 
-	if(is_string($value))
-		return 's:'. strlen($value) .':"'. $value .'";';
+	if (is_string($value))
+		return 's:' . strlen($value) . ':"' . $value . '";';
 
-	if(is_array($value))
+	if (is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
+		foreach ($value as $k => $v)
 			$out .= _safe_serialize($k) . _safe_serialize($v);
 
-		return 'a:'. count($value) .':{'. $out .'}';
+		return 'a:' . count($value) . ':{' . $out . '}';
 	}
 
 	// safe_serialize cannot serialize resources or objects.
@@ -5271,7 +5271,7 @@ 
 function _safe_unserialize($str)
 {
 	// Input  is not a string.
-	if(empty($str) || !is_string($str))
+	if (empty($str) || !is_string($str))
 		return false;
 
 	$stack = array();
@@ -5285,40 +5285,40 @@ 
 	 *   3 - in array, expecting value or another array
 	 */
 	$state = 0;
-	while($state != 1)
+	while ($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
-		if($type == '}')
+		if ($type == '}')
 			$str = substr($str, 1);
 
-		else if($type == 'N' && $str[1] == ';')
+		else if ($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
 		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		else if ($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
 		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		else if ($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
-			$value = (int)$matches[1];
+			$value = (int) $matches[1];
 			$str = $matches[2];
 		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		else if ($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
-			$value = (float)$matches[1];
+			$value = (float) $matches[1];
 			$str = $matches[3];
 		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		else if ($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int) $matches[1], 2) == '";')
 		{
-			$value = substr($matches[2], 0, (int)$matches[1]);
-			$str = substr($matches[2], (int)$matches[1] + 2);
+			$value = substr($matches[2], 0, (int) $matches[1]);
+			$str = substr($matches[2], (int) $matches[1] + 2);
 		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
+		else if ($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
 		{
-			$expectedLength = (int)$matches[1];
+			$expectedLength = (int) $matches[1];
 			$str = $matches[2];
 		}
 
@@ -5326,10 +5326,10 @@ 
 		else
 			return false;
 
-		switch($state)
+		switch ($state)
 		{
 			case 3: // In array, expecting value or another array.
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$stack[] = &$list;
 					$list[$key] = array();
@@ -5338,7 +5338,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$list[$key] = $value;
 					$state = 2;
@@ -5349,29 +5349,29 @@ 
 				return false;
 
 			case 2: // in array, expecting end of array or a key
-				if($type == '}')
+				if ($type == '}')
 				{
 					// Array size is less than expected.
-					if(count($list) < end($expected))
+					if (count($list) < end($expected))
 						return false;
 
 					unset($list);
-					$list = &$stack[count($stack)-1];
+					$list = &$stack[count($stack) - 1];
 					array_pop($stack);
 
 					// Go to terminal state if we're at the end of the root array.
 					array_pop($expected);
 
-					if(count($expected) == 0)
+					if (count($expected) == 0)
 						$state = 1;
 
 					break;
 				}
 
-				if($type == 'i' || $type == 's')
+				if ($type == 'i' || $type == 's')
 				{
 					// Array size exceeds expected length.
-					if(count($list) >= end($expected))
+					if (count($list) >= end($expected))
 						return false;
 
 					$key = $value;
@@ -5384,7 +5384,7 @@ 
 
 			// Expecting array or value.
 			case 0:
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$data = array();
 					$list = &$data;
@@ -5393,7 +5393,7 @@ 
 					break;
 				}
 
-				if($type != '}')
+				if ($type != '}')
 				{
 					$data = $value;
 					$state = 1;
@@ -5406,7 +5406,7 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
+	if (!empty($str))
 		return false;
 
 	return $data;
@@ -5460,7 +5460,7 @@ 
 	// Set different modes.
 	$chmodValues = $isDir ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
 
-	foreach($chmodValues as $val)
+	foreach ($chmodValues as $val)
 	{
 		// If it's writable, break out of the loop.
 		if (is_writable($file))
@@ -5495,13 +5495,13 @@ 
 	$returnArray = @json_decode($json, $returnAsArray);
 
 	// PHP 5.3 so no json_last_error_msg()
-	switch(json_last_error())
+	switch (json_last_error())
 	{
 		case JSON_ERROR_NONE:
 			$jsonError = false;
 			break;
 		case JSON_ERROR_DEPTH:
-			$jsonError =  'JSON_ERROR_DEPTH';
+			$jsonError = 'JSON_ERROR_DEPTH';
 			break;
 		case JSON_ERROR_STATE_MISMATCH:
 			$jsonError = 'JSON_ERROR_STATE_MISMATCH';
@@ -5529,10 +5529,10 @@ 
 		loadLanguage('Errors');
 
 		if (!empty($jsonDebug))
-			log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
+			log_error($txt['json_' . $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
 
 		else
-			log_error($txt['json_'. $jsonError], 'critical');
+			log_error($txt['json_' . $jsonError], 'critical');
 
 		// Everyone expects an array.
 		return array();
@@ -5636,7 +5636,7 @@ 
 		});
 
 		// Convert Punycode to Unicode
-		$tlds = array_map(function ($input) {
+		$tlds = array_map(function($input) {
 			$prefix = 'xn--';
 			$safe_char = 0xFFFC;
 			$base = 36;
@@ -5652,7 +5652,7 @@ 
 
 			foreach ($enco_parts as $encoded)
 			{
-				if (strpos($encoded,$prefix) !== 0 || strlen(trim(str_replace($prefix,'',$encoded))) == 0)
+				if (strpos($encoded, $prefix) !== 0 || strlen(trim(str_replace($prefix, '', $encoded))) == 0)
 				{
 					$output_parts[] = $encoded;
 					continue;
@@ -5663,7 +5663,7 @@ 
 				$idx = 0;
 				$char = 0x80;
 				$decoded = array();
-				$output='';
+				$output = '';
 				$delim_pos = strrpos($encoded, '-');
 
 				if ($delim_pos > strlen($prefix))
@@ -5679,7 +5679,7 @@ 
 
 				for ($enco_idx = $delim_pos ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len)
 				{
-					for ($old_idx = $idx, $w = 1, $k = $base; 1 ; $k += $base)
+					for ($old_idx = $idx, $w = 1, $k = $base; 1; $k += $base)
 					{
 						$cp = ord($encoded{$enco_idx++});
 						$digit = ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $base));
@@ -5720,15 +5720,15 @@ 
 
 					// 2 bytes
 					elseif ($v < (1 << 11))
-						$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+						$output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
 
 					// 3 bytes
 					elseif ($v < (1 << 16))
-						$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					// 4 bytes
 					elseif ($v < (1 << 21))
-						$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					//  'Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k
 					else
@@ -5835,7 +5835,7 @@ 
 	}
 
 	// This recursive function creates the index array from the strings
-	$add_string_to_index = function ($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
+	$add_string_to_index = function($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
 	{
 		static $depth = 0;
 		$depth++;
@@ -5862,7 +5862,7 @@ 
 	};
 
 	// This recursive function turns the index array into a regular expression
-	$index_to_regex = function (&$index, $delim) use (&$strlen, &$index_to_regex)
+	$index_to_regex = function(&$index, $delim) use (&$strlen, &$index_to_regex)
 	{
 		static $depth = 0;
 		$depth++;
@@ -5886,11 +5886,11 @@ 
 
 				if (count(array_keys($value)) == 1)
 				{
-					$new_key_array = explode('(?'.'>', $sub_regex);
+					$new_key_array = explode('(?' . '>', $sub_regex);
 					$new_key .= $new_key_array[0];
 				}
 				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
+					$sub_regex = '(?' . '>' . $sub_regex . ')';
 			}
 
 			if ($depth > 1)
@@ -5930,7 +5930,7 @@ 
 		$index = $add_string_to_index($string, $index);
 
 	while (!empty($index))
-		$regexes[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		$regexes[] = '(?' . '>' . $index_to_regex($index, $delim) . ')';
 
 	// Restore PHP's internal character encoding to whatever it was originally
 	if (!empty($current_encoding))

Braces +1321 added lines, -983 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Update some basic statistics.
@@ -122,10 +123,11 @@ 
 						$smcFunc['db_free_result']($result);
 
 						// Add this to the number of unapproved members
-						if (!empty($changes['unapprovedMembers']))
-							$changes['unapprovedMembers'] += $coppa_approvals;
-						else
-							$changes['unapprovedMembers'] = $coppa_approvals;
+						if (!empty($changes['unapprovedMembers'])) {
+													$changes['unapprovedMembers'] += $coppa_approvals;
+						} else {
+													$changes['unapprovedMembers'] = $coppa_approvals;
+						}
 					}
 				}
 			}
@@ -133,9 +135,9 @@ 
 			break;
 
 		case 'message':
-			if ($parameter1 === true && $parameter2 !== null)
-				updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true);
-			else
+			if ($parameter1 === true && $parameter2 !== null) {
+							updateSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true);
+			} else
 			{
 				// SUM and MAX on a smaller table is better for InnoDB tables.
 				$result = $smcFunc['db_query']('', '
@@ -175,23 +177,25 @@ 
 				$parameter2 = text2words($parameter2);
 
 				$inserts = array();
-				foreach ($parameter2 as $word)
-					$inserts[] = array($word, $parameter1);
+				foreach ($parameter2 as $word) {
+									$inserts[] = array($word, $parameter1);
+				}
 
-				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')
 					);
+				}
 			}
 			break;
 
 		case 'topic':
-			if ($parameter1 === true)
-				updateSettings(array('totalTopics' => true), true);
-			else
+			if ($parameter1 === true) {
+							updateSettings(array('totalTopics' => true), true);
+			} else
 			{
 				// Get the number of topics - a SUM is better for InnoDB tables.
 				// We also ignore the recycle bin here because there will probably be a bunch of one-post topics there.
@@ -212,8 +216,9 @@ 
 
 		case 'postgroups':
 			// Parameter two is the updated columns: we should check to see if we base groups off any of these.
-			if ($parameter2 !== null && !in_array('posts', $parameter2))
-				return;
+			if ($parameter2 !== null && !in_array('posts', $parameter2)) {
+							return;
+			}
 
 			$postgroups = cache_get_data('updateStats:postgroups', 360);
 			if ($postgroups == null || $parameter1 == null)
@@ -228,8 +233,9 @@ 
 					)
 				);
 				$postgroups = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$postgroups[$row['id_group']] = $row['min_posts'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$postgroups[$row['id_group']] = $row['min_posts'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Sort them this way because if it's done with MySQL it causes a filesort :(.
@@ -239,8 +245,9 @@ 
 			}
 
 			// Oh great, they've screwed their post groups.
-			if (empty($postgroups))
-				return;
+			if (empty($postgroups)) {
+							return;
+			}
 
 			// Set all membergroups from most posts to least posts.
 			$conditions = '';
@@ -298,10 +305,9 @@ 
 	{
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
-	}
-	elseif ($members === null)
-		$condition = '1=1';
-	else
+	} elseif ($members === null) {
+			$condition = '1=1';
+	} else
 	{
 		$condition = 'id_member = {int:member}';
 		$parameters['member'] = $members;
@@ -341,9 +347,9 @@ 
 		if (count($vars_to_integrate) != 0)
 		{
 			// Fetch a list of member_names if necessary
-			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members)))
-				$member_names = array($user_info['username']);
-			else
+			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members))) {
+							$member_names = array($user_info['username']);
+			} else
 			{
 				$member_names = array();
 				$request = $smcFunc['db_query']('', '
@@ -352,14 +358,16 @@ 
 					WHERE ' . $condition,
 					$parameters
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$member_names[] = $row['member_name'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$member_names[] = $row['member_name'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
 
-			if (!empty($member_names))
-				foreach ($vars_to_integrate as $var)
+			if (!empty($member_names)) {
+							foreach ($vars_to_integrate as $var)
 					call_integration_hook('integrate_change_member_data', array($member_names, $var, &$data[$var], &$knownInts, &$knownFloats));
+			}
 		}
 	}
 
@@ -367,16 +375,17 @@ 
 	foreach ($data as $var => $val)
 	{
 		$type = 'string';
-		if (in_array($var, $knownInts))
-			$type = 'int';
-		elseif (in_array($var, $knownFloats))
-			$type = 'float';
-		elseif ($var == 'birthdate')
-			$type = 'date';
-		elseif ($var == 'member_ip')
-			$type = 'inet';
-		elseif ($var == 'member_ip2')
-			$type = 'inet';
+		if (in_array($var, $knownInts)) {
+					$type = 'int';
+		} elseif (in_array($var, $knownFloats)) {
+					$type = 'float';
+		} elseif ($var == 'birthdate') {
+					$type = 'date';
+		} elseif ($var == 'member_ip') {
+					$type = 'inet';
+		} elseif ($var == 'member_ip2') {
+					$type = 'inet';
+		}
 
 		// Doing an increment?
 		if ($type == 'int' && ($val === '+' || $val === '-'))
@@ -390,8 +399,9 @@ 
 		{
 			if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match))
 			{
-				if ($match[1] != '+ ')
-					$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				if ($match[1] != '+ ') {
+									$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				}
 				$type = 'raw';
 			}
 		}
@@ -412,8 +422,9 @@ 
 	// Clear any caching?
 	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && !empty($members))
 	{
-		if (!is_array($members))
-			$members = array($members);
+		if (!is_array($members)) {
+					$members = array($members);
+		}
 
 		foreach ($members as $member)
 		{
@@ -446,29 +457,32 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (empty($changeArray) || !is_array($changeArray))
-		return;
+	if (empty($changeArray) || !is_array($changeArray)) {
+			return;
+	}
 
 	$toRemove = array();
 
 	// Go check if there is any setting to be removed.
-	foreach ($changeArray as $k => $v)
-		if ($v === null)
+	foreach ($changeArray as $k => $v) {
+			if ($v === null)
 		{
 			// Found some, remove them from the original array and add them to ours.
 			unset($changeArray[$k]);
+	}
 			$toRemove[] = $k;
 		}
 
 	// Proceed with the deletion.
-	if (!empty($toRemove))
-		$smcFunc['db_query']('', '
+	if (!empty($toRemove)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable IN ({array_string:remove})',
 			array(
 				'remove' => $toRemove,
 			)
 		);
+	}
 
 	// In some cases, this may be better and faster, but for large sets we don't want so many UPDATEs.
 	if ($update)
@@ -497,19 +511,22 @@ 
 	foreach ($changeArray as $variable => $value)
 	{
 		// Don't bother if it's already like that ;).
-		if (isset($modSettings[$variable]) && $modSettings[$variable] == $value)
-			continue;
+		if (isset($modSettings[$variable]) && $modSettings[$variable] == $value) {
+					continue;
+		}
 		// If the variable isn't set, but would only be set to nothing'ness, then don't bother setting it.
-		elseif (!isset($modSettings[$variable]) && empty($value))
-			continue;
+		elseif (!isset($modSettings[$variable]) && empty($value)) {
+					continue;
+		}
 
 		$replaceArray[] = array($variable, $value);
 
 		$modSettings[$variable] = $value;
 	}
 
-	if (empty($replaceArray))
-		return;
+	if (empty($replaceArray)) {
+			return;
+	}
 
 	$smcFunc['db_insert']('replace',
 		'{db_prefix}settings',
@@ -555,20 +572,25 @@ 
 	$start = (int) $start;
 	$start_invalid = $start < 0;
 	
-	if (!empty($options['low_id']))
-		$low_id = $options['low_id'];
-	if (!empty($options['max_id']))
-		$max_id = $options['max_id'];
+	if (!empty($options['low_id'])) {
+			$low_id = $options['low_id'];
+	}
+	if (!empty($options['max_id'])) {
+			$max_id = $options['max_id'];
+	}
 
 	// Make sure $start is a proper variable - not less than 0.
-	if ($start_invalid)
-		$start = 0;
+	if ($start_invalid) {
+			$start = 0;
+	}
 	// Not greater than the upper bound.
-	elseif ($start >= $max_value)
-		$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	elseif ($start >= $max_value) {
+			$start = max(0, (int) $max_value - (((int) $max_value % (int) $num_per_page) == 0 ? $num_per_page : ((int) $max_value % (int) $num_per_page)));
+	}
 	// And it has to be a multiple of $num_per_page!
-	else
-		$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	else {
+			$start = max(0, (int) $start - ((int) $start % (int) $num_per_page));
+	}
 
 	$context['current_page'] = $start / $num_per_page;
 
@@ -596,101 +618,115 @@ 
 	if (empty($modSettings['compactTopicPagesEnable']))
 	{
 		// Show the left arrow.
-		if (empty($low_id))
-			$pageindex .= $start == 0 ? ' ' : sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
-		else
-			$pageindex .= $start == 0 ? ' ' : sprintf($base_link_page, ($start - $num_per_page), $settings['page_index']['previous_page'], 'L'.$low_id);
+		if (empty($low_id)) {
+					$pageindex .= $start == 0 ? ' ' : sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
+		} else {
+					$pageindex .= $start == 0 ? ' ' : sprintf($base_link_page, ($start - $num_per_page), $settings['page_index']['previous_page'], 'L'.$low_id);
+		}
 		
 		// Show all the pages.
 		$display_page = 1;
-		for ($counter = 0; $counter < $max_value; $counter += $num_per_page)
-			$pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		for ($counter = 0; $counter < $max_value; $counter += $num_per_page) {
+					$pageindex .= $start == $counter && !$start_invalid ? sprintf($settings['page_index']['current_page'], $display_page++) : sprintf($base_link, $counter, $display_page++);
+		}
 
 		// Show the right arrow.
 		$display_page = ($start + $num_per_page) > $max_value ? $max_value : ($start + $num_per_page);
 		if ($start != $counter - $max_value && !$start_invalid){
-			if (empty($max_id))
-				$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']);
-			else
-				$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link_page, $display_page , $settings['page_index']['next_page'], 'M'.$max_id);
+			if (empty($max_id)) {
+							$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link, $display_page, $settings['page_index']['next_page']);
+			} else {
+							$pageindex .= $display_page > $counter - $num_per_page ? ' ' : sprintf($base_link_page, $display_page , $settings['page_index']['next_page'], 'M'.$max_id);
+			}
 		}
 			
-	}
-	else
+	} else
 	{
 		// If they didn't enter an odd value, pretend they did.
 		$PageContiguous = (int) ($modSettings['compactTopicPagesContiguous'] - ($modSettings['compactTopicPagesContiguous'] % 2)) / 2;
 
 		// Show the "prev page" link. (>prev page< 1 ... 6 7 [8] 9 10 ... 15 next page)
-		if (!empty($start) && $show_prevnext)
-			if (empty($low_id))
+		if (!empty($start) && $show_prevnext) {
+					if (empty($low_id))
 				$pageindex .= sprintf($base_link, $start - $num_per_page, $settings['page_index']['previous_page']);
-			else
-				$pageindex .= sprintf($base_link_page, $start - $num_per_page, $settings['page_index']['previous_page'], 'L'.$low_id);
-		else
-			$pageindex .= '';
+		} else {
+							$pageindex .= sprintf($base_link_page, $start - $num_per_page, $settings['page_index']['previous_page'], 'L'.$low_id);
+			}
+		else {
+					$pageindex .= '';
+		}
 
 		// Show the first page. (prev page >1< ... 6 7 [8] 9 10 ... 15)
-		if ($start > $num_per_page * $PageContiguous)
-			$pageindex .= sprintf($base_link, 0, '1');
+		if ($start > $num_per_page * $PageContiguous) {
+					$pageindex .= sprintf($base_link, 0, '1');
+		}
 
 		// Show the ... after the first page.  (prev page 1 >...< 6 7 [8] 9 10 ... 15 next page)
-		if ($start > $num_per_page * ($PageContiguous + 1))
-			$pageindex .= strtr($settings['page_index']['expand_pages'], array(
+		if ($start > $num_per_page * ($PageContiguous + 1)) {
+					$pageindex .= strtr($settings['page_index']['expand_pages'], array(
 				'{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)),
 				'{FIRST_PAGE}' => $num_per_page,
 				'{LAST_PAGE}' => $start - $num_per_page * $PageContiguous,
 				'{PER_PAGE}' => $num_per_page,
 			));
+		}
 
 		// Show the pages before the current one. (prev page 1 ... >6 7< [8] 9 10 ... 15 next page)
-		for ($nCont = $PageContiguous; $nCont >= 1; $nCont--)
-			if ($start >= $num_per_page * $nCont)
+		for ($nCont = $PageContiguous; $nCont >= 1; $nCont--) {
+					if ($start >= $num_per_page * $nCont)
 			{
 				$tmpStart = $start - $num_per_page * $nCont;
-				if($nCont != 1 || empty($low_id))
-					$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
-				else
-					$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'L'.$low_id);
+		}
+				if($nCont != 1 || empty($low_id)) {
+									$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
+				} else {
+									$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'L'.$low_id);
+				}
 			}
 
 		// Show the current page. (prev page 1 ... 6 7 >[8]< 9 10 ... 15 next page)
-		if (!$start_invalid)
-			$pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1);
-		else
-			$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		if (!$start_invalid) {
+					$pageindex .= sprintf($settings['page_index']['current_page'], $start / $num_per_page + 1);
+		} else {
+					$pageindex .= sprintf($base_link, $start, $start / $num_per_page + 1);
+		}
 
 		// Show the pages after the current one... (prev page 1 ... 6 7 [8] >9 10< ... 15 next page)
 		$tmpMaxPages = (int) (($max_value - 1) / $num_per_page) * $num_per_page;
-		for ($nCont = 1; $nCont <= $PageContiguous; $nCont++)
-			if ($start + $num_per_page * $nCont <= $tmpMaxPages)
+		for ($nCont = 1; $nCont <= $PageContiguous; $nCont++) {
+					if ($start + $num_per_page * $nCont <= $tmpMaxPages)
 			{
 				$tmpStart = $start + $num_per_page * $nCont;
-				if($nCont != 1 || empty($max_id))
-					$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
-				else
-					$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'M'.$max_id);
+		}
+				if($nCont != 1 || empty($max_id)) {
+									$pageindex .= sprintf($base_link, $tmpStart, $tmpStart / $num_per_page + 1);
+				} else {
+									$pageindex .= sprintf($base_link_page, $tmpStart, $tmpStart / $num_per_page + 1, 'M'.$max_id);
+				}
 			}
 
 		// Show the '...' part near the end. (prev page 1 ... 6 7 [8] 9 10 >...< 15 next page)
-		if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages)
-			$pageindex .= strtr($settings['page_index']['expand_pages'], array(
+		if ($start + $num_per_page * ($PageContiguous + 1) < $tmpMaxPages) {
+					$pageindex .= strtr($settings['page_index']['expand_pages'], array(
 				'{LINK}' => JavaScriptEscape($smcFunc['htmlspecialchars']($base_link)),
 				'{FIRST_PAGE}' => $start + $num_per_page * ($PageContiguous + 1),
 				'{LAST_PAGE}' => $tmpMaxPages,
 				'{PER_PAGE}' => $num_per_page,
 			));
+		}
 
 		// Show the last number in the list. (prev page 1 ... 6 7 [8] 9 10 ... >15<  next page)
-		if ($start + $num_per_page * $PageContiguous < $tmpMaxPages)
-			$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		if ($start + $num_per_page * $PageContiguous < $tmpMaxPages) {
+					$pageindex .= sprintf($base_link, $tmpMaxPages, $tmpMaxPages / $num_per_page + 1);
+		}
 
 		// Show the "next page" link. (prev page 1 ... 6 7 [8] 9 10 ... 15 >next page<)
-		if ($start != $tmpMaxPages && $show_prevnext)
-			if (empty($max_id))
+		if ($start != $tmpMaxPages && $show_prevnext) {
+					if (empty($max_id))
 				$pageindex .= sprintf($base_link, $start + $num_per_page, $settings['page_index']['next_page']);
-			else
-				$pageindex .= sprintf($base_link_page, $start + $num_per_page, $settings['page_index']['next_page'], 'M'.$max_id);
+		} else {
+							$pageindex .= sprintf($base_link_page, $start + $num_per_page, $settings['page_index']['next_page'], 'M'.$max_id);
+			}
 	}
 	$pageindex .= $settings['page_index']['extra_after'];
 
@@ -716,8 +752,9 @@ 
 	if ($decimal_separator === null)
 	{
 		// Not set for whatever reason?
-		if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1)
-			return $number;
+		if (empty($txt['number_format']) || preg_match('~^1([^\d]*)?234([^\d]*)(0*?)$~', $txt['number_format'], $matches) != 1) {
+					return $number;
+		}
 
 		// Cache these each load...
 		$thousands_separator = $matches[1];
@@ -751,17 +788,20 @@ 
 	static $local_cache;
 
 	// Offset the time.
-	if (!$offset_type)
-		$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	if (!$offset_type) {
+			$time = $log_time + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+	}
 	// Just the forum offset?
-	elseif ($offset_type == 'forum')
-		$time = $log_time + $modSettings['time_offset'] * 3600;
-	else
-		$time = $log_time;
+	elseif ($offset_type == 'forum') {
+			$time = $log_time + $modSettings['time_offset'] * 3600;
+	} else {
+			$time = $log_time;
+	}
 
 	// We can't have a negative date (on Windows, at least.)
-	if ($log_time < 0)
-		$log_time = 0;
+	if ($log_time < 0) {
+			$log_time = 0;
+	}
 
 	// Today and Yesterday?
 	if ($modSettings['todayMod'] >= 1 && $show_today === true)
@@ -778,56 +818,65 @@ 
 		{
 			$h = strpos($user_info['time_format'], '%l') === false ? '%I' : '%l';
 			$today_fmt = $h . ':%M' . $s . ' %p';
+		} else {
+					$today_fmt = '%H:%M' . $s;
 		}
-		else
-			$today_fmt = '%H:%M' . $s;
 
 		// Same day of the year, same year.... Today!
-		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year'])
-			return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type);
+		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year']) {
+					return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type);
+		}
 
 		// Day-of-year is one less and same year, or it's the first of the year and that's the last of the year...
-		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31))
-			return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type);
+		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31)) {
+					return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type);
+		}
 	}
 
 	$str = !is_bool($show_today) ? $show_today : $user_info['time_format'];
 
-	if (!isset($local_cache))
-		$local_cache = setlocale(LC_TIME, $txt['lang_locale']);
+	if (!isset($local_cache)) {
+			$local_cache = setlocale(LC_TIME, $txt['lang_locale']);
+	}
 
 	if ($local_cache !== false)
 	{
 		//check if other process change the local
 		if ($process_safe === true)
 		{
-			if (setlocale(LC_TIME, '0') != $local_cache)
-				setlocale(LC_TIME, $txt['lang_locale']);
+			if (setlocale(LC_TIME, '0') != $local_cache) {
+							setlocale(LC_TIME, $txt['lang_locale']);
+			}
 		}
 
-		if (!isset($non_twelve_hour))
-			$non_twelve_hour = trim(strftime('%p')) === '';
-		if ($non_twelve_hour && strpos($str, '%p') !== false)
-			$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		if (!isset($non_twelve_hour)) {
+					$non_twelve_hour = trim(strftime('%p')) === '';
+		}
+		if ($non_twelve_hour && strpos($str, '%p') !== false) {
+					$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 
-		foreach (array('%a', '%A', '%b', '%B') as $token)
-			if (strpos($str, $token) !== false)
+		foreach (array('%a', '%A', '%b', '%B') as $token) {
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, strftime($token, $time), $str);
-	}
-	else
+		}
+	} else
 	{
 		// Do-it-yourself time localization.  Fun.
-		foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label)
-			if (strpos($str, $token) !== false)
+		foreach (array('%a' => 'days_short', '%A' => 'days', '%b' => 'months_short', '%B' => 'months') as $token => $text_label) {
+					if (strpos($str, $token) !== false)
 				$str = str_replace($token, $txt[$text_label][(int) strftime($token === '%a' || $token === '%A' ? '%w' : '%m', $time)], $str);
+		}
 
-		if (strpos($str, '%p') !== false)
-			$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		if (strpos($str, '%p') !== false) {
+					$str = str_replace('%p', (strftime('%H', $time) < 12 ? $txt['time_am'] : $txt['time_pm']), $str);
+		}
 	}
 
 	// Windows doesn't support %e; on some versions, strftime fails altogether if used, so let's prevent that.
-	if ($context['server']['is_windows'] && strpos($str, '%e') !== false)
-		$str = str_replace('%e', ltrim(strftime('%d', $time), '0'), $str);
+	if ($context['server']['is_windows'] && strpos($str, '%e') !== false) {
+			$str = str_replace('%e', ltrim(strftime('%d', $time), '0'), $str);
+	}
 
 	// Format any other characters..
 	return strftime($str, $time);
@@ -849,16 +898,19 @@ 
 	static $translation = array();
 
 	// Determine the character set... Default to UTF-8
-	if (empty($context['character_set']))
-		$charset = 'UTF-8';
+	if (empty($context['character_set'])) {
+			$charset = 'UTF-8';
+	}
 	// Use ISO-8859-1 in place of non-supported ISO-8859 charsets...
-	elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15')))
-		$charset = 'ISO-8859-1';
-	else
-		$charset = $context['character_set'];
+	elseif (strpos($context['character_set'], 'ISO-8859-') !== false && !in_array($context['character_set'], array('ISO-8859-5', 'ISO-8859-15'))) {
+			$charset = 'ISO-8859-1';
+	} else {
+			$charset = $context['character_set'];
+	}
 
-	if (empty($translation))
-		$translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array('&#039;' => '\'', '&#39;' => '\'', '&nbsp;' => ' ');
+	if (empty($translation)) {
+			$translation = array_flip(get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES, $charset)) + array('&#039;' => '\'', '&#39;' => '\'', '&nbsp;' => ' ');
+	}
 
 	return strtr($string, $translation);
 }
@@ -880,8 +932,9 @@ 
 	global $smcFunc;
 
 	// It was already short enough!
-	if ($smcFunc['strlen']($subject) <= $len)
-		return $subject;
+	if ($smcFunc['strlen']($subject) <= $len) {
+			return $subject;
+	}
 
 	// Shorten it by the length it was too long, and strip off junk from the end.
 	return $smcFunc['substr']($subject, 0, $len) . '...';
@@ -900,10 +953,11 @@ 
 {
 	global $user_info, $modSettings;
 
-	if ($timestamp === null)
-		$timestamp = time();
-	elseif ($timestamp == 0)
-		return 0;
+	if ($timestamp === null) {
+			$timestamp = time();
+	} elseif ($timestamp == 0) {
+			return 0;
+	}
 
 	return $timestamp + ($modSettings['time_offset'] + ($use_user_offset ? $user_info['time_offset'] : 0)) * 3600;
 }
@@ -932,8 +986,9 @@ 
 		$array[$i] = $array[$j];
 		$array[$j] = $temp;
 
-		for ($i = 1; $p[$i] == 0; $i++)
-			$p[$i] = 1;
+		for ($i = 1; $p[$i] == 0; $i++) {
+					$p[$i] = 1;
+		}
 
 		$orders[] = $array;
 	}
@@ -965,12 +1020,14 @@ 
 	static $disabled;
 
 	// Don't waste cycles
-	if ($message === '')
-		return '';
+	if ($message === '') {
+			return '';
+	}
 
 	// Just in case it wasn't determined yet whether UTF-8 is enabled.
-	if (!isset($context['utf8']))
-		$context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8';
+	if (!isset($context['utf8'])) {
+			$context['utf8'] = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8';
+	}
 
 	// Clean up any cut/paste issues we may have
 	$message = sanitizeMSCutPaste($message);
@@ -982,13 +1039,15 @@ 
 		return $message;
 	}
 
-	if ($smileys !== null && ($smileys == '1' || $smileys == '0'))
-		$smileys = (bool) $smileys;
+	if ($smileys !== null && ($smileys == '1' || $smileys == '0')) {
+			$smileys = (bool) $smileys;
+	}
 
 	if (empty($modSettings['enableBBC']) && $message !== false)
 	{
-		if ($smileys === true)
-			parsesmileys($message);
+		if ($smileys === true) {
+					parsesmileys($message);
+		}
 
 		return $message;
 	}
@@ -1001,8 +1060,9 @@ 
 	}
 
 	// Ensure $modSettings['tld_regex'] contains a valid regex for the autolinker
-	if (!empty($modSettings['autoLinkUrls']))
-		set_tld_regex();
+	if (!empty($modSettings['autoLinkUrls'])) {
+			set_tld_regex();
+	}
 
 	// Allow mods access before entering the main parse_bbc loop
 	call_integration_hook('integrate_pre_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags));
@@ -1016,12 +1076,14 @@ 
 
 			$temp = explode(',', strtolower($modSettings['disabledBBC']));
 
-			foreach ($temp as $tag)
-				$disabled[trim($tag)] = true;
+			foreach ($temp as $tag) {
+							$disabled[trim($tag)] = true;
+			}
 		}
 
-		if (empty($modSettings['enableEmbeddedFlash']))
-			$disabled['flash'] = true;
+		if (empty($modSettings['enableEmbeddedFlash'])) {
+					$disabled['flash'] = true;
+		}
 
 		/* The following bbc are formatted as an array, with keys as follows:
 
@@ -1142,8 +1204,9 @@ 
 					$returnContext = '';
 
 					// BBC or the entire attachments feature is disabled
-					if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach']))
-						return $data;
+					if (empty($modSettings['attachmentEnable']) || !empty($disabled['attach'])) {
+											return $data;
+					}
 
 					// Save the attach ID.
 					$attachID = $data;
@@ -1154,8 +1217,9 @@ 
 					$currentAttachment = parseAttachBBC($attachID);
 
 					// parseAttachBBC will return a string ($txt key) rather than diying with a fatal_error. Up to you to decide what to do.
-					if (is_string($currentAttachment))
-						return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment;
+					if (is_string($currentAttachment)) {
+											return $data = !empty($txt[$currentAttachment]) ? $txt[$currentAttachment] : $currentAttachment;
+					}
 
 					if (!empty($currentAttachment['is_image']))
 					{
@@ -1171,15 +1235,17 @@ 
 							$height = ' height="' . $currentAttachment['height'] . '"';
 						}
 
-						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}']))
-							$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
-						else
-							$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
+						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}'])) {
+													$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
+						} else {
+													$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
+						}
 					}
 
 					// No image. Show a link.
-					else
-						$returnContext .= $currentAttachment['link'];
+					else {
+											$returnContext .= $currentAttachment['link'];
+					}
 
 					// Gotta append what we just did.
 					$data = $returnContext;
@@ -1210,8 +1276,9 @@ 
 						for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++)
 						{
 							// Do PHP code coloring?
-							if ($php_parts[$php_i] != '&lt;?php')
-								continue;
+							if ($php_parts[$php_i] != '&lt;?php') {
+															continue;
+							}
 
 							$php_string = '';
 							while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;')
@@ -1227,8 +1294,9 @@ 
 						$data = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data);
 
 						// Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection.
-						if ($context['browser']['is_opera'])
-							$data .= '&nbsp;';
+						if ($context['browser']['is_opera']) {
+													$data .= '&nbsp;';
+						}
 					}
 				},
 				'block_level' => true,
@@ -1247,8 +1315,9 @@ 
 						for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++)
 						{
 							// Do PHP code coloring?
-							if ($php_parts[$php_i] != '&lt;?php')
-								continue;
+							if ($php_parts[$php_i] != '&lt;?php') {
+															continue;
+							}
 
 							$php_string = '';
 							while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;')
@@ -1264,8 +1333,9 @@ 
 						$data[0] = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $data[0]);
 
 						// Recent Opera bug requiring temporary fix. &nsbp; is needed before </code> to avoid broken selection.
-						if ($context['browser']['is_opera'])
-							$data[0] .= '&nbsp;';
+						if ($context['browser']['is_opera']) {
+													$data[0] .= '&nbsp;';
+						}
 					}
 				},
 				'block_level' => true,
@@ -1303,11 +1373,13 @@ 
 				'content' => '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never">',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (isset($disabled['url']))
-						$tag['content'] = '$1';
+					if (isset($disabled['url'])) {
+											$tag['content'] = '$1';
+					}
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data[0] = '//' . ltrim($data[0], ':/');
+					if (empty($scheme)) {
+											$data[0] = '//' . ltrim($data[0], ':/');
+					}
 				},
 				'disabled_content' => '<a href="$1" target="_blank" class="new_win">$1</a>',
 			),
@@ -1321,10 +1393,11 @@ 
 				{
 					$class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"';
 
-					if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches))
-						$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
-					else
-						$css = '';
+					if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches)) {
+											$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
+					} else {
+											$css = '';
+					}
 
 					$data = $class . $css;
 				},
@@ -1374,14 +1447,16 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						if ($scheme != 'https') {
+													$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1397,14 +1472,16 @@ 
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if ($image_proxy_enabled)
 					{
-						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = 'http://' . ltrim($data, ':/');
+						}
 
-						if ($scheme != 'https')
-							$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						if ($scheme != 'https') {
+													$data = $boardurl . '/proxy.php?request=' . urlencode($data) . '&hash=' . md5($data . $image_proxy_secret);
+						}
+					} elseif (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
 					}
-					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1416,8 +1493,9 @@ 
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 			),
 			array(
@@ -1428,13 +1506,14 @@ 
 				'after' => '</a>',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (substr($data, 0, 1) == '#')
-						$data = '#post_' . substr($data, 1);
-					else
+					if (substr($data, 0, 1) == '#') {
+											$data = '#post_' . substr($data, 1);
+					} else
 					{
 						$scheme = parse_url($data, PHP_URL_SCHEME);
-						if (empty($scheme))
-							$data = '//' . ltrim($data, ':/');
+						if (empty($scheme)) {
+													$data = '//' . ltrim($data, ':/');
+						}
 					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
@@ -1512,8 +1591,9 @@ 
 					{
 						$add_begin = substr(trim($data), 0, 5) != '&lt;?';
 						$data = highlight_php_code($add_begin ? '&lt;?php ' . $data . '?&gt;' : $data);
-						if ($add_begin)
-							$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
+						if ($add_begin) {
+													$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
+						}
 					}
 				},
 				'block_level' => false,
@@ -1644,10 +1724,11 @@ 
 				'content' => '$1',
 				'validate' => function (&$tag, &$data, $disabled)
 				{
-					if (is_numeric($data))
-						$data = timeformat($data);
-					else
-						$tag['content'] = '[time]$1[/time]';
+					if (is_numeric($data)) {
+											$data = timeformat($data);
+					} else {
+											$tag['content'] = '[time]$1[/time]';
+					}
 				},
 			),
 			array(
@@ -1674,8 +1755,9 @@ 
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 			),
 			array(
@@ -1687,8 +1769,9 @@ 
 				'validate' => function (&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
-					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+					if (empty($scheme)) {
+											$data = '//' . ltrim($data, ':/');
+					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
 				'disabled_after' => ' ($1)',
@@ -1708,8 +1791,9 @@ 
 		// This is mainly for the bbc manager, so it's easy to add tags above.  Custom BBC should be added above this line.
 		if ($message === false)
 		{
-			if (isset($temp_bbc))
-				$bbc_codes = $temp_bbc;
+			if (isset($temp_bbc)) {
+							$bbc_codes = $temp_bbc;
+			}
 			usort($codes, function ($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
 			});
@@ -1729,8 +1813,9 @@ 
 		);
 		if (!isset($disabled['li']) && !isset($disabled['list']))
 		{
-			foreach ($itemcodes as $c => $dummy)
-				$bbc_codes[$c] = array();
+			foreach ($itemcodes as $c => $dummy) {
+							$bbc_codes[$c] = array();
+			}
 		}
 
 		// Shhhh!
@@ -1751,12 +1836,14 @@ 
 		foreach ($codes as $code)
 		{
 			// Make it easier to process parameters later
-			if (!empty($code['parameters']))
-				ksort($code['parameters'], SORT_STRING);
+			if (!empty($code['parameters'])) {
+							ksort($code['parameters'], SORT_STRING);
+			}
 
 			// If we are not doing every tag only do ones we are interested in.
-			if (empty($parse_tags) || in_array($code['tag'], $parse_tags))
-				$bbc_codes[substr($code['tag'], 0, 1)][] = $code;
+			if (empty($parse_tags) || in_array($code['tag'], $parse_tags)) {
+							$bbc_codes[substr($code['tag'], 0, 1)][] = $code;
+			}
 		}
 		$codes = null;
 	}
@@ -1767,8 +1854,9 @@ 
 		// It's likely this will change if the message is modified.
 		$cache_key = 'parse:' . $cache_id . '-' . md5(md5($message) . '-' . $smileys . (empty($disabled) ? '' : implode(',', array_keys($disabled))) . json_encode($context['browser']) . $txt['lang_locale'] . $user_info['time_offset'] . $user_info['time_format']);
 
-		if (($temp = cache_get_data($cache_key, 240)) != null)
-			return $temp;
+		if (($temp = cache_get_data($cache_key, 240)) != null) {
+					return $temp;
+		}
 
 		$cache_t = microtime();
 	}
@@ -1800,8 +1888,9 @@ 
 		$disabled['flash'] = true;
 
 		// @todo Change maybe?
-		if (!isset($_GET['images']))
-			$disabled['img'] = true;
+		if (!isset($_GET['images'])) {
+					$disabled['img'] = true;
+		}
 
 		// @todo Interface/setting to add more?
 	}
@@ -1825,8 +1914,9 @@ 
 		$pos = isset($matches[0][1]) ? $matches[0][1] : false;
 
 		// Failsafe.
-		if ($pos === false || $last_pos > $pos)
-			$pos = strlen($message) + 1;
+		if ($pos === false || $last_pos > $pos) {
+					$pos = strlen($message) + 1;
+		}
 
 		// Can't have a one letter smiley, URL, or email! (sorry.)
 		if ($last_pos < $pos - 1)
@@ -1845,8 +1935,9 @@ 
 
 				// <br> should be empty.
 				$empty_tags = array('br', 'hr');
-				foreach ($empty_tags as $tag)
-					$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '[' . $tag . ' /]', $data);
+				foreach ($empty_tags as $tag) {
+									$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '[' . $tag . ' /]', $data);
+				}
 
 				// b, u, i, s, pre... basic tags.
 				$closable_tags = array('b', 'u', 'i', 's', 'em', 'ins', 'del', 'pre', 'blockquote');
@@ -1855,8 +1946,9 @@ 
 					$diff = substr_count($data, '&lt;' . $tag . '&gt;') - substr_count($data, '&lt;/' . $tag . '&gt;');
 					$data = strtr($data, array('&lt;' . $tag . '&gt;' => '<' . $tag . '>', '&lt;/' . $tag . '&gt;' => '</' . $tag . '>'));
 
-					if ($diff > 0)
-						$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+					if ($diff > 0) {
+											$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+					}
 				}
 
 				// Do <img ...> - with security... action= -> action-.
@@ -1869,8 +1961,9 @@ 
 						$alt = empty($matches[3][$match]) ? '' : ' alt=' . preg_replace('~^&quot;|&quot;$~', '', $matches[3][$match]);
 
 						// Remove action= from the URL - no funny business, now.
-						if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0)
-							$imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag);
+						if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0) {
+													$imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag);
+						}
 
 						// Check if the image is larger than allowed.
 						if (!empty($modSettings['max_image_width']) && !empty($modSettings['max_image_height']))
@@ -1891,9 +1984,9 @@ 
 
 							// Set the new image tag.
 							$replaces[$matches[0][$match]] = '[img width=' . $width . ' height=' . $height . $alt . ']' . $imgtag . '[/img]';
+						} else {
+													$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
 						}
-						else
-							$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
 					}
 
 					$data = strtr($data, $replaces);
@@ -1906,16 +1999,18 @@ 
 				$no_autolink_area = false;
 				if (!empty($open_tags))
 				{
-					foreach ($open_tags as $open_tag)
-						if (in_array($open_tag['tag'], $no_autolink_tags))
+					foreach ($open_tags as $open_tag) {
+											if (in_array($open_tag['tag'], $no_autolink_tags))
 							$no_autolink_area = true;
+					}
 				}
 
 				// Don't go backwards.
 				// @todo Don't think is the real solution....
 				$lastAutoPos = isset($lastAutoPos) ? $lastAutoPos : 0;
-				if ($pos < $lastAutoPos)
-					$no_autolink_area = true;
+				if ($pos < $lastAutoPos) {
+									$no_autolink_area = true;
+				}
 				$lastAutoPos = $pos;
 
 				if (!$no_autolink_area)
@@ -2024,17 +2119,19 @@ 
 							if ($scheme == 'mailto')
 							{
 								$email_address = str_replace('mailto:', '', $url);
-								if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false)
-									return '[email=' . $email_address . ']' . $url . '[/email]';
-								else
-									return $url;
+								if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false) {
+																	return '[email=' . $email_address . ']' . $url . '[/email]';
+								} else {
+																	return $url;
+								}
 							}
 
 							// Are we linking a schemeless URL or naked domain name (e.g. "example.com")?
-							if (empty($scheme))
-								$fullUrl = '//' . ltrim($url, ':/');
-							else
-								$fullUrl = $url;
+							if (empty($scheme)) {
+															$fullUrl = '//' . ltrim($url, ':/');
+							} else {
+															$fullUrl = $url;
+							}
 
 							return '[url=&quot;' . str_replace(array('[', ']'), array('&#91;', '&#93;'), $fullUrl) . '&quot;]' . $url . '[/url]';
 						}, $data);
@@ -2083,16 +2180,18 @@ 
 		}
 
 		// Are we there yet?  Are we there yet?
-		if ($pos >= strlen($message) - 1)
-			break;
+		if ($pos >= strlen($message) - 1) {
+					break;
+		}
 
 		$tags = strtolower($message[$pos + 1]);
 
 		if ($tags == '/' && !empty($open_tags))
 		{
 			$pos2 = strpos($message, ']', $pos + 1);
-			if ($pos2 == $pos + 2)
-				continue;
+			if ($pos2 == $pos + 2) {
+							continue;
+			}
 
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
 
@@ -2102,8 +2201,9 @@ 
 			do
 			{
 				$tag = array_pop($open_tags);
-				if (!$tag)
-					break;
+				if (!$tag) {
+									break;
+				}
 
 				if (!empty($tag['block_level']))
 				{
@@ -2117,10 +2217,11 @@ 
 					// The idea is, if we are LOOKING for a block level tag, we can close them on the way.
 					if (strlen($look_for) > 0 && isset($bbc_codes[$look_for[0]]))
 					{
-						foreach ($bbc_codes[$look_for[0]] as $temp)
-							if ($temp['tag'] == $look_for)
+						foreach ($bbc_codes[$look_for[0]] as $temp) {
+													if ($temp['tag'] == $look_for)
 							{
 								$block_level = !empty($temp['block_level']);
+						}
 								break;
 							}
 					}
@@ -2142,15 +2243,15 @@ 
 			{
 				$open_tags = $to_close;
 				continue;
-			}
-			elseif (!empty($to_close) && $tag['tag'] != $look_for)
+			} elseif (!empty($to_close) && $tag['tag'] != $look_for)
 			{
 				if ($block_level === null && isset($look_for[0], $bbc_codes[$look_for[0]]))
 				{
-					foreach ($bbc_codes[$look_for[0]] as $temp)
-						if ($temp['tag'] == $look_for)
+					foreach ($bbc_codes[$look_for[0]] as $temp) {
+											if ($temp['tag'] == $look_for)
 						{
 							$block_level = !empty($temp['block_level']);
+					}
 							break;
 						}
 				}
@@ -2158,8 +2259,9 @@ 
 				// We're not looking for a block level tag (or maybe even a tag that exists...)
 				if (!$block_level)
 				{
-					foreach ($to_close as $tag)
-						array_push($open_tags, $tag);
+					foreach ($to_close as $tag) {
+											array_push($open_tags, $tag);
+					}
 					continue;
 				}
 			}
@@ -2172,14 +2274,17 @@ 
 
 				// See the comment at the end of the big loop - just eating whitespace ;).
 				$whitespace_regex = '';
-				if (!empty($tag['block_level']))
-					$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				if (!empty($tag['block_level'])) {
+									$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				}
 				// Trim one line of whitespace after unnested tags, but all of it after nested ones
-				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
+									$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				}
 
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) {
+									$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				}
 			}
 
 			if (!empty($to_close))
@@ -2192,8 +2297,9 @@ 
 		}
 
 		// No tags for this character, so just keep going (fastest possible course.)
-		if (!isset($bbc_codes[$tags]))
-			continue;
+		if (!isset($bbc_codes[$tags])) {
+					continue;
+		}
 
 		$inside = empty($open_tags) ? null : $open_tags[count($open_tags) - 1];
 		$tag = null;
@@ -2202,44 +2308,52 @@ 
 			$pt_strlen = strlen($possible['tag']);
 
 			// Not a match?
-			if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag'])
-				continue;
+			if (strtolower(substr($message, $pos + 1, $pt_strlen)) != $possible['tag']) {
+							continue;
+			}
 
 			$next_c = $message[$pos + 1 + $pt_strlen];
 
 			// A test validation?
-			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0)
-				continue;
+			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0) {
+							continue;
+			}
 			// Do we want parameters?
 			elseif (!empty($possible['parameters']))
 			{
-				if ($next_c != ' ')
-					continue;
-			}
-			elseif (isset($possible['type']))
+				if ($next_c != ' ') {
+									continue;
+				}
+			} elseif (isset($possible['type']))
 			{
 				// Do we need an equal sign?
-				if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=')
-					continue;
+				if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=') {
+									continue;
+				}
 				// Maybe we just want a /...
-				if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]')
-					continue;
+				if ($possible['type'] == 'closed' && $next_c != ']' && substr($message, $pos + 1 + $pt_strlen, 2) != '/]' && substr($message, $pos + 1 + $pt_strlen, 3) != ' /]') {
+									continue;
+				}
 				// An immediate ]?
-				if ($possible['type'] == 'unparsed_content' && $next_c != ']')
-					continue;
+				if ($possible['type'] == 'unparsed_content' && $next_c != ']') {
+									continue;
+				}
 			}
 			// No type means 'parsed_content', which demands an immediate ] without parameters!
-			elseif ($next_c != ']')
-				continue;
+			elseif ($next_c != ']') {
+							continue;
+			}
 
 			// Check allowed tree?
-			if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents'])))
-				continue;
-			elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children']))
-				continue;
+			if (isset($possible['require_parents']) && ($inside === null || !in_array($inside['tag'], $possible['require_parents']))) {
+							continue;
+			} elseif (isset($inside['require_children']) && !in_array($possible['tag'], $inside['require_children'])) {
+							continue;
+			}
 			// If this is in the list of disallowed child tags, don't parse it.
-			elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children']))
-				continue;
+			elseif (isset($inside['disallow_children']) && in_array($possible['tag'], $inside['disallow_children'])) {
+							continue;
+			}
 
 			$pos1 = $pos + 1 + $pt_strlen + 1;
 
@@ -2251,8 +2365,9 @@ 
 				foreach ($open_tags as $open_quote)
 				{
 					// Every parent quote this quote has flips the styling
-					if ($open_quote['tag'] == 'quote')
-						$quote_alt = !$quote_alt;
+					if ($open_quote['tag'] == 'quote') {
+											$quote_alt = !$quote_alt;
+					}
 				}
 				// Add a class to the quote to style alternating blockquotes
 				$possible['before'] = strtr($possible['before'], array('<blockquote>' => '<blockquote class="bbc_' . ($quote_alt ? 'alternate' : 'standard') . '_quote">'));
@@ -2263,8 +2378,9 @@ 
 			{
 				// Build a regular expression for each parameter for the current tag.
 				$preg = array();
-				foreach ($possible['parameters'] as $p => $info)
-					$preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+				foreach ($possible['parameters'] as $p => $info) {
+									$preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+				}
 
 				// Extract the string that potentially holds our parameters.
 				$blob = preg_split('~\[/?(?:' . $alltags_regex . ')~i', substr($message, $pos));
@@ -2284,24 +2400,27 @@ 
 
 					$match = preg_match('~^' . implode('', $preg) . '$~i', implode(' ', $given_params), $matches) !== 0;
 
-					if ($match)
-						$blob_counter = count($blobs) + 1;
+					if ($match) {
+											$blob_counter = count($blobs) + 1;
+					}
 				}
 
 				// Didn't match our parameter list, try the next possible.
-				if (!$match)
-					continue;
+				if (!$match) {
+									continue;
+				}
 
 				$params = array();
 				for ($i = 1, $n = count($matches); $i < $n; $i += 2)
 				{
 					$key = strtok(ltrim($matches[$i]), '=');
-					if (isset($possible['parameters'][$key]['value']))
-						$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
-					elseif (isset($possible['parameters'][$key]['validate']))
-						$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
-					else
-						$params['{' . $key . '}'] = $matches[$i + 1];
+					if (isset($possible['parameters'][$key]['value'])) {
+											$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
+					} elseif (isset($possible['parameters'][$key]['validate'])) {
+											$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
+					} else {
+											$params['{' . $key . '}'] = $matches[$i + 1];
+					}
 
 					// Just to make sure: replace any $ or { so they can't interpolate wrongly.
 					$params['{' . $key . '}'] = strtr($params['{' . $key . '}'], array('$' => '&#036;', '{' => '&#123;'));
@@ -2309,23 +2428,26 @@ 
 
 				foreach ($possible['parameters'] as $p => $info)
 				{
-					if (!isset($params['{' . $p . '}']))
-						$params['{' . $p . '}'] = '';
+					if (!isset($params['{' . $p . '}'])) {
+											$params['{' . $p . '}'] = '';
+					}
 				}
 
 				$tag = $possible;
 
 				// Put the parameters into the string.
-				if (isset($tag['before']))
-					$tag['before'] = strtr($tag['before'], $params);
-				if (isset($tag['after']))
-					$tag['after'] = strtr($tag['after'], $params);
-				if (isset($tag['content']))
-					$tag['content'] = strtr($tag['content'], $params);
+				if (isset($tag['before'])) {
+									$tag['before'] = strtr($tag['before'], $params);
+				}
+				if (isset($tag['after'])) {
+									$tag['after'] = strtr($tag['after'], $params);
+				}
+				if (isset($tag['content'])) {
+									$tag['content'] = strtr($tag['content'], $params);
+				}
 
 				$pos1 += strlen($given_param_string);
-			}
-			else
+			} else
 			{
 				$tag = $possible;
 				$params = array();
@@ -2336,8 +2458,9 @@ 
 		// Item codes are complicated buggers... they are implicit [li]s and can make [list]s!
 		if ($smileys !== false && $tag === null && isset($itemcodes[$message[$pos + 1]]) && $message[$pos + 2] == ']' && !isset($disabled['list']) && !isset($disabled['li']))
 		{
-			if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>')))
-				continue;
+			if ($message[$pos + 1] == '0' && !in_array($message[$pos - 1], array(';', ' ', "\t", "\n", '>'))) {
+							continue;
+			}
 
 			$tag = $itemcodes[$message[$pos + 1]];
 
@@ -2358,9 +2481,9 @@ 
 			{
 				array_pop($open_tags);
 				$code = '</li>';
+			} else {
+							$code = '';
 			}
-			else
-				$code = '';
 
 			// Now we open a new tag.
 			$open_tags[] = array(
@@ -2407,12 +2530,14 @@ 
 		}
 
 		// No tag?  Keep looking, then.  Silly people using brackets without actual tags.
-		if ($tag === null)
-			continue;
+		if ($tag === null) {
+					continue;
+		}
 
 		// Propagate the list to the child (so wrapping the disallowed tag won't work either.)
-		if (isset($inside['disallow_children']))
-			$tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children'];
+		if (isset($inside['disallow_children'])) {
+					$tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $inside['disallow_children'])) : $inside['disallow_children'];
+		}
 
 		// Is this tag disabled?
 		if (isset($disabled[$tag['tag']]))
@@ -2422,14 +2547,13 @@ 
 				$tag['before'] = !empty($tag['block_level']) ? '<div>' : '';
 				$tag['after'] = !empty($tag['block_level']) ? '</div>' : '';
 				$tag['content'] = isset($tag['type']) && $tag['type'] == 'closed' ? '' : (!empty($tag['block_level']) ? '<div>$1</div>' : '$1');
-			}
-			elseif (isset($tag['disabled_before']) || isset($tag['disabled_after']))
+			} elseif (isset($tag['disabled_before']) || isset($tag['disabled_after']))
 			{
 				$tag['before'] = isset($tag['disabled_before']) ? $tag['disabled_before'] : (!empty($tag['block_level']) ? '<div>' : '');
 				$tag['after'] = isset($tag['disabled_after']) ? $tag['disabled_after'] : (!empty($tag['block_level']) ? '</div>' : '');
+			} else {
+							$tag['content'] = $tag['disabled_content'];
 			}
-			else
-				$tag['content'] = $tag['disabled_content'];
 		}
 
 		// we use this a lot
@@ -2439,8 +2563,9 @@ 
 		if (!empty($tag['block_level']) && $tag['tag'] != 'html' && empty($inside['block_level']))
 		{
 			$n = count($open_tags) - 1;
-			while (empty($open_tags[$n]['block_level']) && $n >= 0)
-				$n--;
+			while (empty($open_tags[$n]['block_level']) && $n >= 0) {
+							$n--;
+			}
 
 			// Close all the non block level tags so this tag isn't surrounded by them.
 			for ($i = count($open_tags) - 1; $i > $n; $i--)
@@ -2452,12 +2577,15 @@ 
 
 				// Trim or eat trailing stuff... see comment at the end of the big loop.
 				$whitespace_regex = '';
-				if (!empty($tag['block_level']))
-					$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
-				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($tag['block_level'])) {
+									$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+				}
+				if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
+									$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
+				}
+				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0) {
+									$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				}
 
 				array_pop($open_tags);
 			}
@@ -2475,16 +2603,19 @@ 
 		elseif ($tag['type'] == 'unparsed_content')
 		{
 			$pos2 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = substr($message, $pos1, $pos2 - $pos1);
 
-			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>')
-				$data = substr($data, 4);
+			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>') {
+							$data = substr($data, 4);
+			}
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = strtr($tag['content'], array('$1' => $data));
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 3 + $tag_strlen);
@@ -2500,34 +2631,40 @@ 
 			if (isset($tag['quoted']))
 			{
 				$quoted = substr($message, $pos1, 6) == '&quot;';
-				if ($tag['quoted'] != 'optional' && !$quoted)
-					continue;
+				if ($tag['quoted'] != 'optional' && !$quoted) {
+									continue;
+				}
 
-				if ($quoted)
-					$pos1 += 6;
+				if ($quoted) {
+									$pos1 += 6;
+				}
+			} else {
+							$quoted = false;
 			}
-			else
-				$quoted = false;
 
 			$pos2 = strpos($message, $quoted == false ? ']' : '&quot;]', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
-			if ($pos3 === false)
-				continue;
+			if ($pos3 === false) {
+							continue;
+			}
 
 			$data = array(
 				substr($message, $pos2 + ($quoted == false ? 1 : 7), $pos3 - ($pos2 + ($quoted == false ? 1 : 7))),
 				substr($message, $pos1, $pos2 - $pos1)
 			);
 
-			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>')
-				$data[0] = substr($data[0], 4);
+			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>') {
+							$data[0] = substr($data[0], 4);
+			}
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = strtr($tag['content'], array('$1' => $data[0], '$2' => $data[1]));
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
@@ -2544,23 +2681,27 @@ 
 		elseif ($tag['type'] == 'unparsed_commas_content')
 		{
 			$pos2 = strpos($message, ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
-			if ($pos3 === false)
-				continue;
+			if ($pos3 === false) {
+							continue;
+			}
 
 			// We want $1 to be the content, and the rest to be csv.
 			$data = explode(',', ',' . substr($message, $pos1, $pos2 - $pos1));
 			$data[0] = substr($message, $pos2 + 1, $pos3 - $pos2 - 1);
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			$code = $tag['content'];
-			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			}
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
 			$pos += strlen($code) - 1 + 2;
 		}
@@ -2568,24 +2709,28 @@ 
 		elseif ($tag['type'] == 'unparsed_commas')
 		{
 			$pos2 = strpos($message, ']', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = explode(',', substr($message, $pos1, $pos2 - $pos1));
 
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			// Fix after, for disabled code mainly.
-			foreach ($data as $k => $d)
-				$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+			}
 
 			$open_tags[] = $tag;
 
 			// Replace them out, $1, $2, $3, $4, etc.
 			$code = $tag['before'];
-			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+							$code = strtr($code, array('$' . ($k + 1) => trim($d)));
+			}
 			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 1);
 			$pos += strlen($code) - 1 + 2;
 		}
@@ -2596,28 +2741,33 @@ 
 			if (isset($tag['quoted']))
 			{
 				$quoted = substr($message, $pos1, 6) == '&quot;';
-				if ($tag['quoted'] != 'optional' && !$quoted)
-					continue;
+				if ($tag['quoted'] != 'optional' && !$quoted) {
+									continue;
+				}
 
-				if ($quoted)
-					$pos1 += 6;
+				if ($quoted) {
+									$pos1 += 6;
+				}
+			} else {
+							$quoted = false;
 			}
-			else
-				$quoted = false;
 
 			$pos2 = strpos($message, $quoted == false ? ']' : '&quot;]', $pos1);
-			if ($pos2 === false)
-				continue;
+			if ($pos2 === false) {
+							continue;
+			}
 
 			$data = substr($message, $pos1, $pos2 - $pos1);
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				$tag['validate']($tag, $data, $disabled, $params);
+			if (isset($tag['validate'])) {
+							$tag['validate']($tag, $data, $disabled, $params);
+			}
 
 			// For parsed content, we must recurse to avoid security problems.
-			if ($tag['type'] != 'unparsed_equals')
-				$data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array());
+			if ($tag['type'] != 'unparsed_equals') {
+							$data = parse_bbc($data, !empty($tag['parsed_tags_allowed']) ? false : true, '', !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array());
+			}
 
 			$tag['after'] = strtr($tag['after'], array('$1' => $data));
 
@@ -2629,34 +2779,40 @@ 
 		}
 
 		// If this is block level, eat any breaks after it.
-		if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>')
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 5);
+		if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>') {
+					$message = substr($message, 0, $pos + 1) . substr($message, $pos + 5);
+		}
 
 		// Are we trimming outside this tag?
-		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($message, $pos + 1), $matches) != 0)
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0]));
+		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($message, $pos + 1), $matches) != 0) {
+					$message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0]));
+		}
 	}
 
 	// Close any remaining tags.
-	while ($tag = array_pop($open_tags))
-		$message .= "\n" . $tag['after'] . "\n";
+	while ($tag = array_pop($open_tags)) {
+			$message .= "\n" . $tag['after'] . "\n";
+	}
 
 	// Parse the smileys within the parts where it can be done safely.
 	if ($smileys === true)
 	{
 		$message_parts = explode("\n", $message);
-		for ($i = 0, $n = count($message_parts); $i < $n; $i += 2)
-			parsesmileys($message_parts[$i]);
+		for ($i = 0, $n = count($message_parts); $i < $n; $i += 2) {
+					parsesmileys($message_parts[$i]);
+		}
 
 		$message = implode('', $message_parts);
 	}
 
 	// No smileys, just get rid of the markers.
-	else
-		$message = strtr($message, array("\n" => ''));
+	else {
+			$message = strtr($message, array("\n" => ''));
+	}
 
-	if ($message !== '' && $message[0] === ' ')
-		$message = '&nbsp;' . substr($message, 1);
+	if ($message !== '' && $message[0] === ' ') {
+			$message = '&nbsp;' . substr($message, 1);
+	}
 
 	// Cleanup whitespace.
 	$message = strtr($message, array('  ' => ' &nbsp;', "\r" => '', "\n" => '<br>', '<br> ' => '<br>&nbsp;', '&#13;' => "\n"));
@@ -2665,15 +2821,16 @@ 
 	call_integration_hook('integrate_post_parsebbc', array(&$message, &$smileys, &$cache_id, &$parse_tags));
 
 	// Cache the output if it took some time...
-	if (isset($cache_key, $cache_t) && array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.05)
-		cache_put_data($cache_key, $message, 240);
+	if (isset($cache_key, $cache_t) && array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.05) {
+			cache_put_data($cache_key, $message, 240);
+	}
 
 	// If this was a force parse revert if needed.
 	if (!empty($parse_tags))
 	{
-		if (empty($temp_bbc))
-			$bbc_codes = array();
-		else
+		if (empty($temp_bbc)) {
+					$bbc_codes = array();
+		} else
 		{
 			$bbc_codes = $temp_bbc;
 			unset($temp_bbc);
@@ -2700,8 +2857,9 @@ 
 	static $smileyPregSearch = null, $smileyPregReplacements = array();
 
 	// No smiley set at all?!
-	if ($user_info['smiley_set'] == 'none' || trim($message) == '')
-		return;
+	if ($user_info['smiley_set'] == 'none' || trim($message) == '') {
+			return;
+	}
 
 	// If smileyPregSearch hasn't been set, do it now.
 	if (empty($smileyPregSearch))
@@ -2712,8 +2870,7 @@ 
 			$smileysfrom = array('>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', '0:)');
 			$smileysto = array('evil.gif', 'cheesy.gif', 'rolleyes.gif', 'angry.gif', 'laugh.gif', 'smiley.gif', 'wink.gif', 'grin.gif', 'sad.gif', 'shocked.gif', 'cool.gif', 'tongue.gif', 'huh.gif', 'embarrassed.gif', 'lipsrsealed.gif', 'kiss.gif', 'cry.gif', 'undecided.gif', 'azn.gif', 'afro.gif', 'police.gif', 'angel.gif');
 			$smileysdescs = array('', $txt['icon_cheesy'], $txt['icon_rolleyes'], $txt['icon_angry'], '', $txt['icon_smiley'], $txt['icon_wink'], $txt['icon_grin'], $txt['icon_sad'], $txt['icon_shocked'], $txt['icon_cool'], $txt['icon_tongue'], $txt['icon_huh'], $txt['icon_embarrassed'], $txt['icon_lips'], $txt['icon_kiss'], $txt['icon_cry'], $txt['icon_undecided'], '', '', '', '');
-		}
-		else
+		} else
 		{
 			// Load the smileys in reverse order by length so they don't get parsed wrong.
 			if (($temp = cache_get_data('parsing_smileys', 480)) == null)
@@ -2737,9 +2894,9 @@ 
 				$smcFunc['db_free_result']($result);
 
 				cache_put_data('parsing_smileys', array($smileysfrom, $smileysto, $smileysdescs), 480);
+			} else {
+							list ($smileysfrom, $smileysto, $smileysdescs) = $temp;
 			}
-			else
-				list ($smileysfrom, $smileysto, $smileysdescs) = $temp;
 		}
 
 		// The non-breaking-space is a complex thing...
@@ -2816,35 +2973,41 @@ 
 	global $scripturl, $context, $modSettings, $db_show_debug, $db_cache;
 
 	// In case we have mail to send, better do that - as obExit doesn't always quite make it...
-	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	if (!empty($context['flush_mail'])) {
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	$add = preg_match('~^(ftp|http)[s]?://~', $setLocation) == 0 && substr($setLocation, 0, 6) != 'about:';
 
-	if ($add)
-		$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	if ($add) {
+			$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+	}
 
 	// Put the session ID in.
-	if (defined('SID') && SID != '')
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	if (defined('SID') && SID != '') {
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+	}
 	// Keep that debug in their for template debugging!
-	elseif (isset($_GET['debug']))
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	elseif (isset($_GET['debug'])) {
+			$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+	}
 
 	if (!empty($modSettings['queryless_urls']) && (empty($context['server']['is_cgi']) || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && (!empty($context['server']['is_apache']) || !empty($context['server']['is_lighttpd']) || !empty($context['server']['is_litespeed'])))
 	{
-		if (defined('SID') && SID != '')
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
+		if (defined('SID') && SID != '') {
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
 				function ($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : "");
+		}
 				}, $setLocation);
-		else
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
+		else {
+					$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
 				function ($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
+		}
 				}, $setLocation);
 	}
 
@@ -2855,8 +3018,9 @@ 
 	header('Location: ' . str_replace(' ', '%20', $setLocation), true, $permanent ? 301 : 302);
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$_SESSION['debug_redirect'] = $db_cache;
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$_SESSION['debug_redirect'] = $db_cache;
+	}
 
 	obExit(false);
 }
@@ -2875,51 +3039,60 @@ 
 
 	// Attempt to prevent a recursive loop.
 	++$level;
-	if ($level > 1 && !$from_fatal_error && !$has_fatal_error)
-		exit;
-	if ($from_fatal_error)
-		$has_fatal_error = true;
+	if ($level > 1 && !$from_fatal_error && !$has_fatal_error) {
+			exit;
+	}
+	if ($from_fatal_error) {
+			$has_fatal_error = true;
+	}
 
 	// Clear out the stat cache.
 	trackStats();
 
 	// If we have mail to send, send it.
-	if (!empty($context['flush_mail']))
-		// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
+	if (!empty($context['flush_mail'])) {
+			// @todo this relies on 'flush_mail' being only set in AddMailQueue itself... :\
 		AddMailQueue(true);
+	}
 
 	$do_header = $header === null ? !$header_done : $header;
-	if ($do_footer === null)
-		$do_footer = $do_header;
+	if ($do_footer === null) {
+			$do_footer = $do_header;
+	}
 
 	// Has the template/header been done yet?
 	if ($do_header)
 	{
 		// Was the page title set last minute? Also update the HTML safe one.
-		if (!empty($context['page_title']) && empty($context['page_title_html_safe']))
-			$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		if (!empty($context['page_title']) && empty($context['page_title_html_safe'])) {
+					$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+		}
 
 		// Start up the session URL fixer.
 		ob_start('ob_sessrewrite');
 
-		if (!empty($settings['output_buffers']) && is_string($settings['output_buffers']))
-			$buffers = explode(',', $settings['output_buffers']);
-		elseif (!empty($settings['output_buffers']))
-			$buffers = $settings['output_buffers'];
-		else
-			$buffers = array();
+		if (!empty($settings['output_buffers']) && is_string($settings['output_buffers'])) {
+					$buffers = explode(',', $settings['output_buffers']);
+		} elseif (!empty($settings['output_buffers'])) {
+					$buffers = $settings['output_buffers'];
+		} else {
+					$buffers = array();
+		}
 
-		if (isset($modSettings['integrate_buffer']))
-			$buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers);
+		if (isset($modSettings['integrate_buffer'])) {
+					$buffers = array_merge(explode(',', $modSettings['integrate_buffer']), $buffers);
+		}
 
-		if (!empty($buffers))
-			foreach ($buffers as $function)
+		if (!empty($buffers)) {
+					foreach ($buffers as $function)
 			{
 				$call = call_helper($function, true);
+		}
 
 				// Is it valid?
-				if (!empty($call))
-					ob_start($call);
+				if (!empty($call)) {
+									ob_start($call);
+				}
 			}
 
 		// Display the screen in the logical order.
@@ -2931,8 +3104,9 @@ 
 		loadSubTemplate(isset($context['sub_template']) ? $context['sub_template'] : 'main');
 
 		// Anything special to put out?
-		if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml']))
-			echo $context['insert_after_template'];
+		if (!empty($context['insert_after_template']) && !isset($_REQUEST['xml'])) {
+					echo $context['insert_after_template'];
+		}
 
 		// Just so we don't get caught in an endless loop of errors from the footer...
 		if (!$footer_done)
@@ -2941,14 +3115,16 @@ 
 			template_footer();
 
 			// (since this is just debugging... it's okay that it's after </html>.)
-			if (!isset($_REQUEST['xml']))
-				displayDebug();
+			if (!isset($_REQUEST['xml'])) {
+							displayDebug();
+			}
 		}
 	}
 
 	// Remember this URL in case someone doesn't like sending HTTP_REFERER.
-	if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false)
-		$_SESSION['old_url'] = $_SERVER['REQUEST_URL'];
+	if (strpos($_SERVER['REQUEST_URL'], 'action=dlattach') === false && strpos($_SERVER['REQUEST_URL'], 'action=viewsmfile') === false) {
+			$_SESSION['old_url'] = $_SERVER['REQUEST_URL'];
+	}
 
 	// For session check verification.... don't switch browsers...
 	$_SESSION['USER_AGENT'] = empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'];
@@ -2957,9 +3133,10 @@ 
 	call_integration_hook('integrate_exit', array($do_footer));
 
 	// Don't exit if we're coming from index.php; that will pass through normally.
-	if (!$from_index)
-		exit;
-}
+	if (!$from_index) {
+			exit;
+	}
+	}
 
 /**
  * Get the size of a specified image with better error handling.
@@ -2978,8 +3155,9 @@ 
 	$url = str_replace(' ', '%20', $url);
 
 	// Can we pull this from the cache... please please?
-	if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null)
-		return $temp;
+	if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null) {
+			return $temp;
+	}
 	$t = microtime();
 
 	// Get the host to pester...
@@ -2989,12 +3167,10 @@ 
 	if ($url == '' || $url == 'http://' || $url == 'https://')
 	{
 		return false;
-	}
-	elseif (!isset($match[1]))
+	} elseif (!isset($match[1]))
 	{
 		$size = @getimagesize($url);
-	}
-	else
+	} else
 	{
 		// Try to connect to the server... give it half a second.
 		$temp = 0;
@@ -3033,12 +3209,14 @@ 
 	}
 
 	// If we didn't get it, we failed.
-	if (!isset($size))
-		$size = false;
+	if (!isset($size)) {
+			$size = false;
+	}
 
 	// If this took a long time, we may never have to do it again, but then again we might...
-	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.8)
-		cache_put_data('url_image_size-' . md5($url), $size, 240);
+	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.8) {
+			cache_put_data('url_image_size-' . md5($url), $size, 240);
+	}
 
 	// Didn't work.
 	return $size;
@@ -3056,8 +3234,9 @@ 
 
 	// Under SSI this function can be called more then once.  That can cause some problems.
 	//   So only run the function once unless we are forced to run it again.
-	if ($loaded && !$forceload)
-		return;
+	if ($loaded && !$forceload) {
+			return;
+	}
 
 	$loaded = true;
 
@@ -3069,14 +3248,16 @@ 
 	$context['news_lines'] = array_filter(explode("\n", str_replace("\r", '', trim(addslashes($modSettings['news'])))));
 	for ($i = 0, $n = count($context['news_lines']); $i < $n; $i++)
 	{
-		if (trim($context['news_lines'][$i]) == '')
-			continue;
+		if (trim($context['news_lines'][$i]) == '') {
+					continue;
+		}
 
 		// Clean it up for presentation ;).
 		$context['news_lines'][$i] = parse_bbc(stripslashes(trim($context['news_lines'][$i])), true, 'news' . $i);
 	}
-	if (!empty($context['news_lines']))
-		$context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)];
+	if (!empty($context['news_lines'])) {
+			$context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)];
+	}
 
 	if (!$user_info['is_guest'])
 	{
@@ -3085,40 +3266,48 @@ 
 		$context['user']['alerts'] = &$user_info['alerts'];
 
 		// Personal message popup...
-		if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0))
-			$context['user']['popup_messages'] = true;
-		else
-			$context['user']['popup_messages'] = false;
+		if ($user_info['unread_messages'] > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0)) {
+					$context['user']['popup_messages'] = true;
+		} else {
+					$context['user']['popup_messages'] = false;
+		}
 		$_SESSION['unread_messages'] = $user_info['unread_messages'];
 
-		if (allowedTo('moderate_forum'))
-			$context['unapproved_members'] = (!empty($modSettings['registration_method']) && ($modSettings['registration_method'] == 2 || (!empty($modSettings['coppaType']) && $modSettings['coppaType'] == 2))) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
+		if (allowedTo('moderate_forum')) {
+					$context['unapproved_members'] = (!empty($modSettings['registration_method']) && ($modSettings['registration_method'] == 2 || (!empty($modSettings['coppaType']) && $modSettings['coppaType'] == 2))) || !empty($modSettings['approveAccountDeletion']) ? $modSettings['unapprovedMembers'] : 0;
+		}
 
 		$context['user']['avatar'] = array();
 
 		// Check for gravatar first since we might be forcing them...
 		if (($modSettings['gravatarEnabled'] && substr($user_info['avatar']['url'], 0, 11) == 'gravatar://') || !empty($modSettings['gravatarOverride']))
 		{
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11)
-				$context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11));
-			else
-				$context['user']['avatar']['href'] = get_gravatar_url($user_info['email']);
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($user_info['avatar']['url'], 'gravatar://') && strlen($user_info['avatar']['url']) > 11) {
+							$context['user']['avatar']['href'] = get_gravatar_url($smcFunc['substr']($user_info['avatar']['url'], 11));
+			} else {
+							$context['user']['avatar']['href'] = get_gravatar_url($user_info['email']);
+			}
 		}
 		// Uploaded?
-		elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach']))
-			$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar';
+		elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach'])) {
+					$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar';
+		}
 		// Full URL?
-		elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0)
-			$context['user']['avatar']['href'] = $user_info['avatar']['url'];
+		elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0) {
+					$context['user']['avatar']['href'] = $user_info['avatar']['url'];
+		}
 		// Otherwise we assume it's server stored.
-		elseif ($user_info['avatar']['url'] != '')
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']);
+		elseif ($user_info['avatar']['url'] != '') {
+					$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']);
+		}
 		// No avatar at all? Fine, we have a big fat default avatar ;)
-		else
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png';
+		else {
+					$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png';
+		}
 
-		if (!empty($context['user']['avatar']))
-			$context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">';
+		if (!empty($context['user']['avatar'])) {
+					$context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">';
+		}
 
 		// Figure out how long they've been logged in.
 		$context['user']['total_time_logged_in'] = array(
@@ -3126,8 +3315,7 @@ 
 			'hours' => floor(($user_info['total_time_logged_in'] % 86400) / 3600),
 			'minutes' => floor(($user_info['total_time_logged_in'] % 3600) / 60)
 		);
-	}
-	else
+	} else
 	{
 		$context['user']['messages'] = 0;
 		$context['user']['unread_messages'] = 0;
@@ -3135,12 +3323,14 @@ 
 		$context['user']['total_time_logged_in'] = array('days' => 0, 'hours' => 0, 'minutes' => 0);
 		$context['user']['popup_messages'] = false;
 
-		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1)
-			$txt['welcome_guest'] .= $txt['welcome_guest_activate'];
+		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1) {
+					$txt['welcome_guest'] .= $txt['welcome_guest_activate'];
+		}
 
 		// If we've upgraded recently, go easy on the passwords.
-		if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime']))
-			$context['disable_login_hashing'] = true;
+		if (!empty($modSettings['disableHashTime']) && ($modSettings['disableHashTime'] == 1 || time() < $modSettings['disableHashTime'])) {
+					$context['disable_login_hashing'] = true;
+		}
 	}
 
 	// Setup the main menu items.
@@ -3153,8 +3343,8 @@ 
 	$context['show_pm_popup'] = $context['user']['popup_messages'] && !empty($options['popup_messages']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'pm');
 
 	// 2.1+: Add the PM popup here instead. Theme authors can still override it simply by editing/removing the 'fPmPopup' in the array.
-	if ($context['show_pm_popup'])
-		addInlineJavaScript('
+	if ($context['show_pm_popup']) {
+			addInlineJavaScript('
 		jQuery(document).ready(function($) {
 			new smc_Popup({
 				heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']) . ',
@@ -3162,15 +3352,17 @@ 
 				icon_class: \'generic_icons mail_new\'
 			});
 		});');
+	}
 
 	// Add a generic "Are you sure?" confirmation message.
 	addInlineJavaScript('
 	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';');
 
 	// Now add the capping code for avatars.
-	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize')
-		addInlineCss('
+	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize') {
+			addInlineCss('
 img.avatar { max-width: ' . $modSettings['avatar_max_width_external'] . 'px; max-height: ' . $modSettings['avatar_max_height_external'] . 'px; }');
+	}
 
 	// This looks weird, but it's because BoardIndex.php references the variable.
 	$context['common_stats']['latest_member'] = array(
@@ -3187,11 +3379,13 @@ 
 	);
 	$context['common_stats']['boardindex_total_posts'] = sprintf($txt['boardindex_total_posts'], $context['common_stats']['total_posts'], $context['common_stats']['total_topics'], $context['common_stats']['total_members']);
 
-	if (empty($settings['theme_version']))
-		addJavaScriptVar('smf_scripturl', $scripturl);
+	if (empty($settings['theme_version'])) {
+			addJavaScriptVar('smf_scripturl', $scripturl);
+	}
 
-	if (!isset($context['page_title']))
-		$context['page_title'] = '';
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = '';
+	}
 
 	// Set some specific vars.
 	$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
@@ -3201,21 +3395,23 @@ 
 	$context['meta_tags'][] = array('property' => 'og:site_name', 'content' => $context['forum_name']);
 	$context['meta_tags'][] = array('property' => 'og:title', 'content' => $context['page_title_html_safe']);
 
-	if (!empty($context['meta_keywords']))
-		$context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']);
+	if (!empty($context['meta_keywords'])) {
+			$context['meta_tags'][] = array('name' => 'keywords', 'content' => $context['meta_keywords']);
+	}
 
-	if (!empty($context['canonical_url']))
-		$context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']);
+	if (!empty($context['canonical_url'])) {
+			$context['meta_tags'][] = array('property' => 'og:url', 'content' => $context['canonical_url']);
+	}
 
-	if (!empty($settings['og_image']))
-		$context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']);
+	if (!empty($settings['og_image'])) {
+			$context['meta_tags'][] = array('property' => 'og:image', 'content' => $settings['og_image']);
+	}
 
 	if (!empty($context['meta_description']))
 	{
 		$context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['meta_description']);
 		$context['meta_tags'][] = array('name' => 'description', 'content' => $context['meta_description']);
-	}
-	else
+	} else
 	{
 		$context['meta_tags'][] = array('property' => 'og:description', 'content' => $context['page_title_html_safe']);
 		$context['meta_tags'][] = array('name' => 'description', 'content' => $context['page_title_html_safe']);
@@ -3240,8 +3436,9 @@ 
 	$memory_needed = memoryReturnBytes($needed);
 
 	// should we account for how much is currently being used?
-	if ($in_use)
-		$memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576);
+	if ($in_use) {
+			$memory_needed += function_exists('memory_get_usage') ? memory_get_usage() : (2 * 1048576);
+	}
 
 	// if more is needed, request it
 	if ($memory_current < $memory_needed)
@@ -3264,8 +3461,9 @@ 
  */
 function memoryReturnBytes($val)
 {
-	if (is_integer($val))
-		return $val;
+	if (is_integer($val)) {
+			return $val;
+	}
 
 	// Separate the number from the designator
 	$val = trim($val);
@@ -3301,10 +3499,11 @@ 
 		header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
 		// Are we debugging the template/html content?
-		if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie'))
-			header('Content-Type: application/xhtml+xml');
-		elseif (!isset($_REQUEST['xml']))
-			header('Content-Type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie')) {
+					header('Content-Type: application/xhtml+xml');
+		} elseif (!isset($_REQUEST['xml'])) {
+					header('Content-Type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		}
 	}
 
 	header('Content-Type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
@@ -3313,8 +3512,9 @@ 
 	if ($context['in_maintenance'] && $context['user']['is_admin'])
 	{
 		$position = array_search('body', $context['template_layers']);
-		if ($position === false)
-			$position = array_search('main', $context['template_layers']);
+		if ($position === false) {
+					$position = array_search('main', $context['template_layers']);
+		}
 
 		if ($position !== false)
 		{
@@ -3342,23 +3542,25 @@ 
 
 			foreach ($securityFiles as $i => $securityFile)
 			{
-				if (!file_exists($boarddir . '/' . $securityFile))
-					unset($securityFiles[$i]);
+				if (!file_exists($boarddir . '/' . $securityFile)) {
+									unset($securityFiles[$i]);
+				}
 			}
 
 			// We are already checking so many files...just few more doesn't make any difference! :P
-			if (!empty($modSettings['currentAttachmentUploadDir']))
-				$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
-
-			else
-				$path = $modSettings['attachmentUploadDir'];
+			if (!empty($modSettings['currentAttachmentUploadDir'])) {
+							$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
+			} else {
+							$path = $modSettings['attachmentUploadDir'];
+			}
 
 			secureDirectory($path, true);
 			secureDirectory($cachedir);
 
 			// If agreement is enabled, at least the english version shall exists
-			if ($modSettings['requireAgreement'])
-				$agreement = !file_exists($boarddir . '/agreement.txt');
+			if ($modSettings['requireAgreement']) {
+							$agreement = !file_exists($boarddir . '/agreement.txt');
+			}
 
 			if (!empty($securityFiles) || (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) || !empty($agreement))
 			{
@@ -3373,18 +3575,21 @@ 
 					echo '
 				', $txt['not_removed'], '<strong>', $securityFile, '</strong>!<br>';
 
-					if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~')
-						echo '
+					if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~') {
+											echo '
 				', sprintf($txt['not_removed_extra'], $securityFile, substr($securityFile, 0, -1)), '<br>';
+					}
 				}
 
-				if (!empty($modSettings['cache_enable']) && !is_writable($cachedir))
-					echo '
+				if (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) {
+									echo '
 				<strong>', $txt['cache_writable'], '</strong><br>';
+				}
 
-				if (!empty($agreement))
-					echo '
+				if (!empty($agreement)) {
+									echo '
 				<strong>', $txt['agreement_missing'], '</strong><br>';
+				}
 
 				echo '
 			</p>
@@ -3399,16 +3604,18 @@ 
 				<div class="windowbg alert" style="margin: 2ex; padding: 2ex; border: 2px dashed red;">
 					', sprintf($txt['you_are_post_banned'], $user_info['is_guest'] ? $txt['guest_title'] : $user_info['name']);
 
-			if (!empty($_SESSION['ban']['cannot_post']['reason']))
-				echo '
+			if (!empty($_SESSION['ban']['cannot_post']['reason'])) {
+							echo '
 					<div style="padding-left: 4ex; padding-top: 1ex;">', $_SESSION['ban']['cannot_post']['reason'], '</div>';
+			}
 
-			if (!empty($_SESSION['ban']['expire_time']))
-				echo '
+			if (!empty($_SESSION['ban']['expire_time'])) {
+							echo '
 					<div>', sprintf($txt['your_ban_expires'], timeformat($_SESSION['ban']['expire_time'], false)), '</div>';
-			else
-				echo '
+			} else {
+							echo '
 					<div>', $txt['your_ban_expires_never'], '</div>';
+			}
 
 			echo '
 				</div>';
@@ -3424,8 +3631,9 @@ 
 	global $forum_copyright, $software_year, $forum_version;
 
 	// Don't display copyright for things like SSI.
-	if (!isset($forum_version) || !isset($software_year))
-		return;
+	if (!isset($forum_version) || !isset($software_year)) {
+			return;
+	}
 
 	// Put in the version...
 	printf($forum_copyright, $forum_version, $software_year);
@@ -3443,9 +3651,10 @@ 
 	$context['load_time'] = comma_format(round(array_sum(explode(' ', microtime())) - array_sum(explode(' ', $time_start)), 3));
 	$context['load_queries'] = $db_count;
 
-	foreach (array_reverse($context['template_layers']) as $layer)
-		loadSubTemplate($layer . '_below', true);
-}
+	foreach (array_reverse($context['template_layers']) as $layer) {
+			loadSubTemplate($layer . '_below', true);
+	}
+	}
 
 /**
  * Output the Javascript files
@@ -3476,8 +3685,7 @@ 
 			{
 				echo '
 		var ', $key, ';';
-			}
-			else
+			} else
 			{
 				echo '
 		var ', $key, ' = ', $value, ';';
@@ -3492,26 +3700,27 @@ 
 	foreach ($context['javascript_files'] as $id => $js_file)
 	{
 		// Last minute call! allow theme authors to disable single files.
-		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files']))
-			continue;
+		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) {
+					continue;
+		}
 
 		// By default all files don't get minimized unless the file explicitly says so!
 		if (!empty($js_file['options']['minimize']) && !empty($modSettings['minimize_files']))
 		{
-			if ($do_deferred && !empty($js_file['options']['defer']))
-				$toMinifyDefer[] = $js_file;
-
-			elseif (!$do_deferred && empty($js_file['options']['defer']))
-				$toMinify[] = $js_file;
+			if ($do_deferred && !empty($js_file['options']['defer'])) {
+							$toMinifyDefer[] = $js_file;
+			} elseif (!$do_deferred && empty($js_file['options']['defer'])) {
+							$toMinify[] = $js_file;
+			}
 
 			// Grab a random seed.
-			if (!isset($minSeed))
-				$minSeed = $js_file['options']['seed'];
-		}
-
-		elseif ((!$do_deferred && empty($js_file['options']['defer'])) || ($do_deferred && !empty($js_file['options']['defer'])))
-			echo '
+			if (!isset($minSeed)) {
+							$minSeed = $js_file['options']['seed'];
+			}
+		} elseif ((!$do_deferred && empty($js_file['options']['defer'])) || ($do_deferred && !empty($js_file['options']['defer']))) {
+					echo '
 	<script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async="async"' : '', '></script>';
+		}
 	}
 
 	if ((!$do_deferred && !empty($toMinify)) || ($do_deferred && !empty($toMinifyDefer)))
@@ -3519,14 +3728,14 @@ 
 		$result = custMinify(($do_deferred ? $toMinifyDefer : $toMinify), 'js', $do_deferred);
 
 		// Minify process couldn't work, print each individual files.
-		if (!empty($result) && is_array($result))
-			foreach ($result as $minFailedFile)
+		if (!empty($result) && is_array($result)) {
+					foreach ($result as $minFailedFile)
 				echo '
 	<script src="', $minFailedFile['fileUrl'], '"', !empty($minFailedFile['options']['async']) ? ' async="async"' : '', '></script>';
-
-		else
-			echo '
+		} else {
+					echo '
 	<script src="', $settings['theme_url'] ,'/scripts/minified', ($do_deferred ? '_deferred' : '') ,'.js', $minSeed ,'"></script>';
+		}
 	}
 
 	// Inline JavaScript - Actually useful some times!
@@ -3537,8 +3746,9 @@ 
 			echo '
 <script>';
 
-			foreach ($context['javascript_inline']['defer'] as $js_code)
-				echo $js_code;
+			foreach ($context['javascript_inline']['defer'] as $js_code) {
+							echo $js_code;
+			}
 
 			echo '
 </script>';
@@ -3549,8 +3759,9 @@ 
 			echo '
 	<script>';
 
-			foreach ($context['javascript_inline']['standard'] as $js_code)
-				echo $js_code;
+			foreach ($context['javascript_inline']['standard'] as $js_code) {
+							echo $js_code;
+			}
 
 			echo '
 	</script>';
@@ -3575,8 +3786,9 @@ 
 	foreach ($context['css_files'] as $id => $file)
 	{
 		// Last minute call! allow theme authors to disable single files.
-		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files']))
-			continue;
+		if (!empty($settings['disable_files']) && in_array($id, $settings['disable_files'])) {
+					continue;
+		}
 
 		// By default all files don't get minimized unless the file explicitly says so!
 		if (!empty($file['options']['minimize']) && !empty($modSettings['minimize_files']))
@@ -3584,12 +3796,12 @@ 
 			$toMinify[] = $file;
 
 			// Grab a random seed.
-			if (!isset($minSeed))
-				$minSeed = $file['options']['seed'];
+			if (!isset($minSeed)) {
+							$minSeed = $file['options']['seed'];
+			}
+		} else {
+					$normal[] = $file['fileUrl'];
 		}
-
-		else
-			$normal[] = $file['fileUrl'];
 	}
 
 	if (!empty($toMinify))
@@ -3597,28 +3809,30 @@ 
 		$result = custMinify($toMinify, 'css');
 
 		// Minify process couldn't work, print each individual files.
-		if (!empty($result) && is_array($result))
-			foreach ($result as $minFailedFile)
+		if (!empty($result) && is_array($result)) {
+					foreach ($result as $minFailedFile)
 				echo '
 	<link rel="stylesheet" href="', $minFailedFile['fileUrl'], '">';
-
-		else
-			echo '
+		} else {
+					echo '
 	<link rel="stylesheet" href="', $settings['theme_url'] ,'/css/minified.css', $minSeed ,'">';
+		}
 	}
 
 	// Print the rest after the minified files.
-	if (!empty($normal))
-		foreach ($normal as $nf)
+	if (!empty($normal)) {
+			foreach ($normal as $nf)
 			echo '
 	<link rel="stylesheet" href="', $nf ,'">';
+	}
 
 	if ($db_show_debug === true)
 	{
 		// Try to keep only what's useful.
 		$repl = array($boardurl . '/Themes/' => '', $boardurl . '/' => '');
-		foreach ($context['css_files'] as $file)
-			$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
+		foreach ($context['css_files'] as $file) {
+					$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
+		}
 	}
 
 	if (!empty($context['css_header']))
@@ -3626,9 +3840,10 @@ 
 		echo '
 	<style>';
 
-		foreach ($context['css_header'] as $css)
-			echo $css .'
+		foreach ($context['css_header'] as $css) {
+					echo $css .'
 	';
+		}
 
 		echo'
 	</style>';
@@ -3652,15 +3867,17 @@ 
 	$type = !empty($type) && in_array($type, $types) ? $type : false;
 	$data = !empty($data) ? $data : false;
 
-	if (empty($type) || empty($data))
-		return false;
+	if (empty($type) || empty($data)) {
+			return false;
+	}
 
 	// Did we already did this?
 	$toCache = cache_get_data('minimized_'. $settings['theme_id'] .'_'. $type, 86400);
 
 	// Already done?
-	if (!empty($toCache))
-		return true;
+	if (!empty($toCache)) {
+			return true;
+	}
 
 	// No namespaces, sorry!
 	$classType = 'MatthiasMullie\\Minify\\'. strtoupper($type);
@@ -3742,8 +3959,9 @@ 
 	global $modSettings, $smcFunc;
 
 	// Just make up a nice hash...
-	if ($new)
-		return sha1(md5($filename . time()) . mt_rand());
+	if ($new) {
+			return sha1(md5($filename . time()) . mt_rand());
+	}
 
 	// Just make sure that attachment id is only a int
 	$attachment_id = (int) $attachment_id;
@@ -3760,23 +3978,25 @@ 
 				'id_attach' => $attachment_id,
 			));
 
-		if ($smcFunc['db_num_rows']($request) === 0)
-			return false;
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					return false;
+		}
 
 		list ($file_hash) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Still no hash? mmm...
-	if (empty($file_hash))
-		$file_hash = sha1(md5($filename . time()) . mt_rand());
+	if (empty($file_hash)) {
+			$file_hash = sha1(md5($filename . time()) . mt_rand());
+	}
 
 	// Are we using multiple directories?
-	if (is_array($modSettings['attachmentUploadDir']))
-		$path = $modSettings['attachmentUploadDir'][$dir];
-
-	else
-		$path = $modSettings['attachmentUploadDir'];
+	if (is_array($modSettings['attachmentUploadDir'])) {
+			$path = $modSettings['attachmentUploadDir'][$dir];
+	} else {
+			$path = $modSettings['attachmentUploadDir'];
+	}
 
 	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
 }
@@ -3791,8 +4011,9 @@ 
 function ip2range($fullip)
 {
 	// Pretend that 'unknown' is 255.255.255.255. (since that can't be an IP anyway.)
-	if ($fullip == 'unknown')
-		$fullip = '255.255.255.255';
+	if ($fullip == 'unknown') {
+			$fullip = '255.255.255.255';
+	}
 
 	$ip_parts = explode('-', $fullip);
 	$ip_array = array();
@@ -3816,10 +4037,11 @@ 
 		$ip_array['low'] = $ip_parts[0];
 		$ip_array['high'] = $ip_parts[1];
 		return $ip_array;
-	}
-	elseif (count($ip_parts) == 2) // if ip 22.22.*-22.22.*
+	} elseif (count($ip_parts) == 2) {
+		// if ip 22.22.*-22.22.*
 	{
 		$valid_low = isValidIP($ip_parts[0]);
+	}
 		$valid_high = isValidIP($ip_parts[1]);
 		$count = 0;
 		$mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.');
@@ -3834,7 +4056,9 @@ 
 				$ip_parts[0] .= $mode . $min;
 				$valid_low = isValidIP($ip_parts[0]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -3848,7 +4072,9 @@ 
 				$ip_parts[1] .= $mode . $max;
 				$valid_high = isValidIP($ip_parts[1]);
 				$count++;
-				if ($count > 9) break;
+				if ($count > 9) {
+					break;
+				}
 			}
 		}
 
@@ -3873,46 +4099,54 @@ 
 {
 	global $modSettings;
 
-	if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null)
-		return $host;
+	if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null) {
+			return $host;
+	}
 	$t = microtime();
 
 	// Try the Linux host command, perhaps?
 	if (!isset($host) && (strpos(strtolower(PHP_OS), 'win') === false || strpos(strtolower(PHP_OS), 'darwin') !== false) && mt_rand(0, 1) == 1)
 	{
-		if (!isset($modSettings['host_to_dis']))
-			$test = @shell_exec('host -W 1 ' . @escapeshellarg($ip));
-		else
-			$test = @shell_exec('host ' . @escapeshellarg($ip));
+		if (!isset($modSettings['host_to_dis'])) {
+					$test = @shell_exec('host -W 1 ' . @escapeshellarg($ip));
+		} else {
+					$test = @shell_exec('host ' . @escapeshellarg($ip));
+		}
 
 		// Did host say it didn't find anything?
-		if (strpos($test, 'not found') !== false)
-			$host = '';
+		if (strpos($test, 'not found') !== false) {
+					$host = '';
+		}
 		// Invalid server option?
-		elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis']))
-			updateSettings(array('host_to_dis' => 1));
+		elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset($modSettings['host_to_dis'])) {
+					updateSettings(array('host_to_dis' => 1));
+		}
 		// Maybe it found something, after all?
-		elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1)
-			$host = $match[1];
+		elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match) == 1) {
+					$host = $match[1];
+		}
 	}
 
 	// This is nslookup; usually only Windows, but possibly some Unix?
 	if (!isset($host) && stripos(PHP_OS, 'win') !== false && strpos(strtolower(PHP_OS), 'darwin') === false && mt_rand(0, 1) == 1)
 	{
 		$test = @shell_exec('nslookup -timeout=1 ' . @escapeshellarg($ip));
-		if (strpos($test, 'Non-existent domain') !== false)
-			$host = '';
-		elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1)
-			$host = $match[1];
+		if (strpos($test, 'Non-existent domain') !== false) {
+					$host = '';
+		} elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1) {
+					$host = $match[1];
+		}
 	}
 
 	// This is the last try :/.
-	if (!isset($host) || $host === false)
-		$host = @gethostbyaddr($ip);
+	if (!isset($host) || $host === false) {
+			$host = @gethostbyaddr($ip);
+	}
 
 	// It took a long time, so let's cache it!
-	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.5)
-		cache_put_data('hostlookup-' . $ip, $host, 600);
+	if (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $t)) > 0.5) {
+			cache_put_data('hostlookup-' . $ip, $host, 600);
+	}
 
 	return $host;
 }
@@ -3948,20 +4182,21 @@ 
 			{
 				$encrypted = substr(crypt($word, 'uk'), 2, $max_chars);
 				$total = 0;
-				for ($i = 0; $i < $max_chars; $i++)
-					$total += $possible_chars[ord($encrypted{$i})] * pow(63, $i);
+				for ($i = 0; $i < $max_chars; $i++) {
+									$total += $possible_chars[ord($encrypted{$i})] * pow(63, $i);
+				}
 				$returned_ints[] = $max_chars == 4 ? min($total, 16777215) : $total;
 			}
 		}
 		return array_unique($returned_ints);
-	}
-	else
+	} else
 	{
 		// Trim characters before and after and add slashes for database insertion.
 		$returned_words = array();
-		foreach ($words as $word)
-			if (($word = trim($word, '-_\'')) !== '')
+		foreach ($words as $word) {
+					if (($word = trim($word, '-_\'')) !== '')
 				$returned_words[] = $max_chars === null ? $word : substr($word, 0, $max_chars);
+		}
 
 		// Filter out all words that occur more than once.
 		return array_unique($returned_words);
@@ -3983,16 +4218,18 @@ 
 	global $settings, $txt;
 
 	// Does the current loaded theme have this and we are not forcing the usage of this function?
-	if (function_exists('template_create_button') && !$force_use)
-		return template_create_button($name, $alt, $label = '', $custom = '');
+	if (function_exists('template_create_button') && !$force_use) {
+			return template_create_button($name, $alt, $label = '', $custom = '');
+	}
 
-	if (!$settings['use_image_buttons'])
-		return $txt[$alt];
-	elseif (!empty($settings['use_buttons']))
-		return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
-	else
-		return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>';
-}
+	if (!$settings['use_image_buttons']) {
+			return $txt[$alt];
+	} elseif (!empty($settings['use_buttons'])) {
+			return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
+	} else {
+			return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>';
+	}
+	}
 
 /**
  * Sets up all of the top menu buttons
@@ -4035,9 +4272,10 @@ 
 	var user_menus = new smc_PopupMenu();
 	user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup");
 	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true);
-		if ($context['allow_pm'])
-			addInlineJavaScript('
+		if ($context['allow_pm']) {
+					addInlineJavaScript('
 	user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true);
+		}
 
 		if (!empty($modSettings['enable_ajax_alerts']))
 		{
@@ -4197,88 +4435,96 @@ 
 
 		// Now we put the buttons in the context so the theme can use them.
 		$menu_buttons = array();
-		foreach ($buttons as $act => $button)
-			if (!empty($button['show']))
+		foreach ($buttons as $act => $button) {
+					if (!empty($button['show']))
 			{
 				$button['active_button'] = false;
+		}
 
 				// This button needs some action.
-				if (isset($button['action_hook']))
-					$needs_action_hook = true;
+				if (isset($button['action_hook'])) {
+									$needs_action_hook = true;
+				}
 
 				// Make sure the last button truly is the last button.
 				if (!empty($button['is_last']))
 				{
-					if (isset($last_button))
-						unset($menu_buttons[$last_button]['is_last']);
+					if (isset($last_button)) {
+											unset($menu_buttons[$last_button]['is_last']);
+					}
 					$last_button = $act;
 				}
 
 				// Go through the sub buttons if there are any.
-				if (!empty($button['sub_buttons']))
-					foreach ($button['sub_buttons'] as $key => $subbutton)
+				if (!empty($button['sub_buttons'])) {
+									foreach ($button['sub_buttons'] as $key => $subbutton)
 					{
 						if (empty($subbutton['show']))
 							unset($button['sub_buttons'][$key]);
+				}
 
 						// 2nd level sub buttons next...
 						if (!empty($subbutton['sub_buttons']))
 						{
 							foreach ($subbutton['sub_buttons'] as $key2 => $sub_button2)
 							{
-								if (empty($sub_button2['show']))
-									unset($button['sub_buttons'][$key]['sub_buttons'][$key2]);
+								if (empty($sub_button2['show'])) {
+																	unset($button['sub_buttons'][$key]['sub_buttons'][$key2]);
+								}
 							}
 						}
 					}
 
 				// Does this button have its own icon?
-				if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">';
-				elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
-				elseif (isset($button['icon']))
-					$button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>';
-				else
-					$button['icon'] = '<span class="generic_icons ' . $act . '"></span>';
+				if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon'])) {
+									$button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">';
+				} elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon'])) {
+									$button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
+				} elseif (isset($button['icon'])) {
+									$button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>';
+				} else {
+									$button['icon'] = '<span class="generic_icons ' . $act . '"></span>';
+				}
 
 				$menu_buttons[$act] = $button;
 			}
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+		}
 	}
 
 	$context['menu_buttons'] = $menu_buttons;
 
 	// Logging out requires the session id in the url.
-	if (isset($context['menu_buttons']['logout']))
-		$context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']);
+	if (isset($context['menu_buttons']['logout'])) {
+			$context['menu_buttons']['logout']['href'] = sprintf($context['menu_buttons']['logout']['href'], $context['session_var'], $context['session_id']);
+	}
 
 	// Figure out which action we are doing so we can set the active tab.
 	// Default to home.
 	$current_action = 'home';
 
-	if (isset($context['menu_buttons'][$context['current_action']]))
-		$current_action = $context['current_action'];
-	elseif ($context['current_action'] == 'search2')
-		$current_action = 'search';
-	elseif ($context['current_action'] == 'theme')
-		$current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin';
-	elseif ($context['current_action'] == 'register2')
-		$current_action = 'register';
-	elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder'))
-		$current_action = 'login';
-	elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center'])
-		$current_action = 'moderate';
+	if (isset($context['menu_buttons'][$context['current_action']])) {
+			$current_action = $context['current_action'];
+	} elseif ($context['current_action'] == 'search2') {
+			$current_action = 'search';
+	} elseif ($context['current_action'] == 'theme') {
+			$current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin';
+	} elseif ($context['current_action'] == 'register2') {
+			$current_action = 'register';
+	} elseif ($context['current_action'] == 'login2' || ($user_info['is_guest'] && $context['current_action'] == 'reminder')) {
+			$current_action = 'login';
+	} elseif ($context['current_action'] == 'groups' && $context['allow_moderation_center']) {
+			$current_action = 'moderate';
+	}
 
 	// There are certain exceptions to the above where we don't want anything on the menu highlighted.
 	if ($context['current_action'] == 'profile' && !empty($context['user']['is_owner']))
 	{
 		$current_action = !empty($_GET['area']) && $_GET['area'] == 'showalerts' ? 'self_alerts' : 'self_profile';
 		$context[$current_action] = true;
-	}
-	elseif ($context['current_action'] == 'pm')
+	} elseif ($context['current_action'] == 'pm')
 	{
 		$current_action = 'self_pm';
 		$context['self_pm'] = true;
@@ -4319,12 +4565,14 @@ 
 	}
 
 	// Not all actions are simple.
-	if (!empty($needs_action_hook))
-		call_integration_hook('integrate_current_action', array(&$current_action));
+	if (!empty($needs_action_hook)) {
+			call_integration_hook('integrate_current_action', array(&$current_action));
+	}
 
-	if (isset($context['menu_buttons'][$current_action]))
-		$context['menu_buttons'][$current_action]['active_button'] = true;
-}
+	if (isset($context['menu_buttons'][$current_action])) {
+			$context['menu_buttons'][$current_action]['active_button'] = true;
+	}
+	}
 
 /**
  * Generate a random seed and ensure it's stored in settings.
@@ -4348,30 +4596,35 @@ 
 	global $modSettings, $settings, $boarddir, $sourcedir, $db_show_debug;
 	global $context, $txt;
 
-	if ($db_show_debug === true)
-		$context['debug']['hooks'][] = $hook;
+	if ($db_show_debug === true) {
+			$context['debug']['hooks'][] = $hook;
+	}
 
 	// Need to have some control.
-	if (!isset($context['instances']))
-		$context['instances'] = array();
+	if (!isset($context['instances'])) {
+			$context['instances'] = array();
+	}
 
 	$results = array();
-	if (empty($modSettings[$hook]))
-		return $results;
+	if (empty($modSettings[$hook])) {
+			return $results;
+	}
 
 	$functions = explode(',', $modSettings[$hook]);
 	// Loop through each function.
 	foreach ($functions as $function)
 	{
 		// Hook has been marked as "disabled". Skip it!
-		if (strpos($function, '!') !== false)
-			continue;
+		if (strpos($function, '!') !== false) {
+					continue;
+		}
 
 		$call = call_helper($function, true);
 
 		// Is it valid?
-		if (!empty($call))
-			$results[$function] = call_user_func_array($call, $parameters);
+		if (!empty($call)) {
+					$results[$function] = call_user_func_array($call, $parameters);
+		}
 
 		// Whatever it was suppose to call, it failed :(
 		elseif (!empty($function))
@@ -4387,8 +4640,9 @@ 
 			}
 
 			// "Assume" the file resides on $boarddir somewhere...
-			else
-				log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general');
+			else {
+							log_error(sprintf($txt['hook_fail_call_to'], $function, $boarddir), 'general');
+			}
 		}
 	}
 
@@ -4410,12 +4664,14 @@ 
 	global $smcFunc, $modSettings;
 
 	// Any objects?
-	if ($object)
-		$function = $function . '#';
+	if ($object) {
+			$function = $function . '#';
+	}
 
 	// Any files  to load?
-	if (!empty($file) && is_string($file))
-		$function = $file . (!empty($function) ? '|' . $function : '');
+	if (!empty($file) && is_string($file)) {
+			$function = $file . (!empty($function) ? '|' . $function : '');
+	}
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -4437,13 +4693,14 @@ 
 		if (!empty($current_functions))
 		{
 			$current_functions = explode(',', $current_functions);
-			if (in_array($integration_call, $current_functions))
-				return;
+			if (in_array($integration_call, $current_functions)) {
+							return;
+			}
 
 			$permanent_functions = array_merge($current_functions, array($integration_call));
+		} else {
+					$permanent_functions = array($integration_call);
 		}
-		else
-			$permanent_functions = array($integration_call);
 
 		updateSettings(array($hook => implode(',', $permanent_functions)));
 	}
@@ -4452,8 +4709,9 @@ 
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 	// Do nothing, if it's already there.
-	if (in_array($integration_call, $functions))
-		return;
+	if (in_array($integration_call, $functions)) {
+			return;
+	}
 
 	$functions[] = $integration_call;
 	$modSettings[$hook] = implode(',', $functions);
@@ -4476,12 +4734,14 @@ 
 	global $smcFunc, $modSettings;
 
 	// Any objects?
-	if ($object)
-		$function = $function . '#';
+	if ($object) {
+			$function = $function . '#';
+	}
 
 	// Any files  to load?
-	if (!empty($file) && is_string($file))
-		$function = $file . '|' . $function;
+	if (!empty($file) && is_string($file)) {
+			$function = $file . '|' . $function;
+	}
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -4502,16 +4762,18 @@ 
 	{
 		$current_functions = explode(',', $current_functions);
 
-		if (in_array($integration_call, $current_functions))
-			updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
+		if (in_array($integration_call, $current_functions)) {
+					updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
+		}
 	}
 
 	// Turn the function list into something usable.
 	$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 	// You can only remove it if it's available.
-	if (!in_array($integration_call, $functions))
-		return;
+	if (!in_array($integration_call, $functions)) {
+			return;
+	}
 
 	$functions = array_diff($functions, array($integration_call));
 	$modSettings[$hook] = implode(',', $functions);
@@ -4532,17 +4794,20 @@ 
 	global $context, $smcFunc, $txt, $db_show_debug;
 
 	// Really?
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	// An array? should be a "callable" array IE array(object/class, valid_callable).
 	// A closure? should be a callable one.
-	if (is_array($string) || $string instanceof Closure)
-		return $return ? $string : (is_callable($string) ? call_user_func($string) : false);
+	if (is_array($string) || $string instanceof Closure) {
+			return $return ? $string : (is_callable($string) ? call_user_func($string) : false);
+	}
 
 	// No full objects, sorry! pass a method or a property instead!
-	if (is_object($string))
-		return false;
+	if (is_object($string)) {
+			return false;
+	}
 
 	// Stay vitaminized my friends...
 	$string = $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($string));
@@ -4551,8 +4816,9 @@ 
 	$string = load_file($string);
 
 	// Loaded file failed
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	// Found a method.
 	if (strpos($string, '::') !== false)
@@ -4573,8 +4839,9 @@ 
 				// Add another one to the list.
 				if ($db_show_debug === true)
 				{
-					if (!isset($context['debug']['instances']))
-						$context['debug']['instances'] = array();
+					if (!isset($context['debug']['instances'])) {
+											$context['debug']['instances'] = array();
+					}
 
 					$context['debug']['instances'][$class] = $class;
 				}
@@ -4584,13 +4851,15 @@ 
 		}
 
 		// Right then. This is a call to a static method.
-		else
-			$func = array($class, $method);
+		else {
+					$func = array($class, $method);
+		}
 	}
 
 	// Nope! just a plain regular function.
-	else
-		$func = $string;
+	else {
+			$func = $string;
+	}
 
 	// Right, we got what we need, time to do some checks.
 	if (!is_callable($func, false, $callable_name))
@@ -4606,17 +4875,18 @@ 
 	else
 	{
 		// What are we gonna do about it?
-		if ($return)
-			return $func;
+		if ($return) {
+					return $func;
+		}
 
 		// If this is a plain function, avoid the heat of calling call_user_func().
 		else
 		{
-			if (is_array($func))
-				call_user_func($func);
-
-			else
-				$func();
+			if (is_array($func)) {
+							call_user_func($func);
+			} else {
+							$func();
+			}
 		}
 	}
 }
@@ -4633,31 +4903,34 @@ 
 {
 	global $sourcedir, $txt, $boarddir, $settings;
 
-	if (empty($string))
-		return false;
+	if (empty($string)) {
+			return false;
+	}
 
 	if (strpos($string, '|') !== false)
 	{
 		list ($file, $string) = explode('|', $string);
 
 		// Match the wildcards to their regular vars.
-		if (empty($settings['theme_dir']))
-			$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-
-		else
-			$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		if (empty($settings['theme_dir'])) {
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
+		} else {
+					$absPath = strtr(trim($file), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		}
 
 		// Load the file if it can be loaded.
-		if (file_exists($absPath))
-			require_once($absPath);
+		if (file_exists($absPath)) {
+					require_once($absPath);
+		}
 
 		// No? try a fallback to $sourcedir
 		else
 		{
 			$absPath = $sourcedir .'/'. $file;
 
-			if (file_exists($absPath))
-				require_once($absPath);
+			if (file_exists($absPath)) {
+							require_once($absPath);
+			}
 
 			// Sorry, can't do much for you at this point.
 			else
@@ -4684,8 +4957,9 @@ 
 	global $user_info, $smcFunc;
 
 	// Make sure we have something to work with.
-	if (empty($topic))
-		return array();
+	if (empty($topic)) {
+			return array();
+	}
 
 
 	// We already know the number of likes per message, we just want to know whether the current user liked it or not.
@@ -4708,8 +4982,9 @@ 
 				'topic' => $topic,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$temp[] = (int) $row['content_id'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$temp[] = (int) $row['content_id'];
+		}
 
 		cache_put_data($cache_key, $temp, $ttl);
 	}
@@ -4730,8 +5005,9 @@ 
 {
 	global $context;
 
-	if (empty($string))
-		return $string;
+	if (empty($string)) {
+			return $string;
+	}
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
@@ -4772,10 +5048,11 @@ 
 		'--',	// &mdash;
 	);
 
-	if ($context['utf8'])
-		$string = str_replace($findchars_utf8, $replacechars, $string);
-	else
-		$string = str_replace($findchars_iso, $replacechars, $string);
+	if ($context['utf8']) {
+			$string = str_replace($findchars_utf8, $replacechars, $string);
+	} else {
+			$string = str_replace($findchars_iso, $replacechars, $string);
+	}
 
 	return $string;
 }
@@ -4794,49 +5071,59 @@ 
 {
 	global $context;
 
-	if (!isset($matches[2]))
-		return '';
+	if (!isset($matches[2])) {
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// remove left to right / right to left overrides
-	if ($num === 0x202D || $num === 0x202E)
-		return '';
+	if ($num === 0x202D || $num === 0x202E) {
+			return '';
+	}
 
 	// Quote, Ampersand, Apostrophe, Less/Greater Than get html replaced
-	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E)))
-		return '&#' . $num . ';';
+	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E))) {
+			return '&#' . $num . ';';
+	}
 
 	if (empty($context['utf8']))
 	{
 		// no control characters
-		if ($num < 0x20)
-			return '';
+		if ($num < 0x20) {
+					return '';
+		}
 		// text is text
-		elseif ($num < 0x80)
-			return chr($num);
+		elseif ($num < 0x80) {
+					return chr($num);
+		}
 		// all others get html-ised
-		else
-			return '&#' . $matches[2] . ';';
-	}
-	else
+		else {
+					return '&#' . $matches[2] . ';';
+		}
+	} else
 	{
 		// <0x20 are control characters, 0x20 is a space, > 0x10FFFF is past the end of the utf8 character set
 		// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text)
-		if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF))
-			return '';
+		if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF)) {
+					return '';
+		}
 		// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
-		elseif ($num < 0x80)
-			return chr($num);
+		elseif ($num < 0x80) {
+					return chr($num);
+		}
 		// <0x800 (2048)
-		elseif ($num < 0x800)
-			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		elseif ($num < 0x800) {
+					return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		}
 		// < 0x10000 (65536)
-		elseif ($num < 0x10000)
-			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		elseif ($num < 0x10000) {
+					return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		}
 		// <= 0x10FFFF (1114111)
-		else
-			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		else {
+					return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		}
 	}
 }
 
@@ -4852,28 +5139,34 @@ 
  */
 function fixchar__callback($matches)
 {
-	if (!isset($matches[1]))
-		return '';
+	if (!isset($matches[1])) {
+			return '';
+	}
 
 	$num = $matches[1][0] === 'x' ? hexdec(substr($matches[1], 1)) : (int) $matches[1];
 
 	// <0x20 are control characters, > 0x10FFFF is past the end of the utf8 character set
 	// 0xD800 >= $num <= 0xDFFF are surrogate markers (not valid for utf8 text), 0x202D-E are left to right overrides
-	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E)
-		return '';
+	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202D || $num === 0x202E) {
+			return '';
+	}
 	// <0x80 (or less than 128) are standard ascii characters a-z A-Z 0-9 and punctuation
-	elseif ($num < 0x80)
-		return chr($num);
+	elseif ($num < 0x80) {
+			return chr($num);
+	}
 	// <0x800 (2048)
-	elseif ($num < 0x800)
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	elseif ($num < 0x800) {
+			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+	}
 	// < 0x10000 (65536)
-	elseif ($num < 0x10000)
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	elseif ($num < 0x10000) {
+			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
 	// <= 0x10FFFF (1114111)
-	else
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
-}
+	else {
+			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+	}
+	}
 
 /**
  * Strips out invalid html entities, replaces others with html style &#123; codes
@@ -4886,17 +5179,19 @@ 
  */
 function entity_fix__callback($matches)
 {
-	if (!isset($matches[2]))
-		return '';
+	if (!isset($matches[2])) {
+			return '';
+	}
 
 	$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 	// we don't allow control characters, characters out of range, byte markers, etc
-	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E)
-		return '';
-	else
-		return '&#' . $num . ';';
-}
+	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E) {
+			return '';
+	} else {
+			return '&#' . $num . ';';
+	}
+	}
 
 /**
  * Return a Gravatar URL based on
@@ -4920,18 +5215,23 @@ 
 		$ratings = array('G', 'PG', 'R', 'X');
 		$defaults = array('mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank');
 		$url_params = array();
-		if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings))
-			$url_params[] = 'rating=' . $modSettings['gravatarMaxRating'];
-		if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults))
-			$url_params[] = 'default=' . $modSettings['gravatarDefault'];
-		if (!empty($modSettings['avatar_max_width_external']))
-			$size_string = (int) $modSettings['avatar_max_width_external'];
-		if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string))
-			if ((int) $modSettings['avatar_max_height_external'] < $size_string)
+		if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings)) {
+					$url_params[] = 'rating=' . $modSettings['gravatarMaxRating'];
+		}
+		if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults)) {
+					$url_params[] = 'default=' . $modSettings['gravatarDefault'];
+		}
+		if (!empty($modSettings['avatar_max_width_external'])) {
+					$size_string = (int) $modSettings['avatar_max_width_external'];
+		}
+		if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string)) {
+					if ((int) $modSettings['avatar_max_height_external'] < $size_string)
 				$size_string = $modSettings['avatar_max_height_external'];
+		}
 
-		if (!empty($size_string))
-			$url_params[] = 's=' . $size_string;
+		if (!empty($size_string)) {
+					$url_params[] = 's=' . $size_string;
+		}
 	}
 	$http_method = !empty($modSettings['force_ssl']) && $modSettings['force_ssl'] == 2 ? 'https://secure' : 'http://www';
 
@@ -4950,22 +5250,26 @@ 
 	static $timezones = null, $lastwhen = null;
 
 	// No point doing this over if we already did it once
-	if (!empty($timezones) && $when == $lastwhen)
-		return $timezones;
-	else
-		$lastwhen = $when;
+	if (!empty($timezones) && $when == $lastwhen) {
+			return $timezones;
+	} else {
+			$lastwhen = $when;
+	}
 
 	// Parseable datetime string?
-	if (is_int($timestamp = strtotime($when)))
-		$when = $timestamp;
+	if (is_int($timestamp = strtotime($when))) {
+			$when = $timestamp;
+	}
 
 	// A Unix timestamp?
-	elseif (is_numeric($when))
-		$when = intval($when);
+	elseif (is_numeric($when)) {
+			$when = intval($when);
+	}
 
 	// Invalid value? Just get current Unix timestamp.
-	else
-		$when = time();
+	else {
+			$when = time();
+	}
 
 	// We'll need these too
 	$date_when = date_create('@' . $when);
@@ -5029,8 +5333,9 @@ 
 	foreach ($priority_countries as $country)
 	{
 		$country_tzids = @timezone_identifiers_list(DateTimeZone::PER_COUNTRY, strtoupper(trim($country)));
-		if (!empty($country_tzids))
-			$priority_tzids = array_merge($priority_tzids, $country_tzids);
+		if (!empty($country_tzids)) {
+					$priority_tzids = array_merge($priority_tzids, $country_tzids);
+		}
 	}
 
 	// Process the preferred timezones first, then the rest.
@@ -5040,8 +5345,9 @@ 
 	foreach ($tzids as $tzid)
 	{
 		// We don't want UTC right now
-		if ($tzid == 'UTC')
-			continue;
+		if ($tzid == 'UTC') {
+					continue;
+		}
 
 		$tz = timezone_open($tzid);
 
@@ -5056,12 +5362,14 @@ 
 		$tzgeo = timezone_location_get($tz);
 
 		// Don't overwrite our preferred tzids
-		if (empty($zones[$tzkey]['tzid']))
-			$zones[$tzkey]['tzid'] = $tzid;
+		if (empty($zones[$tzkey]['tzid'])) {
+					$zones[$tzkey]['tzid'] = $tzid;
+		}
 
 		// A time zone from a prioritized country?
-		if (in_array($tzid, $priority_tzids))
-			$priority_zones[$tzkey] = true;
+		if (in_array($tzid, $priority_tzids)) {
+					$priority_zones[$tzkey] = true;
+		}
 
 		// Keep track of the location and offset for this tzid
 		$tzid_parts = explode('/', $tzid);
@@ -5082,15 +5390,17 @@ 
 
 		date_timezone_set($date_when, timezone_open($tzvalue['tzid']));
 
-		if (!empty($timezone_descriptions[$tzvalue['tzid']]))
-			$desc = $timezone_descriptions[$tzvalue['tzid']];
-		else
-			$desc = implode(', ', array_unique($tzvalue['locations']));
+		if (!empty($timezone_descriptions[$tzvalue['tzid']])) {
+					$desc = $timezone_descriptions[$tzvalue['tzid']];
+		} else {
+					$desc = implode(', ', array_unique($tzvalue['locations']));
+		}
 
-		if (isset($priority_zones[$tzkey]))
-			$priority_timezones[$tzvalue['tzid']] = $tzinfo[0]['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
-		else
-			$timezones[$tzvalue['tzid']] = $tzinfo[0]['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
+		if (isset($priority_zones[$tzkey])) {
+					$priority_timezones[$tzvalue['tzid']] = $tzinfo[0]['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
+		} else {
+					$timezones[$tzvalue['tzid']] = $tzinfo[0]['abbr'] . ' - ' . $desc . ' [UTC' . date_format($date_when, 'P') . ']';
+		}
 	}
 
 	$timezones = array_merge(
@@ -5144,9 +5454,9 @@ 
 			'Indian/Kerguelen' => 'TFT',
 		);
 
-		if (!empty($missing_tz_abbrs[$tzid]))
-			$tz_abbrev = $missing_tz_abbrs[$tzid];
-		else
+		if (!empty($missing_tz_abbrs[$tzid])) {
+					$tz_abbrev = $missing_tz_abbrs[$tzid];
+		} else
 		{
 			// Russia likes to experiment with time zones often, and names them as offsets from Moscow
 			$tz_location = timezone_location_get(timezone_open($tzid));
@@ -5174,8 +5484,9 @@ 
  */
 function inet_ptod($ip_address)
 {
-	if (!isValidIP($ip_address))
-		return $ip_address;
+	if (!isValidIP($ip_address)) {
+			return $ip_address;
+	}
 
 	$bin = inet_pton($ip_address);
 	return $bin;
@@ -5187,13 +5498,15 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
-		return '';
+	if(empty($bin)) {
+			return '';
+	}
 
 	global $db_type;
 
-	if ($db_type == 'postgresql')
-		return $bin;
+	if ($db_type == 'postgresql') {
+			return $bin;
+	}
 
 	$ip_address = inet_ntop($bin);
 
@@ -5218,26 +5531,32 @@ 
  */
 function _safe_serialize($value)
 {
-	if(is_null($value))
-		return 'N;';
+	if(is_null($value)) {
+			return 'N;';
+	}
 
-	if(is_bool($value))
-		return 'b:'. (int) $value .';';
+	if(is_bool($value)) {
+			return 'b:'. (int) $value .';';
+	}
 
-	if(is_int($value))
-		return 'i:'. $value .';';
+	if(is_int($value)) {
+			return 'i:'. $value .';';
+	}
 
-	if(is_float($value))
-		return 'd:'. str_replace(',', '.', $value) .';';
+	if(is_float($value)) {
+			return 'd:'. str_replace(',', '.', $value) .';';
+	}
 
-	if(is_string($value))
-		return 's:'. strlen($value) .':"'. $value .'";';
+	if(is_string($value)) {
+			return 's:'. strlen($value) .':"'. $value .'";';
+	}
 
 	if(is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
-			$out .= _safe_serialize($k) . _safe_serialize($v);
+		foreach($value as $k => $v) {
+					$out .= _safe_serialize($k) . _safe_serialize($v);
+		}
 
 		return 'a:'. count($value) .':{'. $out .'}';
 	}
@@ -5263,8 +5582,9 @@ 
 
 	$out = _safe_serialize($value);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5281,8 +5601,9 @@ 
 function _safe_unserialize($str)
 {
 	// Input  is not a string.
-	if(empty($str) || !is_string($str))
-		return false;
+	if(empty($str) || !is_string($str)) {
+			return false;
+	}
 
 	$stack = array();
 	$expected = array();
@@ -5298,43 +5619,38 @@ 
 	while($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
-		if($type == '}')
-			$str = substr($str, 1);
-
-		else if($type == 'N' && $str[1] == ';')
+		if($type == '}') {
+					$str = substr($str, 1);
+		} else if($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
-		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		} else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
-		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		} else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
 			$value = (int)$matches[1];
 			$str = $matches[2];
-		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		} else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
 			$value = (float)$matches[1];
 			$str = $matches[3];
-		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		} else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
 		{
 			$value = substr($matches[2], 0, (int)$matches[1]);
 			$str = substr($matches[2], (int)$matches[1] + 2);
-		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
+		} else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
 		{
 			$expectedLength = (int)$matches[1];
 			$str = $matches[2];
 		}
 
 		// Object or unknown/malformed type.
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		switch($state)
 		{
@@ -5362,8 +5678,9 @@ 
 				if($type == '}')
 				{
 					// Array size is less than expected.
-					if(count($list) < end($expected))
-						return false;
+					if(count($list) < end($expected)) {
+											return false;
+					}
 
 					unset($list);
 					$list = &$stack[count($stack)-1];
@@ -5372,8 +5689,9 @@ 
 					// Go to terminal state if we're at the end of the root array.
 					array_pop($expected);
 
-					if(count($expected) == 0)
-						$state = 1;
+					if(count($expected) == 0) {
+											$state = 1;
+					}
 
 					break;
 				}
@@ -5381,8 +5699,9 @@ 
 				if($type == 'i' || $type == 's')
 				{
 					// Array size exceeds expected length.
-					if(count($list) >= end($expected))
-						return false;
+					if(count($list) >= end($expected)) {
+											return false;
+					}
 
 					$key = $value;
 					$state = 3;
@@ -5416,8 +5735,9 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
-		return false;
+	if(!empty($str)) {
+			return false;
+	}
 
 	return $data;
 }
@@ -5440,8 +5760,9 @@ 
 
 	$out = _safe_unserialize($str);
 
-	if (isset($mbIntEnc))
-		mb_internal_encoding($mbIntEnc);
+	if (isset($mbIntEnc)) {
+			mb_internal_encoding($mbIntEnc);
+	}
 
 	return $out;
 }
@@ -5456,12 +5777,14 @@ 
 function smf_chmod($file, $value = 0)
 {
 	// No file? no checks!
-	if (empty($file))
-		return false;
+	if (empty($file)) {
+			return false;
+	}
 
 	// Already writable?
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	// Do we have a file or a dir?
 	$isDir = is_dir($file);
@@ -5477,10 +5800,9 @@ 
 		{
 			$isWritable = true;
 			break;
+		} else {
+					@chmod($file, $val);
 		}
-
-		else
-			@chmod($file, $val);
 	}
 
 	return $isWritable;
@@ -5499,8 +5821,9 @@ 
 	global $txt;
 
 	// Come on...
-	if (empty($json) || !is_string($json))
-		return array();
+	if (empty($json) || !is_string($json)) {
+			return array();
+	}
 
 	$returnArray = @json_decode($json, $returnAsArray);
 
@@ -5538,11 +5861,11 @@ 
 		$jsonDebug = $jsonDebug[0];
 		loadLanguage('Errors');
 
-		if (!empty($jsonDebug))
-			log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
-
-		else
-			log_error($txt['json_'. $jsonError], 'critical');
+		if (!empty($jsonDebug)) {
+					log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
+		} else {
+					log_error($txt['json_'. $jsonError], 'critical');
+		}
 
 		// Everyone expects an array.
 		return array();
@@ -5572,8 +5895,9 @@ 
 	global $db_show_debug, $modSettings;
 
 	// Defensive programming anyone?
-	if (empty($data))
-		return false;
+	if (empty($data)) {
+			return false;
+	}
 
 	// Don't need extra stuff...
 	$db_show_debug = false;
@@ -5581,11 +5905,11 @@ 
 	// Kill anything else.
 	ob_end_clean();
 
-	if (!empty($modSettings['CompressedOutput']))
-		@ob_start('ob_gzhandler');
-
-	else
-		ob_start();
+	if (!empty($modSettings['CompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
 	// Set the header.
 	header($type);
@@ -5617,8 +5941,9 @@ 
 	static $done = false;
 
 	// If we don't need to do anything, don't
-	if (!$update && $done)
-		return;
+	if (!$update && $done) {
+			return;
+	}
 
 	// Should we get a new copy of the official list of TLDs?
 	if ($update)
@@ -5639,10 +5964,11 @@ 
 		// Clean $tlds and convert it to an array
 		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line) {
 			$line = trim($line);
-			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false)
-				return false;
-			else
-				return true;
+			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false) {
+							return false;
+			} else {
+							return true;
+			}
 		});
 
 		// Convert Punycode to Unicode
@@ -5696,8 +6022,9 @@ 
 						$idx += $digit * $w;
 						$t = ($k <= $bias) ? $tmin : (($k >= $bias + $tmax) ? $tmax : ($k - $bias));
 
-						if ($digit < $t)
-							break;
+						if ($digit < $t) {
+													break;
+						}
 
 						$w = (int) ($w * ($base - $t));
 					}
@@ -5706,8 +6033,9 @@ 
 					$delta = intval($is_first ? ($delta / $damp) : ($delta / 2));
 					$delta += intval($delta / ($deco_len + 1));
 
-					for ($k = 0; $delta > (($base - $tmin) * $tmax) / 2; $k += $base)
-						$delta = intval($delta / ($base - $tmin));
+					for ($k = 0; $delta > (($base - $tmin) * $tmax) / 2; $k += $base) {
+											$delta = intval($delta / ($base - $tmin));
+					}
 
 					$bias = intval($k + ($base - $tmin + 1) * $delta / ($delta + $skew));
 					$is_first = false;
@@ -5716,8 +6044,9 @@ 
 
 					if ($deco_len > 0)
 					{
-						for ($i = $deco_len; $i > $idx; $i--)
-							$decoded[$i] = $decoded[($i - 1)];
+						for ($i = $deco_len; $i > $idx; $i--) {
+													$decoded[$i] = $decoded[($i - 1)];
+						}
 					}
 					$decoded[$idx++] = $char;
 				}
@@ -5725,24 +6054,29 @@ 
 				foreach ($decoded as $k => $v)
 				{
 					// 7bit are transferred literally
-					if ($v < 128)
-						$output .= chr($v);
+					if ($v < 128) {
+											$output .= chr($v);
+					}
 
 					// 2 bytes
-					elseif ($v < (1 << 11))
-						$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+					elseif ($v < (1 << 11)) {
+											$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+					}
 
 					// 3 bytes
-					elseif ($v < (1 << 16))
-						$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					elseif ($v < (1 << 16)) {
+											$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					}
 
 					// 4 bytes
-					elseif ($v < (1 << 21))
-						$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					elseif ($v < (1 << 21)) {
+											$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+					}
 
 					//  'Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k
-					else
-						$output .= $safe_char;
+					else {
+											$output .= $safe_char;
+					}
 				}
 
 				$output_parts[] = $output;
@@ -5837,8 +6171,7 @@ 
 
 		$strlen = 'mb_strlen';
 		$substr = 'mb_substr';
-	}
-	else
+	} else
 	{
 		$strlen = $smcFunc['strlen'];
 		$substr = $smcFunc['substr'];
@@ -5852,20 +6185,21 @@ 
 
 		$first = $substr($string, 0, 1);
 
-		if (empty($index[$first]))
-			$index[$first] = array();
+		if (empty($index[$first])) {
+					$index[$first] = array();
+		}
 
 		if ($strlen($string) > 1)
 		{
 			// Sanity check on recursion
-			if ($depth > 99)
-				$index[$first][$substr($string, 1)] = '';
-
-			else
-				$index[$first] = $add_string_to_index($substr($string, 1), $index[$first]);
+			if ($depth > 99) {
+							$index[$first][$substr($string, 1)] = '';
+			} else {
+							$index[$first] = $add_string_to_index($substr($string, 1), $index[$first]);
+			}
+		} else {
+					$index[$first][''] = '';
 		}
-		else
-			$index[$first][''] = '';
 
 		$depth--;
 		return $index;
@@ -5888,9 +6222,9 @@ 
 			$key_regex = preg_quote($key, $delim);
 			$new_key = $key;
 
-			if (empty($value))
-				$sub_regex = '';
-			else
+			if (empty($value)) {
+							$sub_regex = '';
+			} else
 			{
 				$sub_regex = $index_to_regex($value, $delim);
 
@@ -5898,22 +6232,22 @@ 
 				{
 					$new_key_array = explode('(?'.'>', $sub_regex);
 					$new_key .= $new_key_array[0];
+				} else {
+									$sub_regex = '(?'.'>' . $sub_regex . ')';
 				}
-				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
 			}
 
-			if ($depth > 1)
-				$regex[$new_key] = $key_regex . $sub_regex;
-			else
+			if ($depth > 1) {
+							$regex[$new_key] = $key_regex . $sub_regex;
+			} else
 			{
 				if (($length += strlen($key_regex) + 1) < $max_length || empty($regex))
 				{
 					$regex[$new_key] = $key_regex . $sub_regex;
 					unset($index[$key]);
+				} else {
+									break;
 				}
-				else
-					break;
 			}
 		}
 
@@ -5922,10 +6256,11 @@ 
 			$l1 = $strlen($k1);
 			$l2 = $strlen($k2);
 
-			if ($l1 == $l2)
-				return strcmp($k1, $k2) > 0 ? 1 : -1;
-			else
-				return $l1 > $l2 ? -1 : 1;
+			if ($l1 == $l2) {
+							return strcmp($k1, $k2) > 0 ? 1 : -1;
+			} else {
+							return $l1 > $l2 ? -1 : 1;
+			}
 		});
 
 		$depth--;
@@ -5936,15 +6271,18 @@ 
 	$index = array();
 	$regexes = array();
 
-	foreach ($strings as $string)
-		$index = $add_string_to_index($string, $index);
+	foreach ($strings as $string) {
+			$index = $add_string_to_index($string, $index);
+	}
 
-	while (!empty($index))
-		$regexes[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+	while (!empty($index)) {
+			$regexes[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+	}
 
 	// Restore PHP's internal character encoding to whatever it was originally
-	if (!empty($current_encoding))
-		mb_internal_encoding($current_encoding);
+	if (!empty($current_encoding)) {
+			mb_internal_encoding($current_encoding);
+	}
 
 	return $regexes;
 }

Sources/Stats.php

Spacing +1 added lines, -1 removed lines

@@ -555,7 +555,7 @@
 				'subject' => $row_liked_message['subject'],
 				'num' => $row_liked_message['likes'],
 				'href' => $scripturl . '?msg=' . $row_liked_message['id_msg'],
-				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] .'">' . $row_liked_message['subject'] . '</a>'
+				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] . '">' . $row_liked_message['subject'] . '</a>'
 			);
 
 			if ($max_liked_message < $row_liked_message['likes'])

Braces +112 added lines, -78 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Display some useful/interesting board statistics.
@@ -30,8 +31,9 @@ 
 
 	isAllowedTo('view_stats');
 	// Page disabled - redirect them out
-	if (empty($modSettings['trackStats']))
-		fatal_lang_error('feature_disabled', true);
+	if (empty($modSettings['trackStats'])) {
+			fatal_lang_error('feature_disabled', true);
+	}
 
 	if (!empty($_REQUEST['expand']))
 	{
@@ -39,31 +41,34 @@ 
 
 		$month = (int) substr($_REQUEST['expand'], 4);
 		$year = (int) substr($_REQUEST['expand'], 0, 4);
-		if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12)
-			$_SESSION['expanded_stats'][$year][] = $month;
-	}
-	elseif (!empty($_REQUEST['collapse']))
+		if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12) {
+					$_SESSION['expanded_stats'][$year][] = $month;
+		}
+	} elseif (!empty($_REQUEST['collapse']))
 	{
 		$context['robot_no_index'] = true;
 
 		$month = (int) substr($_REQUEST['collapse'], 4);
 		$year = (int) substr($_REQUEST['collapse'], 0, 4);
-		if (!empty($_SESSION['expanded_stats'][$year]))
-			$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+		if (!empty($_SESSION['expanded_stats'][$year])) {
+					$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+		}
 	}
 
 	// Handle the XMLHttpRequest.
 	if (isset($_REQUEST['xml']))
 	{
 		// Collapsing stats only needs adjustments of the session variables.
-		if (!empty($_REQUEST['collapse']))
-			obExit(false);
+		if (!empty($_REQUEST['collapse'])) {
+					obExit(false);
+		}
 
 		$context['sub_template'] = 'stats';
 		$context['yearly'] = array();
 
-		if (empty($month) || empty($year))
-			return;
+		if (empty($month) || empty($year)) {
+					return;
+		}
 
 		getDailyStats('YEAR(date) = {int:year} AND MONTH(date) = {int:month}', array('year' => $year, 'month' => $month));
 		$context['yearly'][$year]['months'][$month]['date'] = array(
@@ -220,8 +225,9 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_num_posts < $row_members['posts'])
-			$max_num_posts = $row_members['posts'];
+		if ($max_num_posts < $row_members['posts']) {
+					$max_num_posts = $row_members['posts'];
+		}
 	}
 	$smcFunc['db_free_result']($members_result);
 
@@ -257,8 +263,9 @@ 
 			'link' => '<a href="' . $scripturl . '?board=' . $row_board['id_board'] . '.0">' . $row_board['name'] . '</a>'
 		);
 
-		if ($max_num_posts < $row_board['num_posts'])
-			$max_num_posts = $row_board['num_posts'];
+		if ($max_num_posts < $row_board['num_posts']) {
+					$max_num_posts = $row_board['num_posts'];
+		}
 	}
 	$smcFunc['db_free_result']($boards_result);
 
@@ -284,12 +291,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	// Topic replies top 10.
 	$topic_reply_result = $smcFunc['db_query']('', '
@@ -329,8 +337,9 @@ 
 			'link' => '<a href="' . $scripturl . '?topic=' . $row_topic_reply['id_topic'] . '.0">' . $row_topic_reply['subject'] . '</a>'
 		);
 
-		if ($max_num_replies < $row_topic_reply['num_replies'])
-			$max_num_replies = $row_topic_reply['num_replies'];
+		if ($max_num_replies < $row_topic_reply['num_replies']) {
+					$max_num_replies = $row_topic_reply['num_replies'];
+		}
 	}
 	$smcFunc['db_free_result']($topic_reply_result);
 
@@ -354,12 +363,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	// Topic views top 10.
 	$topic_view_result = $smcFunc['db_query']('', '
@@ -399,8 +409,9 @@ 
 			'link' => '<a href="' . $scripturl . '?topic=' . $row_topic_views['id_topic'] . '.0">' . $row_topic_views['subject'] . '</a>'
 		);
 
-		if ($max_num < $row_topic_views['num_views'])
-			$max_num = $row_topic_views['num_views'];
+		if ($max_num < $row_topic_views['num_views']) {
+					$max_num = $row_topic_views['num_views'];
+		}
 	}
 	$smcFunc['db_free_result']($topic_view_result);
 
@@ -425,15 +436,17 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member_started']] = $row['hits'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member_started']] = $row['hits'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('stats_top_starters', $members, 360);
 	}
 
-	if (empty($members))
-		$members = array(0 => 0);
+	if (empty($members)) {
+			$members = array(0 => 0);
+	}
 
 	// Topic poster top 10.
 	$members_result = $smcFunc['db_query']('', '
@@ -458,8 +471,9 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_num < $members[$row_members['id_member']])
-			$max_num = $members[$row_members['id_member']];
+		if ($max_num < $members[$row_members['id_member']]) {
+					$max_num = $members[$row_members['id_member']];
+		}
 	}
 	ksort($context['stats_blocks']['starters']);
 	$smcFunc['db_free_result']($members_result);
@@ -488,8 +502,9 @@ 
 	while ($row_members = $smcFunc['db_fetch_assoc']($members_result))
 	{
 		$temp2[] = (int) $row_members['id_member'];
-		if (count($context['stats_blocks']['time_online']) >= 10)
-			continue;
+		if (count($context['stats_blocks']['time_online']) >= 10) {
+					continue;
+		}
 
 		// Figure out the days, hours and minutes.
 		$timeDays = floor($row_members['total_time_logged_in'] / 86400);
@@ -497,10 +512,12 @@ 
 
 		// Figure out which things to show... (days, hours, minutes, etc.)
 		$timelogged = '';
-		if ($timeDays > 0)
-			$timelogged .= $timeDays . $txt['totalTimeLogged5'];
-		if ($timeHours > 0)
-			$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		if ($timeDays > 0) {
+					$timelogged .= $timeDays . $txt['totalTimeLogged5'];
+		}
+		if ($timeHours > 0) {
+					$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		}
 		$timelogged .= floor(($row_members['total_time_logged_in'] % 3600) / 60) . $txt['totalTimeLogged7'];
 
 		$context['stats_blocks']['time_online'][] = array(
@@ -512,17 +529,20 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_time_online < $row_members['total_time_logged_in'])
-			$max_time_online = $row_members['total_time_logged_in'];
+		if ($max_time_online < $row_members['total_time_logged_in']) {
+					$max_time_online = $row_members['total_time_logged_in'];
+		}
 	}
 	$smcFunc['db_free_result']($members_result);
 
-	foreach ($context['stats_blocks']['time_online'] as $i => $member)
-		$context['stats_blocks']['time_online'][$i]['percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	foreach ($context['stats_blocks']['time_online'] as $i => $member) {
+			$context['stats_blocks']['time_online'][$i]['percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	}
 
 	// Cache the ones we found for a bit, just so we don't have to look again.
-	if ($temp !== $temp2)
-		cache_put_data('stats_total_time_members', $temp2, 480);
+	if ($temp !== $temp2) {
+			cache_put_data('stats_total_time_members', $temp2, 480);
+	}
 
 	// Likes.
 	if (!empty($modSettings['enable_likes']))
@@ -558,13 +578,15 @@ 
 				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] .'">' . $row_liked_message['subject'] . '</a>'
 			);
 
-			if ($max_liked_message < $row_liked_message['likes'])
-				$max_liked_message = $row_liked_message['likes'];
+			if ($max_liked_message < $row_liked_message['likes']) {
+							$max_liked_message = $row_liked_message['likes'];
+			}
 		}
 		$smcFunc['db_free_result']($liked_messages);
 
-		foreach ($context['stats_blocks']['liked_messages'] as $i => $liked_messages)
-			$context['stats_blocks']['liked_messages'][$i]['percent'] = round(($liked_messages['num'] * 100) / $max_liked_message);
+		foreach ($context['stats_blocks']['liked_messages'] as $i => $liked_messages) {
+					$context['stats_blocks']['liked_messages'][$i]['percent'] = round(($liked_messages['num'] * 100) / $max_liked_message);
+		}
 
 		// Liked users top 10.
 		$context['stats_blocks']['liked_users'] = array();
@@ -595,14 +617,16 @@ 
 				'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_liked_users['liked_user'] . '">' . $row_liked_users['real_name'] . '</a>',
 			);
 
-			if ($max_liked_users < $row_liked_users['count'])
-				$max_liked_users = $row_liked_users['count'];
+			if ($max_liked_users < $row_liked_users['count']) {
+							$max_liked_users = $row_liked_users['count'];
+			}
 		}
 
 		$smcFunc['db_free_result']($liked_users);
 
-		foreach ($context['stats_blocks']['liked_users'] as $i => $liked_users)
-			$context['stats_blocks']['liked_users'][$i]['percent'] = round(($liked_users['num'] * 100) / $max_liked_users);
+		foreach ($context['stats_blocks']['liked_users'] as $i => $liked_users) {
+					$context['stats_blocks']['liked_users'][$i]['percent'] = round(($liked_users['num'] * 100) / $max_liked_users);
+		}
 	}
 
 	// Activity by month.
@@ -620,8 +644,8 @@ 
 		$ID_MONTH = $row_months['stats_year'] . sprintf('%02d', $row_months['stats_month']);
 		$expanded = !empty($_SESSION['expanded_stats'][$row_months['stats_year']]) && in_array($row_months['stats_month'], $_SESSION['expanded_stats'][$row_months['stats_year']]);
 
-		if (!isset($context['yearly'][$row_months['stats_year']]))
-			$context['yearly'][$row_months['stats_year']] = array(
+		if (!isset($context['yearly'][$row_months['stats_year']])) {
+					$context['yearly'][$row_months['stats_year']] = array(
 				'year' => $row_months['stats_year'],
 				'new_topics' => 0,
 				'new_posts' => 0,
@@ -633,6 +657,7 @@ 
 				'expanded' => false,
 				'current_year' => $row_months['stats_year'] == date('Y'),
 			);
+		}
 
 		$context['yearly'][$row_months['stats_year']]['months'][(int) $row_months['stats_month']] = array(
 			'id' => $ID_MONTH,
@@ -678,26 +703,30 @@ 
 		$context['yearly'][$year]['hits'] = comma_format($data['hits']);
 
 		// Keep a list of collapsed years.
-		if (!$data['expanded'] && !$data['current_year'])
-			$context['collapsed_years'][] = $year;
+		if (!$data['expanded'] && !$data['current_year']) {
+					$context['collapsed_years'][] = $year;
+		}
 	}
 
-	if (empty($_SESSION['expanded_stats']))
-		return;
+	if (empty($_SESSION['expanded_stats'])) {
+			return;
+	}
 
 	$condition_text = array();
 	$condition_params = array();
-	foreach ($_SESSION['expanded_stats'] as $year => $months)
-		if (!empty($months))
+	foreach ($_SESSION['expanded_stats'] as $year => $months) {
+			if (!empty($months))
 		{
 			$condition_text[] = 'YEAR(date) = {int:year_' . $year . '} AND MONTH(date) IN ({array_int:months_' . $year . '})';
+	}
 			$condition_params['year_' . $year] = $year;
 			$condition_params['months_' . $year] = $months;
 		}
 
 	// No daily stats to even look at?
-	if (empty($condition_text))
-		return;
+	if (empty($condition_text)) {
+			return;
+	}
 
 	getDailyStats(implode(' OR ', $condition_text), $condition_params);
 
@@ -723,8 +752,8 @@ 
 		ORDER BY stats_day ASC',
 		$condition_parameters
 	);
-	while ($row_days = $smcFunc['db_fetch_assoc']($days_result))
-		$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
+	while ($row_days = $smcFunc['db_fetch_assoc']($days_result)) {
+			$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
 			'day' => sprintf('%02d', $row_days['stats_day']),
 			'month' => sprintf('%02d', $row_days['stats_month']),
 			'year' => $row_days['stats_year'],
@@ -734,6 +763,7 @@ 
 			'most_members_online' => comma_format($row_days['most_on']),
 			'hits' => comma_format($row_days['hits'])
 		);
+	}
 	$smcFunc['db_free_result']($days_result);
 }
 
@@ -751,16 +781,19 @@ 
 	global $modSettings, $user_info, $forum_version, $sourcedir;
 
 	// First, is it disabled?
-	if (empty($modSettings['enable_sm_stats']) || empty($modSettings['sm_stats_key']))
-		die();
+	if (empty($modSettings['enable_sm_stats']) || empty($modSettings['sm_stats_key'])) {
+			die();
+	}
 
 	// Are we saying who we are, and are we right? (OR an admin)
-	if (!$user_info['is_admin'] && (!isset($_GET['sid']) || $_GET['sid'] != $modSettings['sm_stats_key']))
-		die();
+	if (!$user_info['is_admin'] && (!isset($_GET['sid']) || $_GET['sid'] != $modSettings['sm_stats_key'])) {
+			die();
+	}
 
 	// Verify the referer...
-	if (!$user_info['is_admin'] && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085'))
-		die();
+	if (!$user_info['is_admin'] && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085')) {
+			die();
+	}
 
 	// Get some server versions.
 	require_once($sourcedir . '/Subs-Admin.php');
@@ -786,16 +819,17 @@ 
 	);
 
 	// Encode all the data, for security.
-	foreach ($stats_to_send as $k => $v)
-		$stats_to_send[$k] = urlencode($k) . '=' . urlencode($v);
+	foreach ($stats_to_send as $k => $v) {
+			$stats_to_send[$k] = urlencode($k) . '=' . urlencode($v);
+	}
 
 	// Turn this into the query string!
 	$stats_to_send = implode('&', $stats_to_send);
 
 	// If we're an admin, just plonk them out.
-	if ($user_info['is_admin'])
-		echo $stats_to_send;
-	else
+	if ($user_info['is_admin']) {
+			echo $stats_to_send;
+	} else
 	{
 		// Connect to the collection script.
 		$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);

Sources/Modlog.php

Spacing +2 added lines, -2 removed lines

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

Braces +97 added lines, -73 removed lines

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