SimpleMachines / SMF2.1

Sources/ManageSettings.php

Braces +273 added lines, -199 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function makes sure the requested subaction does exists, if it doesn't, it sets a default action or.
@@ -206,16 +207,18 @@ 
 	{
 		$all_zones = timezone_identifiers_list();
 		// Make sure we set the value to the same as the printed value.
-		foreach ($all_zones as $zone)
-			$config_vars['default_timezone'][2][$zone] = $zone;
+		foreach ($all_zones as $zone) {
+					$config_vars['default_timezone'][2][$zone] = $zone;
+		}
+	} else {
+			unset($config_vars['default_timezone']);
 	}
-	else
-		unset($config_vars['default_timezone']);
 
 	call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -223,8 +226,9 @@ 
 		checkSession();
 
 		// Prevent absurd boundaries here - make it a day tops.
-		if (isset($_POST['lastActive']))
-			$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		if (isset($_POST['lastActive'])) {
+					$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+		}
 
 		call_integration_hook('integrate_save_basic_settings');
 
@@ -269,8 +273,9 @@ 
 
 	call_integration_hook('integrate_modify_bbc_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -287,13 +292,15 @@ 
 
 		// Clean up the tags.
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array();
-		elseif (!is_array($_POST['disabledBBC_enabledTags']))
-			$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		if (!isset($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array();
+		} elseif (!is_array($_POST['disabledBBC_enabledTags'])) {
+					$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+		}
 		// Work out what is actually disabled!
 		$_POST['disabledBBC'] = implode(',', array_diff($bbcTags, $_POST['disabledBBC_enabledTags']));
 
@@ -337,8 +344,9 @@ 
 
 	call_integration_hook('integrate_layout_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -379,8 +387,9 @@ 
 
 	call_integration_hook('integrate_likes_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -418,8 +427,9 @@ 
 
 	call_integration_hook('integrate_mentions_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -463,8 +473,8 @@ 
 			'enable' => array('check', 'warning_enable'),
 	);
 
-	if (!empty($modSettings['warning_settings']) && $currently_enabled)
-		$config_vars += array(
+	if (!empty($modSettings['warning_settings']) && $currently_enabled) {
+			$config_vars += array(
 			'',
 				array('int', 'warning_watch', 'subtext' => $txt['setting_warning_watch_note'] . ' ' . $txt['zero_to_disable']),
 				'moderate' => array('int', 'warning_moderate', 'subtext' => $txt['setting_warning_moderate_note'] . ' ' . $txt['zero_to_disable']),
@@ -473,15 +483,18 @@ 
 				'rem2' => array('int', 'warning_decrement', 'subtext' => $txt['setting_warning_decrement_note'] . ' ' . $txt['zero_to_disable']),
 				array('permissions', 'view_warning'),
 		);
+	}
 
 	call_integration_hook('integrate_warning_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Cannot use moderation if post moderation is not enabled.
-	if (!$modSettings['postmod_active'])
-		unset($config_vars['moderate']);
+	if (!$modSettings['postmod_active']) {
+			unset($config_vars['moderate']);
+	}
 
 	// Will need the utility functions from here.
 	require_once($sourcedir . '/ManageServer.php');
@@ -506,16 +519,16 @@ 
 				'warning_watch' => 10,
 				'warning_mute' => 60,
 			);
-			if ($modSettings['postmod_active'])
-				$vars['warning_moderate'] = 35;
+			if ($modSettings['postmod_active']) {
+							$vars['warning_moderate'] = 35;
+			}
 
 			foreach ($vars as $var => $value)
 			{
 				$config_vars[] = array('int', $var);
 				$_POST[$var] = $value;
 			}
-		}
-		else
+		} else
 		{
 			$_POST['warning_watch'] = min($_POST['warning_watch'], 100);
 			$_POST['warning_moderate'] = $modSettings['postmod_active'] ? min($_POST['warning_moderate'], 100) : 0;
@@ -603,8 +616,9 @@ 
 
 	call_integration_hook('integrate_spam_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// You need to be an admin to edit settings!
 	isAllowedTo('admin_forum');
@@ -638,8 +652,9 @@ 
 
 	if (empty($context['qa_by_lang'][strtr($language, array('-utf8' => ''))]) && !empty($context['question_answers']))
 	{
-		if (empty($context['settings_insert_above']))
-			$context['settings_insert_above'] = '';
+		if (empty($context['settings_insert_above'])) {
+					$context['settings_insert_above'] = '';
+		}
 
 		$context['settings_insert_above'] .= '<div class="noticebox">' . sprintf($txt['question_not_defined'], $context['languages'][$language]['name']) . '</div>';
 	}
@@ -682,8 +697,9 @@ 
 		$_POST['pm_spam_settings'] = (int) $_POST['max_pm_recipients'] . ',' . (int) $_POST['pm_posts_verification'] . ',' . (int) $_POST['pm_posts_per_hour'];
 
 		// Hack in guest requiring verification!
-		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha']))
-			$_POST['posts_require_captcha'] = -1;
+		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha'])) {
+					$_POST['posts_require_captcha'] = -1;
+		}
 
 		$save_vars = $config_vars;
 		unset($save_vars['pm1'], $save_vars['pm2'], $save_vars['pm3'], $save_vars['guest_verify']);
@@ -700,14 +716,16 @@ 
 		foreach ($context['qa_languages'] as $lang_id => $dummy)
 		{
 			// If we had some questions for this language before, but don't now, delete everything from that language.
-			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id]))
-				$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id])) {
+							$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
+			}
 
 			// Now step through and see if any existing questions no longer exist.
-			if (!empty($context['qa_by_lang'][$lang_id]))
-				foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+			if (!empty($context['qa_by_lang'][$lang_id])) {
+							foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 					if (empty($_POST['question'][$lang_id][$q_id]))
 						$changes['delete'][] = $q_id;
+			}
 
 			// Now let's see if there are new questions or ones that need updating.
 			if (isset($_POST['question'][$lang_id]))
@@ -716,14 +734,16 @@ 
 				{
 					// Ignore junky ids.
 					$q_id = (int) $q_id;
-					if ($q_id <= 0)
-						continue;
+					if ($q_id <= 0) {
+											continue;
+					}
 
 					// Check the question isn't empty (because they want to delete it?)
 					if (empty($question) || trim($question) == '')
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$question = $smcFunc['htmlspecialchars'](trim($question));
@@ -731,19 +751,22 @@ 
 					// Get the answers. Firstly check there actually might be some.
 					if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id]))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					// Now get them and check that they might be viable.
 					$answers = array();
-					foreach ($_POST['answer'][$lang_id][$q_id] as $answer)
-						if (!empty($answer) && trim($answer) !== '')
+					foreach ($_POST['answer'][$lang_id][$q_id] as $answer) {
+											if (!empty($answer) && trim($answer) !== '')
 							$answers[] = $smcFunc['htmlspecialchars'](trim($answer));
+					}
 					if (empty($answers))
 					{
-						if (isset($context['question_answers'][$q_id]))
-							$changes['delete'][] = $q_id;
+						if (isset($context['question_answers'][$q_id])) {
+													$changes['delete'][] = $q_id;
+						}
 						continue;
 					}
 					$answers = $smcFunc['json_encode']($answers);
@@ -753,16 +776,17 @@ 
 					{
 						// New question. Now, we don't want to randomly consume ids, so we'll set those, rather than trusting the browser's supplied ids.
 						$changes['insert'][] = array($lang_id, $question, $answers);
-					}
-					else
+					} else
 					{
 						// It's an existing question. Let's see what's changed, if anything.
-						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers'])
-							$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers']) {
+													$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+						}
 					}
 
-					if (!isset($qs_per_lang[$lang_id]))
-						$qs_per_lang[$lang_id] = 0;
+					if (!isset($qs_per_lang[$lang_id])) {
+											$qs_per_lang[$lang_id] = 0;
+					}
 					$qs_per_lang[$lang_id]++;
 				}
 			}
@@ -812,8 +836,9 @@ 
 
 		// Lastly, the count of messages needs to be no more than the lowest number of questions for any one language.
 		$count_questions = empty($qs_per_lang) ? 0 : min($qs_per_lang);
-		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions)
-			$_POST['qa_verification_number'] = $count_questions;
+		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions) {
+					$_POST['qa_verification_number'] = $count_questions;
+		}
 
 		call_integration_hook('integrate_save_spam_settings', array(&$save_vars));
 
@@ -828,24 +853,27 @@ 
 
 	$character_range = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
 	$_SESSION['visual_verification_code'] = '';
-	for ($i = 0; $i < 6; $i++)
-		$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	for ($i = 0; $i < 6; $i++) {
+			$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+	}
 
 	// Some javascript for CAPTCHA.
 	$context['settings_post_javascript'] = '';
-	if ($context['use_graphic_library'])
-		$context['settings_post_javascript'] .= '
+	if ($context['use_graphic_library']) {
+			$context['settings_post_javascript'] .= '
 		function refreshImages()
 		{
 			var imageType = document.getElementById(\'visual_verification_type\').value;
 			document.getElementById(\'verification_image\').src = \'' . $context['verification_image_href'] . ';type=\' + imageType;
 		}';
+	}
 
 	// Show the image itself, or text saying we can't.
-	if ($context['use_graphic_library'])
-		$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
-	else
-		$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	if ($context['use_graphic_library']) {
+			$config_vars['vv']['postinput'] = '<br><img src="' . $context['verification_image_href'] . ';type=' . (empty($modSettings['visual_verification_type']) ? 0 : $modSettings['visual_verification_type']) . '" alt="' . $txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
+	} else {
+			$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
+	}
 
 	// Hack for PM spam settings.
 	list ($modSettings['max_pm_recipients'], $modSettings['pm_posts_verification'], $modSettings['pm_posts_per_hour']) = explode(',', $modSettings['pm_spam_settings']);
@@ -855,9 +883,10 @@ 
 	$modSettings['posts_require_captcha'] = !isset($modSettings['posts_require_captcha']) || $modSettings['posts_require_captcha'] == -1 ? 0 : $modSettings['posts_require_captcha'];
 
 	// Some minor javascript for the guest post setting.
-	if ($modSettings['posts_require_captcha'])
-		$context['settings_post_javascript'] .= '
+	if ($modSettings['posts_require_captcha']) {
+			$context['settings_post_javascript'] .= '
 		document.getElementById(\'guests_require_captcha\').disabled = true;';
+	}
 
 	// And everything else.
 	$context['post_url'] = $scripturl . '?action=admin;area=antispam;save';
@@ -904,8 +933,9 @@ 
 
 	call_integration_hook('integrate_signature_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template.
 	$context['page_title'] = $txt['signature_settings'];
@@ -960,8 +990,9 @@ 
 				$sig = strtr($row['signature'], array('<br>' => "\n"));
 
 				// Max characters...
-				if (!empty($sig_limits[1]))
-					$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				if (!empty($sig_limits[1])) {
+									$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
+				}
 				// Max lines...
 				if (!empty($sig_limits[2]))
 				{
@@ -971,8 +1002,9 @@ 
 						if ($sig[$i] == "\n")
 						{
 							$count++;
-							if ($count >= $sig_limits[2])
-								$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							if ($count >= $sig_limits[2]) {
+															$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+							}
 						}
 					}
 				}
@@ -983,17 +1015,19 @@ 
 					{
 						$limit_broke = 0;
 						// Attempt to allow all sizes of abuse, so to speak.
-						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-							$limit_broke = $sig_limits[7] . 'px';
-						elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-							$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-						elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-							$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-						elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-							$limit_broke = 'large';
-
-						if ($limit_broke)
-							$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
+													$limit_broke = $sig_limits[7] . 'px';
+						} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
+													$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+						} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
+													$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+						} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
+													$limit_broke = 'large';
+						}
+
+						if ($limit_broke) {
+													$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
+						}
 					}
 				}
 
@@ -1049,32 +1083,34 @@ 
 											$img_offset = false;
 										}
 									}
+								} else {
+																	$replaces[$image] = '';
 								}
-								else
-									$replaces[$image] = '';
 
 								continue;
 							}
 
 							// Does it have predefined restraints? Width first.
-							if ($matches[6][$key])
-								$matches[2][$key] = $matches[6][$key];
+							if ($matches[6][$key]) {
+															$matches[2][$key] = $matches[6][$key];
+							}
 							if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 							{
 								$width = $sig_limits[5];
 								$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
+							} elseif ($matches[2][$key]) {
+															$width = $matches[2][$key];
 							}
-							elseif ($matches[2][$key])
-								$width = $matches[2][$key];
 							// ... and height.
 							if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 							{
 								$height = $sig_limits[6];
-								if ($width != -1)
-									$width = $width * ($height / $matches[4][$key]);
+								if ($width != -1) {
+																	$width = $width * ($height / $matches[4][$key]);
+								}
+							} elseif ($matches[4][$key]) {
+															$height = $matches[4][$key];
 							}
-							elseif ($matches[4][$key])
-								$height = $matches[4][$key];
 
 							// If the dimensions are still not fixed - we need to check the actual image.
 							if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -1092,12 +1128,13 @@ 
 									if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
 									{
 										$height = $sig_limits[6];
-										if ($width == -1)
-											$width = $sizes[0];
+										if ($width == -1) {
+																					$width = $sizes[0];
+										}
 										$width = $width * ($height / $sizes[1]);
+									} elseif ($width != -1) {
+																			$height = $sizes[1];
 									}
-									elseif ($width != -1)
-										$height = $sizes[1];
 								}
 							}
 
@@ -1110,8 +1147,9 @@ 
 							// Record that we got one.
 							$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
 						}
-						if (!empty($replaces))
-							$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						if (!empty($replaces)) {
+													$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
+						}
 					}
 				}
 				// Try to fix disabled tags.
@@ -1123,18 +1161,20 @@ 
 
 				$sig = strtr($sig, array("\n" => '<br>'));
 				call_integration_hook('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
-				if ($sig != $row['signature'])
-					$changes[$row['id_member']] = $sig;
+				if ($sig != $row['signature']) {
+									$changes[$row['id_member']] = $sig;
+				}
+			}
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							$done = true;
 			}
-			if ($smcFunc['db_num_rows']($request) == 0)
-				$done = true;
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to delete what we have?
 			if (!empty($changes))
 			{
-				foreach ($changes as $id => $sig)
-					$smcFunc['db_query']('', '
+				foreach ($changes as $id => $sig) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET signature = {string:signature}
 						WHERE id_member = {int:id_member}',
@@ -1143,11 +1183,13 @@ 
 							'signature' => $sig,
 						)
 					);
+				}
 			}
 
 			$_GET['step'] += 50;
-			if (!$done)
-				pauseSignatureApplySettings();
+			if (!$done) {
+							pauseSignatureApplySettings();
+			}
 		}
 		$settings_applied = true;
 	}
@@ -1165,8 +1207,9 @@ 
 	);
 
 	// Temporarily make each setting a modSetting!
-	foreach ($context['signature_settings'] as $key => $value)
-		$modSettings['signature_' . $key] = $value;
+	foreach ($context['signature_settings'] as $key => $value) {
+			$modSettings['signature_' . $key] = $value;
+	}
 
 	// Make sure we check the right tags!
 	$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
@@ -1178,23 +1221,26 @@ 
 
 		// Clean up the tag stuff!
 		$bbcTags = array();
-		foreach (parse_bbc(false) as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach (parse_bbc(false) as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
-		if (!isset($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array();
-		elseif (!is_array($_POST['signature_bbc_enabledTags']))
-			$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		if (!isset($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array();
+		} elseif (!is_array($_POST['signature_bbc_enabledTags'])) {
+					$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+		}
 
 		$sig_limits = array();
 		foreach ($context['signature_settings'] as $key => $value)
 		{
-			if ($key == 'allow_smileys')
-				continue;
-			elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys']))
-				$sig_limits[] = -1;
-			else
-				$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			if ($key == 'allow_smileys') {
+							continue;
+			} elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys'])) {
+							$sig_limits[] = -1;
+			} else {
+							$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
+			}
 		}
 
 		call_integration_hook('integrate_save_signature_settings', array(&$sig_limits, &$bbcTags));
@@ -1227,12 +1273,14 @@ 
 
 	// Try get more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Have we exhausted all the time we allowed?
-	if (time() - array_sum(explode(' ', $sig_start)) < 3)
-		return;
+	if (time() - array_sum(explode(' ', $sig_start)) < 3) {
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $_GET['step'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1278,9 +1326,10 @@ 
 		$disable_fields = array_flip($standard_fields);
 		if (!empty($_POST['active']))
 		{
-			foreach ($_POST['active'] as $value)
-				if (isset($disable_fields[$value]))
+			foreach ($_POST['active'] as $value) {
+							if (isset($disable_fields[$value]))
 					unset($disable_fields[$value]);
+			}
 		}
 		// What we have left!
 		$changes['disabled_profile_fields'] = empty($disable_fields) ? '' : implode(',', array_keys($disable_fields));
@@ -1289,16 +1338,18 @@ 
 		$reg_fields = array();
 		if (!empty($_POST['reg']))
 		{
-			foreach ($_POST['reg'] as $value)
-				if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
+			foreach ($_POST['reg'] as $value) {
+							if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
 					$reg_fields[] = $value;
+			}
 		}
 		// What we have left!
 		$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
 
 		$_SESSION['adm-save'] = true;
-		if (!empty($changes))
-			updateSettings($changes);
+		if (!empty($changes)) {
+					updateSettings($changes);
+		}
 	}
 
 	createToken('admin-scp');
@@ -1401,11 +1452,13 @@ 
 					{
 						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
 
-						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						if ($rowData['field_order'] > 1) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+						}
 
-						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						if ($rowData['field_order'] < $context['custFieldsMaxOrder']) {
+													$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+						}
 
 						$return .= '</p>';
 
@@ -1543,16 +1596,16 @@ 
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
 
-		foreach ($standard_fields as $field)
-			$list[] = array(
+		foreach ($standard_fields as $field) {
+					$list[] = array(
 				'id' => $field,
 				'label' => isset($txt['standard_profile_field_' . $field]) ? $txt['standard_profile_field_' . $field] : (isset($txt[$field]) ? $txt[$field] : $field),
 				'disabled' => in_array($field, $disabled_fields),
 				'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
 				'can_show_register' => !in_array($field, $fields_no_registration),
 			);
-	}
-	else
+		}
+	} else
 	{
 		// Load all the fields.
 		$request = $smcFunc['db_query']('', '
@@ -1566,8 +1619,9 @@ 
 				'items_per_page' => $items_per_page,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$list[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$list[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1633,9 +1687,9 @@ 
 		$context['field'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['field_type'] == 'textarea')
-				@list ($rows, $cols) = @explode(',', $row['default_value']);
-			else
+			if ($row['field_type'] == 'textarea') {
+							@list ($rows, $cols) = @explode(',', $row['default_value']);
+			} else
 			{
 				$rows = 3;
 				$cols = 30;
@@ -1671,8 +1725,8 @@ 
 	}
 
 	// Setup the default values as needed.
-	if (empty($context['field']))
-		$context['field'] = array(
+	if (empty($context['field'])) {
+			$context['field'] = array(
 			'name' => '',
 			'col_name' => '???',
 			'desc' => '',
@@ -1697,6 +1751,7 @@ 
 			'enclose' => '',
 			'placement' => 0,
 		);
+	}
 
 	// Are we moving it?
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
@@ -1705,8 +1760,10 @@ 
 		$new_order = ($_GET['move'] == 'up' ? ($context['field']['order'] - 1) : ($context['field']['order'] + 1));
 
 		// Is this a valid position?
-		if ($new_order <= 0 || $new_order > $order_count)
-			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
+		if ($new_order <= 0 || $new_order > $order_count) {
+					redirectexit('action=admin;area=featuresettings;sa=profile');
+		}
+		// @todo implement an error handler
 
 		// All good, proceed.
 		$smcFunc['db_query']('','
@@ -1737,12 +1794,14 @@ 
 		validateToken('admin-ecp');
 
 		// Everyone needs a name - even the (bracket) unknown...
-		if (trim($_POST['field_name']) == '')
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		if (trim($_POST['field_name']) == '') {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
+		}
 
 		// Regex you say?  Do a very basic test to see if the pattern is valid
-		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false)
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false) {
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
+		}
 
 		$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);
 		$_POST['field_desc'] = $smcFunc['htmlspecialchars']($_POST['field_desc']);
@@ -1759,8 +1818,9 @@ 
 
 		// Some masking stuff...
 		$mask = isset($_POST['mask']) ? $_POST['mask'] : '';
-		if ($mask == 'regex' && isset($_POST['regex']))
-			$mask .= $_POST['regex'];
+		if ($mask == 'regex' && isset($_POST['regex'])) {
+					$mask .= $_POST['regex'];
+		}
 
 		$field_length = isset($_POST['max_length']) ? (int) $_POST['max_length'] : 255;
 		$enclose = isset($_POST['enclose']) ? $_POST['enclose'] : '';
@@ -1779,8 +1839,9 @@ 
 				$v = strtr($v, array(',' => ''));
 
 				// Nada, zip, etc...
-				if (trim($v) == '')
-					continue;
+				if (trim($v) == '') {
+									continue;
+				}
 
 				// Otherwise, save it boy.
 				$field_options .= $v . ',';
@@ -1788,15 +1849,17 @@ 
 				$newOptions[$k] = $v;
 
 				// Is it default?
-				if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
-					$default = $v;
+				if (isset($_POST['default_select']) && $_POST['default_select'] == $k) {
+									$default = $v;
+				}
 			}
 			$field_options = substr($field_options, 0, -1);
 		}
 
 		// Text area has default has dimensions
-		if ($_POST['field_type'] == 'textarea')
-			$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		if ($_POST['field_type'] == 'textarea') {
+					$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+		}
 
 		// Come up with the unique name?
 		if (empty($context['fid']))
@@ -1805,32 +1868,36 @@ 
 			preg_match('~([\w\d_-]+)~', $col_name, $matches);
 
 			// If there is nothing to the name, then let's start out own - for foreign languages etc.
-			if (isset($matches[1]))
-				$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
-			else
-				$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			if (isset($matches[1])) {
+							$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
+			} else {
+							$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
+			}
 
 			// Make sure this is unique.
 			$current_fields = array();
 			$request = $smcFunc['db_query']('', '
 				SELECT id_field, col_name
 				FROM {db_prefix}custom_fields');
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$current_fields[$row['id_field']] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$current_fields[$row['id_field']] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
 			for ($i = 0; !$unique && $i < 9; $i ++)
 			{
-				if (!in_array($col_name, $current_fields))
-					$unique = true;
-				else
-					$col_name = $initial_col_name . $i;
+				if (!in_array($col_name, $current_fields)) {
+									$unique = true;
+				} else {
+									$col_name = $initial_col_name . $i;
+				}
 			}
 
 			// Still not a unique column name? Leave it up to the user, then.
-			if (!$unique)
-				fatal_lang_error('custom_option_not_unique');
+			if (!$unique) {
+							fatal_lang_error('custom_option_not_unique');
+			}
 		}
 		// Work out what to do with the user data otherwise...
 		else
@@ -1858,8 +1925,9 @@ 
 				// Work out what's changed!
 				foreach ($context['field']['options'] as $k => $option)
 				{
-					if (trim($option) == '')
-						continue;
+					if (trim($option) == '') {
+											continue;
+					}
 
 					// Still exists?
 					if (in_array($option, $newOptions))
@@ -1873,8 +1941,8 @@ 
 				foreach ($optionChanges as $k => $option)
 				{
 					// Just been renamed?
-					if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-						$smcFunc['db_query']('', '
+					if (!in_array($k, $takenKeys) && !empty($newOptions[$k])) {
+											$smcFunc['db_query']('', '
 							UPDATE {db_prefix}themes
 							SET value = {string:new_value}
 							WHERE variable = {string:current_column}
@@ -1887,6 +1955,7 @@ 
 								'old_value' => $option,
 							)
 						);
+					}
 				}
 			}
 			// @todo Maybe we should adjust based on new text length limits?
@@ -1929,8 +1998,8 @@ 
 			);
 
 			// Just clean up any old selects - these are a pain!
-			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions))
-				$smcFunc['db_query']('', '
+			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE variable = {string:current_column}
 						AND value NOT IN ({array_string:new_option_values})
@@ -1941,8 +2010,8 @@ 
 						'current_column' => $context['field']['col_name'],
 					)
 				);
-		}
-		else
+			}
+		} else
 		{
 			// Gotta figure it out the order.
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
@@ -2116,11 +2185,13 @@ 
 	call_integration_hook('integrate_prune_settings', array(&$config_vars, &$prune_toggle, false));
 
 	$prune_toggle_dt = array();
-	foreach ($prune_toggle as $item)
-		$prune_toggle_dt[] = 'setting_' . $item;
+	foreach ($prune_toggle as $item) {
+			$prune_toggle_dt[] = 'setting_' . $item;
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	addInlineJavaScript('
 	function togglePruned()
@@ -2158,15 +2229,16 @@ 
 			$vals = array();
 			foreach ($config_vars as $index => $dummy)
 			{
-				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle))
-					continue;
+				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle)) {
+									continue;
+				}
 
 				$vals[] = empty($_POST[$dummy[1]]) || $_POST[$dummy[1]] < 0 ? 0 : (int) $_POST[$dummy[1]];
 			}
 			$_POST['pruningOptions'] = implode(',', $vals);
+		} else {
+					$_POST['pruningOptions'] = '';
 		}
-		else
-			$_POST['pruningOptions'] = '';
 
 		saveDBSettings($savevar);
 		$_SESSION['adm-save'] = true;
@@ -2178,10 +2250,11 @@ 
 	$context['sub_template'] = 'show_settings';
 
 	// Get the actual values
-	if (!empty($modSettings['pruningOptions']))
-		@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
-	else
-		$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	if (!empty($modSettings['pruningOptions'])) {
+			@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+	} else {
+			$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+	}
 
 	prepareDBSettingContext($config_vars);
 }
@@ -2203,8 +2276,9 @@ 
 	// Make it even easier to add new settings.
 	call_integration_hook('integrate_general_mod_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=modsettings;save;sa=general';
 	$context['settings_title'] = $txt['mods_cat_modifications_misc'];

Sources/CacheAPI-memcached.php

Braces +17 added lines, -12 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcached');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -53,9 +55,9 @@ 
 		$currentServers = $this->memcached->getServerList();
 		foreach ($servers as $server)
 		{
-			if (strpos($server,'/') !== false)
-				$tempServer = array($server, 0);
-			else
+			if (strpos($server,'/') !== false) {
+							$tempServer = array($server, 0);
+			} else
 			{
 				$server = explode(':', $server);
 				$tempServer = array($server[0], isset($server[1]) ? $server[1] : 11211);
@@ -73,8 +75,9 @@ 
 			}
 
 			// Found it?
-			if (empty($foundServer))
-				$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			if (empty($foundServer)) {
+							$this->memcached->addServer($tempServer[0], $tempServer[1]);
+			}
 		}
 
 		// Best guess is this worked.
@@ -91,8 +94,9 @@ 
 		$value = $this->memcached->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+					return null;
+		}
 		return $value;
 	}
 
@@ -135,8 +139,9 @@ 
 		$config_vars[] = $txt['cache_memcache_settings'];
 		$config_vars[] = array('cache_memcached', $txt['cache_memcache_servers'], 'file', 'text', 0, 'cache_memcached', 'postinput' => '<br><div class="smalltext"><em>' . $txt['cache_memcache_servers_subtext'] . '</em></div>');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/CacheAPI-memcache.php

Braces +19 added lines, -14 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -34,8 +35,9 @@ 
 
 		$supported = class_exists('memcache');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported && !empty($cache_memcached);
 	}
 
@@ -61,9 +63,9 @@ 
 			$server = trim($servers[array_rand($servers)]);
 
 			// Normal host names do not contain slashes, while e.g. unix sockets do. Assume alternative transport pipe with port 0.
-			if (strpos($server,'/') !== false)
-				$host = $server;
-			else
+			if (strpos($server,'/') !== false) {
+							$host = $server;
+			} else
 			{
 				$server = explode(':', $server);
 				$host = $server[0];
@@ -71,10 +73,11 @@ 
 			}
 
 			// Don't wait too long: yes, we want the server, but we might be able to run the query faster!
-			if (empty($db_persist))
-				$connected = $this->memcache->connect($host, $port);
-			else
-				$connected = $this->memcache->pconnect($host, $port);
+			if (empty($db_persist)) {
+							$connected = $this->memcache->connect($host, $port);
+			} else {
+							$connected = $this->memcache->pconnect($host, $port);
+			}
 		}
 
 		return $connected;
@@ -90,8 +93,9 @@ 
 		$value = $this->memcache->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+					return null;
+		}
 		return $value;
 	}
 
@@ -132,8 +136,9 @@ 
 		$config_vars[] = $txt['cache_memcache_settings'];
 		$config_vars[] = array('cache_memcached', $txt['cache_memcache_servers'], 'file', 'text', 0, 'cache_memcached', 'postinput' => '<br><div class="smalltext"><em>' . $txt['cache_memcache_servers_subtext'] . '</em></div>');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

index.php

Braces +38 added lines, -26 removed lines

@@ -32,16 +32,18 @@ 
 ob_start();
 
 // Do some cleaning, just in case.
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable], $GLOBALS[$variable]);
+}
 
 // Load the settings...
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 // Without those we can't go anywhere
 require_once($sourcedir . '/QueryString.php');
@@ -51,8 +53,9 @@ 
 require_once($sourcedir . '/Load.php');
 
 // If $maintenance is set specifically to 2, then we're upgrading or something.
-if (!empty($maintenance) && $maintenance == 2)
+if (!empty($maintenance) && $maintenance == 2) {
 	display_maintenance_message();
+}
 
 // Create a variable to store some SMF specific functions in.
 $smcFunc = array();
@@ -67,8 +70,9 @@ 
 cleanRequest();
 
 // Seed the random generator.
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Before we get carried away, are we doing a scheduled task? If so save CPU cycles by jumping out!
 if (isset($_GET['scheduled']))
@@ -88,9 +92,9 @@ 
 if (!empty($modSettings['enableCompressedOutput']) && !headers_sent())
 {
 	// If zlib is being used, turn off output compression.
-	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler')
-		$modSettings['enableCompressedOutput'] = '0';
-	else
+	if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler') {
+			$modSettings['enableCompressedOutput'] = '0';
+	} else
 	{
 		ob_end_clean();
 		ob_start('ob_gzhandler');
@@ -182,18 +186,21 @@ 
 	loadPermissions();
 
 	// Attachments don't require the entire theme to be loaded.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach')
-		detectBrowser();
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach') {
+			detectBrowser();
+	}
 	// Load the current theme.  (note that ?theme=1 will also work, may be used for guest theming.)
-	else
-		loadTheme();
+	else {
+			loadTheme();
+	}
 
 	// Check if the user should be disallowed access.
 	is_not_banned();
 
 	// If we are in a topic and don't have permission to approve it then duck out now.
-	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest']))
-		fatal_lang_error('not_a_topic', false);
+	if (!empty($topic) && empty($board_info['cur_topic_approved']) && !allowedTo('approve_posts') && ($user_info['id'] != $board_info['cur_topic_starter'] || $user_info['is_guest'])) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	$no_stat_actions = array('clock', 'dlattach', 'findmember', 'jsoption', 'likes', 'loadeditorlocale', 'modifycat', 'requestmembers', 'smstats', 'suggest', 'about:unknown', '.xml', 'xmlhttp', 'verificationcode', 'viewquery', 'viewsmfile');
 	call_integration_hook('integrate_pre_log_stats', array(&$no_stat_actions));
@@ -204,8 +211,9 @@ 
 		writeLog();
 
 		// Track forum statistics and hits...?
-		if (!empty($modSettings['hitStats']))
-			trackStats(array('hits' => '+'));
+		if (!empty($modSettings['hitStats'])) {
+					trackStats(array('hits' => '+'));
+		}
 	}
 	unset($no_stat_actions);
 
@@ -219,13 +227,14 @@ 
 			return ($_REQUEST['action'] == 'login2' ? 'Login2' : ($_REQUEST['action'] == 'logintfa' ? 'LoginTFA' : 'Logout'));
 		}
 		// Don't even try it, sonny.
-		else
-			return 'InMaintenance';
+		else {
+					return 'InMaintenance';
+		}
 	}
 	// If guest access is off, a guest can only do one of the very few following actions.
-	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2'))))
-		return 'KickGuest';
-	elseif (empty($_REQUEST['action']))
+	elseif (empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('coppa', 'login', 'login2', 'logintfa', 'reminder', 'activate', 'help', 'helpadmin', 'smstats', 'verificationcode', 'signup', 'signup2')))) {
+			return 'KickGuest';
+	} elseif (empty($_REQUEST['action']))
 	{
 		// Action and board are both empty... BoardIndex! Unless someone else wants to do something different.
 		if (empty($board) && empty($topic))
@@ -239,8 +248,9 @@ 
 
 				$call = call_helper($defaultAction, true);
 
-				if (!empty($call))
-					return $call;
+				if (!empty($call)) {
+									return $call;
+				}
 			}
 
 			// No default action huh? then go to our good old BoardIndex.
@@ -370,8 +380,9 @@ 
 
 			$call = call_helper($fallbackAction, true);
 
-			if (!empty($call))
-				return $call;
+			if (!empty($call)) {
+							return $call;
+			}
 		}
 
 		// No fallback action, huh?
@@ -382,8 +393,9 @@ 
 	}
 
 	// Otherwise, it was set - so let's go to that action.
-	if (!empty($actionArray[$_REQUEST['action']][0]))
-		require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
+	if (!empty($actionArray[$_REQUEST['action']][0])) {
+			require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
+	}
 
 	// Do the right thing.
 	return call_helper($actionArray[$_REQUEST['action']][1], true);

Themes/default/index.template.php

Braces +89 added lines, -61 removed lines

@@ -72,9 +72,10 @@ 
 
 	// Allow css/js files to be disable for this specific theme.
 	// Add the identifier as an array key. IE array('smf_script'); Some external files might not add identifiers, on those cases SMF uses its filename as reference.
-	if (!isset($settings['disable_files']))
-		$settings['disable_files'] = array();
-}
+	if (!isset($settings['disable_files'])) {
+			$settings['disable_files'] = array();
+	}
+	}
 
 /**
  * The main sub template above the content.
@@ -111,8 +112,9 @@ 
 		echo '
 	<meta';
 
-		foreach ($meta_tag as $meta_key => $meta_value)
-			echo ' ', $meta_key, '="', $meta_value, '"';
+		foreach ($meta_tag as $meta_key => $meta_value) {
+					echo ' ', $meta_key, '="', $meta_value, '"';
+		}
 
 		echo '>';
 	}
@@ -123,14 +125,16 @@ 
 	<meta name="theme-color" content="#557EA0">';
 
 	// Please don't index these Mr Robot.
-	if (!empty($context['robot_no_index']))
-		echo '
+	if (!empty($context['robot_no_index'])) {
+			echo '
 	<meta name="robots" content="noindex">';
+	}
 
 	// Present a canonical url for search engines to prevent duplicate content in their indices.
-	if (!empty($context['canonical_url']))
-		echo '
+	if (!empty($context['canonical_url'])) {
+			echo '
 	<link rel="canonical" href="', $context['canonical_url'], '">';
+	}
 
 	// Show all the relative links, such as help, search, contents, and the like.
 	echo '
@@ -139,10 +143,11 @@ 
 	<link rel="search" href="' . $scripturl . '?action=search">' : '');
 
 	// If RSS feeds are enabled, advertise the presence of one.
-	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged']))
-		echo '
+	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged'])) {
+			echo '
 	<link rel="alternate" type="application/rss+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['rss'], '" href="', $scripturl, '?action=.xml;type=rss2', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">
 	<link rel="alternate" type="application/atom+xml" title="', $context['forum_name_html_safe'], ' - ', $txt['atom'], '" href="', $scripturl, '?action=.xml;type=atom', !empty($context['current_board']) ? ';board=' . $context['current_board'] : '', '">';
+	}
 
 	// If we're viewing a topic, these should be the previous and next topics, respectively.
 	if (!empty($context['links']['next']))
@@ -158,9 +163,10 @@ 
 	}
 
 	// If we're in a board, or a topic for that matter, the index will be the board's index.
-	if (!empty($context['current_board']))
-		echo '
+	if (!empty($context['current_board'])) {
+			echo '
 	<link rel="index" href="', $scripturl, '?board=', $context['current_board'], '.0">';
+	}
 
 	// Output any remaining HTML headers. (from mods, maybe?)
 	echo $context['html_headers'];
@@ -191,8 +197,9 @@ 
 		<ul class="floatleft" id="top_info">
 			<li>
 				<a href="', $scripturl, '?action=profile"', !empty($context['self_profile']) ? ' class="active"' : '', ' id="profile_menu_top" onclick="return false;">';
-					if (!empty($context['user']['avatar']))
-						echo $context['user']['avatar']['image'];
+					if (!empty($context['user']['avatar'])) {
+											echo $context['user']['avatar']['image'];
+					}
 					echo $context['user']['name'], '</a>
 				<div id="profile_menu" class="top_menu"></div>
 			</li>';
@@ -220,17 +227,18 @@ 
 	}
 	// Otherwise they're a guest. Ask them to either register or login.
 	else
-		if (empty($maintenance))
-			echo '
+		if (empty($maintenance)) {
+					echo '
 			<ul class="floatleft welcome">
 				<li>', sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup'), '</li>
 			</ul>';
-		else
-			//In maintenance mode, only login is allowed and don't show OverlayDiv
+		} else {
+					//In maintenance mode, only login is allowed and don't show OverlayDiv
 			echo '
 			<ul class="floatleft welcome">
 				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl. '?action=login', 'return true;'), '</li>
 			</ul>';
+		}
 
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
 	{
@@ -238,9 +246,10 @@ 
 		<form id="languages_form" method="get" class="floatright">
 			<select id="language_select" name="language" onchange="this.form.submit()">';
 
-		foreach ($context['languages'] as $language)
-			echo '
+		foreach ($context['languages'] as $language) {
+					echo '
 				<option value="', $language['filename'], '"', isset($context['user']['language']) && $context['user']['language'] == $language['filename'] ? ' selected="selected"' : '', '>', str_replace('-utf8', '', $language['name']), '</option>';
+		}
 
 		echo '
 			</select>
@@ -264,31 +273,36 @@ 
 				<option value="all"', ($selected == 'all' ? ' selected' : ''), '>', $txt['search_entireforum'], ' </option>';
 
 		// Can't limit it to a specific topic if we are not in one
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 				<option value="topic"', ($selected == 'current_topic' ? ' selected' : ''), '>', $txt['search_thistopic'], '</option>';
+		}
 
 		// Can't limit it to a specific board if we are not in one
-		if (!empty($context['current_board']))
-			echo '
+		if (!empty($context['current_board'])) {
+					echo '
 				<option value="board"', ($selected == 'current_board' ? ' selected' : ''), '>', $txt['search_thisbrd'], '</option>';
+		}
 
 		// Can't search for members if we can't see the memberlist
-		if (!empty($context['allow_memberlist']))
-			echo '
+		if (!empty($context['allow_memberlist'])) {
+					echo '
 				<option value="members"', ($selected == 'members' ? ' selected' : ''), '>', $txt['search_members'], ' </option>';
+		}
 
 		echo '
 			</select>';
 
 		// Search within current topic?
-		if (!empty($context['current_topic']))
-			echo '
+		if (!empty($context['current_topic'])) {
+					echo '
 			<input type="hidden" name="sd_topic" value="', $context['current_topic'], '">';
+		}
 		// If we're on a certain board, limit it to this board ;).
-		elseif (!empty($context['current_board']))
-			echo '
+		elseif (!empty($context['current_board'])) {
+					echo '
 			<input type="hidden" name="sd_brd" value="', $context['current_board'], '">';
+		}
 
 		echo '
 			<input type="submit" name="search2" value="', $txt['search'], '" class="button_submit">
@@ -318,12 +332,13 @@ 
 						', $context['current_time'], '
 					</div>';
 	// Show a random news item? (or you could pick one from news_lines...)
-	if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
-		echo '
+	if (!empty($settings['enable_news']) && !empty($context['random_news_line'])) {
+			echo '
 					<div class="news">
 						<h2>', $txt['news'], ': </h2>
 						<p>', $context['random_news_line'], '</p>
 					</div>';
+	}
 
 	echo '
 					<hr class="clear">
@@ -386,9 +401,10 @@ 
 		</ul>';
 
 	// Show the load time?
-	if ($context['show_load_time'])
-		echo '
+	if ($context['show_load_time']) {
+			echo '
 		<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
+	}
 
 	echo '
 	</div>';
@@ -418,19 +434,21 @@ 
 	global $context, $shown_linktree, $scripturl, $txt;
 
 	// If linktree is empty, just return - also allow an override.
-	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show))
-		return;
+	if (empty($context['linktree']) || (!empty($context['dont_default_linktree']) && !$force_show)) {
+			return;
+	}
 
 	echo '
 				<div class="navigate_section">
 					<ul>';
 
-	if ($context['user']['is_logged'])
-	echo '
+	if ($context['user']['is_logged']) {
+		echo '
 						<li class="unread_links">
 							<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a>
 							<a href="', $scripturl, '?action=unreadreplies" title="', $txt['show_unread_replies'], '">', $txt['unread_replies'], '</a>
 						</li>';
+	}
 
 	// Each tree item has a URL and name. Some may have extra_before and extra_after.
 	foreach ($context['linktree'] as $link_num => $tree)
@@ -441,25 +459,29 @@ 
 		// Don't show a separator for the first one.
 		// Better here. Always points to the next level when the linktree breaks to a second line.
 		// Picked a better looking HTML entity, and added support for RTL plus a span for styling.
-		if ($link_num != 0)
-			echo '
+		if ($link_num != 0) {
+					echo '
 							<span class="dividers">', $context['right_to_left'] ? ' &#9668; ' : ' &#9658; ', '</span>';
+		}
 
 		// Show something before the link?
-		if (isset($tree['extra_before']))
-			echo $tree['extra_before'], ' ';
+		if (isset($tree['extra_before'])) {
+					echo $tree['extra_before'], ' ';
+		}
 
 		// Show the link, including a URL if it should have one.
-		if (isset($tree['url']))
-			echo '
+		if (isset($tree['url'])) {
+					echo '
 					<a href="' . $tree['url'] . '"><span>' . $tree['name'] . '</span></a>';
-		else
-			echo '
+		} else {
+					echo '
 					<span>' . $tree['name'] . '</span>';
+		}
 
 		// Show something after the link...?
-		if (isset($tree['extra_after']))
-			echo ' ', $tree['extra_after'];
+		if (isset($tree['extra_after'])) {
+					echo ' ', $tree['extra_after'];
+		}
 
 		echo '
 						</li>';
@@ -509,13 +531,14 @@ 
 					echo '
 									<ul>';
 
-					foreach ($childbutton['sub_buttons'] as $grandchildbutton)
-						echo '
+					foreach ($childbutton['sub_buttons'] as $grandchildbutton) {
+											echo '
 										<li>
 											<a href="', $grandchildbutton['href'], '"', isset($grandchildbutton['target']) ? ' target="' . $grandchildbutton['target'] . '"' : '', '>
 												', $grandchildbutton['title'], '
 											</a>
 										</li>';
+					}
 
 					echo '
 									</ul>';
@@ -546,8 +569,9 @@ 
 {
 	global $context, $txt;
 
-	if (!is_array($strip_options))
-		$strip_options = array();
+	if (!is_array($strip_options)) {
+			$strip_options = array();
+	}
 
 	// Create the buttons...
 	$buttons = array();
@@ -556,8 +580,9 @@ 
 		// As of 2.1, the 'test' for each button happens while the array is being generated. The extra 'test' check here is deprecated but kept for backward compatibility (update your mods, folks!)
 		if (!isset($value['test']) || !empty($context[$value['test']]))
 		{
-			if (!isset($value['id']))
-				$value['id'] = $key;
+			if (!isset($value['id'])) {
+							$value['id'] = $key;
+			}
 
 			$button = '
 				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . $txt[$value['text']] . '</a>';
@@ -570,13 +595,15 @@ 
 							<div class="overview">';
 				foreach ($value['sub_buttons'] as $element)
 				{
-					if (isset($element['test']) && empty($context[$element['test']]))
-						continue;
+					if (isset($element['test']) && empty($context[$element['test']])) {
+											continue;
+					}
 
 					$button .= '
 								<a href="' . $element['url'] . '"><strong>' . $txt[$element['text']] . '</strong>';
-					if (isset($txt[$element['text'] . '_desc']))
-						$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					if (isset($txt[$element['text'] . '_desc'])) {
+											$button .= '<br><span>' . $txt[$element['text'] . '_desc'] . '</span>';
+					}
 					$button .= '</a>';
 				}
 				$button .= '
@@ -590,8 +617,9 @@ 
 	}
 
 	// No buttons? No button strip either.
-	if (empty($buttons))
-		return;
+	if (empty($buttons)) {
+			return;
+	}
 
 	echo '
 		<div class="buttonlist', !empty($direction) ? ' float' . $direction : '', '"', (empty($buttons) ? ' style="display: none;"' : ''), (!empty($strip_options['id']) ? ' id="' . $strip_options['id'] . '"' : ''), '>

Sources/SearchAPI-Fulltext.php

Braces +47 added lines, -36 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class fulltext_search
@@ -98,8 +99,9 @@ 
 			$smcFunc['db_free_result']($request);
 		}
 		// 4 is the MySQL default...
-		else
-			$min_word_length = 4;
+		else {
+					$min_word_length = 4;
+		}
 
 		return $min_word_length;
 	}
@@ -138,8 +140,7 @@ 
 					$wordsSearch['words'][] = trim($word, "/*- ");
 					$wordsSearch['complex_words'][] = count($subwords) === 1 ? $word : '"' . $word . '"';
 				}
-			}
-			elseif ($smcFunc['strlen'](trim($word, "/*- ")) < $this->min_word_length)
+			} elseif ($smcFunc['strlen'](trim($word, "/*- ")) < $this->min_word_length)
 			{
 				// short words have feelings too
 				$wordsSearch['words'][] = trim($word, "/*- ");
@@ -149,8 +150,9 @@ 
 
 		$fulltextWord = count($subwords) === 1 ? $word : '"' . $word . '"';
 		$wordsSearch['indexed_words'][] = $fulltextWord;
-		if ($isExcluded)
-			$wordsExclude[] = $fulltextWord;
+		if ($isExcluded) {
+					$wordsExclude[] = $fulltextWord;
+		}
 	}
 
 	/**
@@ -166,44 +168,54 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if( $smcFunc['db_title'] == "PostgreSQL")
-			$modSettings['search_simple_fulltext'] = true;
+		if( $smcFunc['db_title'] == "PostgreSQL") {
+					$modSettings['search_simple_fulltext'] = true;
+		}
 
-		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		if ($query_params['id_search']) {
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
-		if (empty($modSettings['search_simple_fulltext']))
-			foreach ($words['words'] as $regularWord)
+		if (empty($modSettings['search_simple_fulltext'])) {
+					foreach ($words['words'] as $regularWord)
 			{
 				$query_where[] = 'm.body' . (in_array($regularWord, $query_params['excluded_words']) ? ' NOT' : '') . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:complex_body_' . $count . '}';
+		}
 				$query_params['complex_body_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 			}
 
-		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		if ($query_params['user_query']) {
+					$query_where[] = '{raw:user_query}';
+		}
+		if ($query_params['board_query']) {
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		if ($query_params['topic']) {
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
+		if ($query_params['min_msg_id']) {
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
+		if ($query_params['max_msg_id']) {
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
+		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_phrases'] as $phrase)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:exclude_subject_phrase_' . $count . '}';
+		}
 				$query_params['exclude_subject_phrase_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
 			}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
+		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_subject_words'] as $excludedWord)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:exclude_subject_words_' . $count . '}';
+		}
 				$query_params['exclude_subject_words_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($excludedWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $excludedWord), '\\\'') . '[[:>:]]';
 			}
 
@@ -215,12 +227,11 @@ 
 
 				$query_where[] = 'to_tsvector({string:language_ftx},body) @@ to_tsquery({string:language_ftx},{string:body_match})';
 				$query_params['language_ftx'] = $language_ftx;
+			} else {
+							$query_where[] = 'MATCH (body) AGAINST ({string:body_match})';
 			}
-			else
-				$query_where[] = 'MATCH (body) AGAINST ({string:body_match})';
 			$query_params['body_match'] = implode(' ', array_diff($words['indexed_words'], $query_params['excluded_index_words']));
-		}
-		else
+		} else
 		{
 			$query_params['boolean_match'] = '';
 
@@ -234,10 +245,10 @@ 
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '!' : '') . $fulltextWord . ' ';
 					$row++;
 				}
-			}
-			else
-				foreach ($words['indexed_words'] as $fulltextWord)
+			} else {
+							foreach ($words['indexed_words'] as $fulltextWord)
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '-' : '+') . $fulltextWord . ' ';
+			}
 
 			$query_params['boolean_match'] = substr($query_params['boolean_match'], 0, -1);
 
@@ -249,9 +260,9 @@ 
 
 					$query_where[] = 'to_tsvector({string:language_ftx},body) @@ to_tsquery({string:language_ftx},{string:boolean_match})';
 					$query_params['language_ftx'] = $language_ftx;
+				} else {
+									$query_where[] = 'MATCH (body) AGAINST ({string:boolean_match} IN BOOLEAN MODE)';
 				}
-				else
-					$query_where[] = 'MATCH (body) AGAINST ({string:boolean_match} IN BOOLEAN MODE)';
 			}
 
 		}

Sources/Search.php

Braces +417 added lines, -309 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 // This defines two version types for checking the API's are compatible with this version of SMF.
 $GLOBALS['search_versions'] = array(
@@ -39,8 +40,9 @@ 
 	global $txt, $scripturl, $modSettings, $user_info, $context, $smcFunc, $sourcedir;
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	loadLanguage('Search');
 	// Don't load this in XML mode.
@@ -88,23 +90,30 @@ 
 			@list ($k, $v) = explode('|\'|', $data);
 			$context['search_params'][$k] = $v;
 		}
-		if (isset($context['search_params']['brd']))
-			$context['search_params']['brd'] = $context['search_params']['brd'] == '' ? array() : explode(',', $context['search_params']['brd']);
+		if (isset($context['search_params']['brd'])) {
+					$context['search_params']['brd'] = $context['search_params']['brd'] == '' ? array() : explode(',', $context['search_params']['brd']);
+		}
 	}
 
-	if (isset($_REQUEST['search']))
-		$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	if (isset($_REQUEST['search'])) {
+			$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	}
 
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
-	if (!empty($context['search_params']['searchtype']))
-		$context['search_params']['searchtype'] = 2;
-	if (!empty($context['search_params']['minage']))
-		$context['search_params']['minage'] = (int) $context['search_params']['minage'];
-	if (!empty($context['search_params']['maxage']))
-		$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
+	if (!empty($context['search_params']['searchtype'])) {
+			$context['search_params']['searchtype'] = 2;
+	}
+	if (!empty($context['search_params']['minage'])) {
+			$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+	}
+	if (!empty($context['search_params']['maxage'])) {
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	}
 
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
@@ -116,11 +125,13 @@ 
 		$context['search_errors']['messages'] = array();
 		foreach ($context['search_errors'] as $search_error => $dummy)
 		{
-			if ($search_error === 'messages')
-				continue;
+			if ($search_error === 'messages') {
+							continue;
+			}
 
-			if ($search_error == 'string_too_long')
-				$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+			if ($search_error == 'string_too_long') {
+							$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+			}
 
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 		}
@@ -143,12 +154,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -159,8 +171,9 @@ 
 		);
 
 		// If a board wasn't checked that probably should have been ensure the board selection is selected, yo!
-		if (!$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && (empty($modSettings['recycle_enable']) || $row['id_board'] != $modSettings['recycle_board']))
-			$context['boards_check_all'] = false;
+		if (!$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && (empty($modSettings['recycle_enable']) || $row['id_board'] != $modSettings['recycle_board'])) {
+					$context['boards_check_all'] = false;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -182,18 +195,20 @@ 
 	}
 
 	$max_boards = ceil(count($temp_boards) / 2);
-	if ($max_boards == 1)
-		$max_boards = 2;
+	if ($max_boards == 1) {
+			$max_boards = 2;
+	}
 
 	// Now, alternate them so they can be shown left and right ;).
 	$context['board_columns'] = array();
 	for ($i = 0; $i < $max_boards; $i++)
 	{
 		$context['board_columns'][] = $temp_boards[$i];
-		if (isset($temp_boards[$i + $max_boards]))
-			$context['board_columns'][] = $temp_boards[$i + $max_boards];
-		else
-			$context['board_columns'][] = array();
+		if (isset($temp_boards[$i + $max_boards])) {
+					$context['board_columns'][] = $temp_boards[$i + $max_boards];
+		} else {
+					$context['board_columns'][] = array();
+		}
 	}
 
 	if (!empty($_REQUEST['topic']))
@@ -225,8 +240,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('topic_gone', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('topic_gone', false);
+		}
 
 		list ($context['search_topic']['subject']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
@@ -256,11 +272,13 @@ 
 	global $excludedWords, $participants, $smcFunc;
 
 	// if comming from the quick search box, and we want to search on members, well we need to do that ;)
-	if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members')
-		redirectexit($scripturl . '?action=mlist;sa=search;fields=name,email;search=' . urlencode($_REQUEST['search']));
+	if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members') {
+			redirectexit($scripturl . '?action=mlist;sa=search;fields=name,email;search=' . urlencode($_REQUEST['search']));
+	}
 
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	// No, no, no... this is a bit hard on the server, so don't you go prefetching it!
 	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
@@ -307,8 +325,9 @@ 
 	}
 
 	// Zero weight.  Weightless :P.
-	if (empty($weight_total))
-		fatal_lang_error('search_invalid_weights');
+	if (empty($weight_total)) {
+			fatal_lang_error('search_invalid_weights');
+	}
 
 	// These vars don't require an interface, they're just here for tweaking.
 	$recentPercentage = 0.30;
@@ -326,11 +345,13 @@ 
 	$context['search_string_limit'] = 100;
 
 	loadLanguage('Search');
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Search');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Search');
+	}
 	//If we're doing XML we need to use the results template regardless really.
-	else
-		$context['sub_template'] = 'results';
+	else {
+			$context['sub_template'] = 'results';
+	}
 
 	// Are you allowed?
 	isAllowedTo('search_posts');
@@ -363,34 +384,39 @@ 
 			$search_params[$k] = $v;
 		}
 
-		if (isset($search_params['brd']))
-			$search_params['brd'] = empty($search_params['brd']) ? array() : explode(',', $search_params['brd']);
+		if (isset($search_params['brd'])) {
+					$search_params['brd'] = empty($search_params['brd']) ? array() : explode(',', $search_params['brd']);
+		}
 	}
 
 	// Store whether simple search was used (needed if the user wants to do another query).
-	if (!isset($search_params['advanced']))
-		$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	if (!isset($search_params['advanced'])) {
+			$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	}
 
 	// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
-	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
-		$search_params['searchtype'] = 2;
+	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
+			$search_params['searchtype'] = 2;
+	}
 
 	// Minimum age of messages. Default to zero (don't set param in that case).
-	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
-		$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
+			$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	}
 
 	// Maximum age of messages. Default to infinite (9999 days: param not set).
-	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999))
-		$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999)) {
+			$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	}
 
 	// Searching a specific topic?
 	if (!empty($_REQUEST['topic']) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'topic'))
 	{
 		$search_params['topic'] = empty($_REQUEST['search_selection']) ? (int) $_REQUEST['topic'] : (isset($_REQUEST['sd_topic']) ? (int) $_REQUEST['sd_topic'] : '');
 		$search_params['show_complete'] = true;
+	} elseif (!empty($search_params['topic'])) {
+			$search_params['topic'] = (int) $search_params['topic'];
 	}
-	elseif (!empty($search_params['topic']))
-		$search_params['topic'] = (int) $search_params['topic'];
 
 	if (!empty($search_params['minage']) || !empty($search_params['maxage']))
 	{
@@ -408,19 +434,21 @@ 
 			)
 		);
 		list ($minMsgID, $maxMsgID) = $smcFunc['db_fetch_row']($request);
-		if ($minMsgID < 0 || $maxMsgID < 0)
-			$context['search_errors']['no_messages_in_time_frame'] = true;
+		if ($minMsgID < 0 || $maxMsgID < 0) {
+					$context['search_errors']['no_messages_in_time_frame'] = true;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Default the user name to a wildcard matching every user (*).
-	if (!empty($search_params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	if (!empty($search_params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	}
 
 	// If there's no specific user, then don't mention it in the main query.
-	if (empty($search_params['userspec']))
-		$userQuery = '';
-	else
+	if (empty($search_params['userspec'])) {
+			$userQuery = '';
+	} else
 	{
 		$userString = strtr($smcFunc['htmlspecialchars']($search_params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
 		$userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -432,19 +460,21 @@ 
 		{
 			$possible_users[$k] = trim($possible_users[$k]);
 
-			if (strlen($possible_users[$k]) == 0)
-				unset($possible_users[$k]);
+			if (strlen($possible_users[$k]) == 0) {
+							unset($possible_users[$k]);
+			}
 		}
 
 		// Create a list of database-escaped search names.
 		$realNameMatches = array();
-		foreach ($possible_users as $possible_user)
-			$realNameMatches[] = $smcFunc['db_quote'](
+		foreach ($possible_users as $possible_user) {
+					$realNameMatches[] = $smcFunc['db_quote'](
 				'{string:possible_user}',
 				array(
 					'possible_user' => $possible_user
 				)
 			);
+		}
 
 		// Retrieve a list of possible members.
 		$request = $smcFunc['db_query']('', '
@@ -456,9 +486,9 @@ 
 			)
 		);
 		// Simply do nothing if there're too many members matching the criteria.
-		if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch)
-			$userQuery = '';
-		elseif ($smcFunc['db_num_rows']($request) == 0)
+		if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) {
+					$userQuery = '';
+		} elseif ($smcFunc['db_num_rows']($request) == 0)
 		{
 			$userQuery = $smcFunc['db_quote'](
 				'm.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})',
@@ -467,12 +497,12 @@ 
 					'match_possible_guest_names' => 'm.poster_name LIKE ' . implode(' OR m.poster_name LIKE ', $realNameMatches),
 				)
 			);
-		}
-		else
+		} else
 		{
 			$memberlist = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$memberlist[] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$memberlist[] = $row['id_member'];
+			}
 			$userQuery = $smcFunc['db_quote'](
 				'(m.id_member IN ({array_int:matched_members}) OR (m.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})))',
 				array(
@@ -486,22 +516,25 @@ 
 	}
 
 	// If the boards were passed by URL (params=), temporarily put them back in $_REQUEST.
-	if (!empty($search_params['brd']) && is_array($search_params['brd']))
-		$_REQUEST['brd'] = $search_params['brd'];
+	if (!empty($search_params['brd']) && is_array($search_params['brd'])) {
+			$_REQUEST['brd'] = $search_params['brd'];
+	}
 
 	// Ensure that brd is an array.
 	if ((!empty($_REQUEST['brd']) && !is_array($_REQUEST['brd'])) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'board'))
 	{
-		if (!empty($_REQUEST['brd']))
-			$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : array($_REQUEST['brd']);
-		else
-			$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? array($_REQUEST['sd_brd']) : array();
+		if (!empty($_REQUEST['brd'])) {
+					$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : array($_REQUEST['brd']);
+		} else {
+					$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? array($_REQUEST['sd_brd']) : array();
+		}
 	}
 
 	// Make sure all boards are integers.
-	if (!empty($_REQUEST['brd']))
-		foreach ($_REQUEST['brd'] as $id => $brd)
+	if (!empty($_REQUEST['brd'])) {
+			foreach ($_REQUEST['brd'] as $id => $brd)
 			$_REQUEST['brd'][$id] = (int) $brd;
+	}
 
 	// Special case for boards: searching just one topic?
 	if (!empty($search_params['topic']))
@@ -520,17 +553,18 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('topic_gone', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('topic_gone', false);
+		}
 
 		$search_params['brd'] = array();
 		list ($search_params['brd'][0]) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 	// Select all boards you've selected AND are allowed to see.
-	elseif ($user_info['is_admin'] && (!empty($search_params['advanced']) || !empty($_REQUEST['brd'])))
-		$search_params['brd'] = empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'];
-	else
+	elseif ($user_info['is_admin'] && (!empty($search_params['advanced']) || !empty($_REQUEST['brd']))) {
+			$search_params['brd'] = empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'];
+	} else
 	{
 		$see_board = empty($search_params['advanced']) ? 'query_wanna_see_board' : 'query_see_board';
 		$request = $smcFunc['db_query']('', '
@@ -548,19 +582,22 @@ 
 			)
 		);
 		$search_params['brd'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$search_params['brd'][] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$search_params['brd'][] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// This error should pro'bly only happen for hackers.
-		if (empty($search_params['brd']))
-			$context['search_errors']['no_boards_selected'] = true;
+		if (empty($search_params['brd'])) {
+					$context['search_errors']['no_boards_selected'] = true;
+		}
 	}
 
 	if (count($search_params['brd']) != 0)
 	{
-		foreach ($search_params['brd'] as $k => $v)
-			$search_params['brd'][$k] = (int) $v;
+		foreach ($search_params['brd'] as $k => $v) {
+					$search_params['brd'][$k] = (int) $v;
+		}
 
 		// If we've selected all boards, this parameter can be left empty.
 		$request = $smcFunc['db_query']('', '
@@ -574,15 +611,16 @@ 
 		list ($num_boards) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (count($search_params['brd']) == $num_boards)
+		if (count($search_params['brd']) == $num_boards) {
+					$boardQuery = '';
+		} elseif (count($search_params['brd']) == $num_boards - 1 && !empty($modSettings['recycle_board']) && !in_array($modSettings['recycle_board'], $search_params['brd'])) {
+					$boardQuery = '!= ' . $modSettings['recycle_board'];
+		} else {
+					$boardQuery = 'IN (' . implode(', ', $search_params['brd']) . ')';
+		}
+	} else {
 			$boardQuery = '';
-		elseif (count($search_params['brd']) == $num_boards - 1 && !empty($modSettings['recycle_board']) && !in_array($modSettings['recycle_board'], $search_params['brd']))
-			$boardQuery = '!= ' . $modSettings['recycle_board'];
-		else
-			$boardQuery = 'IN (' . implode(', ', $search_params['brd']) . ')';
 	}
-	else
-		$boardQuery = '';
 
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
@@ -596,11 +634,13 @@ 
 		'id_msg',
 	);
 	call_integration_hook('integrate_search_sort_columns', array(&$sort_columns));
-	if (empty($search_params['sort']) && !empty($_REQUEST['sort']))
-		list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) {
+			list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	}
 	$search_params['sort'] = !empty($search_params['sort']) && in_array($search_params['sort'], $sort_columns) ? $search_params['sort'] : 'relevance';
-	if (!empty($search_params['topic']) && $search_params['sort'] === 'num_replies')
-		$search_params['sort'] = 'id_msg';
+	if (!empty($search_params['topic']) && $search_params['sort'] === 'num_replies') {
+			$search_params['sort'] = 'id_msg';
+	}
 
 	// Sorting direction: descending unless stated otherwise.
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
@@ -624,17 +664,19 @@ 
 	// What are we searching for?
 	if (empty($search_params['search']))
 	{
-		if (isset($_GET['search']))
-			$search_params['search'] = un_htmlspecialchars($_GET['search']);
-		elseif (isset($_POST['search']))
-			$search_params['search'] = $_POST['search'];
-		else
-			$search_params['search'] = '';
+		if (isset($_GET['search'])) {
+					$search_params['search'] = un_htmlspecialchars($_GET['search']);
+		} elseif (isset($_POST['search'])) {
+					$search_params['search'] = $_POST['search'];
+		} else {
+					$search_params['search'] = '';
+		}
 	}
 
 	// Nothing??
-	if (!isset($search_params['search']) || $search_params['search'] == '')
-		$context['search_errors']['invalid_search_string'] = true;
+	if (!isset($search_params['search']) || $search_params['search'] == '') {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 	// Too long?
 	elseif ($smcFunc['strlen']($search_params['search']) > $context['search_string_limit'])
 	{
@@ -648,8 +690,9 @@ 
 	$stripped_query = un_htmlspecialchars($smcFunc['strtolower']($stripped_query));
 
 	// This (hidden) setting will do fulltext searching in the most basic way.
-	if (!empty($modSettings['search_simple_fulltext']))
-		$stripped_query = strtr($stripped_query, array('"' => ''));
+	if (!empty($modSettings['search_simple_fulltext'])) {
+			$stripped_query = strtr($stripped_query, array('"' => ''));
+	}
 
 	$no_regexp = preg_match('~&#(?:\d{1,7}|x[0-9a-fA-F]{1,6});~', $stripped_query) === 1;
 
@@ -672,8 +715,9 @@ 
 	{
 		if ($word === '-')
 		{
-			if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				$excludedWords[] = $word;
+			if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
+							$excludedWords[] = $word;
+			}
 			unset($phraseArray[$index]);
 		}
 	}
@@ -683,8 +727,9 @@ 
 	{
 		if (strpos(trim($word), '-') === 0)
 		{
-			if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				$excludedWords[] = $word;
+			if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
+							$excludedWords[] = $word;
+			}
 			unset($wordArray[$index]);
 		}
 	}
@@ -697,8 +742,9 @@ 
 	foreach ($searchArray as $index => $value)
 	{
 		// Skip anything practically empty.
-		if (($searchArray[$index] = trim($value, '-_\' ')) === '')
-			unset($searchArray[$index]);
+		if (($searchArray[$index] = trim($value, '-_\' ')) === '') {
+					unset($searchArray[$index]);
+		}
 		// Skip blacklisted words. Make sure to note we skipped them in case we end up with nothing.
 		elseif (in_array($searchArray[$index], $blacklisted_words))
 		{
@@ -716,31 +762,37 @@ 
 
 	// Create an array of replacements for highlighting.
 	$context['mark'] = array();
-	foreach ($searchArray as $word)
-		$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	foreach ($searchArray as $word) {
+			$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	}
 
 	// Initialize two arrays storing the words that have to be searched for.
 	$orParts = array();
 	$searchWords = array();
 
 	// Make sure at least one word is being searched for.
-	if (empty($searchArray))
-		$context['search_errors']['invalid_search_string' . (!empty($foundBlackListedWords) ? '_blacklist' : '')] = true;
+	if (empty($searchArray)) {
+			$context['search_errors']['invalid_search_string' . (!empty($foundBlackListedWords) ? '_blacklist' : '')] = true;
+	}
 	// All words/sentences must match.
-	elseif (empty($search_params['searchtype']))
-		$orParts[0] = $searchArray;
+	elseif (empty($search_params['searchtype'])) {
+			$orParts[0] = $searchArray;
+	}
 	// Any word/sentence must match.
-	else
-		foreach ($searchArray as $index => $value)
+	else {
+			foreach ($searchArray as $index => $value)
 			$orParts[$index] = array($value);
+	}
 
 	// Don't allow duplicate error messages if one string is too short.
-	if (isset($context['search_errors']['search_string_small_words'], $context['search_errors']['invalid_search_string']))
-		unset($context['search_errors']['invalid_search_string']);
+	if (isset($context['search_errors']['search_string_small_words'], $context['search_errors']['invalid_search_string'])) {
+			unset($context['search_errors']['invalid_search_string']);
+	}
 	// Make sure the excluded words are in all or-branches.
-	foreach ($orParts as $orIndex => $andParts)
-		foreach ($excludedWords as $word)
+	foreach ($orParts as $orIndex => $andParts) {
+			foreach ($excludedWords as $word)
 			$orParts[$orIndex][] = $word;
+	}
 
 	// Determine the or-branches and the fulltext search words.
 	foreach ($orParts as $orIndex => $andParts)
@@ -754,8 +806,9 @@ 
 		);
 
 		// Sort the indexed words (large words -> small words -> excluded words).
-		if ($searchAPI->supportsMethod('searchSort'))
-			usort($orParts[$orIndex], 'searchSort');
+		if ($searchAPI->supportsMethod('searchSort')) {
+					usort($orParts[$orIndex], 'searchSort');
+		}
 
 		foreach ($orParts[$orIndex] as $word)
 		{
@@ -767,15 +820,17 @@ 
 			if (!$is_excluded || count($subjectWords) === 1)
 			{
 				$searchWords[$orIndex]['subject_words'] = array_merge($searchWords[$orIndex]['subject_words'], $subjectWords);
-				if ($is_excluded)
-					$excludedSubjectWords = array_merge($excludedSubjectWords, $subjectWords);
+				if ($is_excluded) {
+									$excludedSubjectWords = array_merge($excludedSubjectWords, $subjectWords);
+				}
+			} else {
+							$excludedPhrases[] = $word;
 			}
-			else
-				$excludedPhrases[] = $word;
 
 			// Have we got indexes to prepare?
-			if ($searchAPI->supportsMethod('prepareIndexes'))
-				$searchAPI->prepareIndexes($word, $searchWords[$orIndex], $excludedIndexWords, $is_excluded);
+			if ($searchAPI->supportsMethod('prepareIndexes')) {
+							$searchAPI->prepareIndexes($word, $searchWords[$orIndex], $excludedIndexWords, $is_excluded);
+			}
 		}
 
 		// Search_force_index requires all AND parts to have at least one fulltext word.
@@ -783,8 +838,7 @@ 
 		{
 			$context['search_errors']['query_not_specific_enough'] = true;
 			break;
-		}
-		elseif ($search_params['subject_only'] && empty($searchWords[$orIndex]['subject_words']) && empty($excludedSubjectWords))
+		} elseif ($search_params['subject_only'] && empty($searchWords[$orIndex]['subject_words']) && empty($excludedSubjectWords))
 		{
 			$context['search_errors']['query_not_specific_enough'] = true;
 			break;
@@ -812,8 +866,9 @@ 
 		$found_misspelling = false;
 		foreach ($searchArray as $word)
 		{
-			if (empty($link))
-				continue;
+			if (empty($link)) {
+							continue;
+			}
 
 			// Don't check phrases.
 			if (preg_match('~^\w+$~', $word) === 0)
@@ -828,8 +883,7 @@ 
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
 				continue;
-			}
-			elseif (spell_check($link, $word))
+			} elseif (spell_check($link, $word))
 			{
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
@@ -840,11 +894,13 @@ 
 			foreach ($suggestions as $i => $s)
 			{
 				// Search is case insensitive.
-				if ($smcFunc['strtolower']($s) == $smcFunc['strtolower']($word))
-					unset($suggestions[$i]);
+				if ($smcFunc['strtolower']($s) == $smcFunc['strtolower']($word)) {
+									unset($suggestions[$i]);
+				}
 				// Plus, don't suggest something the user thinks is rude!
-				elseif ($suggestions[$i] != censorText($s))
-					unset($suggestions[$i]);
+				elseif ($suggestions[$i] != censorText($s)) {
+									unset($suggestions[$i]);
+				}
 			}
 
 			// Anything found?  If so, correct it!
@@ -854,8 +910,7 @@ 
 				$did_you_mean['search'][] = $suggestions[0];
 				$did_you_mean['display'][] = '<em><strong>' . $smcFunc['htmlspecialchars']($suggestions[0]) . '</strong></em>';
 				$found_misspelling = true;
-			}
-			else
+			} else
 			{
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
@@ -872,8 +927,7 @@ 
 				{
 					$temp_excluded['search'][] = '-"' . $word . '"';
 					$temp_excluded['display'][] = '-&quot;' . $smcFunc['htmlspecialchars']($word) . '&quot;';
-				}
-				else
+				} else
 				{
 					$temp_excluded['search'][] = '-' . $word;
 					$temp_excluded['display'][] = '-' . $smcFunc['htmlspecialchars']($word);
@@ -885,11 +939,13 @@ 
 
 			$temp_params = $search_params;
 			$temp_params['search'] = implode(' ', $did_you_mean['search']);
-			if (isset($temp_params['brd']))
-				$temp_params['brd'] = implode(',', $temp_params['brd']);
+			if (isset($temp_params['brd'])) {
+							$temp_params['brd'] = implode(',', $temp_params['brd']);
+			}
 			$context['params'] = array();
-			foreach ($temp_params as $k => $v)
-				$context['did_you_mean_params'][] = $k . '|\'|' . $v;
+			foreach ($temp_params as $k => $v) {
+							$context['did_you_mean_params'][] = $k . '|\'|' . $v;
+			}
 			$context['did_you_mean_params'] = base64_encode(implode('|"|', $context['did_you_mean_params']));
 			$context['did_you_mean'] = implode(' ', $did_you_mean['display']);
 		}
@@ -897,18 +953,20 @@ 
 
 	// Let the user adjust the search query, should they wish?
 	$context['search_params'] = $search_params;
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
 
 	// Do we have captcha enabled?
 	if ($user_info['is_guest'] && !empty($modSettings['search_enable_captcha']) && empty($_SESSION['ss_vv_passed']) && (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search']))
 	{
 		// If we come from another search box tone down the error...
-		if (!isset($_REQUEST['search_vv']))
-			$context['search_errors']['need_verification_code'] = true;
-		else
+		if (!isset($_REQUEST['search_vv'])) {
+					$context['search_errors']['need_verification_code'] = true;
+		} else
 		{
 			require_once($sourcedir . '/Subs-Editor.php');
 			$verificationOptions = array(
@@ -918,12 +976,14 @@ 
 
 			if (is_array($context['require_verification']))
 			{
-				foreach ($context['require_verification'] as $error)
-					$context['search_errors'][$error] = true;
+				foreach ($context['require_verification'] as $error) {
+									$context['search_errors'][$error] = true;
+				}
 			}
 			// Don't keep asking for it - they've proven themselves worthy.
-			else
-				$_SESSION['ss_vv_passed'] = true;
+			else {
+							$_SESSION['ss_vv_passed'] = true;
+			}
 		}
 	}
 
@@ -931,19 +991,22 @@ 
 
 	// All search params have been checked, let's compile them to a single string... made less simple by PHP 4.3.9 and below.
 	$temp_params = $search_params;
-	if (isset($temp_params['brd']))
-		$temp_params['brd'] = implode(',', $temp_params['brd']);
+	if (isset($temp_params['brd'])) {
+			$temp_params['brd'] = implode(',', $temp_params['brd']);
+	}
 	$context['params'] = array();
-	foreach ($temp_params as $k => $v)
-		$context['params'][] = $k . '|\'|' . $v;
+	foreach ($temp_params as $k => $v) {
+			$context['params'][] = $k . '|\'|' . $v;
+	}
 
 	if (!empty($context['params']))
 	{
 		// Due to old IE's 2083 character limit, we have to compress long search strings
 		$params = @gzcompress(implode('|"|', $context['params']));
 		// Gzcompress failed, use try non-gz
-		if (empty($params))
-			$params = implode('|"|', $context['params']);
+		if (empty($params)) {
+					$params = implode('|"|', $context['params']);
+		}
 		// Base64 encode, then replace +/= with uri safe ones that can be reverted
 		$context['params'] = str_replace(array('+', '/', '='), array('-', '_', '.'), base64_encode($params));
 	}
@@ -969,8 +1032,9 @@ 
 	}
 
 	// Spam me not, Spam-a-lot?
-	if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search'])
-		spamProtection('search');
+	if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search']) {
+			spamProtection('search');
+	}
 	// Store the last search string to allow pages of results to be browsed.
 	$_SESSION['last_ss'] = $search_params['search'];
 
@@ -1030,8 +1094,9 @@ 
 						'where' => array(),
 					);
 
-					if ($modSettings['postmod_active'])
-						$subject_query['where'][] = 't.approved = {int:is_approved}';
+					if ($modSettings['postmod_active']) {
+											$subject_query['where'][] = 't.approved = {int:is_approved}';
+					}
 
 					$numTables = 0;
 					$prev_join = 0;
@@ -1043,8 +1108,7 @@ 
 						{
 							$subject_query['left_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}') . ' AND subj' . $numTables . '.id_topic = t.id_topic)';
 							$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
-						}
-						else
+						} else
 						{
 							$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 							$subject_query['where'][] = 'subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}');
@@ -1062,14 +1126,18 @@ 
 						}
 						$subject_query['where'][] = $userQuery;
 					}
-					if (!empty($search_params['topic']))
-						$subject_query['where'][] = 't.id_topic = ' . $search_params['topic'];
-					if (!empty($minMsgID))
-						$subject_query['where'][] = 't.id_first_msg >= ' . $minMsgID;
-					if (!empty($maxMsgID))
-						$subject_query['where'][] = 't.id_last_msg <= ' . $maxMsgID;
-					if (!empty($boardQuery))
-						$subject_query['where'][] = 't.id_board ' . $boardQuery;
+					if (!empty($search_params['topic'])) {
+											$subject_query['where'][] = 't.id_topic = ' . $search_params['topic'];
+					}
+					if (!empty($minMsgID)) {
+											$subject_query['where'][] = 't.id_first_msg >= ' . $minMsgID;
+					}
+					if (!empty($maxMsgID)) {
+											$subject_query['where'][] = 't.id_last_msg <= ' . $maxMsgID;
+					}
+					if (!empty($boardQuery)) {
+											$subject_query['where'][] = 't.id_board ' . $boardQuery;
+					}
 					if (!empty($excludedPhrases))
 					{
 						if ($subject_query['from'] != '{db_prefix}messages AS m')
@@ -1089,8 +1157,9 @@ 
 					foreach ($weight_factors as $type => $value)
 					{
 						$relevance .= $weight[$type];
-						if (!empty($value['results']))
-							$relevance .= ' * ' . $value['results'];
+						if (!empty($value['results'])) {
+													$relevance .= ' * ' . $value['results'];
+						}
 						$relevance .= ' + ';
 					}
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
@@ -1128,20 +1197,23 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($inserts[$row[1]]))
-								continue;
+							if (isset($inserts[$row[1]])) {
+															continue;
+							}
 
-							foreach ($row as $key => $value)
-								$inserts[$row[1]][] = (int) $row[$key];
+							foreach ($row as $key => $value) {
+															$inserts[$row[1]][] = (int) $row[$key];
+							}
 						}
 						$smcFunc['db_free_result']($ignoreRequest);
 						$numSubjectResults = count($inserts);
+					} else {
+											$numSubjectResults += $smcFunc['db_affected_rows']();
 					}
-					else
-						$numSubjectResults += $smcFunc['db_affected_rows']();
 
-					if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results'])
-						break;
+					if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results']) {
+											break;
+					}
 				}
 
 				// If there's data to be inserted for non-IGNORE databases do it here!
@@ -1156,8 +1228,7 @@ 
 				}
 
 				$_SESSION['search_cache']['num_results'] = $numSubjectResults;
-			}
-			else
+			} else
 			{
 				$main_query = array(
 					'select' => array(
@@ -1189,8 +1260,7 @@ 
 					$main_query['weights'] = $weight_factors;
 
 					$main_query['group_by'][] = 't.id_topic';
-				}
-				else
+				} else
 				{
 					// This is outrageous!
 					$main_query['select']['id_topic'] = 'm.id_msg AS id_topic';
@@ -1211,8 +1281,9 @@ 
 						$main_query['where'][] = 't.id_topic = {int:topic}';
 						$main_query['parameters']['topic'] = $search_params['topic'];
 					}
-					if (!empty($search_params['show_complete']))
-						$main_query['group_by'][] = 'm.id_msg, t.id_first_msg, t.id_last_msg';
+					if (!empty($search_params['show_complete'])) {
+											$main_query['group_by'][] = 'm.id_msg, t.id_first_msg, t.id_last_msg';
+					}
 				}
 
 				// *** Get the subject results.
@@ -1237,14 +1308,15 @@ 
 					) !== false;
 
 					// Clean up some previous cache.
-					if (!$createTemporary)
-						$smcFunc['db_search_query']('delete_log_search_topics', '
+					if (!$createTemporary) {
+											$smcFunc['db_search_query']('delete_log_search_topics', '
 							DELETE FROM {db_prefix}log_search_topics
 							WHERE id_search = {int:search_id}',
 							array(
 								'search_id' => $_SESSION['search_cache']['id_search'],
 							)
 						);
+					}
 
 					foreach ($searchWords as $orIndex => $words)
 					{
@@ -1276,8 +1348,7 @@ 
 								$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
 								$subject_query['where'][] = 'm.body NOT ' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:body_not_' . $count . '}';
 								$subject_query['params']['body_not_' . $count++] = empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($subjectWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $subjectWord), '\\\'') . '[[:>:]]';
-							}
-							else
+							} else
 							{
 								$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 								$subject_query['where'][] = 'subj' . $numTables . '.word LIKE {string:subject_like_' . $count . '}';
@@ -1332,8 +1403,9 @@ 
 						call_integration_hook('integrate_subject_search_query', array(&$subject_query));
 
 						// Nothing to search for?
-						if (empty($subject_query['where']))
-							continue;
+						if (empty($subject_query['where'])) {
+													continue;
+						}
 
 						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ( '
 							INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics
@@ -1356,19 +1428,21 @@ 
 							{
 								$ind = $createTemporary ? 0 : 1;
 								// No duplicates!
-								if (isset($inserts[$row[$ind]]))
-									continue;
+								if (isset($inserts[$row[$ind]])) {
+																	continue;
+								}
 
 								$inserts[$row[$ind]] = $row;
 							}
 							$smcFunc['db_free_result']($ignoreRequest);
 							$numSubjectResults = count($inserts);
+						} else {
+													$numSubjectResults += $smcFunc['db_affected_rows']();
 						}
-						else
-							$numSubjectResults += $smcFunc['db_affected_rows']();
 
-						if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results'])
-							break;
+						if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results']) {
+													break;
+						}
 					}
 
 					// Got some non-MySQL data to plonk in?
@@ -1386,8 +1460,9 @@ 
 					{
 						$main_query['weights']['subject']['search'] = 'CASE WHEN MAX(lst.id_topic) IS NULL THEN 0 ELSE 1 END';
 						$main_query['left_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics AS lst ON (' . ($createTemporary ? '' : 'lst.id_search = {int:id_search} AND ') . 'lst.id_topic = t.id_topic)';
-						if (!$createTemporary)
-							$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
+						if (!$createTemporary) {
+													$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
+						}
 					}
 				}
 
@@ -1413,14 +1488,15 @@ 
 					) !== false;
 
 					// Clear, all clear!
-					if (!$createTemporary)
-						$smcFunc['db_search_query']('delete_log_search_messages', '
+					if (!$createTemporary) {
+											$smcFunc['db_search_query']('delete_log_search_messages', '
 							DELETE FROM {db_prefix}log_search_messages
 							WHERE id_search = {int:id_search}',
 							array(
 								'id_search' => $_SESSION['search_cache']['id_search'],
 							)
 						);
+					}
 
 					foreach ($searchWords as $orIndex => $words)
 					{
@@ -1454,19 +1530,21 @@ 
 								while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 								{
 									// No duplicates!
-									if (isset($inserts[$row[0]]))
-										continue;
+									if (isset($inserts[$row[0]])) {
+																			continue;
+									}
 
 									$inserts[$row[0]] = $row;
 								}
 								$smcFunc['db_free_result']($ignoreRequest);
 								$indexedResults = count($inserts);
+							} else {
+															$indexedResults += $smcFunc['db_affected_rows']();
 							}
-							else
-								$indexedResults += $smcFunc['db_affected_rows']();
 
-							if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults)
-								break;
+							if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults) {
+															break;
+							}
 						}
 					}
 
@@ -1486,8 +1564,7 @@ 
 						$context['search_errors']['query_not_specific_enough'] = true;
 						$_REQUEST['params'] = $context['params'];
 						return PlushSearch1();
-					}
-					elseif (!empty($indexedResults))
+					} elseif (!empty($indexedResults))
 					{
 						$main_query['inner_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_messages AS lsm ON (lsm.id_msg = m.id_msg)';
 						if (!$createTemporary)
@@ -1509,15 +1586,18 @@ 
 						foreach ($words['all_words'] as $regularWord)
 						{
 							$where[] = 'm.body' . (in_array($regularWord, $excludedWords) ? ' NOT' : '') . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
-							if (in_array($regularWord, $excludedWords))
-								$where[] = 'm.subject NOT' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
+							if (in_array($regularWord, $excludedWords)) {
+															$where[] = 'm.subject NOT' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
+							}
 							$main_query['parameters']['all_word_body_' . $count++] = empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 						}
-						if (!empty($where))
-							$orWhere[] = count($where) > 1 ? '(' . implode(' AND ', $where) . ')' : $where[0];
+						if (!empty($where)) {
+													$orWhere[] = count($where) > 1 ? '(' . implode(' AND ', $where) . ')' : $where[0];
+						}
+					}
+					if (!empty($orWhere)) {
+											$main_query['where'][] = count($orWhere) > 1 ? '(' . implode(' OR ', $orWhere) . ')' : $orWhere[0];
 					}
-					if (!empty($orWhere))
-						$main_query['where'][] = count($orWhere) > 1 ? '(' . implode(' OR ', $orWhere) . ')' : $orWhere[0];
 
 					if (!empty($userQuery))
 					{
@@ -1555,8 +1635,9 @@ 
 					foreach ($main_query['weights'] as $type => $value)
 					{
 						$relevance .= $weight[$type];
-						if (!empty($value['search']))
-							$relevance .= ' * ' . $value['search'];
+						if (!empty($value['search'])) {
+													$relevance .= ' * ' . $value['search'];
+						}
 						$relevance .= ' + ';
 						$new_weight_total += $weight[$type];
 					}
@@ -1587,11 +1668,13 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($inserts[$row[2]]))
-								continue;
+							if (isset($inserts[$row[2]])) {
+															continue;
+							}
 
-							foreach ($row as $key => $value)
-								$inserts[$row[2]][] = (int) $row[$key];
+							foreach ($row as $key => $value) {
+															$inserts[$row[2]][] = (int) $row[$key];
+							}
 						}
 						$smcFunc['db_free_result']($ignoreRequest);
 
@@ -1599,8 +1682,9 @@ 
 						if (!empty($inserts))
 						{
 							$query_columns = array();
-							foreach ($main_query['select'] as $k => $v)
-								$query_columns[$k] = 'int';
+							foreach ($main_query['select'] as $k => $v) {
+															$query_columns[$k] = 'int';
+							}
 
 							$smcFunc['db_insert']('',
 								'{db_prefix}log_search_results',
@@ -1610,21 +1694,23 @@ 
 							);
 						}
 						$_SESSION['search_cache']['num_results'] += count($inserts);
+					} else {
+											$_SESSION['search_cache']['num_results'] = $smcFunc['db_affected_rows']();
 					}
-					else
-						$_SESSION['search_cache']['num_results'] = $smcFunc['db_affected_rows']();
 				}
 
 				// Insert subject-only matches.
 				if ($_SESSION['search_cache']['num_results'] < $modSettings['search_max_results'] && $numSubjectResults !== 0)
 				{
 					$relevance = '1000 * (';
-					foreach ($weight_factors as $type => $value)
-						if (isset($value['results']))
+					foreach ($weight_factors as $type => $value) {
+											if (isset($value['results']))
 						{
 							$relevance .= $weight[$type];
-							if (!empty($value['results']))
-								$relevance .= ' * ' . $value['results'];
+					}
+							if (!empty($value['results'])) {
+															$relevance .= ' * ' . $value['results'];
+							}
 							$relevance .= ' + ';
 						}
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
@@ -1658,8 +1744,9 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($usedIDs[$row[1]]))
-								continue;
+							if (isset($usedIDs[$row[1]])) {
+															continue;
+							}
 
 							$usedIDs[$row[1]] = true;
 							$inserts[] = $row;
@@ -1677,12 +1764,12 @@ 
 							);
 						}
 						$_SESSION['search_cache']['num_results'] += count($inserts);
+					} else {
+											$_SESSION['search_cache']['num_results'] += $smcFunc['db_affected_rows']();
 					}
-					else
-						$_SESSION['search_cache']['num_results'] += $smcFunc['db_affected_rows']();
+				} elseif ($_SESSION['search_cache']['num_results'] == -1) {
+									$_SESSION['search_cache']['num_results'] = 0;
 				}
-				elseif ($_SESSION['search_cache']['num_results'] == -1)
-					$_SESSION['search_cache']['num_results'] = 0;
 			}
 		}
 
@@ -1752,14 +1839,16 @@ 
 			)
 		);
 		$posters = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$posters[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$posters[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		call_integration_hook('integrate_search_message_list', array(&$msg_list, &$posters));
 
-		if (!empty($posters))
-			loadMemberData(array_unique($posters));
+		if (!empty($posters)) {
+					loadMemberData(array_unique($posters));
+		}
 
 		// PG optimization to evade FIND_IN_SET
 		if ($smcFunc['db_title'] == 'PostgreSQL')
@@ -1768,8 +1857,9 @@ 
 			$msg_list_size = count($msg_list);
 			for ($i = 0; $i < $msg_list_size; $i++)
 			{
-				if ($i > 0)
-					$orderJoin .= ',';
+				if ($i > 0) {
+									$orderJoin .= ',';
+				}
 				$orderJoin .= '(' . $i . ',' . $msg_list[$i] . ')';
 			}
 
@@ -1809,8 +1899,9 @@ 
 		);
 
 		// If there are no results that means the things in the cache got deleted, so pretend we have no topics anymore.
-		if ($smcFunc['db_num_rows']($messages_request) == 0)
-			$context['topics'] = array();
+		if ($smcFunc['db_num_rows']($messages_request) == 0) {
+					$context['topics'] = array();
+		}
 
 		// If we want to know who participated in what then load this now.
 		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'])
@@ -1828,8 +1919,9 @@ 
 					'limit' => count($participants),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($result))
-				$participants[$row['id_topic']] = true;
+			while ($row = $smcFunc['db_fetch_assoc']($result)) {
+							$participants[$row['id_topic']] = true;
+			}
 			$smcFunc['db_free_result']($result);
 		}
 	}
@@ -1838,15 +1930,17 @@ 
 	$context['page_index'] = constructPageIndex($scripturl . '?action=search2;params=' . $context['params'], $_REQUEST['start'], $num_results, $modSettings['search_results_per_page'], false);
 
 	// Consider the search complete!
-	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('search_start:' . ($user_info['is_guest'] ? $user_info['ip'] : $user_info['id']), null, 90);
+	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+			cache_put_data('search_start:' . ($user_info['is_guest'] ? $user_info['ip'] : $user_info['id']), null, 90);
+	}
 
 	$context['key_words'] = &$searchArray;
 
 	// 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';
+	}
 
 	$context['sub_template'] = 'results';
 	$context['page_title'] = $txt['search_results'];
@@ -1877,26 +1971,31 @@ 
 	global $boards_can, $participants, $smcFunc;
 	static $recycle_board = null;
 
-	if ($recycle_board === null)
-		$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
+	if ($recycle_board === null) {
+			$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
+	}
 
 	// Remember which message this is.  (ie. reply #83)
 	static $counter = null;
-	if ($counter == null || $reset)
-		$counter = $_REQUEST['start'] + 1;
+	if ($counter == null || $reset) {
+			$counter = $_REQUEST['start'] + 1;
+	}
 
 	// If the query returned false, bail.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Start from the beginning...
-	if ($reset)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Attempt to get the next message.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
-	if (!$message)
-		return false;
+	if (!$message) {
+			return false;
+	}
 
 	// Can't have an empty subject can we?
 	$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -1935,9 +2034,9 @@ 
 
 		if ($smcFunc['strlen']($message['body']) > $charLimit)
 		{
-			if (empty($context['key_words']))
-				$message['body'] = $smcFunc['substr']($message['body'], 0, $charLimit) . '<strong>...</strong>';
-			else
+			if (empty($context['key_words'])) {
+							$message['body'] = $smcFunc['substr']($message['body'], 0, $charLimit) . '<strong>...</strong>';
+			} else
 			{
 				$matchString = '';
 				$force_partial_word = false;
@@ -1946,18 +2045,20 @@ 
 					$keyword = un_htmlspecialchars($keyword);
 					$keyword = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', strtr($keyword, array('\\\'' => '\'', '&' => '&amp;')));
 
-					if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0)
-						$force_partial_word = true;
+					if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0) {
+											$force_partial_word = true;
+					}
 					$matchString .= strtr(preg_quote($keyword, '/'), array('\*' => '.+?')) . '|';
 				}
 				$matchString = un_htmlspecialchars(substr($matchString, 0, -1));
 
 				$message['body'] = un_htmlspecialchars(strtr($message['body'], array('&nbsp;' => ' ', '<br>' => "\n", '&#91;' => '[', '&#93;' => ']', '&#58;' => ':', '&#64;' => '@')));
 
-				if (empty($modSettings['search_method']) || $force_partial_word)
-					preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
-				else
-					preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				if (empty($modSettings['search_method']) || $force_partial_word) {
+									preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				} else {
+									preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				}
 
 				$message['body'] = '';
 				foreach ($matches[0] as $index => $match)
@@ -1970,8 +2071,7 @@ 
 			// Re-fix the international characters.
 			$message['body'] = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $message['body']);
 		}
-	}
-	else
+	} else
 	{
 		// Run BBC interpreter on the message.
 		$message['body'] = parse_bbc($message['body'], $message['smileys_enabled'], $message['id_msg']);
@@ -1990,21 +2090,26 @@ 
 	// Sadly, we need to check the icon ain't broke.
 	if (!empty($modSettings['messageIconChecks_enable']))
 	{
-		if (!isset($context['icon_sources'][$message['first_icon']]))
-			$context['icon_sources'][$message['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		if (!isset($context['icon_sources'][$message['last_icon']]))
-			$context['icon_sources'][$message['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
-	}
-	else
+		if (!isset($context['icon_sources'][$message['first_icon']])) {
+					$context['icon_sources'][$message['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+		if (!isset($context['icon_sources'][$message['last_icon']])) {
+					$context['icon_sources'][$message['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+	} else
 	{
-		if (!isset($context['icon_sources'][$message['first_icon']]))
-			$context['icon_sources'][$message['first_icon']] = 'images_url';
-		if (!isset($context['icon_sources'][$message['last_icon']]))
-			$context['icon_sources'][$message['last_icon']] = 'images_url';
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = 'images_url';
+		if (!isset($context['icon_sources'][$message['first_icon']])) {
+					$context['icon_sources'][$message['first_icon']] = 'images_url';
+		}
+		if (!isset($context['icon_sources'][$message['last_icon']])) {
+					$context['icon_sources'][$message['last_icon']] = 'images_url';
+		}
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = 'images_url';
+		}
 	}
 
 	// Do we have quote tag enabled?
@@ -2014,12 +2119,14 @@ 
 	$colorClass = 'windowbg';
 
 	// Sticky topics should get a different color, too.
-	if ($message['is_sticky'])
-		$colorClass .= ' sticky';
+	if ($message['is_sticky']) {
+			$colorClass .= ' sticky';
+	}
 
 	// Locked topics get special treatment as well.
-	if ($message['locked'])
-		$colorClass .= ' locked';
+	if ($message['locked']) {
+			$colorClass .= ' locked';
+	}
 
 	$output = array_merge($context['topics'][$message['id_msg']], array(
 		'id' => $message['id_topic'],
@@ -2163,8 +2270,9 @@ 
 
 	// Load up the search API we are going to use.
 	$modSettings['search_index'] = empty($modSettings['search_index']) ? 'standard' : $modSettings['search_index'];
-	if (!file_exists($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php'))
-		fatal_lang_error('search_api_missing');
+	if (!file_exists($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php')) {
+			fatal_lang_error('search_api_missing');
+	}
 	require_once($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php');
 
 	// Create an instance of the search API and check it is valid for this version of SMF.

Themes/default/ManageAttachments.template.php

Braces +20 added lines, -14 removed lines

@@ -116,9 +116,10 @@ 
 				<h3 class="catbg">', $txt['attachment_transfer'], '</h3>
 			</div>';
 
-	if (!empty($context['results']))
-		echo '
+	if (!empty($context['results'])) {
+			echo '
 			<div class="noticebox">', $context['results'], '</div>';
+	}
 
 	echo '
 			<div class="windowbg2 noup">
@@ -129,9 +130,10 @@ 
 						<dd><select name="from">
 							<option value="0">', $txt['attachment_transfer_select'], '</option>';
 
-	foreach ($context['attach_dirs'] as $id => $dir)
-		echo '
+	foreach ($context['attach_dirs'] as $id => $dir) {
+			echo '
 							<option value="', $id, '">', $dir, '</option>';
+	}
 	echo '
 						</select></dd>
 						<dt>', $txt['attachment_transfer_auto'], '</dt>
@@ -139,13 +141,14 @@ 
 							<option value="0">', $txt['attachment_transfer_auto_select'], '</option>
 							<option value="-1">', $txt['attachment_transfer_forum_root'], '</option>';
 
-	if (!empty($context['base_dirs']))
-		foreach ($context['base_dirs'] as $id => $dir)
+	if (!empty($context['base_dirs'])) {
+			foreach ($context['base_dirs'] as $id => $dir)
 			echo '
 							<option value="', $id, '">', $dir, '</option>';
-	else
-			echo '
+	} else {
+				echo '
 							<option value="0" disabled>', $txt['attachment_transfer_no_base'], '</option>';
+	}
 
 	echo '
 						</select></dd>
@@ -153,16 +156,18 @@ 
 						<dd><select name="to">
 							<option value="0">', $txt['attachment_transfer_select'], '</option>';
 
-	foreach ($context['attach_dirs'] as $id => $dir)
-		echo '
+	foreach ($context['attach_dirs'] as $id => $dir) {
+			echo '
 							<option value="', $id, '">', $dir, '</option>';
+	}
 	echo '
 						</select></dd>';
 
-	if (!empty($modSettings['attachmentDirFileLimit']))
-		echo '
+	if (!empty($modSettings['attachmentDirFileLimit'])) {
+			echo '
 						<dt>', $txt['attachment_transfer_empty'], '</dt>
 						<dd><input type="checkbox" name="empty_it"', $context['checked'] ? ' checked' : '', '></dd>';
+	}
 	echo '
 					</dl>
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -238,10 +243,11 @@ 
 		// Loop through each error reporting the status
 		foreach ($context['repair_errors'] as $error => $number)
 		{
-			if (!empty($number))
-			echo '
+			if (!empty($number)) {
+						echo '
 				<input type="checkbox" name="to_fix[]" id="', $error, '" value="', $error, '">
 				<label for="', $error, '">', sprintf($txt['attach_repair_' . $error], $number), '</label><br>';
+			}
 		}
 
 		echo '		<br>

Themes/default/Post.template.php

Braces +89 added lines, -61 removed lines

@@ -22,22 +22,24 @@ 
 		<script>';
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
-	if (isBrowser('is_firefox'))
-		echo '
+	if (isBrowser('is_firefox')) {
+			echo '
 			window.addEventListener("pageshow", reActivate, false);';
+	}
 
 	// Start with message icons - and any missing from this theme.
 	echo '
 			var icon_urls = {';
-	foreach ($context['icons'] as $icon)
-		echo '
+	foreach ($context['icons'] as $icon) {
+			echo '
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
+	}
 	echo '
 			};';
 
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
-	if ($context['make_poll'])
-		echo '
+	if ($context['make_poll']) {
+			echo '
 			var pollOptionNum = 0, pollTabIndex;
 			var pollOptionId = ', $context['last_choice_id'], ';
 			function addPollOption()
@@ -56,11 +58,13 @@ 
 
 				setOuterHTML(document.getElementById(\'pollMoreOptions\'), ', JavaScriptEscape('<dt><label for="options-'), ' + pollOptionId + ', JavaScriptEscape('">' . $txt['option'] . ' '), ' + pollOptionNum + ', JavaScriptEscape('</label>:</dt><dd><input type="text" name="options['), ' + pollOptionId + ', JavaScriptEscape(']" id="options-'), ' + pollOptionId + ', JavaScriptEscape('" value="" size="80" maxlength="255" tabindex="'), ' + pollTabIndex + ', JavaScriptEscape('"></dd><p id="pollMoreOptions"></p>'), ');
 			}';
+	}
 
 	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
-	if ($context['make_event'])
-		echo '
+	if ($context['make_event']) {
+			echo '
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
+	}
 
 	// End of the javascript, start the form and display the link tree.
 	echo '
@@ -80,9 +84,10 @@ 
 				</div>
 			</div><br>';
 
-	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
-		echo '
+	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) {
+			echo '
 			<input type="hidden" name="eventid" value="', $context['event']['id'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -117,18 +122,20 @@ 
 	}
 
 	// If it's locked, show a message to warn the replier.
-	if (!empty($context['locked']))
-	echo '
+	if (!empty($context['locked'])) {
+		echo '
 					<p class="errorbox">
 						', $txt['topic_locked_no_reply'], '
 					</p>';
+	}
 
-	if (!empty($modSettings['drafts_post_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_post_enabled'])) {
+			echo '
 					<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 						sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
 						', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 					</div>';
+	}
 
 	// The post header... important stuff
 	echo '
@@ -180,9 +187,10 @@ 
 				{
 					echo '
 										<optgroup label="', $category['name'], '">';
-					foreach ($category['boards'] as $board)
-						echo '
+					foreach ($category['boards'] as $board) {
+											echo '
 											<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '&nbsp;</option>';
+					}
 					echo '
 										</optgroup>';
 				}
@@ -218,9 +226,10 @@ 
 									<span class="label">', $txt['calendar_timezone'], '</span>
 									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-			foreach ($context['all_timezones'] as $tz => $tzname)
-				echo '
+			foreach ($context['all_timezones'] as $tz => $tzname) {
+							echo '
 										<option value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+			}
 
 			echo '
 									</select>
@@ -286,14 +295,15 @@ 
 									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
 								</dd>';
 
-		if ($context['poll_options']['guest_vote_enabled'])
-			echo '
+		if ($context['poll_options']['guest_vote_enabled']) {
+					echo '
 								<dt>
 									<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 								</dt>
 								<dd>
 									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', '>
 								</dd>';
+		}
 
 		echo '
 								<dt>
@@ -314,8 +324,8 @@ 
 					', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
 
 	// If we're editing and displaying edit details, show a box where they can say why
-	if (isset($context['editing']) && $modSettings['show_modify'])
-		echo '
+	if (isset($context['editing']) && $modSettings['show_modify']) {
+			echo '
 					<dl>
 						<dt class="clear">
 							<span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span>
@@ -324,20 +334,23 @@ 
 							<input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80">
 						</dd>
 					</dl>';
+	}
 
 	// If this message has been edited in the past - display when it was.
-	if (isset($context['last_modified']))
-		echo '
+	if (isset($context['last_modified'])) {
+			echo '
 					<div class="padding smalltext">
 						', $context['last_modified_text'], '
 					</div>';
+	}
 
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 					<div id="postAdditionalOptionsHeader">
 						<strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
 					</div>';
+	}
 
 	echo '
 					<div id="postAdditionalOptions">';
@@ -369,19 +382,21 @@ 
 								<input type="hidden" name="attach_del[]" value="0">
 								', $txt['uncheck_unwatchd_attach'], ':
 							</dd>';
-		foreach ($context['current_attachments'] as $attachment)
-			echo '
+		foreach ($context['current_attachments'] as $attachment) {
+					echo '
 							<dd class="smalltext">
 								<label for="attachment_', $attachment['attachID'], '"><input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', '> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
 								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1028) / 1028), 0)) : '', '</label>
 							</dd>';
+		}
 
 		echo '
 						</dl>';
 
-		if (!empty($context['files_in_session_warning']))
-			echo '
+		if (!empty($context['files_in_session_warning'])) {
+					echo '
 						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
+		}
 	}
 
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
@@ -445,8 +460,8 @@ 
 								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1028 . '">');
 
 		// Show more boxes if they aren't approaching that limit.
-		if ($context['num_allowed_attachments'] > 1)
-			echo '
+		if ($context['num_allowed_attachments'] > 1) {
+					echo '
 										<script>
 											var allowed_attachments = ', $context['num_allowed_attachments'], ';
 											var current_attachment = 1;
@@ -467,9 +482,10 @@ 
 									</div>
 								</div>
 							</dd>';
-		else
-			echo '
+		} else {
+					echo '
 							</dd>';
+		}
 
 		// Add any template changes for an alternative upload system here.
 		call_integration_hook('integrate_upload_template');
@@ -478,21 +494,25 @@ 
 							<dd class="smalltext">';
 
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
-		if (!empty($modSettings['attachmentCheckExtensions']))
-			echo '
+		if (!empty($modSettings['attachmentCheckExtensions'])) {
+					echo '
 								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';
+		}
 
-		if (!empty($context['attachment_restrictions']))
-			echo '
+		if (!empty($context['attachment_restrictions'])) {
+					echo '
 								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';
+		}
 
-		if ($context['num_allowed_attachments'] == 0)
-			echo '
+		if ($context['num_allowed_attachments'] == 0) {
+					echo '
 								', $txt['attach_limit_nag'], '<br>';
+		}
 
-		if (!$context['can_post_attachment_unapproved'])
-			echo '
+		if (!$context['can_post_attachment_unapproved']) {
+					echo '
 								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>';
+		}
 
 		echo '
 							</dd>
@@ -515,10 +535,11 @@ 
 							<dt><strong>', $txt['subject'], '</strong></dt>
 							<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
-		foreach ($context['drafts'] as $draft)
-			echo '
+		foreach ($context['drafts'] as $draft) {
+					echo '
 							<dt>', $draft['link'], '</dt>
 							<dd>', $draft['poster_time'], '</dd>';
+		}
 		echo '
 						</dl>
 					</div>';
@@ -543,9 +564,10 @@ 
 						', template_control_richedit_buttons($context['post_box_name']);
 
 	// Option to delete an event if user is editing one.
-	if ($context['make_event'] && !$context['event']['new'])
-		echo '
+	if ($context['make_event'] && !$context['event']['new']) {
+			echo '
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button_submit you_sure">';
+	}
 
 	echo '
 					</span>
@@ -554,9 +576,10 @@ 
 			<br class="clear">';
 
 	// Assuming this isn't a new topic pass across the last message id.
-	if (isset($context['topic_last_message']))
-		echo '
+	if (isset($context['topic_last_message'])) {
+			echo '
 			<input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '">
@@ -698,9 +721,10 @@ 
 
 						newPostsHTML += \'<div class="windowbg\' + (++reply_counter % 2 == 0 ? \'2\' : \'\') + \'"><div id="msg\' + newPosts[i].getAttribute("id") + \'"><div class="floatleft"><h5>', $txt['posted_by'], ': \' + newPosts[i].getElementsByTagName("poster")[0].firstChild.nodeValue + \'</h5><span class="smalltext">&#171;&nbsp;<strong>', $txt['on'], ':</strong> \' + newPosts[i].getElementsByTagName("time")[0].firstChild.nodeValue + \'&nbsp;&#187;</span> <span class="new_posts" id="image_new_\' + newPosts[i].getAttribute("id") + \'">', $txt['new'], '</span></div>\';';
 
-	if ($context['can_quote'])
-		echo '
+	if ($context['can_quote']) {
+			echo '
 						newPostsHTML += \'<ul class="quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>', $txt['quote'], '</span><\' + \'/a></li></ul>\';';
+	}
 
 	echo '
 						newPostsHTML += \'<br class="clear">\';
@@ -743,8 +767,8 @@ 
 			}';
 
 	// Code for showing and hiding additional options.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 			var oSwapAdditionalOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -772,10 +796,11 @@ 
 					}
 				]
 			});';
+	}
 
 	// Code for showing and hiding drafts
-	if (!empty($context['drafts']))
-		echo '
+	if (!empty($context['drafts'])) {
+			echo '
 			var oSwapDraftOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -797,6 +822,7 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -817,8 +843,9 @@ 
 		foreach ($context['previous_posts'] as $post)
 		{
 			$ignoring = false;
-			if (!empty($post['is_ignored']))
-				$ignored_posts[] = $ignoring = $post['id'];
+			if (!empty($post['is_ignored'])) {
+							$ignored_posts[] = $ignoring = $post['id'];
+			}
 
 			echo '
 			<div class="windowbg">
@@ -1001,10 +1028,10 @@ 
 		<div id="temporary_posting_area" style="display: none;"></div>
 		<script>';
 
-	if ($context['close_window'])
-		echo '
+	if ($context['close_window']) {
+			echo '
 			window.close();';
-	else
+	} else
 	{
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;).
 		echo '
@@ -1058,11 +1085,12 @@ 
 				</p>
 				<ul>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 					<li>
 						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em>
 					</li>';
+	}
 
 	echo '
 					<li>