View GitHub Repository SMF2.1

Schedule Inspection
Subscribe
Completed
Pull Request — release-2.1 (#4927)
by Mert
07:36
created
Status
Category
Toggle Patches
Sources/Load.php 3 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -2259,9 +2259,9 @@  discard block
 
 block discarded – undo
2259 2259 
  *
2260 2260 
  * @uses the template_include() function to include the file.
2261 2261 
  * @param string $template_name The name of the template to load
2262 
- * @param array|string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load
2262 
+ * @param string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load
2263 2263 
  * @param bool $fatal If true, dies with an error message if the template cannot be found
2264 
- * @return boolean Whether or not the template was loaded
2264 
+ * @return boolean|null Whether or not the template was loaded
2265 2265 
  */
2266 2266 
 function loadTemplate($template_name, $style_sheets = array(), $fatal = true)
2267 2267 
 {
 
@@ -2444,7 +2444,7 @@  discard block
 
 block discarded – undo
2444 2444 
  * - all code added with this function is added to the same <style> tag so do make sure your css is valid!
2445 2445 
  *
2446 2446 
  * @param string $css Some css code
2447 
- * @return void|bool Adds the CSS to the $context['css_header'] array or returns if no CSS is specified
2447 
+ * @return false|null Adds the CSS to the $context['css_header'] array or returns if no CSS is specified
2448 2448 
  */
2449 2449 
 function addInlineCss($css)
2450 2450 
 {
 
@@ -2558,7 +2558,7 @@  discard block
 
 block discarded – undo
2558 2558 
  *
2559 2559 
  * @param string $javascript Some JS code
2560 2560 
  * @param bool $defer Whether the script should load in <head> or before the closing <html> tag
2561 
- * @return void|bool Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified
2561 
+ * @return false|null Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified
2562 2562 
  */
2563 2563 
 function addInlineJavaScript($javascript, $defer = false)
2564 2564 
 {
 
@@ -2791,7 +2791,7 @@  discard block
 
 block discarded – undo
2791 2791 
  * It will try to choose only utf8 or non-utf8 languages.
2792 2792 
  *
2793 2793 
  * @param bool $use_cache Whether or not to use the cache
2794 
- * @return array An array of information about available languages
2794 
+ * @return string An array of information about available languages
2795 2795 
  */
2796 2796 
 function getLanguages($use_cache = true)
2797 2797 
 {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -1742,7 +1742,7 @@  discard block
 
 block discarded – undo
1742 1742 
 	}
1743 1743
1744 1744 
 	// We already load the basic stuff?
1745 
-	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme )
1745 
+	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme)
1746 1746 
 	{
1747 1747 
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
1748 1748 
 
@@ -1767,7 +1767,7 @@  discard block
 
 block discarded – undo
1767 1767 
 				SELECT variable, value, id_member, id_theme
1768 1768 
 				FROM {db_prefix}themes
1769 1769 
 				WHERE id_member' . (empty($themeData[0]) ? ' IN (-1, 0, {int:id_member})' : ' = {int:id_member}') . '
1770 
-					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') .'
1770 
+					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') . '
1771 1771 
 				ORDER BY id_theme asc',
1772 1772 
 				array(
1773 1773 
 					'id_theme' => $id_theme,
 
@@ -1997,7 +1997,7 @@  discard block
 
 block discarded – undo
1997 1997 
 	if (!isset($context['javascript_vars']))
1998 1998 
 		$context['javascript_vars'] = array();
1999 1999
2000 
-	$context['login_url'] =  $scripturl . '?action=login2';
2000 
+	$context['login_url'] = $scripturl . '?action=login2';
2001 2001 
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
2002 2002 
 	$context['session_var'] = $_SESSION['session_var'];
2003 2003 
 	$context['session_id'] = $_SESSION['session_value'];
Please login to merge, or discard this patch.
Braces   +792 added lines, -597 removed lines patch added patch discarded remove patch 
@@ -13,8 +13,9 @@  discard block
 
 block discarded – undo
13 13 
  * @version 2.1 Beta 4
14 14 
  */
15 15
16 
-if (!defined('SMF'))
16 
+if (!defined('SMF')) {
17 17 
 	die('No direct access...');
18 
+}
18 19
19 20 
 /**
20 21 
  * Load the $modSettings array.
 
@@ -25,13 +26,14 @@  discard block
 
 block discarded – undo
25 26 
 	global $cache_enable, $sourcedir, $context;
26 27
27 28 
 	// Most database systems have not set UTF-8 as their default input charset.
28 
-	if (!empty($db_character_set))
29 
-		$smcFunc['db_query']('', '
29 
+	if (!empty($db_character_set)) {
30 
+			$smcFunc['db_query']('', '
30 31 
 			SET NAMES {string:db_character_set}',
31 32 
 			array(
32 33 
 				'db_character_set' => $db_character_set,
33 34 
 			)
34 35 
 		);
36 
+	}
35 37
36 38 
 	// We need some caching support, maybe.
37 39 
 	loadCacheAccelerator();
 
@@ -46,28 +48,36 @@  discard block
 
 block discarded – undo
46 48 
 			)
47 49 
 		);
48 50 
 		$modSettings = array();
49 
-		if (!$request)
50 
-			display_db_error();
51 
-		while ($row = $smcFunc['db_fetch_row']($request))
52 
-			$modSettings[$row[0]] = $row[1];
51 
+		if (!$request) {
52 
+					display_db_error();
53 
+		}
54 
+		while ($row = $smcFunc['db_fetch_row']($request)) {
55 
+					$modSettings[$row[0]] = $row[1];
56 
+		}
53 57 
 		$smcFunc['db_free_result']($request);
54 58
55 59 
 		// Do a few things to protect against missing settings or settings with invalid values...
56 
-		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999)
57 
-			$modSettings['defaultMaxTopics'] = 20;
58 
-		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999)
59 
-			$modSettings['defaultMaxMessages'] = 15;
60 
-		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999)
61 
-			$modSettings['defaultMaxMembers'] = 30;
62 
-		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999)
63 
-			$modSettings['defaultMaxListItems'] = 15;
60 
+		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999) {
61 
+					$modSettings['defaultMaxTopics'] = 20;
62 
+		}
63 
+		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999) {
64 
+					$modSettings['defaultMaxMessages'] = 15;
65 
+		}
66 
+		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999) {
67 
+					$modSettings['defaultMaxMembers'] = 30;
68 
+		}
69 
+		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999) {
70 
+					$modSettings['defaultMaxListItems'] = 15;
71 
+		}
64 72
65 73 
 		// We explicitly do not use $smcFunc['json_decode'] here yet, as $smcFunc is not fully loaded.
66 
-		if (!is_array($modSettings['attachmentUploadDir']))
67 
-			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
74 
+		if (!is_array($modSettings['attachmentUploadDir'])) {
75 
+					$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
76 
+		}
68 77
69 
-		if (!empty($cache_enable))
70 
-			cache_put_data('modSettings', $modSettings, 90);
78 
+		if (!empty($cache_enable)) {
79 
+					cache_put_data('modSettings', $modSettings, 90);
80 
+		}
71 81 
 	}
72 82
73 83 
 	$modSettings['cache_enable'] = $cache_enable;
 
@@ -87,8 +97,9 @@  discard block
 
 block discarded – undo
87 97 
 		};
88 98 
 	$fix_utf8mb4 = function($string) use ($utf8, $smcFunc)
89 99 
 	{
90 
-		if (!$utf8 || $smcFunc['db_mb4'])
91 
-			return $string;
100 
+		if (!$utf8 || $smcFunc['db_mb4']) {
101 
+					return $string;
102 
+		}
92 103
93 104 
 		$i = 0;
94 105 
 		$len = strlen($string);
 
@@ -100,18 +111,15 @@  discard block
 
 block discarded – undo
100 111 
 			{
101 112 
 				$new_string .= $string[$i];
102 113 
 				$i++;
103 
-			}
104 
-			elseif ($ord < 224)
114 
+			} elseif ($ord < 224)
105 115 
 			{
106 116 
 				$new_string .= $string[$i] . $string[$i + 1];
107 117 
 				$i += 2;
108 
-			}
109 
-			elseif ($ord < 240)
118 
+			} elseif ($ord < 240)
110 119 
 			{
111 120 
 				$new_string .= $string[$i] . $string[$i + 1] . $string[$i + 2];
112 121 
 				$i += 3;
113 
-			}
114 
-			elseif ($ord < 248)
122 
+			} elseif ($ord < 248)
115 123 
 			{
116 124 
 				// Magic happens.
117 125 
 				$val = (ord($string[$i]) & 0x07) << 18;
 
@@ -155,8 +163,7 @@  discard block
 
 block discarded – undo
155 163 
 			{
156 164 
 				$result = array_search($needle, array_slice($haystack_arr, $offset));
157 165 
 				return is_int($result) ? $result + $offset : false;
158 
-			}
159 
-			else
166 
+			} else
160 167 
 			{
161 168 
 				$needle_arr = preg_split('~(' . $ent_list . '|.)~' . ($utf8 ? 'u' : '') . '', $ent_check($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
162 169 
 				$needle_size = count($needle_arr);
 
@@ -165,8 +172,9 @@  discard block
 
 block discarded – undo
165 172 
 				while ((int) $result === $result)
166 173 
 				{
167 174 
 					$offset += $result;
168 
-					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr)
169 
-						return $offset;
175 
+					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr) {
176 
+											return $offset;
177 
+					}
170 178 
 					$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
171 179 
 				}
172 180 
 				return false;
 
@@ -204,8 +212,9 @@  discard block
 
 block discarded – undo
204 212 
 			$string = $ent_check($string);
205 213 
 			preg_match('~^(' . $ent_list . '|.){' . $smcFunc['strlen'](substr($string, 0, $length)) . '}~' . ($utf8 ? 'u' : ''), $string, $matches);
206 214 
 			$string = $matches[0];
207 
-			while (strlen($string) > $length)
208 
-				$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
215 
+			while (strlen($string) > $length) {
216 
+							$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
217 
+			}
209 218 
 			return $string;
210 219 
 		},
211 220 
 		'ucfirst' => $utf8 ? function($string) use (&$smcFunc)
 
@@ -215,8 +224,9 @@  discard block
 
 block discarded – undo
215 224 
 		'ucwords' => $utf8 ? function($string) use (&$smcFunc)
216 225 
 		{
217 226 
 			$words = preg_split('~([\s\r\n\t]+)~', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
218 
-			for ($i = 0, $n = count($words); $i < $n; $i += 2)
219 
-				$words[$i] = $smcFunc['ucfirst']($words[$i]);
227 
+			for ($i = 0, $n = count($words); $i < $n; $i += 2) {
228 
+							$words[$i] = $smcFunc['ucfirst']($words[$i]);
229 
+			}
220 230 
 			return implode('', $words);
221 231 
 		} : 'ucwords',
222 232 
 		'json_decode' => 'smf_json_decode',
 
@@ -224,16 +234,17 @@  discard block
 
 block discarded – undo
224 234 
 	);
225 235
226 236 
 	// Setting the timezone is a requirement for some functions.
227 
-	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list()))
228 
-		date_default_timezone_set($modSettings['default_timezone']);
229 
-	else
237 
+	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list())) {
238 
+			date_default_timezone_set($modSettings['default_timezone']);
239 
+	} else
230 240 
 	{
231 241 
 		// Get PHP's default timezone, if set
232 242 
 		$ini_tz = ini_get('date.timezone');
233 
-		if (!empty($ini_tz))
234 
-			$modSettings['default_timezone'] = $ini_tz;
235 
-		else
236 
-			$modSettings['default_timezone'] = '';
243 
+		if (!empty($ini_tz)) {
244 
+					$modSettings['default_timezone'] = $ini_tz;
245 
+		} else {
246 
+					$modSettings['default_timezone'] = '';
247 
+		}
237 248
238 249 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
239 250 
 		if (!in_array($modSettings['default_timezone'], timezone_identifiers_list()))
 
@@ -251,22 +262,26 @@  discard block
 
 block discarded – undo
251 262 
 		if (($modSettings['load_average'] = cache_get_data('loadavg', 90)) == null)
252 263 
 		{
253 264 
 			$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
254 
-			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0)
255 
-				$modSettings['load_average'] = (float) $matches[1];
256 
-			elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0)
257 
-				$modSettings['load_average'] = (float) $matches[1];
258 
-			else
259 
-				unset($modSettings['load_average']);
265 
+			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0) {
266 
+							$modSettings['load_average'] = (float) $matches[1];
267 
+			} elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0) {
268 
+							$modSettings['load_average'] = (float) $matches[1];
269 
+			} else {
270 
+							unset($modSettings['load_average']);
271 
+			}
260 272
261 
-			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
262 
-				cache_put_data('loadavg', $modSettings['load_average'], 90);
273 
+			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
274 
+							cache_put_data('loadavg', $modSettings['load_average'], 90);
275 
+			}
263 276 
 		}
264 277
265 
-		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
266 
-			call_integration_hook('integrate_load_average', array($modSettings['load_average']));
278 
+		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
279 
+					call_integration_hook('integrate_load_average', array($modSettings['load_average']));
280 
+		}
267 281
268 
-		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum'])
269 
-			display_loadavg_error();
282 
+		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum']) {
283 
+					display_loadavg_error();
284 
+		}
270 285 
 	}
271 286
272 287 
 	// Is post moderation alive and well? Everywhere else assumes this has been defined, so let's make sure it is.
 
@@ -287,8 +302,9 @@  discard block
 
 block discarded – undo
287 302 
 	if (defined('SMF_INTEGRATION_SETTINGS'))
288 303 
 	{
289 304 
 		$integration_settings = $smcFunc['json_decode'](SMF_INTEGRATION_SETTINGS, true);
290 
-		foreach ($integration_settings as $hook => $function)
291 
-			add_integration_function($hook, $function, '', false);
305 
+		foreach ($integration_settings as $hook => $function) {
306 
+					add_integration_function($hook, $function, '', false);
307 
+		}
292 308 
 	}
293 309
294 310 
 	// Any files to pre include?
 
@@ -298,8 +314,9 @@  discard block
 
 block discarded – undo
298 314 
 		foreach ($pre_includes as $include)
299 315 
 		{
300 316 
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
301 
-			if (file_exists($include))
302 
-				require_once($include);
317 
+			if (file_exists($include)) {
318 
+							require_once($include);
319 
+			}
303 320 
 		}
304 321 
 	}
305 322 
 
@@ -405,9 +422,9 @@  discard block
 
 block discarded – undo
405 422 
 				break;
406 423 
 			}
407 424 
 		}
425 
+	} else {
426 
+			$id_member = 0;
408 427 
 	}
409 
-	else
410 
-		$id_member = 0;
411 428
412 429 
 	if (empty($id_member) && isset($_COOKIE[$cookiename]))
413 430 
 	{
 
@@ -415,8 +432,9 @@  discard block
 
 block discarded – undo
415 432 
 		$cookie_data = $smcFunc['json_decode']($_COOKIE[$cookiename], true, false);
416 433
417 434 
 		// Legacy format (for recent 2.0 --> 2.1 upgrades)
418 
-		if (empty($cookie_data))
419 
-			$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
435 
+		if (empty($cookie_data)) {
436 
+					$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
437 
+		}
420 438
421 439 
 		list($id_member, $password, $login_span, $cookie_domain, $cookie_path) = array_pad((array) $cookie_data, 5, '');
422 440 
 
@@ -424,16 +442,17 @@  discard block
 
 block discarded – undo
424 442
425 443 
 		// Make sure the cookie is set to the correct domain and path
426 444 
 		require_once($sourcedir . '/Subs-Auth.php');
427 
-		if (array($cookie_domain, $cookie_path) !== url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies'])))
428 
-			setLoginCookie((int) $login_span - time(), $id_member);
429 
-	}
430 
-	elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
445 
+		if (array($cookie_domain, $cookie_path) !== url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies']))) {
446 
+					setLoginCookie((int) $login_span - time(), $id_member);
447 
+		}
448 
+	} elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
431 449 
 	{
432 450 
 		// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
433 451 
 		$cookie_data = $smcFunc['json_decode']($_SESSION['login_' . $cookiename], true);
434 452
435 
-		if (empty($cookie_data))
436 
-			$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
453 
+		if (empty($cookie_data)) {
454 
+					$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
455 
+		}
437 456
438 457 
 		list($id_member, $password, $login_span) = array_pad((array) $cookie_data, 3, '');
439 458 
 		$id_member = !empty($id_member) && strlen($password) == 128 && (int) $login_span > time() ? (int) $id_member : 0;
 
@@ -458,30 +477,34 @@  discard block
 
 block discarded – undo
458 477 
 			$user_settings = $smcFunc['db_fetch_assoc']($request);
459 478 
 			$smcFunc['db_free_result']($request);
460 479
461 
-			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
462 
-				$user_settings['avatar'] = get_proxied_url($user_settings['avatar']);
480 
+			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
481 
+							$user_settings['avatar'] = get_proxied_url($user_settings['avatar']);
482 
+			}
463 483
464 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
465 
-				cache_put_data('user_settings-' . $id_member, $user_settings, 60);
484 
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
485 
+							cache_put_data('user_settings-' . $id_member, $user_settings, 60);
486 
+			}
466 487 
 		}
467 488
468 489 
 		// Did we find 'im?  If not, junk it.
469 490 
 		if (!empty($user_settings))
470 491 
 		{
471 492 
 			// As much as the password should be right, we can assume the integration set things up.
472 
-			if (!empty($already_verified) && $already_verified === true)
473 
-				$check = true;
493 
+			if (!empty($already_verified) && $already_verified === true) {
494 
+							$check = true;
495 
+			}
474 496 
 			// SHA-512 hash should be 128 characters long.
475 
-			elseif (strlen($password) == 128)
476 
-				$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
477 
-			else
478 
-				$check = false;
497 
+			elseif (strlen($password) == 128) {
498 
+							$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
499 
+			} else {
500 
+							$check = false;
501 
+			}
479 502
480 503 
 			// Wrong password or not activated - either way, you're going nowhere.
481 504 
 			$id_member = $check && ($user_settings['is_activated'] == 1 || $user_settings['is_activated'] == 11) ? (int) $user_settings['id_member'] : 0;
505 
+		} else {
506 
+					$id_member = 0;
482 507 
 		}
483 
-		else
484 
-			$id_member = 0;
485 508
486 509 
 		// If we no longer have the member maybe they're being all hackey, stop brute force!
487 510 
 		if (!$id_member)
 
@@ -510,8 +533,9 @@  discard block
 
 block discarded – undo
510 533
511 534 
 					list ($tfamember, $tfasecret) = array_pad((array) $tfa_data, 2, '');
512 535
513 
-					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member)
514 
-						$tfasecret = null;
536 
+					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member) {
537 
+											$tfasecret = null;
538 
+					}
515 539 
 				}
516 540
517 541 
 				// They didn't finish logging in before coming here? Then they're no one to us.
 
@@ -533,10 +557,12 @@  discard block
 
 block discarded – undo
533 557 
 		// Are we forcing 2FA? Need to check if the user groups actually require 2FA
534 558 
 		elseif (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] >= 2 && $id_member && empty($user_settings['tfa_secret']))
535 559 
 		{
536 
-			if ($modSettings['tfa_mode'] == 2) //only do this if we are just forcing SOME membergroups
560 
+			if ($modSettings['tfa_mode'] == 2) {
561 
+				//only do this if we are just forcing SOME membergroups
537 562 
 			{
538 563 
 				//Build an array of ALL user membergroups.
539 564 
 				$full_groups = array($user_settings['id_group']);
565 
+			}
540 566 
 				if (!empty($user_settings['additional_groups']))
541 567 
 				{
542 568 
 					$full_groups = array_merge($full_groups, explode(',', $user_settings['additional_groups']));
 
@@ -556,15 +582,17 @@  discard block
 
 block discarded – undo
556 582 
 				);
557 583 
 				$row = $smcFunc['db_fetch_assoc']($request);
558 584 
 				$smcFunc['db_free_result']($request);
585 
+			} else {
586 
+							$row['total'] = 1;
559 587 
 			}
560 
-			else
561 
-				$row['total'] = 1; //simplifies logics in the next "if"
588 
+			//simplifies logics in the next "if"
562 589
563 590 
 			$area = !empty($_REQUEST['area']) ? $_REQUEST['area'] : '';
564 591 
 			$action = !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
565 592
566 
-			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup'))
567 
-				redirectexit('action=profile;area=tfasetup;forced');
593 
+			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup')) {
594 
+							redirectexit('action=profile;area=tfasetup;forced');
595 
+			}
568 596 
 		}
569 597 
 	}
570 598 
 
@@ -601,29 +629,32 @@  discard block
 
 block discarded – undo
601 629 
 				updateMemberData($id_member, array('id_msg_last_visit' => (int) $modSettings['maxMsgID'], 'last_login' => time(), 'member_ip' => $_SERVER['REMOTE_ADDR'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']));
602 630 
 				$user_settings['last_login'] = time();
603 631
604 
-				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
605 
-					cache_put_data('user_settings-' . $id_member, $user_settings, 60);
632 
+				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
633 
+									cache_put_data('user_settings-' . $id_member, $user_settings, 60);
634 
+				}
606 635
607 
-				if (!empty($modSettings['cache_enable']))
608 
-					cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
636 
+				if (!empty($modSettings['cache_enable'])) {
637 
+									cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
638 
+				}
609 639 
 			}
640 
+		} elseif (empty($_SESSION['id_msg_last_visit'])) {
641 
+					$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
610 642 
 		}
611 
-		elseif (empty($_SESSION['id_msg_last_visit']))
612 
-			$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
613 643
614 644 
 		$username = $user_settings['member_name'];
615 645
616 
-		if (empty($user_settings['additional_groups']))
617 
-			$user_info = array(
646 
+		if (empty($user_settings['additional_groups'])) {
647 
+					$user_info = array(
618 648 
 				'groups' => array($user_settings['id_group'], $user_settings['id_post_group'])
619 649 
 			);
620 
-		else
621 
-			$user_info = array(
650 
+		} else {
651 
+					$user_info = array(
622 652 
 				'groups' => array_merge(
623 653 
 					array($user_settings['id_group'], $user_settings['id_post_group']),
624 654 
 					explode(',', $user_settings['additional_groups'])
625 655 
 				)
626 656 
 			);
657 
+		}
627 658
628 659 
 		// Because history has proven that it is possible for groups to go bad - clean up in case.
629 660 
 		$user_info['groups'] = array_map('intval', $user_info['groups']);
 
@@ -640,8 +671,7 @@  discard block
 
 block discarded – undo
640 671 
 			$time_system = new DateTime('now', $tz_system);
641 672 
 			$time_user = new DateTime('now', $tz_user);
642 673 
 			$user_info['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
643 
-		}
644 
-		else
674 
+		} else
645 675 
 		{
646 676 
 			// !!! Compatibility.
647 677 
 			$user_info['time_offset'] = empty($user_settings['time_offset']) ? 0 : $user_settings['time_offset'];
 
@@ -655,8 +685,9 @@  discard block
 
 block discarded – undo
655 685 
 		$user_info = array('groups' => array(-1));
656 686 
 		$user_settings = array();
657 687
658 
-		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member']))
659 
-			$_COOKIE[$cookiename] = '';
688 
+		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member'])) {
689 
+					$_COOKIE[$cookiename] = '';
690 
+		}
660 691
661 692 
 		// Expire the 2FA cookie
662 693 
 		if (isset($_COOKIE[$cookiename . '_tfa']) && empty($context['tfa_member']))
 
@@ -673,19 +704,20 @@  discard block
 
 block discarded – undo
673 704 
 		}
674 705
675 706 
 		// Create a login token if it doesn't exist yet.
676 
-		if (!isset($_SESSION['token']['post-login']))
677 
-			createToken('login');
678 
-		else
679 
-			list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
707 
+		if (!isset($_SESSION['token']['post-login'])) {
708 
+					createToken('login');
709 
+		} else {
710 
+					list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
711 
+		}
680 712
681 713 
 		// Do we perhaps think this is a search robot? Check every five minutes just in case...
682 714 
 		if ((!empty($modSettings['spider_mode']) || !empty($modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300))
683 715 
 		{
684 716 
 			require_once($sourcedir . '/ManageSearchEngines.php');
685 717 
 			$user_info['possibly_robot'] = SpiderCheck();
718 
+		} elseif (!empty($modSettings['spider_mode'])) {
719 
+					$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
686 720 
 		}
687 
-		elseif (!empty($modSettings['spider_mode']))
688 
-			$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
689 721 
 		// If we haven't turned on proper spider hunts then have a guess!
690 722 
 		else
691 723 
 		{
 
@@ -733,8 +765,9 @@  discard block
 
 block discarded – undo
733 765 
 	$user_info['groups'] = array_unique($user_info['groups']);
734 766
735 767 
 	// Make sure that the last item in the ignore boards array is valid. If the list was too long it could have an ending comma that could cause problems.
736 
-	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1]))
737 
-		unset($user_info['ignoreboards'][$tmp]);
768 
+	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1])) {
769 
+			unset($user_info['ignoreboards'][$tmp]);
770 
+	}
738 771
739 772 
 	// Allow the user to change their language.
740 773 
 	if (!empty($modSettings['userLanguage']))
 
@@ -747,13 +780,14 @@  discard block
 
 block discarded – undo
747 780 
 			$user_info['language'] = strtr($_GET['language'], './\\:', '____');
748 781
749 782 
 			// Make it permanent for members.
750 
-			if (!empty($user_info['id']))
751 
-				updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
752 
-			else
753 
-				$_SESSION['language'] = $user_info['language'];
783 
+			if (!empty($user_info['id'])) {
784 
+							updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
785 
+			} else {
786 
+							$_SESSION['language'] = $user_info['language'];
787 
+			}
788 
+		} elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')])) {
789 
+					$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
754 790 
 		}
755 
-		elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')]))
756 
-			$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
757 791 
 	}
758 792
759 793 
 	$temp = build_query_board($user_info['id']);
 
@@ -816,9 +850,9 @@  discard block
 
 block discarded – undo
816 850 
 		}
817 851
818 852 
 		// Remember redirection is the key to avoiding fallout from your bosses.
819 
-		if (!empty($topic))
820 
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
821 
-		else
853 
+		if (!empty($topic)) {
854 
+					redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
855 
+		} else
822 856 
 		{
823 857 
 			loadPermissions();
824 858 
 			loadTheme();
 
@@ -836,10 +870,11 @@  discard block
 
 block discarded – undo
836 870 
 	if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
837 871 
 	{
838 872 
 		// @todo SLOW?
839 
-		if (!empty($topic))
840 
-			$temp = cache_get_data('topic_board-' . $topic, 120);
841 
-		else
842 
-			$temp = cache_get_data('board-' . $board, 120);
873 
+		if (!empty($topic)) {
874 
+					$temp = cache_get_data('topic_board-' . $topic, 120);
875 
+		} else {
876 
+					$temp = cache_get_data('board-' . $board, 120);
877 
+		}
843 878
844 879 
 		if (!empty($temp))
845 880 
 		{
 
@@ -877,8 +912,9 @@  discard block
 
 block discarded – undo
877 912 
 			$row = $smcFunc['db_fetch_assoc']($request);
878 913
879 914 
 			// Set the current board.
880 
-			if (!empty($row['id_board']))
881 
-				$board = $row['id_board'];
915 
+			if (!empty($row['id_board'])) {
916 
+							$board = $row['id_board'];
917 
+			}
882 918
883 919 
 			// Basic operating information. (globals... :/)
884 920 
 			$board_info = array(
 
@@ -914,21 +950,23 @@  discard block
 
 block discarded – undo
914 950
915 951 
 			do
916 952 
 			{
917 
-				if (!empty($row['id_moderator']))
918 
-					$board_info['moderators'][$row['id_moderator']] = array(
953 
+				if (!empty($row['id_moderator'])) {
954 
+									$board_info['moderators'][$row['id_moderator']] = array(
919 955 
 						'id' => $row['id_moderator'],
920 956 
 						'name' => $row['real_name'],
921 957 
 						'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
922 958 
 						'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
923 959 
 					);
960 
+				}
924 961
925 
-				if (!empty($row['id_moderator_group']))
926 
-					$board_info['moderator_groups'][$row['id_moderator_group']] = array(
962 
+				if (!empty($row['id_moderator_group'])) {
963 
+									$board_info['moderator_groups'][$row['id_moderator_group']] = array(
927 964 
 						'id' => $row['id_moderator_group'],
928 965 
 						'name' => $row['group_name'],
929 966 
 						'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
930 967 
 						'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
931 968 
 					);
969 
+				}
932 970 
 			}
933 971 
 			while ($row = $smcFunc['db_fetch_assoc']($request));
934 972 
 
@@ -960,12 +998,12 @@  discard block
 
 block discarded – undo
960 998 
 			if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
961 999 
 			{
962 1000 
 				// @todo SLOW?
963 
-				if (!empty($topic))
964 
-					cache_put_data('topic_board-' . $topic, $board_info, 120);
1001 
+				if (!empty($topic)) {
1002 
+									cache_put_data('topic_board-' . $topic, $board_info, 120);
1003 
+				}
965 1004 
 				cache_put_data('board-' . $board, $board_info, 120);
966 1005 
 			}
967 
-		}
968 
-		else
1006 
+		} else
969 1007 
 		{
970 1008 
 			// Otherwise the topic is invalid, there are no moderators, etc.
971 1009 
 			$board_info = array(
 
@@ -979,8 +1017,9 @@  discard block
 
 block discarded – undo
979 1017 
 		$smcFunc['db_free_result']($request);
980 1018 
 	}
981 1019
982 
-	if (!empty($topic))
983 
-		$_GET['board'] = (int) $board;
1020 
+	if (!empty($topic)) {
1021 
+			$_GET['board'] = (int) $board;
1022 
+	}
984 1023
985 1024 
 	if (!empty($board))
986 1025 
 	{
 
@@ -990,10 +1029,12 @@  discard block
 
 block discarded – undo
990 1029 
 		// Now check if the user is a moderator.
991 1030 
 		$user_info['is_mod'] = isset($board_info['moderators'][$user_info['id']]) || count(array_intersect($user_info['groups'], $moderator_groups)) != 0;
992 1031
993 
-		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin'])
994 
-			$board_info['error'] = 'access';
995 
-		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin'])
996 
-			$board_info['error'] = 'access';
1032 
+		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin']) {
1033 
+					$board_info['error'] = 'access';
1034 
+		}
1035 
+		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin']) {
1036 
+					$board_info['error'] = 'access';
1037 
+		}
997 1038
998 1039 
 		// Build up the linktree.
999 1040 
 		$context['linktree'] = array_merge(
 
@@ -1016,8 +1057,9 @@  discard block
 
 block discarded – undo
1016 1057 
 	$context['current_board'] = $board;
1017 1058
1018 1059 
 	// No posting in redirection boards!
1019 
-	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect']))
1020 
-		$board_info['error'] == 'post_in_redirect';
1060 
+	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect'])) {
1061 
+			$board_info['error'] == 'post_in_redirect';
1062 
+	}
1021 1063
1022 1064 
 	// Hacker... you can't see this topic, I'll tell you that. (but moderators can!)
1023 1065 
 	if (!empty($board_info['error']) && (!empty($modSettings['deny_boards_access']) || $board_info['error'] != 'access' || !$user_info['is_mod']))
 
@@ -1043,24 +1085,23 @@  discard block
 
 block discarded – undo
1043 1085 
 			ob_end_clean();
1044 1086 
 			header('HTTP/1.1 403 Forbidden');
1045 1087 
 			die;
1046 
-		}
1047 
-		elseif ($board_info['error'] == 'post_in_redirect')
1088 
+		} elseif ($board_info['error'] == 'post_in_redirect')
1048 1089 
 		{
1049 1090 
 			// Slightly different error message here...
1050 1091 
 			fatal_lang_error('cannot_post_redirect', false);
1051 
-		}
1052 
-		elseif ($user_info['is_guest'])
1092 
+		} elseif ($user_info['is_guest'])
1053 1093 
 		{
1054 1094 
 			loadLanguage('Errors');
1055 1095 
 			is_not_guest($txt['topic_gone']);
1096 
+		} else {
1097 
+					fatal_lang_error('topic_gone', false);
1056 1098 
 		}
1057 
-		else
1058 
-			fatal_lang_error('topic_gone', false);
1059 1099 
 	}
1060 1100
1061 
-	if ($user_info['is_mod'])
1062 
-		$user_info['groups'][] = 3;
1063 
-}
1101 
+	if ($user_info['is_mod']) {
1102 
+			$user_info['groups'][] = 3;
1103 
+	}
1104 
+	}
1064 1105
1065 1106 
 /**
1066 1107 
  * Load this user's permissions.
 
@@ -1081,8 +1122,9 @@  discard block
 
 block discarded – undo
1081 1122 
 		asort($cache_groups);
1082 1123 
 		$cache_groups = implode(',', $cache_groups);
1083 1124 
 		// If it's a spider then cache it different.
1084 
-		if ($user_info['possibly_robot'])
1085 
-			$cache_groups .= '-spider';
1125 
+		if ($user_info['possibly_robot']) {
1126 
+					$cache_groups .= '-spider';
1127 
+		}
1086 1128
1087 1129 
 		if ($modSettings['cache_enable'] >= 2 && !empty($board) && ($temp = cache_get_data('permissions:' . $cache_groups . ':' . $board, 240)) != null && time() - 240 > $modSettings['settings_updated'])
1088 1130 
 		{
 
@@ -1090,9 +1132,9 @@  discard block
 
 block discarded – undo
1090 1132 
 			banPermissions();
1091 1133
1092 1134 
 			return;
1135 
+		} elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated']) {
1136 
+					list ($user_info['permissions'], $removals) = $temp;
1093 1137 
 		}
1094 
-		elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated'])
1095 
-			list ($user_info['permissions'], $removals) = $temp;
1096 1138 
 	}
1097 1139
1098 1140 
 	// If it is detected as a robot, and we are restricting permissions as a special group - then implement this.
 
@@ -1114,23 +1156,26 @@  discard block
 
 block discarded – undo
1114 1156 
 		$removals = array();
1115 1157 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
1116 1158 
 		{
1117 
-			if (empty($row['add_deny']))
1118 
-				$removals[] = $row['permission'];
1119 
-			else
1120 
-				$user_info['permissions'][] = $row['permission'];
1159 
+			if (empty($row['add_deny'])) {
1160 
+							$removals[] = $row['permission'];
1161 
+			} else {
1162 
+							$user_info['permissions'][] = $row['permission'];
1163 
+			}
1121 1164 
 		}
1122 1165 
 		$smcFunc['db_free_result']($request);
1123 1166
1124 
-		if (isset($cache_groups))
1125 
-			cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
1167 
+		if (isset($cache_groups)) {
1168 
+					cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
1169 
+		}
1126 1170 
 	}
1127 1171
1128 1172 
 	// Get the board permissions.
1129 1173 
 	if (!empty($board))
1130 1174 
 	{
1131 1175 
 		// Make sure the board (if any) has been loaded by loadBoard().
1132 
-		if (!isset($board_info['profile']))
1133 
-			fatal_lang_error('no_board');
1176 
+		if (!isset($board_info['profile'])) {
1177 
+					fatal_lang_error('no_board');
1178 
+		}
1134 1179
1135 1180 
 		$request = $smcFunc['db_query']('', '
1136 1181 
 			SELECT permission, add_deny
 
@@ -1146,20 +1191,23 @@  discard block
 
 block discarded – undo
1146 1191 
 		);
1147 1192 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
1148 1193 
 		{
1149 
-			if (empty($row['add_deny']))
1150 
-				$removals[] = $row['permission'];
1151 
-			else
1152 
-				$user_info['permissions'][] = $row['permission'];
1194 
+			if (empty($row['add_deny'])) {
1195 
+							$removals[] = $row['permission'];
1196 
+			} else {
1197 
+							$user_info['permissions'][] = $row['permission'];
1198 
+			}
1153 1199 
 		}
1154 1200 
 		$smcFunc['db_free_result']($request);
1155 1201 
 	}
1156 1202
1157 1203 
 	// Remove all the permissions they shouldn't have ;).
1158 
-	if (!empty($modSettings['permission_enable_deny']))
1159 
-		$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
1204 
+	if (!empty($modSettings['permission_enable_deny'])) {
1205 
+			$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
1206 
+	}
1160 1207
1161 
-	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2)
1162 
-		cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
1208 
+	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2) {
1209 
+			cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
1210 
+	}
1163 1211
1164 1212 
 	// Banned?  Watch, don't touch..
1165 1213 
 	banPermissions();
 
@@ -1171,17 +1219,18 @@  discard block
 
 block discarded – undo
1171 1219 
 		{
1172 1220 
 			require_once($sourcedir . '/Subs-Auth.php');
1173 1221 
 			rebuildModCache();
1222 
+		} else {
1223 
+					$user_info['mod_cache'] = $_SESSION['mc'];
1174 1224 
 		}
1175 
-		else
1176 
-			$user_info['mod_cache'] = $_SESSION['mc'];
1177 1225
1178 1226 
 		// This is a useful phantom permission added to the current user, and only the current user while they are logged in.
1179 1227 
 		// For example this drastically simplifies certain changes to the profile area.
1180 1228 
 		$user_info['permissions'][] = 'is_not_guest';
1181 1229 
 		// And now some backwards compatibility stuff for mods and whatnot that aren't expecting the new permissions.
1182 1230 
 		$user_info['permissions'][] = 'profile_view_own';
1183 
-		if (in_array('profile_view', $user_info['permissions']))
1184 
-			$user_info['permissions'][] = 'profile_view_any';
1231 
+		if (in_array('profile_view', $user_info['permissions'])) {
1232 
+					$user_info['permissions'][] = 'profile_view_any';
1233 
+		}
1185 1234 
 	}
1186 1235 
 }
1187 1236 
 
@@ -1199,8 +1248,9 @@  discard block
 
 block discarded – undo
1199 1248 
 	global $image_proxy_enabled, $user_info;
1200 1249
1201 1250 
 	// Can't just look for no users :P.
1202 
-	if (empty($users))
1203 
-		return array();
1251 
+	if (empty($users)) {
1252 
+			return array();
1253 
+	}
1204 1254
1205 1255 
 	// Pass the set value
1206 1256 
 	$context['loadMemberContext_set'] = $set;
 
@@ -1215,8 +1265,9 @@  discard block
 
 block discarded – undo
1215 1265 
 		for ($i = 0, $n = count($users); $i < $n; $i++)
1216 1266 
 		{
1217 1267 
 			$data = cache_get_data('member_data-' . $set . '-' . $users[$i], 240);
1218 
-			if ($data == null)
1219 
-				continue;
1268 
+			if ($data == null) {
1269 
+							continue;
1270 
+			}
1220 1271
1221 1272 
 			$loaded_ids[] = $data['id_member'];
1222 1273 
 			$user_profile[$data['id_member']] = $data;
 
@@ -1283,16 +1334,19 @@  discard block
 
 block discarded – undo
1283 1334 
 			$row['avatar_original'] = !empty($row['avatar']) ? $row['avatar'] : '';
1284 1335
1285 1336 
 			// Take care of proxying avatar if required, do this here for maximum reach
1286 
-			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
1287 
-				$row['avatar'] = get_proxied_url($row['avatar']);
1337 
+			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
1338 
+							$row['avatar'] = get_proxied_url($row['avatar']);
1339 
+			}
1288 1340
1289 1341 
 			// Keep track of the member's normal member group
1290 1342 
 			$row['primary_group'] = !empty($row['member_group']) ? $row['member_group'] : '';
1291 1343
1292 
-			if (isset($row['member_ip']))
1293 
-				$row['member_ip'] = inet_dtop($row['member_ip']);
1294 
-			if (isset($row['member_ip2']))
1295 
-				$row['member_ip2'] = inet_dtop($row['member_ip2']);
1344 
+			if (isset($row['member_ip'])) {
1345 
+							$row['member_ip'] = inet_dtop($row['member_ip']);
1346 
+			}
1347 
+			if (isset($row['member_ip2'])) {
1348 
+							$row['member_ip2'] = inet_dtop($row['member_ip2']);
1349 
+			}
1296 1350 
 			$new_loaded_ids[] = $row['id_member'];
1297 1351 
 			$loaded_ids[] = $row['id_member'];
1298 1352 
 			$row['options'] = array();
 
@@ -1311,8 +1365,9 @@  discard block
 
 block discarded – undo
1311 1365 
 				'loaded_ids' => $new_loaded_ids,
1312 1366 
 			)
1313 1367 
 		);
1314 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
1315 
-			$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
1368 
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
1369 
+					$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
1370 
+		}
1316 1371 
 		$smcFunc['db_free_result']($request);
1317 1372 
 	}
1318 1373 
 
@@ -1323,10 +1378,11 @@  discard block
 
 block discarded – undo
1323 1378 
 	{
1324 1379 
 		foreach ($loaded_ids as $a_member)
1325 1380 
 		{
1326 
-			if (!empty($user_profile[$a_member]['additional_groups']))
1327 
-				$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
1328 
-			else
1329 
-				$groups = array($user_profile[$a_member]['id_group']);
1381 
+			if (!empty($user_profile[$a_member]['additional_groups'])) {
1382 
+							$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
1383 
+			} else {
1384 
+							$groups = array($user_profile[$a_member]['id_group']);
1385 
+			}
1330 1386
1331 1387 
 			$temp = array_intersect($groups, array_keys($board_info['moderator_groups']));
1332 1388 
 
@@ -1339,8 +1395,9 @@  discard block
 
 block discarded – undo
1339 1395
1340 1396 
 	if (!empty($new_loaded_ids) && !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
1341 1397 
 	{
1342 
-		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++)
1343 
-			cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
1398 
+		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++) {
1399 
+					cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
1400 
+		}
1344 1401 
 	}
1345 1402
1346 1403 
 	// Are we loading any moderators?  If so, fix their group data...
 
@@ -1366,14 +1423,17 @@  discard block
 
 block discarded – undo
1366 1423 
 		foreach ($temp_mods as $id)
1367 1424 
 		{
1368 1425 
 			// By popular demand, don't show admins or global moderators as moderators.
1369 
-			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2)
1370 
-				$user_profile[$id]['member_group'] = $row['member_group'];
1426 
+			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2) {
1427 
+							$user_profile[$id]['member_group'] = $row['member_group'];
1428 
+			}
1371 1429
1372 1430 
 			// If the Moderator group has no color or icons, but their group does... don't overwrite.
1373 
-			if (!empty($row['icons']))
1374 
-				$user_profile[$id]['icons'] = $row['icons'];
1375 
-			if (!empty($row['member_group_color']))
1376 
-				$user_profile[$id]['member_group_color'] = $row['member_group_color'];
1431 
+			if (!empty($row['icons'])) {
1432 
+							$user_profile[$id]['icons'] = $row['icons'];
1433 
+			}
1434 
+			if (!empty($row['member_group_color'])) {
1435 
+							$user_profile[$id]['member_group_color'] = $row['member_group_color'];
1436 
+			}
1377 1437 
 		}
1378 1438 
 	}
1379 1439 
 
@@ -1395,12 +1455,14 @@  discard block
 
 block discarded – undo
1395 1455 
 	static $loadedLanguages = array();
1396 1456
1397 1457 
 	// If this person's data is already loaded, skip it.
1398 
-	if (isset($dataLoaded[$user]))
1399 
-		return true;
1458 
+	if (isset($dataLoaded[$user])) {
1459 
+			return true;
1460 
+	}
1400 1461
1401 1462 
 	// We can't load guests or members not loaded by loadMemberData()!
1402 
-	if ($user == 0)
1403 
-		return false;
1463 
+	if ($user == 0) {
1464 
+			return false;
1465 
+	}
1404 1466 
 	if (!isset($user_profile[$user]))
1405 1467 
 	{
1406 1468 
 		trigger_error('loadMemberContext(): member id ' . $user . ' not previously loaded by loadMemberData()', E_USER_WARNING);
 
@@ -1426,12 +1488,16 @@  discard block
 
 block discarded – undo
1426 1488 
 	$buddy_list = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
1427 1489
1428 1490 
 	//We need a little fallback for the membergroup icons. If it doesn't exist in the current theme, fallback to default theme
1429 
-	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) //icon is set and exists
1491 
+	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) {
1492 
+		//icon is set and exists
1430 1493 
 		$group_icon_url = $settings['images_url'] . '/membericons/' . $profile['icons'][1];
1431 
-	elseif (isset($profile['icons'][1])) //icon is set and doesn't exist, fallback to default
1494 
+	} elseif (isset($profile['icons'][1])) {
1495 
+		//icon is set and doesn't exist, fallback to default
1432 1496 
 		$group_icon_url = $settings['default_images_url'] . '/membericons/' . $profile['icons'][1];
1433 
-	else //not set, bye bye
1497 
+	} else {
1498 
+		//not set, bye bye
1434 1499 
 		$group_icon_url = '';
1500 
+	}
1435 1501
1436 1502 
 	// These minimal values are always loaded
1437 1503 
 	$memberContext[$user] = array(
 
@@ -1450,8 +1516,9 @@  discard block
 
 block discarded – undo
1450 1516 
 	if ($context['loadMemberContext_set'] != 'minimal')
1451 1517 
 	{
1452 1518 
 		// Go the extra mile and load the user's native language name.
1453 
-		if (empty($loadedLanguages))
1454 
-			$loadedLanguages = getLanguages();
1519 
+		if (empty($loadedLanguages)) {
1520 
+					$loadedLanguages = getLanguages();
1521 
+		}
1455 1522
1456 1523 
 		$memberContext[$user] += array(
1457 1524 
 			'username_color' => '<span ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['member_name'] . '</span>',
 
@@ -1506,31 +1573,33 @@  discard block
 
 block discarded – undo
1506 1573 
 	{
1507 1574 
 		if (!empty($modSettings['gravatarOverride']) || (!empty($modSettings['gravatarEnabled']) && stristr($profile['avatar'], 'gravatar://')))
1508 1575 
 		{
1509 
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11)
1510 
-				$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
1511 
-			else
1512 
-				$image = get_gravatar_url($profile['email_address']);
1513 
-		}
1514 
-		else
1576 
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11) {
1577 
+							$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
1578 
+			} else {
1579 
+							$image = get_gravatar_url($profile['email_address']);
1580 
+			}
1581 
+		} else
1515 1582 
 		{
1516 1583 
 			// So it's stored in the member table?
1517 1584 
 			if (!empty($profile['avatar']))
1518 1585 
 			{
1519 1586 
 				$image = (stristr($profile['avatar'], 'http://') || stristr($profile['avatar'], 'https://')) ? $profile['avatar'] : $modSettings['avatar_url'] . '/' . $profile['avatar'];
1587 
+			} elseif (!empty($profile['filename'])) {
1588 
+							$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
1520 1589 
 			}
1521 
-			elseif (!empty($profile['filename']))
1522 
-				$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
1523 1590 
 			// Right... no avatar...use the default one
1524 
-			else
1525 
-				$image = $modSettings['avatar_url'] . '/default.png';
1591 
+			else {
1592 
+							$image = $modSettings['avatar_url'] . '/default.png';
1593 
+			}
1526 1594 
 		}
1527 
-		if (!empty($image))
1528 
-			$memberContext[$user]['avatar'] = array(
1595 
+		if (!empty($image)) {
1596 
+					$memberContext[$user]['avatar'] = array(
1529 1597 
 				'name' => $profile['avatar'],
1530 1598 
 				'image' => '<img class="avatar" src="' . $image . '" alt="avatar_' . $profile['member_name'] . '">',
1531 1599 
 				'href' => $image,
1532 1600 
 				'url' => $image,
1533 1601 
 			);
1602 
+		}
1534 1603 
 	}
1535 1604
1536 1605 
 	// Are we also loading the members custom fields into context?
 
@@ -1538,13 +1607,15 @@  discard block
 
 block discarded – undo
1538 1607 
 	{
1539 1608 
 		$memberContext[$user]['custom_fields'] = array();
1540 1609
1541 
-		if (!isset($context['display_fields']))
1542 
-			$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
1610 
+		if (!isset($context['display_fields'])) {
1611 
+					$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
1612 
+		}
1543 1613
1544 1614 
 		foreach ($context['display_fields'] as $custom)
1545 1615 
 		{
1546 
-			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']]))
1547 
-				continue;
1616 
+			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']])) {
1617 
+							continue;
1618 
+			}
1548 1619
1549 1620 
 			$value = $profile['options'][$custom['col_name']];
1550 1621 
 
@@ -1552,31 +1623,36 @@  discard block
 
 block discarded – undo
1552 1623 
 			$currentKey = 0;
1553 1624
1554 1625 
 			// Create a key => value array for multiple options fields
1555 
-			if (!empty($custom['options']))
1556 
-				foreach ($custom['options'] as $k => $v)
1626 
+			if (!empty($custom['options'])) {
1627 
+							foreach ($custom['options'] as $k => $v)
1557 1628 
 				{
1558 1629 
 					$fieldOptions[] = $v;
1559 
-					if (empty($currentKey))
1560 
-						$currentKey = $v == $value ? $k : 0;
1630 
+			}
1631 
+					if (empty($currentKey)) {
1632 
+											$currentKey = $v == $value ? $k : 0;
1633 
+					}
1561 1634 
 				}
1562 1635
1563 1636 
 			// BBC?
1564 
-			if ($custom['bbc'])
1565 
-				$value = parse_bbc($value);
1637 
+			if ($custom['bbc']) {
1638 
+							$value = parse_bbc($value);
1639 
+			}
1566 1640
1567 1641 
 			// ... or checkbox?
1568 
-			elseif (isset($custom['type']) && $custom['type'] == 'check')
1569 
-				$value = $value ? $txt['yes'] : $txt['no'];
1642 
+			elseif (isset($custom['type']) && $custom['type'] == 'check') {
1643 
+							$value = $value ? $txt['yes'] : $txt['no'];
1644 
+			}
1570 1645
1571 1646 
 			// Enclosing the user input within some other text?
1572 
-			if (!empty($custom['enclose']))
1573 
-				$value = strtr($custom['enclose'], array(
1647 
+			if (!empty($custom['enclose'])) {
1648 
+							$value = strtr($custom['enclose'], array(
1574 1649 
 					'{SCRIPTURL}' => $scripturl,
1575 1650 
 					'{IMAGES_URL}' => $settings['images_url'],
1576 1651 
 					'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
1577 1652 
 					'{INPUT}' => $value,
1578 1653 
 					'{KEY}' => $currentKey,
1579 1654 
 				));
1655 
+			}
1580 1656
1581 1657 
 			$memberContext[$user]['custom_fields'][] = array(
1582 1658 
 				'title' => !empty($custom['title']) ? $custom['title'] : $custom['col_name'],
 
@@ -1603,8 +1679,9 @@  discard block
 
 block discarded – undo
1603 1679 
 	global $smcFunc, $txt, $scripturl, $settings;
1604 1680
1605 1681 
 	// Do not waste my time...
1606 
-	if (empty($users) || empty($params))
1607 
-		return false;
1682 
+	if (empty($users) || empty($params)) {
1683 
+			return false;
1684 
+	}
1608 1685
1609 1686 
 	// Make sure it's an array.
1610 1687 
 	$users = !is_array($users) ? array($users) : array_unique($users);
 
@@ -1631,41 +1708,48 @@  discard block
 
 block discarded – undo
1631 1708 
 		$currentKey = 0;
1632 1709
1633 1710 
 		// Create a key => value array for multiple options fields
1634 
-		if (!empty($row['field_options']))
1635 
-			foreach (explode(',', $row['field_options']) as $k => $v)
1711 
+		if (!empty($row['field_options'])) {
1712 
+					foreach (explode(',', $row['field_options']) as $k => $v)
1636 1713 
 			{
1637 1714 
 				$fieldOptions[] = $v;
1638 
-				if (empty($currentKey))
1639 
-					$currentKey = $v == $row['value'] ? $k : 0;
1715 
+		}
1716 
+				if (empty($currentKey)) {
1717 
+									$currentKey = $v == $row['value'] ? $k : 0;
1718 
+				}
1640 1719 
 			}
1641 1720
1642 1721 
 		// BBC?
1643 
-		if (!empty($row['bbc']))
1644 
-			$row['value'] = parse_bbc($row['value']);
1722 
+		if (!empty($row['bbc'])) {
1723 
+					$row['value'] = parse_bbc($row['value']);
1724 
+		}
1645 1725
1646 1726 
 		// ... or checkbox?
1647 
-		elseif (isset($row['type']) && $row['type'] == 'check')
1648 
-			$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
1727 
+		elseif (isset($row['type']) && $row['type'] == 'check') {
1728 
+					$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
1729 
+		}
1649 1730
1650 1731 
 		// Enclosing the user input within some other text?
1651 
-		if (!empty($row['enclose']))
1652 
-			$row['value'] = strtr($row['enclose'], array(
1732 
+		if (!empty($row['enclose'])) {
1733 
+					$row['value'] = strtr($row['enclose'], array(
1653 1734 
 				'{SCRIPTURL}' => $scripturl,
1654 1735 
 				'{IMAGES_URL}' => $settings['images_url'],
1655 1736 
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
1656 1737 
 				'{INPUT}' => un_htmlspecialchars($row['value']),
1657 1738 
 				'{KEY}' => $currentKey,
1658 1739 
 			));
1740 
+		}
1659 1741
1660 1742 
 		// Send a simple array if there is just 1 param
1661 
-		if (count($params) == 1)
1662 
-			$return[$row['id_member']] = $row;
1743 
+		if (count($params) == 1) {
1744 
+					$return[$row['id_member']] = $row;
1745 
+		}
1663 1746
1664 1747 
 		// More than 1? knock yourself out...
1665 1748 
 		else
1666 1749 
 		{
1667 
-			if (!isset($return[$row['id_member']]))
1668 
-				$return[$row['id_member']] = array();
1750 
+			if (!isset($return[$row['id_member']])) {
1751 
+							$return[$row['id_member']] = array();
1752 
+			}
1669 1753
1670 1754 
 			$return[$row['id_member']][$row['variable']] = $row;
1671 1755 
 		}
 
@@ -1699,8 +1783,9 @@  discard block
 
 block discarded – undo
1699 1783 
 	global $context;
1700 1784
1701 1785 
 	// Don't know any browser!
1702 
-	if (empty($context['browser']))
1703 
-		detectBrowser();
1786 
+	if (empty($context['browser'])) {
1787 
+			detectBrowser();
1788 
+	}
1704 1789
1705 1790 
 	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_' . $browser]) ? true : false;
1706 1791 
 }
 
@@ -1718,8 +1803,9 @@  discard block
 
 block discarded – undo
1718 1803 
 	global $context, $settings, $options, $sourcedir, $ssi_theme, $smcFunc, $language, $board, $image_proxy_enabled;
1719 1804
1720 1805 
 	// The theme was specified by parameter.
1721 
-	if (!empty($id_theme))
1722 
-		$id_theme = (int) $id_theme;
1806 
+	if (!empty($id_theme)) {
1807 
+			$id_theme = (int) $id_theme;
1808 
+	}
1723 1809 
 	// The theme was specified by REQUEST.
1724 1810 
 	elseif (!empty($_REQUEST['theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
1725 1811 
 	{
 
@@ -1727,32 +1813,38 @@  discard block
 
 block discarded – undo
1727 1813 
 		$_SESSION['id_theme'] = $id_theme;
1728 1814 
 	}
1729 1815 
 	// The theme was specified by REQUEST... previously.
1730 
-	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
1731 
-		$id_theme = (int) $_SESSION['id_theme'];
1816 
+	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum'))) {
1817 
+			$id_theme = (int) $_SESSION['id_theme'];
1818 
+	}
1732 1819 
 	// The theme is just the user's choice. (might use ?board=1;theme=0 to force board theme.)
1733 
-	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme']))
1734 
-		$id_theme = $user_info['theme'];
1820 
+	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme'])) {
1821 
+			$id_theme = $user_info['theme'];
1822 
+	}
1735 1823 
 	// The theme was specified by the board.
1736 
-	elseif (!empty($board_info['theme']))
1737 
-		$id_theme = $board_info['theme'];
1824 
+	elseif (!empty($board_info['theme'])) {
1825 
+			$id_theme = $board_info['theme'];
1826 
+	}
1738 1827 
 	// The theme is the forum's default.
1739 
-	else
1740 
-		$id_theme = $modSettings['theme_guests'];
1828 
+	else {
1829 
+			$id_theme = $modSettings['theme_guests'];
1830 
+	}
1741 1831
1742 1832 
 	// Verify the id_theme... no foul play.
1743 1833 
 	// Always allow the board specific theme, if they are overriding.
1744 
-	if (!empty($board_info['theme']) && $board_info['override_theme'])
1745 
-		$id_theme = $board_info['theme'];
1834 
+	if (!empty($board_info['theme']) && $board_info['override_theme']) {
1835 
+			$id_theme = $board_info['theme'];
1836 
+	}
1746 1837 
 	// If they have specified a particular theme to use with SSI allow it to be used.
1747 
-	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme)
1748 
-		$id_theme = (int) $id_theme;
1749 
-	elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
1838 
+	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme) {
1839 
+			$id_theme = (int) $id_theme;
1840 
+	} elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
1750 1841 
 	{
1751 1842 
 		$themes = explode(',', $modSettings['enableThemes']);
1752 
-		if (!in_array($id_theme, $themes))
1753 
-			$id_theme = $modSettings['theme_guests'];
1754 
-		else
1755 
-			$id_theme = (int) $id_theme;
1843 
+		if (!in_array($id_theme, $themes)) {
1844 
+					$id_theme = $modSettings['theme_guests'];
1845 
+		} else {
1846 
+					$id_theme = (int) $id_theme;
1847 
+		}
1756 1848 
 	}
1757 1849
1758 1850 
 	// We already load the basic stuff?
 
@@ -1761,18 +1853,19 @@  discard block
 
 block discarded – undo
1761 1853 
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
1762 1854
1763 1855 
 		// Disable image proxy if we don't have SSL enabled
1764 
-		if (empty($modSettings['force_ssl']))
1765 
-			$image_proxy_enabled = false;
1856 
+		if (empty($modSettings['force_ssl'])) {
1857 
+					$image_proxy_enabled = false;
1858 
+		}
1766 1859
1767 1860 
 		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && ($temp = cache_get_data('theme_settings-' . $id_theme . ':' . $member, 60)) != null && time() - 60 > $modSettings['settings_updated'])
1768 1861 
 		{
1769 1862 
 			$themeData = $temp;
1770 1863 
 			$flag = true;
1864 
+		} elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated']) {
1865 
+					$themeData = $temp + array($member => array());
1866 
+		} else {
1867 
+					$themeData = array(-1 => array(), 0 => array(), $member => array());
1771 1868 
 		}
1772 
-		elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated'])
1773 
-			$themeData = $temp + array($member => array());
1774 
-		else
1775 
-			$themeData = array(-1 => array(), 0 => array(), $member => array());
1776 1869
1777 1870 
 		if (empty($flag))
1778 1871 
 		{
 
@@ -1792,31 +1885,37 @@  discard block
 
 block discarded – undo
1792 1885 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
1793 1886 
 			{
1794 1887 
 				// There are just things we shouldn't be able to change as members.
1795 
-				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url')))
1796 
-					continue;
1888 
+				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url'))) {
1889 
+									continue;
1890 
+				}
1797 1891
1798 1892 
 				// If this is the theme_dir of the default theme, store it.
1799 
-				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member']))
1800 
-					$themeData[0]['default_' . $row['variable']] = $row['value'];
1893 
+				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member'])) {
1894 
+									$themeData[0]['default_' . $row['variable']] = $row['value'];
1895 
+				}
1801 1896
1802 1897 
 				// If this isn't set yet, is a theme option, or is not the default theme..
1803 
-				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1')
1804 
-					$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
1898 
+				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1') {
1899 
+									$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
1900 
+				}
1805 1901 
 			}
1806 1902 
 			$smcFunc['db_free_result']($result);
1807 1903
1808 
-			if (!empty($themeData[-1]))
1809 
-				foreach ($themeData[-1] as $k => $v)
1904 
+			if (!empty($themeData[-1])) {
1905 
+							foreach ($themeData[-1] as $k => $v)
1810 1906 
 				{
1811 1907 
 					if (!isset($themeData[$member][$k]))
1812 1908 
 						$themeData[$member][$k] = $v;
1909 
+			}
1813 1910 
 				}
1814 1911
1815 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
1816 
-				cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
1912 
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
1913 
+							cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
1914 
+			}
1817 1915 
 			// Only if we didn't already load that part of the cache...
1818 
-			elseif (!isset($temp))
1819 
-				cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
1916 
+			elseif (!isset($temp)) {
1917 
+							cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
1918 
+			}
1820 1919 
 		}
1821 1920
1822 1921 
 		$settings = $themeData[0];
 
@@ -1833,17 +1932,20 @@  discard block
 
 block discarded – undo
1833 1932 
 		$settings['template_dirs'][] = $settings['theme_dir'];
1834 1933
1835 1934 
 		// Based on theme (if there is one).
1836 
-		if (!empty($settings['base_theme_dir']))
1837 
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
1935 
+		if (!empty($settings['base_theme_dir'])) {
1936 
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
1937 
+		}
1838 1938
1839 1939 
 		// Lastly the default theme.
1840 
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
1841 
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
1940 
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
1941 
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
1942 
+		}
1842 1943 
 	}
1843 1944
1844 1945
1845 
-	if (!$initialize)
1846 
-		return;
1946 
+	if (!$initialize) {
1947 
+			return;
1948 
+	}
1847 1949
1848 1950 
 	// Check to see if we're forcing SSL
1849 1951 
 	if (!empty($modSettings['force_ssl']) && empty($maintenance) &&
 
@@ -1864,8 +1966,9 @@  discard block
 
 block discarded – undo
1864 1966 
 		$detected_url = httpsOn() ? 'https://' : 'http://';
1865 1967 
 		$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
1866 1968 
 		$temp = preg_replace('~/' . basename($scripturl) . '(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
1867 
-		if ($temp != '/')
1868 
-			$detected_url .= $temp;
1969 
+		if ($temp != '/') {
1970 
+					$detected_url .= $temp;
1971 
+		}
1869 1972 
 	}
1870 1973 
 	if (isset($detected_url) && $detected_url != $boardurl)
1871 1974 
 	{
 
@@ -1877,8 +1980,9 @@  discard block
 
 block discarded – undo
1877 1980 
 			foreach ($aliases as $alias)
1878 1981 
 			{
1879 1982 
 				// Rip off all the boring parts, spaces, etc.
1880 
-				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias))
1881 
-					$do_fix = true;
1983 
+				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias)) {
1984 
+									$do_fix = true;
1985 
+				}
1882 1986 
 			}
1883 1987 
 		}
1884 1988 
 
@@ -1886,21 +1990,23 @@  discard block
 
 block discarded – undo
1886 1990 
 		if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == $boardurl && (empty($_GET) || count($_GET) == 1) && SMF != 'SSI')
1887 1991 
 		{
1888 1992 
 			// Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;).
1889 
-			if (empty($_GET))
1890 
-				redirectexit('wwwRedirect');
1891 
-			else
1993 
+			if (empty($_GET)) {
1994 
+							redirectexit('wwwRedirect');
1995 
+			} else
1892 1996 
 			{
1893 1997 
 				$k = key($_GET);
1894 1998 
 				$v = current($_GET);
1895 1999
1896 
-				if ($k != 'wwwRedirect')
1897 
-					redirectexit('wwwRedirect;' . $k . '=' . $v);
2000 
+				if ($k != 'wwwRedirect') {
2001 
+									redirectexit('wwwRedirect;' . $k . '=' . $v);
2002 
+				}
1898 2003 
 			}
1899 2004 
 		}
1900 2005
1901 2006 
 		// #3 is just a check for SSL...
1902 
-		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl)
1903 
-			$do_fix = true;
2007 
+		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl) {
2008 
+					$do_fix = true;
2009 
+		}
1904 2010
1905 2011 
 		// Okay, #4 - perhaps it's an IP address?  We're gonna want to use that one, then. (assuming it's the IP or something...)
1906 2012 
 		if (!empty($do_fix) || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) == 1)
 
@@ -1935,8 +2041,9 @@  discard block
 
 block discarded – undo
1935 2041 
 					$board_info['moderators'][$k]['link'] = strtr($dummy['link'], array('"' . $oldurl => '"' . $boardurl));
1936 2042 
 				}
1937 2043 
 			}
1938 
-			foreach ($context['linktree'] as $k => $dummy)
1939 
-				$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
2044 
+			foreach ($context['linktree'] as $k => $dummy) {
2045 
+							$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
2046 
+			}
1940 2047 
 		}
1941 2048 
 	}
1942 2049 
 	// Set up the contextual user array.
 
@@ -1955,16 +2062,16 @@  discard block
 
 block discarded – undo
1955 2062 
 			'email' => $user_info['email'],
1956 2063 
 			'ignoreusers' => $user_info['ignoreusers'],
1957 2064 
 		);
1958 
-		if (!$context['user']['is_guest'])
1959 
-			$context['user']['name'] = $user_info['name'];
1960 
-		elseif ($context['user']['is_guest'] && !empty($txt['guest_title']))
1961 
-			$context['user']['name'] = $txt['guest_title'];
2065 
+		if (!$context['user']['is_guest']) {
2066 
+					$context['user']['name'] = $user_info['name'];
2067 
+		} elseif ($context['user']['is_guest'] && !empty($txt['guest_title'])) {
2068 
+					$context['user']['name'] = $txt['guest_title'];
2069 
+		}
1962 2070
1963 2071 
 		// Determine the current smiley set.
1964 2072 
 		$user_info['smiley_set'] = (!in_array($user_info['smiley_set'], explode(',', $modSettings['smiley_sets_known'])) && $user_info['smiley_set'] != 'none') || empty($modSettings['smiley_sets_enable']) ? (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default']) : $user_info['smiley_set'];
1965 2073 
 		$context['user']['smiley_set'] = $user_info['smiley_set'];
1966 
-	}
1967 
-	else
2074 
+	} else
1968 2075 
 	{
1969 2076 
 		// What to do when there is no $user_info (e.g., an error very early in the login process)
1970 2077 
 		$context['user'] = array(
 
@@ -1998,18 +2105,24 @@  discard block
 
 block discarded – undo
1998 2105 
 	}
1999 2106
2000 2107 
 	// Some basic information...
2001 
-	if (!isset($context['html_headers']))
2002 
-		$context['html_headers'] = '';
2003 
-	if (!isset($context['javascript_files']))
2004 
-		$context['javascript_files'] = array();
2005 
-	if (!isset($context['css_files']))
2006 
-		$context['css_files'] = array();
2007 
-	if (!isset($context['css_header']))
2008 
-		$context['css_header'] = array();
2009 
-	if (!isset($context['javascript_inline']))
2010 
-		$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
2011 
-	if (!isset($context['javascript_vars']))
2012 
-		$context['javascript_vars'] = array();
2108 
+	if (!isset($context['html_headers'])) {
2109 
+			$context['html_headers'] = '';
2110 
+	}
2111 
+	if (!isset($context['javascript_files'])) {
2112 
+			$context['javascript_files'] = array();
2113 
+	}
2114 
+	if (!isset($context['css_files'])) {
2115 
+			$context['css_files'] = array();
2116 
+	}
2117 
+	if (!isset($context['css_header'])) {
2118 
+			$context['css_header'] = array();
2119 
+	}
2120 
+	if (!isset($context['javascript_inline'])) {
2121 
+			$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
2122 
+	}
2123 
+	if (!isset($context['javascript_vars'])) {
2124 
+			$context['javascript_vars'] = array();
2125 
+	}
2013 2126
2014 2127 
 	$context['login_url'] =  $scripturl . '?action=login2';
2015 2128 
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
 
@@ -2021,16 +2134,18 @@  discard block
 
 block discarded – undo
2021 2134 
 	$context['current_action'] = isset($_REQUEST['action']) ? $smcFunc['htmlspecialchars']($_REQUEST['action']) : null;
2022 2135 
 	$context['current_subaction'] = isset($_REQUEST['sa']) ? $_REQUEST['sa'] : null;
2023 2136 
 	$context['can_register'] = empty($modSettings['registration_method']) || $modSettings['registration_method'] != 3;
2024 
-	if (isset($modSettings['load_average']))
2025 
-		$context['load_average'] = $modSettings['load_average'];
2137 
+	if (isset($modSettings['load_average'])) {
2138 
+			$context['load_average'] = $modSettings['load_average'];
2139 
+	}
2026 2140
2027 2141 
 	// Detect the browser. This is separated out because it's also used in attachment downloads
2028 2142 
 	detectBrowser();
2029 2143
2030 2144 
 	// Set the top level linktree up.
2031 2145 
 	// Note that if we're dealing with certain very early errors (e.g., login) the linktree might not be set yet...
2032 
-	if (empty($context['linktree']))
2033 
-		$context['linktree'] = array();
2146 
+	if (empty($context['linktree'])) {
2147 
+			$context['linktree'] = array();
2148 
+	}
2034 2149 
 	array_unshift($context['linktree'], array(
2035 2150 
 		'url' => $scripturl,
2036 2151 
 		'name' => $context['forum_name_html_safe']
 
@@ -2039,8 +2154,9 @@  discard block
 
 block discarded – undo
2039 2154 
 	// This allows sticking some HTML on the page output - useful for controls.
2040 2155 
 	$context['insert_after_template'] = '';
2041 2156
2042 
-	if (!isset($txt))
2043 
-		$txt = array();
2157 
+	if (!isset($txt)) {
2158 
+			$txt = array();
2159 
+	}
2044 2160
2045 2161 
 	$simpleActions = array(
2046 2162 
 		'findmember',
 
@@ -2086,9 +2202,10 @@  discard block
 
 block discarded – undo
2086 2202
2087 2203 
 	// See if theres any extra param to check.
2088 2204 
 	$requiresXML = false;
2089 
-	foreach ($extraParams as $key => $extra)
2090 
-		if (isset($_REQUEST[$extra]))
2205 
+	foreach ($extraParams as $key => $extra) {
2206 
+			if (isset($_REQUEST[$extra]))
2091 2207 
 			$requiresXML = true;
2208 
+	}
2092 2209
2093 2210 
 	// Output is fully XML, so no need for the index template.
2094 2211 
 	if (isset($_REQUEST['xml']) && (in_array($context['current_action'], $xmlActions) || $requiresXML))
 
@@ -2103,37 +2220,39 @@  discard block
 
 block discarded – undo
2103 2220 
 	{
2104 2221 
 		loadLanguage('index+Modifications');
2105 2222 
 		$context['template_layers'] = array();
2106 
-	}
2107 
-
2108 
-	else
2223 
+	} else
2109 2224 
 	{
2110 2225 
 		// Custom templates to load, or just default?
2111 
-		if (isset($settings['theme_templates']))
2112 
-			$templates = explode(',', $settings['theme_templates']);
2113 
-		else
2114 
-			$templates = array('index');
2226 
+		if (isset($settings['theme_templates'])) {
2227 
+					$templates = explode(',', $settings['theme_templates']);
2228 
+		} else {
2229 
+					$templates = array('index');
2230 
+		}
2115 2231
2116 2232 
 		// Load each template...
2117 
-		foreach ($templates as $template)
2118 
-			loadTemplate($template);
2233 
+		foreach ($templates as $template) {
2234 
+					loadTemplate($template);
2235 
+		}
2119 2236
2120 2237 
 		// ...and attempt to load their associated language files.
2121 2238 
 		$required_files = implode('+', array_merge($templates, array('Modifications')));
2122 2239 
 		loadLanguage($required_files, '', false);
2123 2240
2124 2241 
 		// Custom template layers?
2125 
-		if (isset($settings['theme_layers']))
2126 
-			$context['template_layers'] = explode(',', $settings['theme_layers']);
2127 
-		else
2128 
-			$context['template_layers'] = array('html', 'body');
2242 
+		if (isset($settings['theme_layers'])) {
2243 
+					$context['template_layers'] = explode(',', $settings['theme_layers']);
2244 
+		} else {
2245 
+					$context['template_layers'] = array('html', 'body');
2246 
+		}
2129 2247 
 	}
2130 2248
2131 2249 
 	// Initialize the theme.
2132 2250 
 	loadSubTemplate('init', 'ignore');
2133 2251
2134 2252 
 	// Allow overriding the board wide time/number formats.
2135 
-	if (empty($user_settings['time_format']) && !empty($txt['time_format']))
2136 
-		$user_info['time_format'] = $txt['time_format'];
2253 
+	if (empty($user_settings['time_format']) && !empty($txt['time_format'])) {
2254 
+			$user_info['time_format'] = $txt['time_format'];
2255 
+	}
2137 2256
2138 2257 
 	// Set the character set from the template.
2139 2258 
 	$context['character_set'] = empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set'];
 
@@ -2141,12 +2260,14 @@  discard block
 
 block discarded – undo
2141 2260 
 	$context['right_to_left'] = !empty($txt['lang_rtl']);
2142 2261
2143 2262 
 	// Guests may still need a name.
2144 
-	if ($context['user']['is_guest'] && empty($context['user']['name']))
2145 
-		$context['user']['name'] = $txt['guest_title'];
2263 
+	if ($context['user']['is_guest'] && empty($context['user']['name'])) {
2264 
+			$context['user']['name'] = $txt['guest_title'];
2265 
+	}
2146 2266
2147 2267 
 	// Any theme-related strings that need to be loaded?
2148 
-	if (!empty($settings['require_theme_strings']))
2149 
-		loadLanguage('ThemeStrings', '', false);
2268 
+	if (!empty($settings['require_theme_strings'])) {
2269 
+			loadLanguage('ThemeStrings', '', false);
2270 
+	}
2150 2271
2151 2272 
 	// Make a special URL for the language.
2152 2273 
 	$settings['lang_images_url'] = $settings['images_url'] . '/' . (!empty($txt['image_lang']) ? $txt['image_lang'] : $user_info['language']);
 
@@ -2157,8 +2278,9 @@  discard block
 
 block discarded – undo
2157 2278 
 	// Here is my luvly Responsive CSS
2158 2279 
 	loadCSSFile('responsive.css', array('force_current' => false, 'validate' => true, 'minimize' => true, 'order_pos' => 9000), 'smf_responsive');
2159 2280
2160 
-	if ($context['right_to_left'])
2161 
-		loadCSSFile('rtl.css', array('order_pos' => 200), 'smf_rtl');
2281 
+	if ($context['right_to_left']) {
2282 
+			loadCSSFile('rtl.css', array('order_pos' => 200), 'smf_rtl');
2283 
+	}
2162 2284
2163 2285 
 	// We allow theme variants, because we're cool.
2164 2286 
 	$context['theme_variant'] = '';
 
@@ -2166,14 +2288,17 @@  discard block
 
 block discarded – undo
2166 2288 
 	if (!empty($settings['theme_variants']))
2167 2289 
 	{
2168 2290 
 		// Overriding - for previews and that ilk.
2169 
-		if (!empty($_REQUEST['variant']))
2170 
-			$_SESSION['id_variant'] = $_REQUEST['variant'];
2291 
+		if (!empty($_REQUEST['variant'])) {
2292 
+					$_SESSION['id_variant'] = $_REQUEST['variant'];
2293 
+		}
2171 2294 
 		// User selection?
2172 
-		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum'))
2173 
-			$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
2295 
+		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum')) {
2296 
+					$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
2297 
+		}
2174 2298 
 		// If not a user variant, select the default.
2175 
-		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants']))
2176 
-			$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
2299 
+		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants'])) {
2300 
+					$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
2301 
+		}
2177 2302
2178 2303 
 		// Do this to keep things easier in the templates.
2179 2304 
 		$context['theme_variant'] = '_' . $context['theme_variant'];
 
@@ -2182,20 +2307,23 @@  discard block
 
 block discarded – undo
2182 2307 
 		if (!empty($context['theme_variant']))
2183 2308 
 		{
2184 2309 
 			loadCSSFile('index' . $context['theme_variant'] . '.css', array('order_pos' => 300), 'smf_index' . $context['theme_variant']);
2185 
-			if ($context['right_to_left'])
2186 
-				loadCSSFile('rtl' . $context['theme_variant'] . '.css', array('order_pos' => 400), 'smf_rtl' . $context['theme_variant']);
2310 
+			if ($context['right_to_left']) {
2311 
+							loadCSSFile('rtl' . $context['theme_variant'] . '.css', array('order_pos' => 400), 'smf_rtl' . $context['theme_variant']);
2312 
+			}
2187 2313 
 		}
2188 2314 
 	}
2189 2315
2190 2316 
 	// Let's be compatible with old themes!
2191 
-	if (!function_exists('template_html_above') && in_array('html', $context['template_layers']))
2192 
-		$context['template_layers'] = array('main');
2317 
+	if (!function_exists('template_html_above') && in_array('html', $context['template_layers'])) {
2318 
+			$context['template_layers'] = array('main');
2319 
+	}
2193 2320
2194 2321 
 	$context['tabindex'] = 1;
2195 2322
2196 2323 
 	// Compatibility.
2197 
-	if (!isset($settings['theme_version']))
2198 
-		$modSettings['memberCount'] = $modSettings['totalMembers'];
2324 
+	if (!isset($settings['theme_version'])) {
2325 
+			$modSettings['memberCount'] = $modSettings['totalMembers'];
2326 
+	}
2199 2327
2200 2328 
 	// Default JS variables for use in every theme
2201 2329 
 	$context['javascript_vars'] = array(
 
@@ -2215,18 +2343,18 @@  discard block
 
 block discarded – undo
2215 2343 
 	);
2216 2344
2217 2345 
 	// Add the JQuery library to the list of files to load.
2218 
-	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn')
2219 
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
2220 
-
2221 
-	elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local')
2222 
-		loadJavaScriptFile('jquery-3.2.1.min.js', array('seed' => false), 'smf_jquery');
2223 
-
2224 
-	elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom')
2225 
-		loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
2346 
+	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn') {
2347 
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
2348 
+	} elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local') {
2349 
+			loadJavaScriptFile('jquery-3.2.1.min.js', array('seed' => false), 'smf_jquery');
2350 
+	} elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom') {
2351 
+			loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
2352 
+	}
2226 2353
2227 2354 
 	// Auto loading? template_javascript() will take care of the local half of this.
2228 
-	else
2229 
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
2355 
+	else {
2356 
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
2357 
+	}
2230 2358
2231 2359 
 	// Queue our JQuery plugins!
2232 2360 
 	loadJavaScriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
 
@@ -2249,12 +2377,12 @@  discard block
 
 block discarded – undo
2249 2377 
 			require_once($sourcedir . '/ScheduledTasks.php');
2250 2378
2251 2379 
 			// What to do, what to do?!
2252 
-			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time())
2253 
-				AutoTask();
2254 
-			else
2255 
-				ReduceMailQueue();
2256 
-		}
2257 
-		else
2380 
+			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time()) {
2381 
+							AutoTask();
2382 
+			} else {
2383 
+							ReduceMailQueue();
2384 
+			}
2385 
+		} else
2258 2386 
 		{
2259 2387 
 			$type = empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time() ? 'task' : 'mailq';
2260 2388 
 			$ts = $type == 'mailq' ? $modSettings['mail_next_send'] : $modSettings['next_task_time'];
 
@@ -2305,8 +2433,9 @@  discard block
 
 block discarded – undo
2305 2433 
 		foreach ($theme_includes as $include)
2306 2434 
 		{
2307 2435 
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
2308 
-			if (file_exists($include))
2309 
-				require_once($include);
2436 
+			if (file_exists($include)) {
2437 
+							require_once($include);
2438 
+			}
2310 2439 
 		}
2311 2440 
 	}
2312 2441 
 
@@ -2336,16 +2465,19 @@  discard block
 
 block discarded – undo
2336 2465 
 	// Do any style sheets first, cause we're easy with those.
2337 2466 
 	if (!empty($style_sheets))
2338 2467 
 	{
2339 
-		if (!is_array($style_sheets))
2340 
-			$style_sheets = array($style_sheets);
2468 
+		if (!is_array($style_sheets)) {
2469 
+					$style_sheets = array($style_sheets);
2470 
+		}
2341 2471
2342 
-		foreach ($style_sheets as $sheet)
2343 
-			loadCSSFile($sheet . '.css', array(), $sheet);
2472 
+		foreach ($style_sheets as $sheet) {
2473 
+					loadCSSFile($sheet . '.css', array(), $sheet);
2474 
+		}
2344 2475 
 	}
2345 2476
2346 2477 
 	// No template to load?
2347 
-	if ($template_name === false)
2348 
-		return true;
2478 
+	if ($template_name === false) {
2479 
+			return true;
2480 
+	}
2349 2481
2350 2482 
 	$loaded = false;
2351 2483 
 	foreach ($settings['template_dirs'] as $template_dir)
 
@@ -2360,12 +2492,14 @@  discard block
 
 block discarded – undo
2360 2492
2361 2493 
 	if ($loaded)
2362 2494 
 	{
2363 
-		if ($db_show_debug === true)
2364 
-			$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
2495 
+		if ($db_show_debug === true) {
2496 
+					$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
2497 
+		}
2365 2498
2366 2499 
 		// If they have specified an initialization function for this template, go ahead and call it now.
2367 
-		if (function_exists('template_' . $template_name . '_init'))
2368 
-			call_user_func('template_' . $template_name . '_init');
2500 
+		if (function_exists('template_' . $template_name . '_init')) {
2501 
+					call_user_func('template_' . $template_name . '_init');
2502 
+		}
2369 2503 
 	}
2370 2504 
 	// Hmmm... doesn't exist?!  I don't suppose the directory is wrong, is it?
2371 2505 
 	elseif (!file_exists($settings['default_theme_dir']) && file_exists($boarddir . '/Themes/default'))
 
@@ -2385,13 +2519,14 @@  discard block
 
 block discarded – undo
2385 2519 
 		loadTemplate($template_name);
2386 2520 
 	}
2387 2521 
 	// Cause an error otherwise.
2388 
-	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal)
2389 
-		fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
2390 
-	elseif ($fatal)
2391 
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
2392 
-	else
2393 
-		return false;
2394 
-}
2522 
+	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal) {
2523 
+			fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
2524 
+	} elseif ($fatal) {
2525 
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
2526 
+	} else {
2527 
+			return false;
2528 
+	}
2529 
+	}
2395 2530
2396 2531 
 /**
2397 2532 
  * Load a sub-template.
 
@@ -2409,17 +2544,19 @@  discard block
 
 block discarded – undo
2409 2544 
 {
2410 2545 
 	global $context, $txt, $db_show_debug;
2411 2546
2412 
-	if ($db_show_debug === true)
2413 
-		$context['debug']['sub_templates'][] = $sub_template_name;
2547 
+	if ($db_show_debug === true) {
2548 
+			$context['debug']['sub_templates'][] = $sub_template_name;
2549 
+	}
2414 2550
2415 2551 
 	// Figure out what the template function is named.
2416 2552 
 	$theme_function = 'template_' . $sub_template_name;
2417 
-	if (function_exists($theme_function))
2418 
-		$theme_function();
2419 
-	elseif ($fatal === false)
2420 
-		fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
2421 
-	elseif ($fatal !== 'ignore')
2422 
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
2553 
+	if (function_exists($theme_function)) {
2554 
+			$theme_function();
2555 
+	} elseif ($fatal === false) {
2556 
+			fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
2557 
+	} elseif ($fatal !== 'ignore') {
2558 
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
2559 
+	}
2423 2560
2424 2561 
 	// Are we showing debugging for templates?  Just make sure not to do it before the doctype...
2425 2562 
 	if (allowedTo('admin_forum') && isset($_REQUEST['debug']) && !in_array($sub_template_name, array('init', 'main_below')) && ob_get_length() > 0 && !isset($_REQUEST['xml']))
 
@@ -2449,8 +2586,9 @@  discard block
 
 block discarded – undo
2449 2586 
 {
2450 2587 
 	global $settings, $context, $modSettings;
2451 2588
2452 
-	if (empty($context['css_files_order']))
2453 
-		$context['css_files_order'] = array();
2589 
+	if (empty($context['css_files_order'])) {
2590 
+			$context['css_files_order'] = array();
2591 
+	}
2454 2592
2455 2593 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? (array_key_exists('browser_cache', $modSettings) ? $modSettings['browser_cache'] : '') : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
2456 2594 
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 
@@ -2461,8 +2599,9 @@  discard block
 
 block discarded – undo
2461 2599 
 	$params['order_pos'] = isset($params['order_pos']) ? (int) $params['order_pos'] : 3000;
2462 2600
2463 2601 
 	// If this is an external file, automatically set this to false.
2464 
-	if (!empty($params['external']))
2465 
-		$params['minimize'] = false;
2602 
+	if (!empty($params['external'])) {
2603 
+			$params['minimize'] = false;
2604 
+	}
2466 2605
2467 2606 
 	// Account for shorthand like admin.css?alp21 filenames
2468 2607 
 	$has_seed = strpos($fileName, '.css?');
 
@@ -2479,16 +2618,12 @@  discard block
 
 block discarded – undo
2479 2618 
 			{
2480 2619 
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
2481 2620 
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
2482 
-			}
2483 
-
2484 
-			else
2621 
+			} else
2485 2622 
 			{
2486 2623 
 				$fileUrl = false;
2487 2624 
 				$filePath = false;
2488 2625 
 			}
2489 
-		}
2490 
-
2491 
-		else
2626 
+		} else
2492 2627 
 		{
2493 2628 
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
2494 2629 
 			$filePath = $settings[$themeRef . '_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 
@@ -2506,16 +2641,18 @@  discard block
 
 block discarded – undo
2506 2641 
 	if (!empty($fileName))
2507 2642 
 	{
2508 2643 
 		// find a free number/position
2509 
-		while (isset($context['css_files_order'][$params['order_pos']]))
2510 
-			$params['order_pos']++;
2644 
+		while (isset($context['css_files_order'][$params['order_pos']])) {
2645 
+					$params['order_pos']++;
2646 
+		}
2511 2647 
 		$context['css_files_order'][$params['order_pos']] = $id;
2512 2648
2513 2649 
 		$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
2514 2650 
 	}
2515 2651
2516 
-	if (!empty($context['right_to_left']) && !empty($params['rtl']))
2517 
-		loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
2518 
-}
2652 
+	if (!empty($context['right_to_left']) && !empty($params['rtl'])) {
2653 
+			loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
2654 
+	}
2655 
+	}
2519 2656
2520 2657 
 /**
2521 2658 
  * Add a block of inline css code to be executed later
 
@@ -2532,8 +2669,9 @@  discard block
 
 block discarded – undo
2532 2669 
 	global $context;
2533 2670
2534 2671 
 	// Gotta add something...
2535 
-	if (empty($css))
2536 
-		return false;
2672 
+	if (empty($css)) {
2673 
+			return false;
2674 
+	}
2537 2675
2538 2676 
 	$context['css_header'][] = $css;
2539 2677 
 }
 
@@ -2569,8 +2707,9 @@  discard block
 
 block discarded – undo
2569 2707 
 	$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
2570 2708
2571 2709 
 	// If this is an external file, automatically set this to false.
2572 
-	if (!empty($params['external']))
2573 
-		$params['minimize'] = false;
2710 
+	if (!empty($params['external'])) {
2711 
+			$params['minimize'] = false;
2712 
+	}
2574 2713
2575 2714 
 	// Account for shorthand like admin.js?alp21 filenames
2576 2715 
 	$has_seed = strpos($fileName, '.js?');
 
@@ -2587,16 +2726,12 @@  discard block
 
 block discarded – undo
2587 2726 
 			{
2588 2727 
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
2589 2728 
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
2590 
-			}
2591 
-
2592 
-			else
2729 
+			} else
2593 2730 
 			{
2594 2731 
 				$fileUrl = false;
2595 2732 
 				$filePath = false;
2596 2733 
 			}
2597 
-		}
2598 
-
2599 
-		else
2734 
+		} else
2600 2735 
 		{
2601 2736 
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
2602 2737 
 			$filePath = $settings[$themeRef . '_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 
@@ -2611,9 +2746,10 @@  discard block
 
 block discarded – undo
2611 2746 
 	}
2612 2747
2613 2748 
 	// Add it to the array for use in the template
2614 
-	if (!empty($fileName))
2615 
-		$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
2616 
-}
2749 
+	if (!empty($fileName)) {
2750 
+			$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
2751 
+	}
2752 
+	}
2617 2753
2618 2754 
 /**
2619 2755 
  * Add a Javascript variable for output later (for feeding text strings and similar to JS)
 
@@ -2627,9 +2763,10 @@  discard block
 
 block discarded – undo
2627 2763 
 {
2628 2764 
 	global $context;
2629 2765
2630 
-	if (!empty($key) && (!empty($value) || $value === '0'))
2631 
-		$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
2632 
-}
2766 
+	if (!empty($key) && (!empty($value) || $value === '0')) {
2767 
+			$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
2768 
+	}
2769 
+	}
2633 2770
2634 2771 
 /**
2635 2772 
  * Add a block of inline Javascript code to be executed later
 
@@ -2646,8 +2783,9 @@  discard block
 
 block discarded – undo
2646 2783 
 {
2647 2784 
 	global $context;
2648 2785
2649 
-	if (empty($javascript))
2650 
-		return false;
2786 
+	if (empty($javascript)) {
2787 
+			return false;
2788 
+	}
2651 2789
2652 2790 
 	$context['javascript_inline'][($defer === true ? 'defer' : 'standard')][] = $javascript;
2653 2791 
 }
 
@@ -2668,15 +2806,18 @@  discard block
 
 block discarded – undo
2668 2806 
 	static $already_loaded = array();
2669 2807
2670 2808 
 	// Default to the user's language.
2671 
-	if ($lang == '')
2672 
-		$lang = isset($user_info['language']) ? $user_info['language'] : $language;
2809 
+	if ($lang == '') {
2810 
+			$lang = isset($user_info['language']) ? $user_info['language'] : $language;
2811 
+	}
2673 2812
2674 2813 
 	// Do we want the English version of language file as fallback?
2675 
-	if (empty($modSettings['disable_language_fallback']) && $lang != 'english')
2676 
-		loadLanguage($template_name, 'english', false);
2814 
+	if (empty($modSettings['disable_language_fallback']) && $lang != 'english') {
2815 
+			loadLanguage($template_name, 'english', false);
2816 
+	}
2677 2817
2678 
-	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang)
2679 
-		return $lang;
2818 
+	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang) {
2819 
+			return $lang;
2820 
+	}
2680 2821
2681 2822 
 	// Make sure we have $settings - if not we're in trouble and need to find it!
2682 2823 
 	if (empty($settings['default_theme_dir']))
 
@@ -2687,8 +2828,9 @@  discard block
 
 block discarded – undo
2687 2828
2688 2829 
 	// What theme are we in?
2689 2830 
 	$theme_name = basename($settings['theme_url']);
2690 
-	if (empty($theme_name))
2691 
-		$theme_name = 'unknown';
2831 
+	if (empty($theme_name)) {
2832 
+			$theme_name = 'unknown';
2833 
+	}
2692 2834
2693 2835 
 	// For each file open it up and write it out!
2694 2836 
 	foreach (explode('+', $template_name) as $template)
 
@@ -2730,8 +2872,9 @@  discard block
 
 block discarded – undo
2730 2872 
 				$found = true;
2731 2873
2732 2874 
 				// setlocale is required for basename() & pathinfo() to work properly on the selected language
2733 
-				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set']))
2734 
-					setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
2875 
+				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set'])) {
2876 
+									setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
2877 
+				}
2735 2878
2736 2879 
 				break;
2737 2880 
 			}
 
@@ -2771,8 +2914,9 @@  discard block
 
 block discarded – undo
2771 2914 
 	}
2772 2915
2773 2916 
 	// Keep track of what we're up to soldier.
2774 
-	if ($db_show_debug === true)
2775 
-		$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
2917 
+	if ($db_show_debug === true) {
2918 
+			$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
2919 
+	}
2776 2920
2777 2921 
 	// Remember what we have loaded, and in which language.
2778 2922 
 	$already_loaded[$template_name] = $lang;
 
@@ -2818,8 +2962,9 @@  discard block
 
 block discarded – undo
2818 2962 
 				)
2819 2963 
 			);
2820 2964 
 			// In the EXTREMELY unlikely event this happens, give an error message.
2821 
-			if ($smcFunc['db_num_rows']($result) == 0)
2822 
-				fatal_lang_error('parent_not_found', 'critical');
2965 
+			if ($smcFunc['db_num_rows']($result) == 0) {
2966 
+							fatal_lang_error('parent_not_found', 'critical');
2967 
+			}
2823 2968 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
2824 2969 
 			{
2825 2970 
 				if (!isset($boards[$row['id_board']]))
 
@@ -2836,8 +2981,8 @@  discard block
 
 block discarded – undo
2836 2981 
 					);
2837 2982 
 				}
2838 2983 
 				// If a moderator exists for this board, add that moderator for all children too.
2839 
-				if (!empty($row['id_moderator']))
2840 
-					foreach ($boards as $id => $dummy)
2984 
+				if (!empty($row['id_moderator'])) {
2985 
+									foreach ($boards as $id => $dummy)
2841 2986 
 					{
2842 2987 
 						$boards[$id]['moderators'][$row['id_moderator']] = array(
2843 2988 
 							'id' => $row['id_moderator'],
 
@@ -2845,11 +2990,12 @@  discard block
 
 block discarded – undo
2845 2990 
 							'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
2846 2991 
 							'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
2847 2992 
 						);
2993 
+				}
2848 2994 
 					}
2849 2995
2850 2996 
 				// If a moderator group exists for this board, add that moderator group for all children too
2851 
-				if (!empty($row['id_moderator_group']))
2852 
-					foreach ($boards as $id => $dummy)
2997 
+				if (!empty($row['id_moderator_group'])) {
2998 
+									foreach ($boards as $id => $dummy)
2853 2999 
 					{
2854 3000 
 						$boards[$id]['moderator_groups'][$row['id_moderator_group']] = array(
2855 3001 
 							'id' => $row['id_moderator_group'],
 
@@ -2857,6 +3003,7 @@  discard block
 
 block discarded – undo
2857 3003 
 							'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
2858 3004 
 							'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
2859 3005 
 						);
3006 
+				}
2860 3007 
 					}
2861 3008 
 			}
2862 3009 
 			$smcFunc['db_free_result']($result);
 
@@ -2883,23 +3030,27 @@  discard block
 
 block discarded – undo
2883 3030 
 	if (!$use_cache || ($context['languages'] = cache_get_data('known_languages', !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600)) == null)
2884 3031 
 	{
2885 3032 
 		// If we don't have our ucwords function defined yet, let's load the settings data.
2886 
-		if (empty($smcFunc['ucwords']))
2887 
-			reloadSettings();
3033 
+		if (empty($smcFunc['ucwords'])) {
3034 
+					reloadSettings();
3035 
+		}
2888 3036
2889 3037 
 		// If we don't have our theme information yet, let's get it.
2890 
-		if (empty($settings['default_theme_dir']))
2891 
-			loadTheme(0, false);
3038 
+		if (empty($settings['default_theme_dir'])) {
3039 
+					loadTheme(0, false);
3040 
+		}
2892 3041
2893 3042 
 		// Default language directories to try.
2894 3043 
 		$language_directories = array(
2895 3044 
 			$settings['default_theme_dir'] . '/languages',
2896 3045 
 		);
2897 
-		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir'])
2898 
-			$language_directories[] = $settings['actual_theme_dir'] . '/languages';
3046 
+		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir']) {
3047 
+					$language_directories[] = $settings['actual_theme_dir'] . '/languages';
3048 
+		}
2899 3049
2900 3050 
 		// We possibly have a base theme directory.
2901 
-		if (!empty($settings['base_theme_dir']))
2902 
-			$language_directories[] = $settings['base_theme_dir'] . '/languages';
3051 
+		if (!empty($settings['base_theme_dir'])) {
3052 
+					$language_directories[] = $settings['base_theme_dir'] . '/languages';
3053 
+		}
2903 3054
2904 3055 
 		// Remove any duplicates.
2905 3056 
 		$language_directories = array_unique($language_directories);
 
@@ -2913,20 +3064,21 @@  discard block
 
 block discarded – undo
2913 3064 
 		foreach ($language_directories as $language_dir)
2914 3065 
 		{
2915 3066 
 			// Can't look in here... doesn't exist!
2916 
-			if (!file_exists($language_dir))
2917 
-				continue;
3067 
+			if (!file_exists($language_dir)) {
3068 
+							continue;
3069 
+			}
2918 3070
2919 3071 
 			$dir = dir($language_dir);
2920 3072 
 			while ($entry = $dir->read())
2921 3073 
 			{
2922 3074 
 				// Look for the index language file... For good measure skip any "index.language-utf8.php" files
2923 
-				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches))
2924 
-					continue;
2925 
-
2926 
-				if (!empty($langList) && !empty($langList[$matches[1]]))
2927 
-					$langName = $langList[$matches[1]];
3075 
+				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches)) {
3076 
+									continue;
3077 
+				}
2928 3078
2929 
-				else
3079 
+				if (!empty($langList) && !empty($langList[$matches[1]])) {
3080 
+									$langName = $langList[$matches[1]];
3081 
+				} else
2930 3082 
 				{
2931 3083 
 					$langName = $smcFunc['ucwords'](strtr($matches[1], array('_' => ' ')));
2932 3084 
 
@@ -2967,12 +3119,14 @@  discard block
 
 block discarded – undo
2967 3119 
 		}
2968 3120
2969 3121 
 		// Do we need to store the lang list?
2970 
-		if (empty($langList))
2971 
-			updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
3122 
+		if (empty($langList)) {
3123 
+					updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
3124 
+		}
2972 3125
2973 3126 
 		// Let's cash in on this deal.
2974 
-		if (!empty($modSettings['cache_enable']))
2975 
-			cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
3127 
+		if (!empty($modSettings['cache_enable'])) {
3128 
+					cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
3129 
+		}
2976 3130 
 	}
2977 3131
2978 3132 
 	return $context['languages'];
 
@@ -2995,8 +3149,9 @@  discard block
 
 block discarded – undo
2995 3149 
 	global $modSettings, $options, $txt;
2996 3150 
 	static $censor_vulgar = null, $censor_proper;
2997 3151
2998 
-	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '')
2999 
-		return $text;
3152 
+	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '') {
3153 
+			return $text;
3154 
+	}
3000 3155
3001 3156 
 	// If they haven't yet been loaded, load them.
3002 3157 
 	if ($censor_vulgar == null)
 
@@ -3027,9 +3182,9 @@  discard block
 
 block discarded – undo
3027 3182 
 	{
3028 3183 
 		$func = !empty($modSettings['censorIgnoreCase']) ? 'str_ireplace' : 'str_replace';
3029 3184 
 		$text = $func($censor_vulgar, $censor_proper, $text);
3185 
+	} else {
3186 
+			$text = preg_replace($censor_vulgar, $censor_proper, $text);
3030 3187 
 	}
3031 
-	else
3032 
-		$text = preg_replace($censor_vulgar, $censor_proper, $text);
3033 3188
3034 3189 
 	return $text;
3035 3190 
 }
 
@@ -3055,30 +3210,35 @@  discard block
 
 block discarded – undo
3055 3210 
 	@ini_set('track_errors', '1');
3056 3211
3057 3212 
 	// Don't include the file more than once, if $once is true.
3058 
-	if ($once && in_array($filename, $templates))
3059 
-		return;
3213 
+	if ($once && in_array($filename, $templates)) {
3214 
+			return;
3215 
+	}
3060 3216 
 	// Add this file to the include list, whether $once is true or not.
3061 
-	else
3062 
-		$templates[] = $filename;
3217 
+	else {
3218 
+			$templates[] = $filename;
3219 
+	}
3063 3220
3064 3221
3065 3222 
 	$file_found = file_exists($filename);
3066 3223
3067 
-	if ($once && $file_found)
3068 
-		require_once($filename);
3069 
-	elseif ($file_found)
3070 
-		require($filename);
3224 
+	if ($once && $file_found) {
3225 
+			require_once($filename);
3226 
+	} elseif ($file_found) {
3227 
+			require($filename);
3228 
+	}
3071 3229
3072 3230 
 	if ($file_found !== true)
3073 3231 
 	{
3074 3232 
 		ob_end_clean();
3075 
-		if (!empty($modSettings['enableCompressedOutput']))
3076 
-			@ob_start('ob_gzhandler');
3077 
-		else
3078 
-			ob_start();
3233 
+		if (!empty($modSettings['enableCompressedOutput'])) {
3234 
+					@ob_start('ob_gzhandler');
3235 
+		} else {
3236 
+					ob_start();
3237 
+		}
3079 3238
3080 
-		if (isset($_GET['debug']))
3081 
-			header('content-type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
3239 
+		if (isset($_GET['debug'])) {
3240 
+					header('content-type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
3241 
+		}
3082 3242
3083 3243 
 		// Don't cache error pages!!
3084 3244 
 		header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
 
@@ -3097,12 +3257,13 @@  discard block
 
 block discarded – undo
3097 3257 
 		echo '<!DOCTYPE html>
3098 3258 
 <html', !empty($context['right_to_left']) ? ' dir="rtl"' : '', '>
3099 3259 
 	<head>';
3100 
-		if (isset($context['character_set']))
3101 
-			echo '
3260 
+		if (isset($context['character_set'])) {
3261 
+					echo '
3102 3262 
 		<meta charset="', $context['character_set'], '">';
3263 
+		}
3103 3264
3104 
-		if (!empty($maintenance) && !allowedTo('admin_forum'))
3105 
-			echo '
3265 
+		if (!empty($maintenance) && !allowedTo('admin_forum')) {
3266 
+					echo '
3106 3267 
 		<title>', $mtitle, '</title>
3107 3268 
 	</head>
3108 3269 
 	<body>
 
@@ -3110,8 +3271,8 @@  discard block
 
 block discarded – undo
3110 3271 
 		', $mmessage, '
3111 3272 
 	</body>
3112 3273 
 </html>';
3113 
-		elseif (!allowedTo('admin_forum'))
3114 
-			echo '
3274 
+		} elseif (!allowedTo('admin_forum')) {
3275 
+					echo '
3115 3276 
 		<title>', $txt['template_parse_error'], '</title>
3116 3277 
 	</head>
3117 3278 
 	<body>
 
@@ -3119,14 +3280,16 @@  discard block
 
 block discarded – undo
3119 3280 
 		', $txt['template_parse_error_message'], '
3120 3281 
 	</body>
3121 3282 
 </html>';
3122 
-		else
3283 
+		} else
3123 3284 
 		{
3124 3285 
 			$error = fetch_web_data($boardurl . strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
3125 3286 
 			$error_array = error_get_last();
3126 
-			if (empty($error) && ini_get('track_errors') && !empty($error_array))
3127 
-				$error = $error_array['message'];
3128 
-			if (empty($error))
3129 
-				$error = $txt['template_parse_errmsg'];
3287 
+			if (empty($error) && ini_get('track_errors') && !empty($error_array)) {
3288 
+							$error = $error_array['message'];
3289 
+			}
3290 
+			if (empty($error)) {
3291 
+							$error = $txt['template_parse_errmsg'];
3292 
+			}
3130 3293
3131 3294 
 			$error = strtr($error, array('<b>' => '<strong>', '</b>' => '</strong>'));
3132 3295 
 
@@ -3137,11 +3300,12 @@  discard block
 
 block discarded – undo
3137 3300 
 		<h3>', $txt['template_parse_error'], '</h3>
3138 3301 
 		', sprintf($txt['template_parse_error_details'], strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
3139 3302
3140 
-			if (!empty($error))
3141 
-				echo '
3303 
+			if (!empty($error)) {
3304 
+							echo '
3142 3305 
 		<hr>
3143 3306
3144 3307 
 		<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>' . $boarddir => '<strong>...', '<strong>' . strtr($boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
3308 
+			}
3145 3309
3146 3310 
 			// I know, I know... this is VERY COMPLICATED.  Still, it's good.
3147 3311 
 			if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0)
 
@@ -3151,10 +3315,11 @@  discard block
 
 block discarded – undo
3151 3315 
 				$data2 = preg_split('~\<br( /)?\>~', $data2);
3152 3316
3153 3317 
 				// Fix the PHP code stuff...
3154 
-				if (!isBrowser('gecko'))
3155 
-					$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
3156 
-				else
3157 
-					$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
3318 
+				if (!isBrowser('gecko')) {
3319 
+									$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
3320 
+				} else {
3321 
+									$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
3322 
+				}
3158 3323
3159 3324 
 				// Now we get to work around a bug in PHP where it doesn't escape <br>s!
3160 3325 
 				$j = -1;
 
@@ -3162,8 +3327,9 @@  discard block
 
 block discarded – undo
3162 3327 
 				{
3163 3328 
 					$j++;
3164 3329
3165 
-					if (substr_count($line, '<br>') == 0)
3166 
-						continue;
3330 
+					if (substr_count($line, '<br>') == 0) {
3331 
+											continue;
3332 
+					}
3167 3333
3168 3334 
 					$n = substr_count($line, '<br>');
3169 3335 
 					for ($i = 0; $i < $n; $i++)
 
@@ -3182,38 +3348,42 @@  discard block
 
 block discarded – undo
3182 3348 
 				// Figure out what the color coding was before...
3183 3349 
 				$line = max($match[1] - 9, 1);
3184 3350 
 				$last_line = '';
3185 
-				for ($line2 = $line - 1; $line2 > 1; $line2--)
3186 
-					if (strpos($data2[$line2], '<') !== false)
3351 
+				for ($line2 = $line - 1; $line2 > 1; $line2--) {
3352 
+									if (strpos($data2[$line2], '<') !== false)
3187 3353 
 					{
3188 3354 
 						if (preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line2], $color_match) != 0)
3189 3355 
 							$last_line = $color_match[1];
3356 
+				}
3190 3357 
 						break;
3191 3358 
 					}
3192 3359
3193 3360 
 				// Show the relevant lines...
3194 3361 
 				for ($n = min($match[1] + 4, count($data2) + 1); $line <= $n; $line++)
3195 3362 
 				{
3196 
-					if ($line == $match[1])
3197 
-						echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
3363 
+					if ($line == $match[1]) {
3364 
+											echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
3365 
+					}
3198 3366
3199 3367 
 					echo '<span style="color: black;">', sprintf('%' . strlen($n) . 's', $line), ':</span> ';
3200 
-					if (isset($data2[$line]) && $data2[$line] != '')
3201 
-						echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
3368 
+					if (isset($data2[$line]) && $data2[$line] != '') {
3369 
+											echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
3370 
+					}
3202 3371
3203 3372 
 					if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0)
3204 3373 
 					{
3205 3374 
 						$last_line = $color_match[1];
3206 3375 
 						echo '</', substr($last_line, 1, 4), '>';
3376 
+					} elseif ($last_line != '' && strpos($data2[$line], '<') !== false) {
3377 
+											$last_line = '';
3378 
+					} elseif ($last_line != '' && $data2[$line] != '') {
3379 
+											echo '</', substr($last_line, 1, 4), '>';
3207 3380 
 					}
3208 
-					elseif ($last_line != '' && strpos($data2[$line], '<') !== false)
3209 
-						$last_line = '';
3210 
-					elseif ($last_line != '' && $data2[$line] != '')
3211 
-						echo '</', substr($last_line, 1, 4), '>';
3212 3381
3213 
-					if ($line == $match[1])
3214 
-						echo '</pre></div><pre style="margin: 0;">';
3215 
-					else
3216 
-						echo "\n";
3382 
+					if ($line == $match[1]) {
3383 
+											echo '</pre></div><pre style="margin: 0;">';
3384 
+					} else {
3385 
+											echo "\n";
3386 
+					}
3217 3387 
 				}
3218 3388
3219 3389 
 				echo '</pre></div>';
 
@@ -3237,8 +3407,9 @@  discard block
 
 block discarded – undo
3237 3407 
 	global $db_type, $db_name, $ssi_db_user, $ssi_db_passwd, $sourcedir, $db_prefix, $db_port, $db_mb4;
3238 3408
3239 3409 
 	// Figure out what type of database we are using.
3240 
-	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
3241 
-		$db_type = 'mysql';
3410 
+	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php')) {
3411 
+			$db_type = 'mysql';
3412 
+	}
3242 3413
3243 3414 
 	// Load the file for the database.
3244 3415 
 	require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
 
@@ -3246,11 +3417,13 @@  discard block
 
 block discarded – undo
3246 3417 
 	$db_options = array();
3247 3418
3248 3419 
 	// Add in the port if needed
3249 
-	if (!empty($db_port))
3250 
-		$db_options['port'] = $db_port;
3420 
+	if (!empty($db_port)) {
3421 
+			$db_options['port'] = $db_port;
3422 
+	}
3251 3423
3252 
-	if (!empty($db_mb4))
3253 
-		$db_options['db_mb4'] = $db_mb4;
3424 
+	if (!empty($db_mb4)) {
3425 
+			$db_options['db_mb4'] = $db_mb4;
3426 
+	}
3254 3427
3255 3428 
 	// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
3256 3429 
 	if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
 
@@ -3269,13 +3442,15 @@  discard block
 
 block discarded – undo
3269 3442 
 	}
3270 3443
3271 3444 
 	// Safe guard here, if there isn't a valid connection lets put a stop to it.
3272 
-	if (!$db_connection)
3273 
-		display_db_error();
3445 
+	if (!$db_connection) {
3446 
+			display_db_error();
3447 
+	}
3274 3448
3275 3449 
 	// If in SSI mode fix up the prefix.
3276 
-	if (SMF == 'SSI')
3277 
-		db_fix_prefix($db_prefix, $db_name);
3278 
-}
3450 
+	if (SMF == 'SSI') {
3451 
+			db_fix_prefix($db_prefix, $db_name);
3452 
+	}
3453 
+	}
3279 3454
3280 3455 
 /**
3281 3456 
  * Try to load up a supported caching method. This is saved in $cacheAPI if we are not overriding it.
 
@@ -3289,10 +3464,11 @@  discard block
 
 block discarded – undo
3289 3464 
 	global $sourcedir, $cacheAPI, $cache_accelerator;
3290 3465
3291 3466 
 	// Not overriding this and we have a cacheAPI, send it back.
3292 
-	if (empty($overrideCache) && is_object($cacheAPI))
3293 
-		return $cacheAPI;
3294 
-	elseif (is_null($cacheAPI))
3295 
-		$cacheAPI = false;
3467 
+	if (empty($overrideCache) && is_object($cacheAPI)) {
3468 
+			return $cacheAPI;
3469 
+	} elseif (is_null($cacheAPI)) {
3470 
+			$cacheAPI = false;
3471 
+	}
3296 3472
3297 3473 
 	// Make sure our class is in session.
3298 3474 
 	require_once($sourcedir . '/Class-CacheAPI.php');
 
@@ -3313,8 +3489,9 @@  discard block
 
 block discarded – undo
3313 3489 
 		if (!$testAPI->isSupported())
3314 3490 
 		{
3315 3491 
 			// Can we save ourselves?
3316 
-			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf')
3317 
-				return loadCacheAccelerator(null, false);
3492 
+			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf') {
3493 
+							return loadCacheAccelerator(null, false);
3494 
+			}
3318 3495 
 			return false;
3319 3496 
 		}
3320 3497 
 
@@ -3326,9 +3503,9 @@  discard block
 
 block discarded – undo
3326 3503 
 		{
3327 3504 
 			$cacheAPI = $testAPI;
3328 3505 
 			return $cacheAPI;
3506 
+		} else {
3507 
+					return $testAPI;
3329 3508 
 		}
3330 
-		else
3331 
-			return $testAPI;
3332 3509 
 	}
3333 3510 
 }
3334 3511 
 
@@ -3348,8 +3525,9 @@  discard block
 
 block discarded – undo
3348 3525
3349 3526 
 	// @todo Why are we doing this if caching is disabled?
3350 3527
3351 
-	if (function_exists('call_integration_hook'))
3352 
-		call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
3528 
+	if (function_exists('call_integration_hook')) {
3529 
+			call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
3530 
+	}
3353 3531
3354 3532 
 	/* Refresh the cache if either:
3355 3533 
 		1. Caching is disabled.
 
@@ -3363,16 +3541,19 @@  discard block
 
 block discarded – undo
3363 3541 
 		require_once($sourcedir . '/' . $file);
3364 3542 
 		$cache_block = call_user_func_array($function, $params);
3365 3543
3366 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level)
3367 
-			cache_put_data($key, $cache_block, $cache_block['expires'] - time());
3544 
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level) {
3545 
+					cache_put_data($key, $cache_block, $cache_block['expires'] - time());
3546 
+		}
3368 3547 
 	}
3369 3548
3370 3549 
 	// Some cached data may need a freshening up after retrieval.
3371 
-	if (!empty($cache_block['post_retri_eval']))
3372 
-		eval($cache_block['post_retri_eval']);
3550 
+	if (!empty($cache_block['post_retri_eval'])) {
3551 
+			eval($cache_block['post_retri_eval']);
3552 
+	}
3373 3553
3374 
-	if (function_exists('call_integration_hook'))
3375 
-		call_integration_hook('post_cache_quick_get', array(&$cache_block));
3554 
+	if (function_exists('call_integration_hook')) {
3555 
+			call_integration_hook('post_cache_quick_get', array(&$cache_block));
3556 
+	}
3376 3557
3377 3558 
 	return $cache_block['data'];
3378 3559 
 }
 
@@ -3399,8 +3580,9 @@  discard block
 
 block discarded – undo
3399 3580 
 	global $smcFunc, $cache_enable, $cacheAPI;
3400 3581 
 	global $cache_hits, $cache_count, $db_show_debug;
3401 3582
3402 
-	if (empty($cache_enable) || empty($cacheAPI))
3403 
-		return;
3583 
+	if (empty($cache_enable) || empty($cacheAPI)) {
3584 
+			return;
3585 
+	}
3404 3586
3405 3587 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
3406 3588 
 	if (isset($db_show_debug) && $db_show_debug === true)
 
@@ -3413,12 +3595,14 @@  discard block
 
 block discarded – undo
3413 3595 
 	$value = $value === null ? null : (isset($smcFunc['json_encode']) ? $smcFunc['json_encode']($value) : json_encode($value));
3414 3596 
 	$cacheAPI->putData($key, $value, $ttl);
3415 3597
3416 
-	if (function_exists('call_integration_hook'))
3417 
-		call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
3598 
+	if (function_exists('call_integration_hook')) {
3599 
+			call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
3600 
+	}
3418 3601
3419 
-	if (isset($db_show_debug) && $db_show_debug === true)
3420 
-		$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
3421 
-}
3602 
+	if (isset($db_show_debug) && $db_show_debug === true) {
3603 
+			$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
3604 
+	}
3605 
+	}
3422 3606
3423 3607 
 /**
3424 3608 
  * Gets the value from the cache specified by key, so long as it is not older than ttl seconds.
 
@@ -3434,8 +3618,9 @@  discard block
 
 block discarded – undo
3434 3618 
 	global $smcFunc, $cache_enable, $cacheAPI;
3435 3619 
 	global $cache_hits, $cache_count, $cache_misses, $cache_count_misses, $db_show_debug;
3436 3620
3437 
-	if (empty($cache_enable) || empty($cacheAPI))
3438 
-		return;
3621 
+	if (empty($cache_enable) || empty($cacheAPI)) {
3622 
+			return;
3623 
+	}
3439 3624
3440 3625 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
3441 3626 
 	if (isset($db_show_debug) && $db_show_debug === true)
 
@@ -3455,16 +3640,18 @@  discard block
 
 block discarded – undo
3455 3640
3456 3641 
 		if (empty($value))
3457 3642 
 		{
3458 
-			if (!is_array($cache_misses))
3459 
-				$cache_misses = array();
3643 
+			if (!is_array($cache_misses)) {
3644 
+							$cache_misses = array();
3645 
+			}
3460 3646
3461 3647 
 			$cache_count_misses = isset($cache_count_misses) ? $cache_count_misses + 1 : 1;
3462 3648 
 			$cache_misses[$cache_count_misses] = array('k' => $original_key, 'd' => 'get');
3463 3649 
 		}
3464 3650 
 	}
3465 3651
3466 
-	if (function_exists('call_integration_hook') && isset($value))
3467 
-		call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
3652 
+	if (function_exists('call_integration_hook') && isset($value)) {
3653 
+			call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
3654 
+	}
3468 3655
3469 3656 
 	return empty($value) ? null : (isset($smcFunc['json_decode']) ? $smcFunc['json_decode']($value, true) : smf_json_decode($value, true));
3470 3657 
 }
 
@@ -3486,8 +3673,9 @@  discard block
 
 block discarded – undo
3486 3673 
 	global $cacheAPI;
3487 3674
3488 3675 
 	// If we can't get to the API, can't do this.
3489 
-	if (empty($cacheAPI))
3490 
-		return;
3676 
+	if (empty($cacheAPI)) {
3677 
+			return;
3678 
+	}
3491 3679
3492 3680 
 	// Ask the API to do the heavy lifting. cleanCache also calls invalidateCache to be sure.
3493 3681 
 	$cacheAPI->cleanCache($type);
 
@@ -3512,8 +3700,9 @@  discard block
 
 block discarded – undo
3512 3700 
 	global $modSettings, $smcFunc, $image_proxy_enabled, $user_info;
3513 3701
3514 3702 
 	// Come on!
3515 
-	if (empty($data))
3516 
-		return array();
3703 
+	if (empty($data)) {
3704 
+			return array();
3705 
+	}
3517 3706
3518 3707 
 	// Set a nice default var.
3519 3708 
 	$image = '';
 
@@ -3521,11 +3710,11 @@  discard block
 
 block discarded – undo
3521 3710 
 	// Gravatar has been set as mandatory!
3522 3711 
 	if (!empty($modSettings['gravatarOverride']))
3523 3712 
 	{
3524 
-		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://'))
3525 
-			$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
3526 
-
3527 
-		else if (!empty($data['email']))
3528 
-			$image = get_gravatar_url($data['email']);
3713 
+		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://')) {
3714 
+					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
3715 
+		} else if (!empty($data['email'])) {
3716 
+					$image = get_gravatar_url($data['email']);
3717 
+		}
3529 3718 
 	}
3530 3719
3531 3720 
 	// Look if the user has a gravatar field or has set an external url as avatar.
 
@@ -3537,54 +3726,60 @@  discard block
 
 block discarded – undo
3537 3726 
 			// Gravatar.
3538 3727 
 			if (stristr($data['avatar'], 'gravatar://'))
3539 3728 
 			{
3540 
-				if ($data['avatar'] == 'gravatar://')
3541 
-					$image = get_gravatar_url($data['email']);
3542 
-
3543 
-				elseif (!empty($modSettings['gravatarAllowExtraEmail']))
3544 
-					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
3729 
+				if ($data['avatar'] == 'gravatar://') {
3730 
+									$image = get_gravatar_url($data['email']);
3731 
+				} elseif (!empty($modSettings['gravatarAllowExtraEmail'])) {
3732 
+									$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
3733 
+				}
3545 3734 
 			}
3546 3735
3547 3736 
 			// External url.
3548 3737 
 			else
3549 3738 
 			{
3550 3739 
 				// Using ssl?
3551 
-				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
3552 
-					$image = get_proxied_url($data['avatar']);
3740 
+				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
3741 
+									$image = get_proxied_url($data['avatar']);
3742 
+				}
3553 3743
3554 3744 
 				// Just a plain external url.
3555 
-				else
3556 
-					$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
3745 
+				else {
3746 
+									$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
3747 
+				}
3557 3748 
 			}
3558 3749 
 		}
3559 3750
3560 3751 
 		// Perhaps this user has an attachment as avatar...
3561 
-		else if (!empty($data['filename']))
3562 
-			$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
3752 
+		else if (!empty($data['filename'])) {
3753 
+					$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
3754 
+		}
3563 3755
3564 3756 
 		// Right... no avatar... use our default image.
3565 
-		else
3566 
-			$image = $modSettings['avatar_url'] . '/default.png';
3757 
+		else {
3758 
+					$image = $modSettings['avatar_url'] . '/default.png';
3759 
+		}
3567 3760 
 	}
3568 3761
3569 3762 
 	call_integration_hook('integrate_set_avatar_data', array(&$image, &$data));
3570 3763
3571 3764 
 	// At this point in time $image has to be filled unless you chose to force gravatar and the user doesn't have the needed data to retrieve it... thus a check for !empty() is still needed.
3572 
-	if (!empty($image))
3573 
-		return array(
3765 
+	if (!empty($image)) {
3766 
+			return array(
3574 3767 
 			'name' => !empty($data['avatar']) ? $data['avatar'] : '',
3575 3768 
 			'image' => '<img class="avatar" src="' . $image . '" />',
3576 3769 
 			'href' => $image,
3577 3770 
 			'url' => $image,
3578 3771 
 		);
3772 
+	}
3579 3773
3580 3774 
 	// Fallback to make life easier for everyone...
3581 
-	else
3582 
-		return array(
3775 
+	else {
3776 
+			return array(
3583 3777 
 			'name' => '',
3584 3778 
 			'image' => '',
3585 3779 
 			'href' => '',
3586 3780 
 			'url' => '',
3587 3781 
 		);
3588 
-}
3782 
+	}
3783 
+	}
3589 3784
3590 3785 
 ?>
3591 3786 
\ No newline at end of file
Please login to merge, or discard this patch.
Sources/Subs-Db-postgresql.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -500,7 +500,7 @@  discard block
 
 block discarded – undo
500 500 
 /**
501 501 
  * Returns the amount of affected rows for a query.
502 502 
  *
503 
- * @param mixed $result
503 
+ * @param resource|null $result
504 504 
  *
505 505 
  * @return int
506 506 
  *
 
@@ -869,7 +869,7 @@  discard block
 
 block discarded – undo
869 869 
  *
870 870 
  * @param string $db_name The database name
871 871 
  * @param resource $db_connection The database connection
872 
- * @return true Always returns true
872 
+ * @return boolean Always returns true
873 873 
  */
874 874 
 function smf_db_select_db($db_name, $db_connection)
875 875 
 {
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -199,22 +199,22 @@  discard block
 
 block discarded – undo
199 199
200 200 
 		case 'date':
201 201 
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
202 
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
202 
+				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]) . '::date';
203 203 
 			else
204 204 
 				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
205 205 
 		break;
206 206
207 207 
 		case 'time':
208 208 
 			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
209 
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
209 
+				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]) . '::time';
210 210 
 			else
211 211 
 				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
212 212 
 		break;
213 213
214 214 
 		case 'datetime':
215 215 
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
216 
-				return 'to_timestamp('.
217 
-					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
216 
+				return 'to_timestamp(' .
217 
+					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
218 218 
 					',\'YYYY-MM-DD HH24:MI:SS\')';
219 219 
 			else
220 220 
 				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
@@ -424,7 +424,7 @@  discard block
 
 block discarded – undo
424 424 
 		$old_pos = 0;
425 425 
 		$pos = -1;
426 426 
 		// Remove the string escape for better runtime
427 
-		$db_string_1 = str_replace('\'\'','',$db_string);
427 
+		$db_string_1 = str_replace('\'\'', '', $db_string);
428 428 
 		while (true)
429 429 
 		{
430 430 
 			$pos = strpos($db_string_1, '\'', $pos + 1);
 
@@ -802,7 +802,7 @@  discard block
 
 block discarded – undo
802 802 
 	if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
803 803 
 	{
804 804 
 		// we only take the first key
805 
-		$returning = ' RETURNING '.$keys[0];
805 
+		$returning = ' RETURNING ' . $keys[0];
806 806 
 		$with_returning = true;
807 807 
 	}
808 808 
 
@@ -833,7 +833,7 @@  discard block
 
 block discarded – undo
833 833 
 			INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
834 834 
 			VALUES
835 835 
 				' . implode(',
836 
-				', $insertRows).$replace.$returning,
836 
+				', $insertRows) . $replace . $returning,
837 837 
 			array(
838 838 
 				'security_override' => true,
839 839 
 				'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
 
@@ -846,7 +846,7 @@  discard block
 
 block discarded – undo
846 846 
 			if ($returnmode === 2)
847 847 
 				$return_var = array();
848 848
849 
-			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
849 
+			while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
850 850 
 			{
851 851 
 				if (is_numeric($row[0])) // try to emulate mysql limitation
852 852 
 				{
 
@@ -1009,7 +1009,7 @@  discard block
 
 block discarded – undo
1009 1009 
  */
1010 1010 
 function smf_db_custom_order($field, $array_values, $desc = false)
1011 1011 
 {
1012 
-	$return = 'CASE '. $field . ' ';
1012 
+	$return = 'CASE ' . $field . ' ';
1013 1013 
 	$count = count($array_values);
1014 1014 
 	$then = ($desc ? ' THEN -' : ' THEN ');
1015 1015
Please login to merge, or discard this patch.
Braces   +238 added lines, -175 removed lines patch added patch discarded remove patch 
@@ -13,8 +13,9 @@  discard block
 
 block discarded – undo
13 13 
  * @version 2.1 Beta 4
14 14 
  */
15 15
16 
-if (!defined('SMF'))
16 
+if (!defined('SMF')) {
17 17 
 	die('No direct access...');
18 
+}
18 19
19 20 
 /**
20 21 
  * Maps the implementations in this file (smf_db_function_name)
 
@@ -34,8 +35,8 @@  discard block
 
 block discarded – undo
34 35 
 	global $smcFunc;
35 36
36 37 
 	// Map some database specific functions, only do this once.
37 
-	if (!isset($smcFunc['db_fetch_assoc']))
38 
-		$smcFunc += array(
38 
+	if (!isset($smcFunc['db_fetch_assoc'])) {
39 
+			$smcFunc += array(
39 40 
 			'db_query'					=> 'smf_db_query',
40 41 
 			'db_quote'					=> 'smf_db_quote',
41 42 
 			'db_insert'					=> 'smf_db_insert',
 
@@ -65,15 +66,18 @@  discard block
 
 block discarded – undo
65 66 
 			'db_custom_order'			=> 'smf_db_custom_order',
66 67 
 			'db_native_replace'			=> 'smf_db_native_replace',
67 68 
 		);
69 
+	}
68 70
69 71 
 	// We are not going to make it very far without these.
70 
-	if (!function_exists('pg_pconnect'))
71 
-		display_db_error();
72 
+	if (!function_exists('pg_pconnect')) {
73 
+			display_db_error();
74 
+	}
72 75
73 
-	if (!empty($db_options['persist']))
74 
-		$connection = @pg_pconnect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
75 
-	else
76 
-		$connection = @pg_connect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
76 
+	if (!empty($db_options['persist'])) {
77 
+			$connection = @pg_pconnect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
78 
+	} else {
79 
+			$connection = @pg_connect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
80 
+	}
77 81
78 82 
 	// Something's wrong, show an error if its fatal (which we assume it is)
79 83 
 	if (!$connection)
 
@@ -81,15 +85,15 @@  discard block
 
 block discarded – undo
81 85 
 		if (!empty($db_options['non_fatal']))
82 86 
 		{
83 87 
 			return null;
84 
-		}
85 
-		else
88 
+		} else
86 89 
 		{
87 90 
 			display_db_error();
88 91 
 		}
89 92 
 	}
90 93
91 
-	if (!empty($db_options['db_mb4']))
92 
-		$smcFunc['db_mb4'] = (bool) $db_options['db_mb4'];
94 
+	if (!empty($db_options['db_mb4'])) {
95 
+			$smcFunc['db_mb4'] = (bool) $db_options['db_mb4'];
96 
+	}
93 97
94 98 
 	return $connection;
95 99 
 }
 
@@ -136,31 +140,38 @@  discard block
 
 block discarded – undo
136 140
137 141 
 	list ($values, $connection) = $db_callback;
138 142
139 
-	if ($matches[1] === 'db_prefix')
140 
-		return $db_prefix;
143 
+	if ($matches[1] === 'db_prefix') {
144 
+			return $db_prefix;
145 
+	}
141 146
142 
-	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false)
143 
-		return $user_info[$matches[1]];
147 
+	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false) {
148 
+			return $user_info[$matches[1]];
149 
+	}
144 150
145 
-	if ($matches[1] === 'empty')
146 
-		return '\'\'';
151 
+	if ($matches[1] === 'empty') {
152 
+			return '\'\'';
153 
+	}
147 154
148 
-	if (!isset($matches[2]))
149 
-		smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
155 
+	if (!isset($matches[2])) {
156 
+			smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
157 
+	}
150 158
151 
-	if ($matches[1] === 'literal')
152 
-		return '\'' . pg_escape_string($matches[2]) . '\'';
159 
+	if ($matches[1] === 'literal') {
160 
+			return '\'' . pg_escape_string($matches[2]) . '\'';
161 
+	}
153 162
154 
-	if (!isset($values[$matches[2]]))
155 
-		smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
163 
+	if (!isset($values[$matches[2]])) {
164 
+			smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
165 
+	}
156 166
157 167 
 	$replacement = $values[$matches[2]];
158 168
159 169 
 	switch ($matches[1])
160 170 
 	{
161 171 
 		case 'int':
162 
-			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
163 
-				smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
172 
+			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
173 
+							smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
174 
+			}
164 175 
 			return (string) (int) $replacement;
165 176 
 		break;
166 177 
 
@@ -172,65 +183,73 @@  discard block
 
 block discarded – undo
172 183 
 		case 'array_int':
173 184 
 			if (is_array($replacement))
174 185 
 			{
175 
-				if (empty($replacement))
176 
-					smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
186 
+				if (empty($replacement)) {
187 
+									smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
188 
+				}
177 189
178 190 
 				foreach ($replacement as $key => $value)
179 191 
 				{
180 
-					if (!is_numeric($value) || (string) $value !== (string) (int) $value)
181 
-						smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
192 
+					if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
193 
+											smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
194 
+					}
182 195
183 196 
 					$replacement[$key] = (string) (int) $value;
184 197 
 				}
185 198
186 199 
 				return implode(', ', $replacement);
200 
+			} else {
201 
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
187 202 
 			}
188 
-			else
189 
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
190 203
191 204 
 		break;
192 205
193 206 
 		case 'array_string':
194 207 
 			if (is_array($replacement))
195 208 
 			{
196 
-				if (empty($replacement))
197 
-					smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
209 
+				if (empty($replacement)) {
210 
+									smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
211 
+				}
198 212
199 
-				foreach ($replacement as $key => $value)
200 
-					$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($value));
213 
+				foreach ($replacement as $key => $value) {
214 
+									$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($value));
215 
+				}
201 216
202 217 
 				return implode(', ', $replacement);
218 
+			} else {
219 
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
203 220 
 			}
204 
-			else
205 
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
206 221 
 		break;
207 222
208 223 
 		case 'date':
209 
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
210 
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
211 
-			else
212 
-				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
224 
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
225 
+							return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
226 
+			} else {
227 
+							smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
228 
+			}
213 229 
 		break;
214 230
215 231 
 		case 'time':
216 
-			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
217 
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
218 
-			else
219 
-				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
232 
+			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
233 
+							return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
234 
+			} else {
235 
+							smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
236 
+			}
220 237 
 		break;
221 238
222 239 
 		case 'datetime':
223 
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
224 
-				return 'to_timestamp('.
240 
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) {
241 
+							return 'to_timestamp('.
225 242 
 					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
226 243 
 					',\'YYYY-MM-DD HH24:MI:SS\')';
227 
-			else
228 
-				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
244 
+			} else {
245 
+							smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
246 
+			}
229 247 
 		break;
230 248
231 249 
 		case 'float':
232 
-			if (!is_numeric($replacement))
233 
-				smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
250 
+			if (!is_numeric($replacement)) {
251 
+							smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
252 
+			}
234 253 
 			return (string) (float) $replacement;
235 254 
 		break;
236 255 
 
@@ -243,31 +262,36 @@  discard block
 
 block discarded – undo
243 262 
 		break;
244 263
245 264 
 		case 'inet':
246 
-			if ($replacement == 'null' || $replacement == '')
247 
-				return 'null';
248 
-			if (inet_pton($replacement) === false)
249 
-				smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
265 
+			if ($replacement == 'null' || $replacement == '') {
266 
+							return 'null';
267 
+			}
268 
+			if (inet_pton($replacement) === false) {
269 
+							smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
270 
+			}
250 271 
 			return sprintf('\'%1$s\'::inet', pg_escape_string($replacement));
251 272
252 273 
 		case 'array_inet':
253 274 
 			if (is_array($replacement))
254 275 
 			{
255 
-				if (empty($replacement))
256 
-					smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
276 
+				if (empty($replacement)) {
277 
+									smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
278 
+				}
257 279
258 280 
 				foreach ($replacement as $key => $value)
259 281 
 				{
260 
-					if ($replacement == 'null' || $replacement == '')
261 
-						$replacement[$key] = 'null';
262 
-					if (!isValidIP($value))
263 
-						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
282 
+					if ($replacement == 'null' || $replacement == '') {
283 
+											$replacement[$key] = 'null';
284 
+					}
285 
+					if (!isValidIP($value)) {
286 
+											smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
287 
+					}
264 288 
 					$replacement[$key] = sprintf('\'%1$s\'::inet', pg_escape_string($value));
265 289 
 				}
266 290
267 291 
 				return implode(', ', $replacement);
292 
+			} else {
293 
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
268 294 
 			}
269 
-			else
270 
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
271 295 
 		break;
272 296
273 297 
 		default:
 
@@ -355,14 +379,16 @@  discard block
 
 block discarded – undo
355 379 
 		),
356 380 
 	);
357 381
358 
-	if (isset($replacements[$identifier]))
359 
-		$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
382 
+	if (isset($replacements[$identifier])) {
383 
+			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
384 
+	}
360 385
361 386 
 	// Limits need to be a little different.
362 387 
 	$db_string = preg_replace('~\sLIMIT\s(\d+|{int:.+}),\s*(\d+|{int:.+})\s*$~i', 'LIMIT $2 OFFSET $1', $db_string);
363 388
364 
-	if (trim($db_string) == '')
365 
-		return false;
389 
+	if (trim($db_string) == '') {
390 
+			return false;
391 
+	}
366 392
367 393 
 	// Comments that are allowed in a query are preg_removed.
368 394 
 	static $allowed_comments_from = array(
 
@@ -382,8 +408,9 @@  discard block
 
 block discarded – undo
382 408 
 	$db_count = !isset($db_count) ? 1 : $db_count + 1;
383 409 
 	$db_replace_result = 0;
384 410
385 
-	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
386 
-		smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
411 
+	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
412 
+			smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
413 
+	}
387 414
388 415 
 	if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
389 416 
 	{
 
@@ -408,17 +435,18 @@  discard block
 
 block discarded – undo
408 435 
 		while (true)
409 436 
 		{
410 437 
 			$pos = strpos($db_string_1, '\'', $pos + 1);
411 
-			if ($pos === false)
412 
-				break;
438 
+			if ($pos === false) {
439 
+							break;
440 
+			}
413 441 
 			$clean .= substr($db_string_1, $old_pos, $pos - $old_pos);
414 442
415 443 
 			while (true)
416 444 
 			{
417 445 
 				$pos1 = strpos($db_string_1, '\'', $pos + 1);
418 446 
 				$pos2 = strpos($db_string_1, '\\', $pos + 1);
419 
-				if ($pos1 === false)
420 
-					break;
421 
-				elseif ($pos2 === false || $pos2 > $pos1)
447 
+				if ($pos1 === false) {
448 
+									break;
449 
+				} elseif ($pos2 === false || $pos2 > $pos1)
422 450 
 				{
423 451 
 					$pos = $pos1;
424 452 
 					break;
 
@@ -434,16 +462,19 @@  discard block
 
 block discarded – undo
434 462 
 		$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
435 463
436 464 
 		// Comments?  We don't use comments in our queries, we leave 'em outside!
437 
-		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
438 
-			$fail = true;
465 
+		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
466 
+					$fail = true;
467 
+		}
439 468 
 		// Trying to change passwords, slow us down, or something?
440 
-		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
441 
-			$fail = true;
442 
-		elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
443 
-			$fail = true;
469 
+		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
470 
+					$fail = true;
471 
+		} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
472 
+					$fail = true;
473 
+		}
444 474
445 
-		if (!empty($fail) && function_exists('log_error'))
446 
-			smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
475 
+		if (!empty($fail) && function_exists('log_error')) {
476 
+					smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
477 
+		}
447 478 
 	}
448 479
449 480 
 	// Set optimize stuff
 
@@ -470,8 +501,9 @@  discard block
 
 block discarded – undo
470 501 
 		list ($file, $line) = smf_db_error_backtrace('', '', 'return', __FILE__, __LINE__);
471 502
472 503 
 		// Initialize $db_cache if not already initialized.
473 
-		if (!isset($db_cache))
474 
-			$db_cache = array();
504 
+		if (!isset($db_cache)) {
505 
+					$db_cache = array();
506 
+		}
475 507
476 508 
 		if (!empty($_SESSION['debug_redirect']))
477 509 
 		{
 
@@ -489,12 +521,14 @@  discard block
 
 block discarded – undo
489 521
490 522 
 	$db_last_result = @pg_query($connection, $db_string);
491 523
492 
-	if ($db_last_result === false && empty($db_values['db_error_skip']))
493 
-		$db_last_result = smf_db_error($db_string, $connection);
524 
+	if ($db_last_result === false && empty($db_values['db_error_skip'])) {
525 
+			$db_last_result = smf_db_error($db_string, $connection);
526 
+	}
494 527
495 528 
 	// Debugging.
496 
-	if (isset($db_show_debug) && $db_show_debug === true)
497 
-		$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
529 
+	if (isset($db_show_debug) && $db_show_debug === true) {
530 
+			$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
531 
+	}
498 532
499 533 
 	return $db_last_result;
500 534 
 }
 
@@ -511,10 +545,11 @@  discard block
 
 block discarded – undo
511 545 
 {
512 546 
 	global $db_last_result, $db_replace_result;
513 547
514 
-	if ($db_replace_result)
515 
-		return $db_replace_result;
516 
-	elseif ($result === null && !$db_last_result)
517 
-		return 0;
548 
+	if ($db_replace_result) {
549 
+			return $db_replace_result;
550 
+	} elseif ($result === null && !$db_last_result) {
551 
+			return 0;
552 
+	}
518 553
519 554 
 	return pg_affected_rows($result === null ? $db_last_result : $result);
520 555 
 }
 
@@ -538,8 +573,9 @@  discard block
 
 block discarded – undo
538 573 
 		array(
539 574 
 		)
540 575 
 	);
541 
-	if (!$request)
542 
-		return false;
576 
+	if (!$request) {
577 
+			return false;
578 
+	}
543 579 
 	list ($lastID) = $smcFunc['db_fetch_row']($request);
544 580 
 	$smcFunc['db_free_result']($request);
545 581 
 
@@ -560,12 +596,13 @@  discard block
 
 block discarded – undo
560 596 
 	// Decide which connection to use
561 597 
 	$connection = $connection === null ? $db_connection : $connection;
562 598
563 
-	if ($type == 'begin')
564 
-		return @pg_query($connection, 'BEGIN');
565 
-	elseif ($type == 'rollback')
566 
-		return @pg_query($connection, 'ROLLBACK');
567 
-	elseif ($type == 'commit')
568 
-		return @pg_query($connection, 'COMMIT');
599 
+	if ($type == 'begin') {
600 
+			return @pg_query($connection, 'BEGIN');
601 
+	} elseif ($type == 'rollback') {
602 
+			return @pg_query($connection, 'ROLLBACK');
603 
+	} elseif ($type == 'commit') {
604 
+			return @pg_query($connection, 'COMMIT');
605 
+	}
569 606
570 607 
 	return false;
571 608 
 }
 
@@ -593,19 +630,22 @@  discard block
 
 block discarded – undo
593 630 
 	$query_error = @pg_last_error($connection);
594 631
595 632 
 	// Log the error.
596 
-	if (function_exists('log_error'))
597 
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
633 
+	if (function_exists('log_error')) {
634 
+			log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
635 
+	}
598 636
599 637 
 	// Nothing's defined yet... just die with it.
600 
-	if (empty($context) || empty($txt))
601 
-		die($query_error);
638 
+	if (empty($context) || empty($txt)) {
639 
+			die($query_error);
640 
+	}
602 641
603 642 
 	// Show an error message, if possible.
604 643 
 	$context['error_title'] = $txt['database_error'];
605 
-	if (allowedTo('admin_forum'))
606 
-		$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
607 
-	else
608 
-		$context['error_message'] = $txt['try_again'];
644 
+	if (allowedTo('admin_forum')) {
645 
+			$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
646 
+	} else {
647 
+			$context['error_message'] = $txt['try_again'];
648 
+	}
609 649
610 650 
 	if (allowedTo('admin_forum') && isset($db_show_debug) && $db_show_debug === true)
611 651 
 	{
 
@@ -627,12 +667,14 @@  discard block
 
 block discarded – undo
627 667 
 {
628 668 
 	global $db_row_count;
629 669
630 
-	if ($counter !== false)
631 
-		return pg_fetch_row($request, $counter);
670 
+	if ($counter !== false) {
671 
+			return pg_fetch_row($request, $counter);
672 
+	}
632 673
633 674 
 	// Reset the row counter...
634 
-	if (!isset($db_row_count[(int) $request]))
635 
-		$db_row_count[(int) $request] = 0;
675 
+	if (!isset($db_row_count[(int) $request])) {
676 
+			$db_row_count[(int) $request] = 0;
677 
+	}
636 678
637 679 
 	// Return the right row.
638 680 
 	return @pg_fetch_row($request, $db_row_count[(int) $request]++);
 
@@ -649,12 +691,14 @@  discard block
 
 block discarded – undo
649 691 
 {
650 692 
 	global $db_row_count;
651 693
652 
-	if ($counter !== false)
653 
-		return pg_fetch_assoc($request, $counter);
694 
+	if ($counter !== false) {
695 
+			return pg_fetch_assoc($request, $counter);
696 
+	}
654 697
655 698 
 	// Reset the row counter...
656 
-	if (!isset($db_row_count[(int) $request]))
657 
-		$db_row_count[(int) $request] = 0;
699 
+	if (!isset($db_row_count[(int) $request])) {
700 
+			$db_row_count[(int) $request] = 0;
701 
+	}
658 702
659 703 
 	// Return the right row.
660 704 
 	return @pg_fetch_assoc($request, $db_row_count[(int) $request]++);
 
@@ -707,11 +751,13 @@  discard block
 
 block discarded – undo
707 751
708 752 
 	$replace = '';
709 753
710 
-	if (empty($data))
711 
-		return;
754 
+	if (empty($data)) {
755 
+			return;
756 
+	}
712 757
713 
-	if (!is_array($data[array_rand($data)]))
714 
-		$data = array($data);
758 
+	if (!is_array($data[array_rand($data)])) {
759 
+			$data = array($data);
760 
+	}
715 761
716 762 
 	// Replace the prefix holder with the actual prefix.
717 763 
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
@@ -737,32 +783,35 @@  discard block
 
 block discarded – undo
737 783 
 					$key_str .= ($count_pk > 0 ? ',' : '');
738 784 
 					$key_str .= $columnName;
739 785 
 					$count_pk++;
740 
-				}
741 
-				else if ($method == 'replace') //normal field
786 
+				} else if ($method == 'replace') {
787 
+					//normal field
742 788 
 				{
743 789 
 					$col_str .= ($count > 0 ? ',' : '');
790 
+				}
744 791 
 					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
745 792 
 					$count++;
746 793 
 				}
747 794 
 			}
748 
-			if ($method == 'replace')
749 
-				$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
750 
-			else
751 
-				$replace = ' ON CONFLICT (' . $key_str . ') DO NOTHING';
752 
-		}
753 
-		else if ($method == 'replace')
795 
+			if ($method == 'replace') {
796 
+							$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
797 
+			} else {
798 
+							$replace = ' ON CONFLICT (' . $key_str . ') DO NOTHING';
799 
+			}
800 
+		} else if ($method == 'replace')
754 801 
 		{
755 802 
 			foreach ($columns as $columnName => $type)
756 803 
 			{
757 804 
 				// Are we restricting the length?
758 
-				if (strpos($type, 'string-') !== false)
759 
-					$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
760 
-				else
761 
-					$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
805 
+				if (strpos($type, 'string-') !== false) {
806 
+									$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
807 
+				} else {
808 
+									$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
809 
+				}
762 810
763 811 
 				// A key? That's what we were looking for.
764 
-				if (in_array($columnName, $keys))
765 
-					$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
812 
+				if (in_array($columnName, $keys)) {
813 
+									$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
814 
+				}
766 815 
 				$count++;
767 816 
 			}
768 817 
 
@@ -798,10 +847,11 @@  discard block
 
 block discarded – undo
798 847 
 		foreach ($columns as $columnName => $type)
799 848 
 		{
800 849 
 			// Are we restricting the length?
801 
-			if (strpos($type, 'string-') !== false)
802 
-				$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
803 
-			else
804 
-				$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
850 
+			if (strpos($type, 'string-') !== false) {
851 
+							$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
852 
+			} else {
853 
+							$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
854 
+			}
805 855 
 		}
806 856 
 		$insertData = substr($insertData, 0, -2) . ')';
807 857 
 
@@ -810,8 +860,9 @@  discard block
 
 block discarded – undo
810 860
811 861 
 		// Here's where the variables are injected to the query.
812 862 
 		$insertRows = array();
813 
-		foreach ($data as $dataRow)
814 
-			$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
863 
+		foreach ($data as $dataRow) {
864 
+					$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
865 
+		}
815 866
816 867 
 		// Do the insert.
817 868 
 		$request = $smcFunc['db_query']('', '
 
@@ -828,19 +879,21 @@  discard block
 
 block discarded – undo
828 879
829 880 
 		if ($with_returning && $request !== false)
830 881 
 		{
831 
-			if ($returnmode === 2)
832 
-				$return_var = array();
882 
+			if ($returnmode === 2) {
883 
+							$return_var = array();
884 
+			}
833 885
834 886 
 			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
835 887 
 			{
836 
-				if (is_numeric($row[0])) // try to emulate mysql limitation
888 
+				if (is_numeric($row[0])) {
889 
+					// try to emulate mysql limitation
837 890 
 				{
838 891 
 					if ($returnmode === 1)
839 892 
 						$return_var = $row[0];
840 
-					elseif ($returnmode === 2)
841 
-						$return_var[] = $row[0];
842 
-				}
843 
-				else
893 
+				} elseif ($returnmode === 2) {
894 
+											$return_var[] = $row[0];
895 
+					}
896 
+				} else
844 897 
 				{
845 898 
 					$with_returning = false;
846 899 
 					trigger_error('trying to returning ID Field which is not a Int field', E_USER_ERROR);
 
@@ -849,9 +902,10 @@  discard block
 
 block discarded – undo
849 902 
 		}
850 903 
 	}
851 904
852 
-	if ($with_returning && !empty($return_var))
853 
-		return $return_var;
854 
-}
905 
+	if ($with_returning && !empty($return_var)) {
906 
+			return $return_var;
907 
+	}
908 
+	}
855 909
856 910 
 /**
857 911 
  * Dummy function really. Doesn't do anything on PostgreSQL.
 
@@ -888,8 +942,9 @@  discard block
 
 block discarded – undo
888 942 
  */
889 943 
 function smf_db_error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
890 944 
 {
891 
-	if (empty($log_message))
892 
-		$log_message = $error_message;
945 
+	if (empty($log_message)) {
946 
+			$log_message = $error_message;
947 
+	}
893 948
894 949 
 	foreach (debug_backtrace() as $step)
895 950 
 	{
 
@@ -908,12 +963,14 @@  discard block
 
 block discarded – undo
908 963 
 	}
909 964
910 965 
 	// A special case - we want the file and line numbers for debugging.
911 
-	if ($error_type == 'return')
912 
-		return array($file, $line);
966 
+	if ($error_type == 'return') {
967 
+			return array($file, $line);
968 
+	}
913 969
914 970 
 	// Is always a critical error.
915 
-	if (function_exists('log_error'))
916 
-		log_error($log_message, 'critical', $file, $line);
971 
+	if (function_exists('log_error')) {
972 
+			log_error($log_message, 'critical', $file, $line);
973 
+	}
917 974
918 975 
 	if (function_exists('fatal_error'))
919 976 
 	{
 
@@ -921,12 +978,12 @@  discard block
 
 block discarded – undo
921 978
922 979 
 		// Cannot continue...
923 980 
 		exit;
981 
+	} elseif ($error_type) {
982 
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
983 
+	} else {
984 
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
985 
+	}
924 986 
 	}
925 
-	elseif ($error_type)
926 
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
927 
-	else
928 
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
929 
-}
930 987
931 988 
 /**
932 989 
  * Escape the LIKE wildcards so that they match the character and not the wildcard.
 
@@ -943,10 +1000,11 @@  discard block
 
 block discarded – undo
943 1000 
 		'\\' => '\\\\',
944 1001 
 	);
945 1002
946 
-	if ($translate_human_wildcards)
947 
-		$replacements += array(
1003 
+	if ($translate_human_wildcards) {
1004 
+			$replacements += array(
948 1005 
 			'*' => '%',
949 1006 
 		);
1007 
+	}
950 1008
951 1009 
 	return strtr($string, $replacements);
952 1010 
 }
 
@@ -975,14 +1033,16 @@  discard block
 
 block discarded – undo
975 1033 
 	static $pg_error_data_prep;
976 1034
977 1035 
 	// without database we can't do anything
978 
-	if (empty($db_connection))
979 
-		return;
1036 
+	if (empty($db_connection)) {
1037 
+			return;
1038 
+	}
980 1039
981 
-	if (empty($pg_error_data_prep))
982 
-			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
1040 
+	if (empty($pg_error_data_prep)) {
1041 
+				$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
983 1042 
 				'INSERT INTO ' . $db_prefix . 'log_errors(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)
984 1043 
 													VALUES(		$1,		$2,		$3, $4, 	$5,		$6,			$7,		$8,	$9, $10)'
985 1044 
 			);
1045 
+	}
986 1046
987 1047 
 	pg_execute($db_connection, 'smf_log_errors', $error_array);
988 1048 
 }
 
@@ -1002,8 +1062,9 @@  discard block
 
 block discarded – undo
1002 1062 
 	$count = count($array_values);
1003 1063 
 	$then = ($desc ? ' THEN -' : ' THEN ');
1004 1064
1005 
-	for ($i = 0; $i < $count; $i++)
1006 
-		$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
1065 
+	for ($i = 0; $i < $count; $i++) {
1066 
+			$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
1067 
+	}
1007 1068
1008 1069 
 	$return .= 'END';
1009 1070 
 	return $return;
 
@@ -1026,11 +1087,13 @@  discard block
 
 block discarded – undo
1026 1087 
 		//pg 9.5 got replace support
1027 1088 
 		$pg_version = $smcFunc['db_get_version']();
1028 1089 
 		// if we got a Beta Version
1029 
-		if (stripos($pg_version, 'beta') !== false)
1030 
-			$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
1090 
+		if (stripos($pg_version, 'beta') !== false) {
1091 
+					$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
1092 
+		}
1031 1093 
 		// or RC
1032 
-		if (stripos($pg_version, 'rc') !== false)
1033 
-			$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
1094 
+		if (stripos($pg_version, 'rc') !== false) {
1095 
+					$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
1096 
+		}
1034 1097
1035 1098 
 		$replace_support = (version_compare($pg_version, '9.5.0', '>=') ? true : false);
1036 1099 
 	}
Please login to merge, or discard this patch.
Sources/ManageSettings.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -1334,7 +1334,7 @@  discard block
 
 block discarded – undo
1334 1334 
 					'class' => 'centercol',
1335 1335 
 				),
1336 1336 
 				'data' => array(
1337 
-					'function' => function ($rowData)
1337 
+					'function' => function($rowData)
1338 1338 
 					{
1339 1339 
 						$isChecked = $rowData['disabled'] ? '' : ' checked';
1340 1340 
 						$onClickHandler = $rowData['can_show_register'] ? sprintf(' onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
 
@@ -1350,7 +1350,7 @@  discard block
 
 block discarded – undo
1350 1350 
 					'class' => 'centercol',
1351 1351 
 				),
1352 1352 
 				'data' => array(
1353 
-					'function' => function ($rowData)
1353 
+					'function' => function($rowData)
1354 1354 
 					{
1355 1355 
 						$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked' : '';
1356 1356 
 						$isDisabled = $rowData['can_show_register'] ? '' : ' disabled';
 
@@ -1397,15 +1397,15 @@  discard block
 
 block discarded – undo
1397 1397 
 					'value' => $txt['custom_profile_fieldorder'],
1398 1398 
 				),
1399 1399 
 				'data' => array(
1400 
-					'function' => function ($rowData) use ($context, $txt, $scripturl)
1400 
+					'function' => function($rowData) use ($context, $txt, $scripturl)
1401 1401 
 					{
1402 
-						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
1402 
+						$return = '<p class="centertext bold_text">' . $rowData['field_order'] . '<br>';
1403 1403
1404 1404 
 						if ($rowData['field_order'] > 1)
1405 
-							$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>';
1405 
+							$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>';
1406 1406
1407 1407 
 						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
1408 
-							$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>';
1408 
+							$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>';
1409 1409
1410 1410 
 						$return .= '</p>';
1411 1411 
 
@@ -1423,7 +1423,7 @@  discard block
 
 block discarded – undo
1423 1423 
 					'value' => $txt['custom_profile_fieldname'],
1424 1424 
 				),
1425 1425 
 				'data' => array(
1426 
-					'function' => function ($rowData) use ($scripturl)
1426 
+					'function' => function($rowData) use ($scripturl)
1427 1427 
 					{
1428 1428 
 						return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>', $scripturl, $rowData['id_field'], $rowData['field_name'], $rowData['field_desc']);
1429 1429 
 					},
 
@@ -1439,7 +1439,7 @@  discard block
 
 block discarded – undo
1439 1439 
 					'value' => $txt['custom_profile_fieldtype'],
1440 1440 
 				),
1441 1441 
 				'data' => array(
1442 
-					'function' => function ($rowData) use ($txt)
1442 
+					'function' => function($rowData) use ($txt)
1443 1443 
 					{
1444 1444 
 						$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
1445 1445 
 						return isset($txt[$textKey]) ? $txt[$textKey] : $textKey;
 
@@ -1457,7 +1457,7 @@  discard block
 
 block discarded – undo
1457 1457 
 					'value' => $txt['custom_profile_active'],
1458 1458 
 				),
1459 1459 
 				'data' => array(
1460 
-					'function' => function ($rowData) use ($txt)
1460 
+					'function' => function($rowData) use ($txt)
1461 1461 
 					{
1462 1462 
 						return $rowData['active'] ? $txt['yes'] : $txt['no'];
1463 1463 
 					},
 
@@ -1474,7 +1474,7 @@  discard block
 
 block discarded – undo
1474 1474 
 					'value' => $txt['custom_profile_placement'],
1475 1475 
 				),
1476 1476 
 				'data' => array(
1477 
-					'function' => function ($rowData)
1477 
+					'function' => function($rowData)
1478 1478 
 					{
1479 1479 
 						global $txt, $context;
1480 1480 
 
@@ -1709,7 +1709,7 @@  discard block
 
 block discarded – undo
1709 1709 
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
1710 1710
1711 1711 
 		// All good, proceed.
1712 
-		$smcFunc['db_query']('','
1712 
+		$smcFunc['db_query']('', '
1713 1713 
 			UPDATE {db_prefix}custom_fields
1714 1714 
 			SET field_order = {int:old_order}
1715 1715 
 			WHERE field_order = {int:new_order}',
 
@@ -1718,7 +1718,7 @@  discard block
 
 block discarded – undo
1718 1718 
 				'old_order' => $context['field']['order'],
1719 1719 
 			)
1720 1720 
 		);
1721 
-		$smcFunc['db_query']('','
1721 
+		$smcFunc['db_query']('', '
1722 1722 
 			UPDATE {db_prefix}custom_fields
1723 1723 
 			SET field_order = {int:new_order}
1724 1724 
 			WHERE id_field = {int:id_field}',
 
@@ -1820,7 +1820,7 @@  discard block
 
 block discarded – undo
1820 1820 
 			$smcFunc['db_free_result']($request);
1821 1821
1822 1822 
 			$unique = false;
1823 
-			for ($i = 0; !$unique && $i < 9; $i ++)
1823 
+			for ($i = 0; !$unique && $i < 9; $i++)
1824 1824 
 			{
1825 1825 
 				if (!in_array($col_name, $current_fields))
1826 1826 
 					$unique = true;
 
@@ -1993,7 +1993,7 @@  discard block
 
 block discarded – undo
1993 1993 
 		);
1994 1994
1995 1995 
 		// Re-arrange the order.
1996 
-		$smcFunc['db_query']('','
1996 
+		$smcFunc['db_query']('', '
1997 1997 
 			UPDATE {db_prefix}custom_fields
1998 1998 
 			SET field_order = field_order - 1
1999 1999 
 			WHERE field_order > {int:current_order}',
 
@@ -2257,7 +2257,7 @@  discard block
 
 block discarded – undo
2257 2257 
 	$context['token_check'] = 'noti-admin';
2258 2258
2259 2259 
 	// Specify our action since we'll want to post back here instead of the profile
2260 
-	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;'. $context['session_var'] .'='. $context['session_id'];
2260 
+	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;' . $context['session_var'] . '=' . $context['session_id'];
2261 2261
2262 2262 
 	loadTemplate('Profile');
2263 2263 
 	loadLanguage('Profile');
Please login to merge, or discard this patch.
Braces   +276 added lines, -201 removed lines patch added patch discarded remove patch 
@@ -14,8 +14,9 @@  discard block
 
 block discarded – undo
14 14 
  * @version 2.1 Beta 4
15 15 
  */
16 16
17 
-if (!defined('SMF'))
17 
+if (!defined('SMF')) {
18 18 
 	die('No direct access...');
19 
+}
19 20
20 21 
 /**
21 22 
  * This function makes sure the requested subaction does exists, if it doesn't, it sets a default action or.
 
@@ -206,16 +207,18 @@  discard block
 
 block discarded – undo
206 207 
 	{
207 208 
 		$all_zones = timezone_identifiers_list();
208 209 
 		// Make sure we set the value to the same as the printed value.
209 
-		foreach ($all_zones as $zone)
210 
-			$config_vars['default_timezone'][2][$zone] = $zone;
210 
+		foreach ($all_zones as $zone) {
211 
+					$config_vars['default_timezone'][2][$zone] = $zone;
212 
+		}
213 
+	} else {
214 
+			unset($config_vars['default_timezone']);
211 215 
 	}
212 
-	else
213 
-		unset($config_vars['default_timezone']);
214 216
215 217 
 	call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
216 218
217 
-	if ($return_config)
218 
-		return $config_vars;
219 
+	if ($return_config) {
220 
+			return $config_vars;
221 
+	}
219 222
220 223 
 	// Saving?
221 224 
 	if (isset($_GET['save']))
 
@@ -223,8 +226,9 @@  discard block
 
 block discarded – undo
223 226 
 		checkSession();
224 227
225 228 
 		// Prevent absurd boundaries here - make it a day tops.
226 
-		if (isset($_POST['lastActive']))
227 
-			$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
229 
+		if (isset($_POST['lastActive'])) {
230 
+					$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
231 
+		}
228 232
229 233 
 		call_integration_hook('integrate_save_basic_settings');
230 234 
 
@@ -232,8 +236,9 @@  discard block
 
 block discarded – undo
232 236 
 		$_SESSION['adm-save'] = true;
233 237
234 238 
 		// Do a bit of housekeeping
235 
-		if (empty($_POST['minimize_files']))
236 
-			deleteAllMinified();
239 
+		if (empty($_POST['minimize_files'])) {
240 
+					deleteAllMinified();
241 
+		}
237 242
238 243 
 		writeLog();
239 244 
 		redirectexit('action=admin;area=featuresettings;sa=basic');
 
@@ -273,8 +278,9 @@  discard block
 
 block discarded – undo
273 278
274 279 
 	call_integration_hook('integrate_modify_bbc_settings', array(&$config_vars));
275 280
276 
-	if ($return_config)
277 
-		return $config_vars;
281 
+	if ($return_config) {
282 
+			return $config_vars;
283 
+	}
278 284
279 285 
 	// Setup the template.
280 286 
 	require_once($sourcedir . '/ManageServer.php');
 
@@ -291,13 +297,15 @@  discard block
 
 block discarded – undo
291 297
292 298 
 		// Clean up the tags.
293 299 
 		$bbcTags = array();
294 
-		foreach (parse_bbc(false) as $tag)
295 
-			$bbcTags[] = $tag['tag'];
300 
+		foreach (parse_bbc(false) as $tag) {
301 
+					$bbcTags[] = $tag['tag'];
302 
+		}
296 303
297 
-		if (!isset($_POST['disabledBBC_enabledTags']))
298 
-			$_POST['disabledBBC_enabledTags'] = array();
299 
-		elseif (!is_array($_POST['disabledBBC_enabledTags']))
300 
-			$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
304 
+		if (!isset($_POST['disabledBBC_enabledTags'])) {
305 
+					$_POST['disabledBBC_enabledTags'] = array();
306 
+		} elseif (!is_array($_POST['disabledBBC_enabledTags'])) {
307 
+					$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
308 
+		}
301 309 
 		// Work out what is actually disabled!
302 310 
 		$_POST['disabledBBC'] = implode(',', array_diff($bbcTags, $_POST['disabledBBC_enabledTags']));
303 311 
 
@@ -341,8 +349,9 @@  discard block
 
 block discarded – undo
341 349
342 350 
 	call_integration_hook('integrate_layout_settings', array(&$config_vars));
343 351
344 
-	if ($return_config)
345 
-		return $config_vars;
352 
+	if ($return_config) {
353 
+			return $config_vars;
354 
+	}
346 355
347 356 
 	// Saving?
348 357 
 	if (isset($_GET['save']))
 
@@ -382,8 +391,9 @@  discard block
 
 block discarded – undo
382 391
383 392 
 	call_integration_hook('integrate_likes_settings', array(&$config_vars));
384 393
385 
-	if ($return_config)
386 
-		return $config_vars;
394 
+	if ($return_config) {
395 
+			return $config_vars;
396 
+	}
387 397
388 398 
 	// Saving?
389 399 
 	if (isset($_GET['save']))
 
@@ -421,8 +431,9 @@  discard block
 
 block discarded – undo
421 431
422 432 
 	call_integration_hook('integrate_mentions_settings', array(&$config_vars));
423 433
424 
-	if ($return_config)
425 
-		return $config_vars;
434 
+	if ($return_config) {
435 
+			return $config_vars;
436 
+	}
426 437
427 438 
 	// Saving?
428 439 
 	if (isset($_GET['save']))
 
@@ -466,8 +477,8 @@  discard block
 
 block discarded – undo
466 477 
 			'enable' => array('check', 'warning_enable'),
467 478 
 	);
468 479
469 
-	if (!empty($modSettings['warning_settings']) && $currently_enabled)
470 
-		$config_vars += array(
480 
+	if (!empty($modSettings['warning_settings']) && $currently_enabled) {
481 
+			$config_vars += array(
471 482 
 			'',
472 483 
 				array('int', 'warning_watch', 'subtext' => $txt['setting_warning_watch_note'] . ' ' . $txt['zero_to_disable']),
473 484 
 				'moderate' => array('int', 'warning_moderate', 'subtext' => $txt['setting_warning_moderate_note'] . ' ' . $txt['zero_to_disable']),
 
@@ -476,15 +487,18 @@  discard block
 
 block discarded – undo
476 487 
 				'rem2' => array('int', 'warning_decrement', 'subtext' => $txt['setting_warning_decrement_note'] . ' ' . $txt['zero_to_disable']),
477 488 
 				array('permissions', 'view_warning'),
478 489 
 		);
490 
+	}
479 491
480 492 
 	call_integration_hook('integrate_warning_settings', array(&$config_vars));
481 493
482 
-	if ($return_config)
483 
-		return $config_vars;
494 
+	if ($return_config) {
495 
+			return $config_vars;
496 
+	}
484 497
485 498 
 	// Cannot use moderation if post moderation is not enabled.
486 
-	if (!$modSettings['postmod_active'])
487 
-		unset($config_vars['moderate']);
499 
+	if (!$modSettings['postmod_active']) {
500 
+			unset($config_vars['moderate']);
501 
+	}
488 502
489 503 
 	// Will need the utility functions from here.
490 504 
 	require_once($sourcedir . '/ManageServer.php');
 
@@ -509,16 +523,16 @@  discard block
 
 block discarded – undo
509 523 
 				'warning_watch' => 10,
510 524 
 				'warning_mute' => 60,
511 525 
 			);
512 
-			if ($modSettings['postmod_active'])
513 
-				$vars['warning_moderate'] = 35;
526 
+			if ($modSettings['postmod_active']) {
527 
+							$vars['warning_moderate'] = 35;
528 
+			}
514 529
515 530 
 			foreach ($vars as $var => $value)
516 531 
 			{
517 532 
 				$config_vars[] = array('int', $var);
518 533 
 				$_POST[$var] = $value;
519 534 
 			}
520 
-		}
521 
-		else
535 
+		} else
522 536 
 		{
523 537 
 			$_POST['warning_watch'] = min($_POST['warning_watch'], 100);
524 538 
 			$_POST['warning_moderate'] = $modSettings['postmod_active'] ? min($_POST['warning_moderate'], 100) : 0;
 
@@ -606,8 +620,9 @@  discard block
 
 block discarded – undo
606 620
607 621 
 	call_integration_hook('integrate_spam_settings', array(&$config_vars));
608 622
609 
-	if ($return_config)
610 
-		return $config_vars;
623 
+	if ($return_config) {
624 
+			return $config_vars;
625 
+	}
611 626
612 627 
 	// You need to be an admin to edit settings!
613 628 
 	isAllowedTo('admin_forum');
 
@@ -641,8 +656,9 @@  discard block
 
 block discarded – undo
641 656
642 657 
 	if (empty($context['qa_by_lang'][strtr($language, array('-utf8' => ''))]) && !empty($context['question_answers']))
643 658 
 	{
644 
-		if (empty($context['settings_insert_above']))
645 
-			$context['settings_insert_above'] = '';
659 
+		if (empty($context['settings_insert_above'])) {
660 
+					$context['settings_insert_above'] = '';
661 
+		}
646 662
647 663 
 		$context['settings_insert_above'] .= '<div class="noticebox">' . sprintf($txt['question_not_defined'], $context['languages'][$language]['name']) . '</div>';
648 664 
 	}
 
@@ -685,8 +701,9 @@  discard block
 
 block discarded – undo
685 701 
 		$_POST['pm_spam_settings'] = (int) $_POST['max_pm_recipients'] . ',' . (int) $_POST['pm_posts_verification'] . ',' . (int) $_POST['pm_posts_per_hour'];
686 702
687 703 
 		// Hack in guest requiring verification!
688 
-		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha']))
689 
-			$_POST['posts_require_captcha'] = -1;
704 
+		if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha'])) {
705 
+					$_POST['posts_require_captcha'] = -1;
706 
+		}
690 707
691 708 
 		$save_vars = $config_vars;
692 709 
 		unset($save_vars['pm1'], $save_vars['pm2'], $save_vars['pm3'], $save_vars['guest_verify']);
 
@@ -703,14 +720,16 @@  discard block
 
 block discarded – undo
703 720 
 		foreach ($context['qa_languages'] as $lang_id => $dummy)
704 721 
 		{
705 722 
 			// If we had some questions for this language before, but don't now, delete everything from that language.
706 
-			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id]))
707 
-				$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
723 
+			if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty($context['qa_by_lang'][$lang_id])) {
724 
+							$changes['delete'] = array_merge($questions['delete'], $context['qa_by_lang'][$lang_id]);
725 
+			}
708 726
709 727 
 			// Now step through and see if any existing questions no longer exist.
710 
-			if (!empty($context['qa_by_lang'][$lang_id]))
711 
-				foreach ($context['qa_by_lang'][$lang_id] as $q_id)
728 
+			if (!empty($context['qa_by_lang'][$lang_id])) {
729 
+							foreach ($context['qa_by_lang'][$lang_id] as $q_id)
712 730 
 					if (empty($_POST['question'][$lang_id][$q_id]))
713 731 
 						$changes['delete'][] = $q_id;
732 
+			}
714 733
715 734 
 			// Now let's see if there are new questions or ones that need updating.
716 735 
 			if (isset($_POST['question'][$lang_id]))
 
@@ -719,14 +738,16 @@  discard block
 
 block discarded – undo
719 738 
 				{
720 739 
 					// Ignore junky ids.
721 740 
 					$q_id = (int) $q_id;
722 
-					if ($q_id <= 0)
723 
-						continue;
741 
+					if ($q_id <= 0) {
742 
+											continue;
743 
+					}
724 744
725 745 
 					// Check the question isn't empty (because they want to delete it?)
726 746 
 					if (empty($question) || trim($question) == '')
727 747 
 					{
728 
-						if (isset($context['question_answers'][$q_id]))
729 
-							$changes['delete'][] = $q_id;
748 
+						if (isset($context['question_answers'][$q_id])) {
749 
+													$changes['delete'][] = $q_id;
750 
+						}
730 751 
 						continue;
731 752 
 					}
732 753 
 					$question = $smcFunc['htmlspecialchars'](trim($question));
 
@@ -734,19 +755,22 @@  discard block
 
 block discarded – undo
734 755 
 					// Get the answers. Firstly check there actually might be some.
735 756 
 					if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id]))
736 757 
 					{
737 
-						if (isset($context['question_answers'][$q_id]))
738 
-							$changes['delete'][] = $q_id;
758 
+						if (isset($context['question_answers'][$q_id])) {
759 
+													$changes['delete'][] = $q_id;
760 
+						}
739 761 
 						continue;
740 762 
 					}
741 763 
 					// Now get them and check that they might be viable.
742 764 
 					$answers = array();
743 
-					foreach ($_POST['answer'][$lang_id][$q_id] as $answer)
744 
-						if (!empty($answer) && trim($answer) !== '')
765 
+					foreach ($_POST['answer'][$lang_id][$q_id] as $answer) {
766 
+											if (!empty($answer) && trim($answer) !== '')
745 767 
 							$answers[] = $smcFunc['htmlspecialchars'](trim($answer));
768 
+					}
746 769 
 					if (empty($answers))
747 770 
 					{
748 
-						if (isset($context['question_answers'][$q_id]))
749 
-							$changes['delete'][] = $q_id;
771 
+						if (isset($context['question_answers'][$q_id])) {
772 
+													$changes['delete'][] = $q_id;
773 
+						}
750 774 
 						continue;
751 775 
 					}
752 776 
 					$answers = $smcFunc['json_encode']($answers);
 
@@ -756,16 +780,17 @@  discard block
 
 block discarded – undo
756 780 
 					{
757 781 
 						// New question. Now, we don't want to randomly consume ids, so we'll set those, rather than trusting the browser's supplied ids.
758 782 
 						$changes['insert'][] = array($lang_id, $question, $answers);
759 
-					}
760 
-					else
783 
+					} else
761 784 
 					{
762 785 
 						// It's an existing question. Let's see what's changed, if anything.
763 
-						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers'])
764 
-							$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
786 
+						if ($lang_id != $context['question_answers'][$q_id]['lngfile'] || $question != $context['question_answers'][$q_id]['question'] || $answers != $context['question_answers'][$q_id]['answers']) {
787 
+													$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
788 
+						}
765 789 
 					}
766 790
767 
-					if (!isset($qs_per_lang[$lang_id]))
768 
-						$qs_per_lang[$lang_id] = 0;
791 
+					if (!isset($qs_per_lang[$lang_id])) {
792 
+											$qs_per_lang[$lang_id] = 0;
793 
+					}
769 794 
 					$qs_per_lang[$lang_id]++;
770 795 
 				}
771 796 
 			}
 
@@ -815,8 +840,9 @@  discard block
 
 block discarded – undo
815 840
816 841 
 		// Lastly, the count of messages needs to be no more than the lowest number of questions for any one language.
817 842 
 		$count_questions = empty($qs_per_lang) ? 0 : min($qs_per_lang);
818 
-		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions)
819 
-			$_POST['qa_verification_number'] = $count_questions;
843 
+		if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions) {
844 
+					$_POST['qa_verification_number'] = $count_questions;
845 
+		}
820 846
821 847 
 		call_integration_hook('integrate_save_spam_settings', array(&$save_vars));
822 848 
 
@@ -831,24 +857,27 @@  discard block
 
 block discarded – undo
831 857
832 858 
 	$character_range = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
833 859 
 	$_SESSION['visual_verification_code'] = '';
834 
-	for ($i = 0; $i < 6; $i++)
835 
-		$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
860 
+	for ($i = 0; $i < 6; $i++) {
861 
+			$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
862 
+	}
836 863
837 864 
 	// Some javascript for CAPTCHA.
838 865 
 	$context['settings_post_javascript'] = '';
839 
-	if ($context['use_graphic_library'])
840 
-		$context['settings_post_javascript'] .= '
866 
+	if ($context['use_graphic_library']) {
867 
+			$context['settings_post_javascript'] .= '
841 868 
 		function refreshImages()
842 869 
 		{
843 870 
 			var imageType = document.getElementById(\'visual_verification_type\').value;
844 871 
 			document.getElementById(\'verification_image\').src = \'' . $context['verification_image_href'] . ';type=\' + imageType;
845 872 
 		}';
873 
+	}
846 874
847 875 
 	// Show the image itself, or text saying we can't.
848 
-	if ($context['use_graphic_library'])
849 
-		$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>';
850 
-	else
851 
-		$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
876 
+	if ($context['use_graphic_library']) {
877 
+			$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>';
878 
+	} else {
879 
+			$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . $txt['setting_image_verification_nogd'] . '</span>';
880 
+	}
852 881
853 882 
 	// Hack for PM spam settings.
854 883 
 	list ($modSettings['max_pm_recipients'], $modSettings['pm_posts_verification'], $modSettings['pm_posts_per_hour']) = explode(',', $modSettings['pm_spam_settings']);
 
@@ -858,9 +887,10 @@  discard block
 
 block discarded – undo
858 887 
 	$modSettings['posts_require_captcha'] = !isset($modSettings['posts_require_captcha']) || $modSettings['posts_require_captcha'] == -1 ? 0 : $modSettings['posts_require_captcha'];
859 888
860 889 
 	// Some minor javascript for the guest post setting.
861 
-	if ($modSettings['posts_require_captcha'])
862 
-		$context['settings_post_javascript'] .= '
890 
+	if ($modSettings['posts_require_captcha']) {
891 
+			$context['settings_post_javascript'] .= '
863 892 
 		document.getElementById(\'guests_require_captcha\').disabled = true;';
893 
+	}
864 894
865 895 
 	// And everything else.
866 896 
 	$context['post_url'] = $scripturl . '?action=admin;area=antispam;save';
 
@@ -907,8 +937,9 @@  discard block
 
 block discarded – undo
907 937
908 938 
 	call_integration_hook('integrate_signature_settings', array(&$config_vars));
909 939
910 
-	if ($return_config)
911 
-		return $config_vars;
940 
+	if ($return_config) {
941 
+			return $config_vars;
942 
+	}
912 943
913 944 
 	// Setup the template.
914 945 
 	$context['page_title'] = $txt['signature_settings'];
 
@@ -963,8 +994,9 @@  discard block
 
 block discarded – undo
963 994 
 				$sig = strtr($row['signature'], array('<br>' => "\n"));
964 995
965 996 
 				// Max characters...
966 
-				if (!empty($sig_limits[1]))
967 
-					$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
997 
+				if (!empty($sig_limits[1])) {
998 
+									$sig = $smcFunc['substr']($sig, 0, $sig_limits[1]);
999 
+				}
968 1000 
 				// Max lines...
969 1001 
 				if (!empty($sig_limits[2]))
970 1002 
 				{
 
@@ -974,8 +1006,9 @@  discard block
 
 block discarded – undo
974 1006 
 						if ($sig[$i] == "\n")
975 1007 
 						{
976 1008 
 							$count++;
977 
-							if ($count >= $sig_limits[2])
978 
-								$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
1009 
+							if ($count >= $sig_limits[2]) {
1010 
+															$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
1011 
+							}
979 1012 
 						}
980 1013 
 					}
981 1014 
 				}
 
@@ -986,17 +1019,19 @@  discard block
 
 block discarded – undo
986 1019 
 					{
987 1020 
 						$limit_broke = 0;
988 1021 
 						// Attempt to allow all sizes of abuse, so to speak.
989 
-						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
990 
-							$limit_broke = $sig_limits[7] . 'px';
991 
-						elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
992 
-							$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
993 
-						elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
994 
-							$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
995 
-						elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
996 
-							$limit_broke = 'large';
997 
-
998 
-						if ($limit_broke)
999 
-							$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
1022 
+						if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
1023 
+													$limit_broke = $sig_limits[7] . 'px';
1024 
+						} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
1025 
+													$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
1026 
+						} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
1027 
+													$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
1028 
+						} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
1029 
+													$limit_broke = 'large';
1030 
+						}
1031 
+
1032 
+						if ($limit_broke) {
1033 
+													$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
1034 
+						}
1000 1035 
 					}
1001 1036 
 				}
1002 1037 
 
@@ -1052,32 +1087,34 @@  discard block
 
 block discarded – undo
1052 1087 
 											$img_offset = false;
1053 1088 
 										}
1054 1089 
 									}
1090 
+								} else {
1091 
+																	$replaces[$image] = '';
1055 1092 
 								}
1056 
-								else
1057 
-									$replaces[$image] = '';
1058 1093
1059 1094 
 								continue;
1060 1095 
 							}
1061 1096
1062 1097 
 							// Does it have predefined restraints? Width first.
1063 
-							if ($matches[6][$key])
1064 
-								$matches[2][$key] = $matches[6][$key];
1098 
+							if ($matches[6][$key]) {
1099 
+															$matches[2][$key] = $matches[6][$key];
1100 
+							}
1065 1101 
 							if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
1066 1102 
 							{
1067 1103 
 								$width = $sig_limits[5];
1068 1104 
 								$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
1105 
+							} elseif ($matches[2][$key]) {
1106 
+															$width = $matches[2][$key];
1069 1107 
 							}
1070 
-							elseif ($matches[2][$key])
1071 
-								$width = $matches[2][$key];
1072 1108 
 							// ... and height.
1073 1109 
 							if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
1074 1110 
 							{
1075 1111 
 								$height = $sig_limits[6];
1076 
-								if ($width != -1)
1077 
-									$width = $width * ($height / $matches[4][$key]);
1112 
+								if ($width != -1) {
1113 
+																	$width = $width * ($height / $matches[4][$key]);
1114 
+								}
1115 
+							} elseif ($matches[4][$key]) {
1116 
+															$height = $matches[4][$key];
1078 1117 
 							}
1079 
-							elseif ($matches[4][$key])
1080 
-								$height = $matches[4][$key];
1081 1118
1082 1119 
 							// If the dimensions are still not fixed - we need to check the actual image.
1083 1120 
 							if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
 
@@ -1095,12 +1132,13 @@  discard block
 
 block discarded – undo
1095 1132 
 									if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
1096 1133 
 									{
1097 1134 
 										$height = $sig_limits[6];
1098 
-										if ($width == -1)
1099 
-											$width = $sizes[0];
1135 
+										if ($width == -1) {
1136 
+																					$width = $sizes[0];
1137 
+										}
1100 1138 
 										$width = $width * ($height / $sizes[1]);
1139 
+									} elseif ($width != -1) {
1140 
+																			$height = $sizes[1];
1101 1141 
 									}
1102 
-									elseif ($width != -1)
1103 
-										$height = $sizes[1];
1104 1142 
 								}
1105 1143 
 							}
1106 1144 
 
@@ -1113,8 +1151,9 @@  discard block
 
 block discarded – undo
1113 1151 
 							// Record that we got one.
1114 1152 
 							$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
1115 1153 
 						}
1116 
-						if (!empty($replaces))
1117 
-							$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
1154 
+						if (!empty($replaces)) {
1155 
+													$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
1156 
+						}
1118 1157 
 					}
1119 1158 
 				}
1120 1159 
 				// Try to fix disabled tags.
 
@@ -1126,18 +1165,20 @@  discard block
 
 block discarded – undo
1126 1165
1127 1166 
 				$sig = strtr($sig, array("\n" => '<br>'));
1128 1167 
 				call_integration_hook('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
1129 
-				if ($sig != $row['signature'])
1130 
-					$changes[$row['id_member']] = $sig;
1168 
+				if ($sig != $row['signature']) {
1169 
+									$changes[$row['id_member']] = $sig;
1170 
+				}
1171 
+			}
1172 
+			if ($smcFunc['db_num_rows']($request) == 0) {
1173 
+							$done = true;
1131 1174 
 			}
1132 
-			if ($smcFunc['db_num_rows']($request) == 0)
1133 
-				$done = true;
1134 1175 
 			$smcFunc['db_free_result']($request);
1135 1176
1136 1177 
 			// Do we need to delete what we have?
1137 1178 
 			if (!empty($changes))
1138 1179 
 			{
1139 
-				foreach ($changes as $id => $sig)
1140 
-					$smcFunc['db_query']('', '
1180 
+				foreach ($changes as $id => $sig) {
1181 
+									$smcFunc['db_query']('', '
1141 1182 
 						UPDATE {db_prefix}members
1142 1183 
 						SET signature = {string:signature}
1143 1184 
 						WHERE id_member = {int:id_member}',
 
@@ -1146,11 +1187,13 @@  discard block
 
 block discarded – undo
1146 1187 
 							'signature' => $sig,
1147 1188 
 						)
1148 1189 
 					);
1190 
+				}
1149 1191 
 			}
1150 1192
1151 1193 
 			$_GET['step'] += 50;
1152 
-			if (!$done)
1153 
-				pauseSignatureApplySettings();
1194 
+			if (!$done) {
1195 
+							pauseSignatureApplySettings();
1196 
+			}
1154 1197 
 		}
1155 1198 
 		$settings_applied = true;
1156 1199 
 	}
 
@@ -1168,8 +1211,9 @@  discard block
 
 block discarded – undo
1168 1211 
 	);
1169 1212
1170 1213 
 	// Temporarily make each setting a modSetting!
1171 
-	foreach ($context['signature_settings'] as $key => $value)
1172 
-		$modSettings['signature_' . $key] = $value;
1214 
+	foreach ($context['signature_settings'] as $key => $value) {
1215 
+			$modSettings['signature_' . $key] = $value;
1216 
+	}
1173 1217
1174 1218 
 	// Make sure we check the right tags!
1175 1219 
 	$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
 
@@ -1181,23 +1225,26 @@  discard block
 
 block discarded – undo
1181 1225
1182 1226 
 		// Clean up the tag stuff!
1183 1227 
 		$bbcTags = array();
1184 
-		foreach (parse_bbc(false) as $tag)
1185 
-			$bbcTags[] = $tag['tag'];
1228 
+		foreach (parse_bbc(false) as $tag) {
1229 
+					$bbcTags[] = $tag['tag'];
1230 
+		}
1186 1231
1187 
-		if (!isset($_POST['signature_bbc_enabledTags']))
1188 
-			$_POST['signature_bbc_enabledTags'] = array();
1189 
-		elseif (!is_array($_POST['signature_bbc_enabledTags']))
1190 
-			$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
1232 
+		if (!isset($_POST['signature_bbc_enabledTags'])) {
1233 
+					$_POST['signature_bbc_enabledTags'] = array();
1234 
+		} elseif (!is_array($_POST['signature_bbc_enabledTags'])) {
1235 
+					$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
1236 
+		}
1191 1237
1192 1238 
 		$sig_limits = array();
1193 1239 
 		foreach ($context['signature_settings'] as $key => $value)
1194 1240 
 		{
1195 
-			if ($key == 'allow_smileys')
1196 
-				continue;
1197 
-			elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys']))
1198 
-				$sig_limits[] = -1;
1199 
-			else
1200 
-				$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
1241 
+			if ($key == 'allow_smileys') {
1242 
+							continue;
1243 
+			} elseif ($key == 'max_smileys' && empty($_POST['signature_allow_smileys'])) {
1244 
+							$sig_limits[] = -1;
1245 
+			} else {
1246 
+							$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
1247 
+			}
1201 1248 
 		}
1202 1249
1203 1250 
 		call_integration_hook('integrate_save_signature_settings', array(&$sig_limits, &$bbcTags));
 
@@ -1230,12 +1277,14 @@  discard block
 
 block discarded – undo
1230 1277
1231 1278 
 	// Try get more time...
1232 1279 
 	@set_time_limit(600);
1233 
-	if (function_exists('apache_reset_timeout'))
1234 
-		@apache_reset_timeout();
1280 
+	if (function_exists('apache_reset_timeout')) {
1281 
+			@apache_reset_timeout();
1282 
+	}
1235 1283
1236 1284 
 	// Have we exhausted all the time we allowed?
1237 
-	if (time() - array_sum(explode(' ', $sig_start)) < 3)
1238 
-		return;
1285 
+	if (time() - array_sum(explode(' ', $sig_start)) < 3) {
1286 
+			return;
1287 
+	}
1239 1288
1240 1289 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $_GET['step'] . ';' . $context['session_var'] . '=' . $context['session_id'];
1241 1290 
 	$context['page_title'] = $txt['not_done_title'];
 
@@ -1281,9 +1330,10 @@  discard block
 
 block discarded – undo
1281 1330 
 		$disable_fields = array_flip($standard_fields);
1282 1331 
 		if (!empty($_POST['active']))
1283 1332 
 		{
1284 
-			foreach ($_POST['active'] as $value)
1285 
-				if (isset($disable_fields[$value]))
1333 
+			foreach ($_POST['active'] as $value) {
1334 
+							if (isset($disable_fields[$value]))
1286 1335 
 					unset($disable_fields[$value]);
1336 
+			}
1287 1337 
 		}
1288 1338 
 		// What we have left!
1289 1339 
 		$changes['disabled_profile_fields'] = empty($disable_fields) ? '' : implode(',', array_keys($disable_fields));
 
@@ -1292,16 +1342,18 @@  discard block
 
 block discarded – undo
1292 1342 
 		$reg_fields = array();
1293 1343 
 		if (!empty($_POST['reg']))
1294 1344 
 		{
1295 
-			foreach ($_POST['reg'] as $value)
1296 
-				if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
1345 
+			foreach ($_POST['reg'] as $value) {
1346 
+							if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
1297 1347 
 					$reg_fields[] = $value;
1348 
+			}
1298 1349 
 		}
1299 1350 
 		// What we have left!
1300 1351 
 		$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
1301 1352
1302 1353 
 		$_SESSION['adm-save'] = true;
1303 
-		if (!empty($changes))
1304 
-			updateSettings($changes);
1354 
+		if (!empty($changes)) {
1355 
+					updateSettings($changes);
1356 
+		}
1305 1357 
 	}
1306 1358
1307 1359 
 	createToken('admin-scp');
 
@@ -1404,11 +1456,13 @@  discard block
 
 block discarded – undo
1404 1456 
 					{
1405 1457 
 						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
1406 1458
1407 
-						if ($rowData['field_order'] > 1)
1408 
-							$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>';
1459 
+						if ($rowData['field_order'] > 1) {
1460 
+													$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>';
1461 
+						}
1409 1462
1410 
-						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
1411 
-							$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>';
1463 
+						if ($rowData['field_order'] < $context['custFieldsMaxOrder']) {
1464 
+													$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>';
1465 
+						}
1412 1466
1413 1467 
 						$return .= '</p>';
1414 1468 
 
@@ -1546,16 +1600,16 @@  discard block
 
 block discarded – undo
1546 1600 
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
1547 1601 
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
1548 1602
1549 
-		foreach ($standard_fields as $field)
1550 
-			$list[] = array(
1603 
+		foreach ($standard_fields as $field) {
1604 
+					$list[] = array(
1551 1605 
 				'id' => $field,
1552 1606 
 				'label' => isset($txt['standard_profile_field_' . $field]) ? $txt['standard_profile_field_' . $field] : (isset($txt[$field]) ? $txt[$field] : $field),
1553 1607 
 				'disabled' => in_array($field, $disabled_fields),
1554 1608 
 				'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
1555 1609 
 				'can_show_register' => !in_array($field, $fields_no_registration),
1556 1610 
 			);
1557 
-	}
1558 
-	else
1611 
+		}
1612 
+	} else
1559 1613 
 	{
1560 1614 
 		// Load all the fields.
1561 1615 
 		$request = $smcFunc['db_query']('', '
 
@@ -1569,8 +1623,9 @@  discard block
 
 block discarded – undo
1569 1623 
 				'items_per_page' => $items_per_page,
1570 1624 
 			)
1571 1625 
 		);
1572 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
1573 
-			$list[] = $row;
1626 
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
1627 
+					$list[] = $row;
1628 
+		}
1574 1629 
 		$smcFunc['db_free_result']($request);
1575 1630 
 	}
1576 1631 
 
@@ -1636,9 +1691,9 @@  discard block
 
 block discarded – undo
1636 1691 
 		$context['field'] = array();
1637 1692 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
1638 1693 
 		{
1639 
-			if ($row['field_type'] == 'textarea')
1640 
-				@list ($rows, $cols) = @explode(',', $row['default_value']);
1641 
-			else
1694 
+			if ($row['field_type'] == 'textarea') {
1695 
+							@list ($rows, $cols) = @explode(',', $row['default_value']);
1696 
+			} else
1642 1697 
 			{
1643 1698 
 				$rows = 3;
1644 1699 
 				$cols = 30;
 
@@ -1674,8 +1729,8 @@  discard block
 
 block discarded – undo
1674 1729 
 	}
1675 1730
1676 1731 
 	// Setup the default values as needed.
1677 
-	if (empty($context['field']))
1678 
-		$context['field'] = array(
1732 
+	if (empty($context['field'])) {
1733 
+			$context['field'] = array(
1679 1734 
 			'name' => '',
1680 1735 
 			'col_name' => '???',
1681 1736 
 			'desc' => '',
 
@@ -1700,6 +1755,7 @@  discard block
 
 block discarded – undo
1700 1755 
 			'enclose' => '',
1701 1756 
 			'placement' => 0,
1702 1757 
 		);
1758 
+	}
1703 1759
1704 1760 
 	// Are we moving it?
1705 1761 
 	if (isset($_GET['move']) && in_array($smcFunc['htmlspecialchars']($_GET['move']), $move_to))
 
@@ -1708,8 +1764,10 @@  discard block
 
 block discarded – undo
1708 1764 
 		$new_order = ($_GET['move'] == 'up' ? ($context['field']['order'] - 1) : ($context['field']['order'] + 1));
1709 1765
1710 1766 
 		// Is this a valid position?
1711 
-		if ($new_order <= 0 || $new_order > $order_count)
1712 
-			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
1767 
+		if ($new_order <= 0 || $new_order > $order_count) {
1768 
+					redirectexit('action=admin;area=featuresettings;sa=profile');
1769 
+		}
1770 
+		// @todo implement an error handler
1713 1771
1714 1772 
 		// All good, proceed.
1715 1773 
 		$smcFunc['db_query']('','
 
@@ -1740,12 +1798,14 @@  discard block
 
 block discarded – undo
1740 1798 
 		validateToken('admin-ecp');
1741 1799
1742 1800 
 		// Everyone needs a name - even the (bracket) unknown...
1743 
-		if (trim($_POST['field_name']) == '')
1744 
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
1801 
+		if (trim($_POST['field_name']) == '') {
1802 
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
1803 
+		}
1745 1804
1746 1805 
 		// Regex you say?  Do a very basic test to see if the pattern is valid
1747 
-		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false)
1748 
-			redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
1806 
+		if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false) {
1807 
+					redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
1808 
+		}
1749 1809
1750 1810 
 		$_POST['field_name'] = $smcFunc['htmlspecialchars']($_POST['field_name']);
1751 1811 
 		$_POST['field_desc'] = $smcFunc['htmlspecialchars']($_POST['field_desc']);
 
@@ -1762,8 +1822,9 @@  discard block
 
 block discarded – undo
1762 1822
1763 1823 
 		// Some masking stuff...
1764 1824 
 		$mask = isset($_POST['mask']) ? $_POST['mask'] : '';
1765 
-		if ($mask == 'regex' && isset($_POST['regex']))
1766 
-			$mask .= $_POST['regex'];
1825 
+		if ($mask == 'regex' && isset($_POST['regex'])) {
1826 
+					$mask .= $_POST['regex'];
1827 
+		}
1767 1828
1768 1829 
 		$field_length = isset($_POST['max_length']) ? (int) $_POST['max_length'] : 255;
1769 1830 
 		$enclose = isset($_POST['enclose']) ? $_POST['enclose'] : '';
 
@@ -1782,8 +1843,9 @@  discard block
 
 block discarded – undo
1782 1843 
 				$v = strtr($v, array(',' => ''));
1783 1844
1784 1845 
 				// Nada, zip, etc...
1785 
-				if (trim($v) == '')
1786 
-					continue;
1846 
+				if (trim($v) == '') {
1847 
+									continue;
1848 
+				}
1787 1849
1788 1850 
 				// Otherwise, save it boy.
1789 1851 
 				$field_options .= $v . ',';
 
@@ -1791,15 +1853,17 @@  discard block
 
 block discarded – undo
1791 1853 
 				$newOptions[$k] = $v;
1792 1854
1793 1855 
 				// Is it default?
1794 
-				if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
1795 
-					$default = $v;
1856 
+				if (isset($_POST['default_select']) && $_POST['default_select'] == $k) {
1857 
+									$default = $v;
1858 
+				}
1796 1859 
 			}
1797 1860 
 			$field_options = substr($field_options, 0, -1);
1798 1861 
 		}
1799 1862
1800 1863 
 		// Text area has default has dimensions
1801 
-		if ($_POST['field_type'] == 'textarea')
1802 
-			$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
1864 
+		if ($_POST['field_type'] == 'textarea') {
1865 
+					$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
1866 
+		}
1803 1867
1804 1868 
 		// Come up with the unique name?
1805 1869 
 		if (empty($context['fid']))
 
@@ -1808,32 +1872,36 @@  discard block
 
 block discarded – undo
1808 1872 
 			preg_match('~([\w\d_-]+)~', $col_name, $matches);
1809 1873
1810 1874 
 			// If there is nothing to the name, then let's start out own - for foreign languages etc.
1811 
-			if (isset($matches[1]))
1812 
-				$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
1813 
-			else
1814 
-				$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
1875 
+			if (isset($matches[1])) {
1876 
+							$col_name = $initial_col_name = 'cust_' . strtolower($matches[1]);
1877 
+			} else {
1878 
+							$col_name = $initial_col_name = 'cust_' . mt_rand(1, 9999);
1879 
+			}
1815 1880
1816 1881 
 			// Make sure this is unique.
1817 1882 
 			$current_fields = array();
1818 1883 
 			$request = $smcFunc['db_query']('', '
1819 1884 
 				SELECT id_field, col_name
1820 1885 
 				FROM {db_prefix}custom_fields');
1821 
-			while ($row = $smcFunc['db_fetch_assoc']($request))
1822 
-				$current_fields[$row['id_field']] = $row['col_name'];
1886 
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
1887 
+							$current_fields[$row['id_field']] = $row['col_name'];
1888 
+			}
1823 1889 
 			$smcFunc['db_free_result']($request);
1824 1890
1825 1891 
 			$unique = false;
1826 1892 
 			for ($i = 0; !$unique && $i < 9; $i ++)
1827 1893 
 			{
1828 
-				if (!in_array($col_name, $current_fields))
1829 
-					$unique = true;
1830 
-				else
1831 
-					$col_name = $initial_col_name . $i;
1894 
+				if (!in_array($col_name, $current_fields)) {
1895 
+									$unique = true;
1896 
+				} else {
1897 
+									$col_name = $initial_col_name . $i;
1898 
+				}
1832 1899 
 			}
1833 1900
1834 1901 
 			// Still not a unique column name? Leave it up to the user, then.
1835 
-			if (!$unique)
1836 
-				fatal_lang_error('custom_option_not_unique');
1902 
+			if (!$unique) {
1903 
+							fatal_lang_error('custom_option_not_unique');
1904 
+			}
1837 1905 
 		}
1838 1906 
 		// Work out what to do with the user data otherwise...
1839 1907 
 		else
 
@@ -1861,8 +1929,9 @@  discard block
 
 block discarded – undo
1861 1929 
 				// Work out what's changed!
1862 1930 
 				foreach ($context['field']['options'] as $k => $option)
1863 1931 
 				{
1864 
-					if (trim($option) == '')
1865 
-						continue;
1932 
+					if (trim($option) == '') {
1933 
+											continue;
1934 
+					}
1866 1935
1867 1936 
 					// Still exists?
1868 1937 
 					if (in_array($option, $newOptions))
 
@@ -1876,8 +1945,8 @@  discard block
 
 block discarded – undo
1876 1945 
 				foreach ($optionChanges as $k => $option)
1877 1946 
 				{
1878 1947 
 					// Just been renamed?
1879 
-					if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
1880 
-						$smcFunc['db_query']('', '
1948 
+					if (!in_array($k, $takenKeys) && !empty($newOptions[$k])) {
1949 
+											$smcFunc['db_query']('', '
1881 1950 
 							UPDATE {db_prefix}themes
1882 1951 
 							SET value = {string:new_value}
1883 1952 
 							WHERE variable = {string:current_column}
 
@@ -1890,6 +1959,7 @@  discard block
 
 block discarded – undo
1890 1959 
 								'old_value' => $option,
1891 1960 
 							)
1892 1961 
 						);
1962 
+					}
1893 1963 
 				}
1894 1964 
 			}
1895 1965 
 			// @todo Maybe we should adjust based on new text length limits?
 
@@ -1932,8 +2002,8 @@  discard block
 
 block discarded – undo
1932 2002 
 			);
1933 2003
1934 2004 
 			// Just clean up any old selects - these are a pain!
1935 
-			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions))
1936 
-				$smcFunc['db_query']('', '
2005 
+			if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions)) {
2006 
+							$smcFunc['db_query']('', '
1937 2007 
 					DELETE FROM {db_prefix}themes
1938 2008 
 					WHERE variable = {string:current_column}
1939 2009 
 						AND value NOT IN ({array_string:new_option_values})
 
@@ -1944,8 +2014,8 @@  discard block
 
 block discarded – undo
1944 2014 
 						'current_column' => $context['field']['col_name'],
1945 2015 
 					)
1946 2016 
 				);
1947 
-		}
1948 
-		else
2017 
+			}
2018 
+		} else
1949 2019 
 		{
1950 2020 
 			// Gotta figure it out the order.
1951 2021 
 			$new_order = $order_count > 1 ? ($order_count + 1) : 1;
 
@@ -2120,11 +2190,13 @@  discard block
 
 block discarded – undo
2120 2190 
 	call_integration_hook('integrate_prune_settings', array(&$config_vars, &$prune_toggle, false));
2121 2191
2122 2192 
 	$prune_toggle_dt = array();
2123 
-	foreach ($prune_toggle as $item)
2124 
-		$prune_toggle_dt[] = 'setting_' . $item;
2193 
+	foreach ($prune_toggle as $item) {
2194 
+			$prune_toggle_dt[] = 'setting_' . $item;
2195 
+	}
2125 2196
2126 
-	if ($return_config)
2127 
-		return $config_vars;
2197 
+	if ($return_config) {
2198 
+			return $config_vars;
2199 
+	}
2128 2200
2129 2201 
 	addInlineJavaScript('
2130 2202 
 	function togglePruned()
 
@@ -2162,15 +2234,16 @@  discard block
 
 block discarded – undo
2162 2234 
 			$vals = array();
2163 2235 
 			foreach ($config_vars as $index => $dummy)
2164 2236 
 			{
2165 
-				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle))
2166 
-					continue;
2237 
+				if (!is_array($dummy) || $index == 'pruningOptions' || !in_array($dummy[1], $prune_toggle)) {
2238 
+									continue;
2239 
+				}
2167 2240
2168 2241 
 				$vals[] = empty($_POST[$dummy[1]]) || $_POST[$dummy[1]] < 0 ? 0 : (int) $_POST[$dummy[1]];
2169 2242 
 			}
2170 2243 
 			$_POST['pruningOptions'] = implode(',', $vals);
2244 
+		} else {
2245 
+					$_POST['pruningOptions'] = '';
2171 2246 
 		}
2172 
-		else
2173 
-			$_POST['pruningOptions'] = '';
2174 2247
2175 2248 
 		saveDBSettings($savevar);
2176 2249 
 		$_SESSION['adm-save'] = true;
 
@@ -2182,10 +2255,11 @@  discard block
 
 block discarded – undo
2182 2255 
 	$context['sub_template'] = 'show_settings';
2183 2256
2184 2257 
 	// Get the actual values
2185 
-	if (!empty($modSettings['pruningOptions']))
2186 
-		@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
2187 
-	else
2188 
-		$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
2258 
+	if (!empty($modSettings['pruningOptions'])) {
2259 
+			@list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
2260 
+	} else {
2261 
+			$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneSpiderHitLog'] = 0;
2262 
+	}
2189 2263
2190 2264 
 	prepareDBSettingContext($config_vars);
2191 2265 
 }
 
@@ -2207,8 +2281,9 @@  discard block
 
 block discarded – undo
2207 2281 
 	// Make it even easier to add new settings.
2208 2282 
 	call_integration_hook('integrate_general_mod_settings', array(&$config_vars));
2209 2283
2210 
-	if ($return_config)
2211 
-		return $config_vars;
2284 
+	if ($return_config) {
2285 
+			return $config_vars;
2286 
+	}
2212 2287
2213 2288 
 	$context['post_url'] = $scripturl . '?action=admin;area=modsettings;save;sa=general';
2214 2289 
 	$context['settings_title'] = $txt['mods_cat_modifications_misc'];
Please login to merge, or discard this patch.
Sources/Post.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -256,8 +256,8 @@  discard block
 
 block discarded – undo
256 256 
 			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
257 257
258 258 
 		$js_time_string = str_replace(
259 
-			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
260 
-			array('H',  'G',  'h',  'g',  'i',  'A',  'a',  'h:i:s A', 'H:i', 's',  'H:i:s', 'H:i:s'),
259 
+			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r', '%R', '%S', '%T', '%X'),
260 
+			array('H', 'G', 'h', 'g', 'i', 'A', 'a', 'h:i:s A', 'H:i', 's', 'H:i:s', 'H:i:s'),
261 261 
 			$time_string
262 262 
 		);
263 263 
 
@@ -1305,14 +1305,14 @@  discard block
 
 block discarded – undo
1305 1305 
 	if (isset($context['name']) && isset($context['email']))
1306 1306 
 	{
1307 1307 
 		$context['posting_fields']['guestname'] = array(
1308 
-			'dt' => '<span id="caption_guestname"' .  (isset($context['post_error']['long_name']) || isset($context['post_error']['no_name']) || isset($context['post_error']['bad_name']) ? ' class="error"' : '') . '>' . $txt['name'] . '</span>',
1308 
+			'dt' => '<span id="caption_guestname"' . (isset($context['post_error']['long_name']) || isset($context['post_error']['no_name']) || isset($context['post_error']['bad_name']) ? ' class="error"' : '') . '>' . $txt['name'] . '</span>',
1309 1309 
 			'dd' => '<input type="text" name="guestname" size="25" value="' . $context['name'] . '" required>',
1310 1310 
 		);
1311 1311
1312 1312 
 		if (empty($modSettings['guest_post_no_email']))
1313 1313 
 		{
1314 1314 
 			$context['posting_fields']['email'] = array(
1315 
-				'dt' => '<span id="caption_email"' .  (isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '') . '>' . $txt['email'] . '</span>',
1315 
+				'dt' => '<span id="caption_email"' . (isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '') . '>' . $txt['email'] . '</span>',
1316 1316 
 				'dd' => '<input type="email" name="email" size="25" value="' . $context['email'] . '" required>',
1317 1317 
 			);
1318 1318 
 		}
Please login to merge, or discard this patch.
Braces   +677 added lines, -523 removed lines patch added patch discarded remove patch 
@@ -14,8 +14,9 @@  discard block
 
 block discarded – undo
14 14 
  * @version 2.1 Beta 4
15 15 
  */
16 16
17 
-if (!defined('SMF'))
17 
+if (!defined('SMF')) {
18 18 
 	die('No direct access...');
19 
+}
19 20
20 21 
 /**
21 22 
  * Handles showing the post screen, loading the post to be modified, and loading any post quoted.
 
@@ -35,12 +36,14 @@  discard block
 
 block discarded – undo
35 36 
 	global $sourcedir, $smcFunc, $language;
36 37
37 38 
 	loadLanguage('Post');
38 
-	if (!empty($modSettings['drafts_post_enabled']))
39 
-		loadLanguage('Drafts');
39 
+	if (!empty($modSettings['drafts_post_enabled'])) {
40 
+			loadLanguage('Drafts');
41 
+	}
40 42
41 43 
 	// You can't reply with a poll... hacker.
42 
-	if (isset($_REQUEST['poll']) && !empty($topic) && !isset($_REQUEST['msg']))
43 
-		unset($_REQUEST['poll']);
44 
+	if (isset($_REQUEST['poll']) && !empty($topic) && !isset($_REQUEST['msg'])) {
45 
+			unset($_REQUEST['poll']);
46 
+	}
44 47
45 48 
 	// Posting an event?
46 49 
 	$context['make_event'] = isset($_REQUEST['calendar']);
 
@@ -60,12 +63,14 @@  discard block
 
 block discarded – undo
60 63 
 	{
61 64 
 		// Get ids of all the boards they can post in.
62 65 
 		$post_permissions = array('post_new');
63 
-		if ($modSettings['postmod_active'])
64 
-			$post_permissions[] = 'post_unapproved_topics';
66 
+		if ($modSettings['postmod_active']) {
67 
+					$post_permissions[] = 'post_unapproved_topics';
68 
+		}
65 69
66 70 
 		$boards = boardsAllowedTo($post_permissions);
67 
-		if (empty($boards))
68 
-			fatal_lang_error('cannot_post_new', false);
71 
+		if (empty($boards)) {
72 
+					fatal_lang_error('cannot_post_new', false);
73 
+		}
69 74
70 75 
 		// Get a list of boards for the select menu
71 76 
 		require_once($sourcedir . '/Subs-MessageIndex.php');
 
@@ -78,8 +83,9 @@  discard block
 
 block discarded – undo
78 83 
 		$board_list = getBoardList($boardListOptions);
79 84 
 	}
80 85 
 	// Let's keep things simple for ourselves below
81 
-	else
82 
-		$boards = array($board);
86 
+	else {
87 
+			$boards = array($board);
88 
+	}
83 89
84 90 
 	require_once($sourcedir . '/Subs-Post.php');
85 91 
 
@@ -102,10 +108,11 @@  discard block
 
 block discarded – undo
102 108 
 			array(
103 109 
 				'msg' => (int) $_REQUEST['msg'],
104 110 
 		));
105 
-		if ($smcFunc['db_num_rows']($request) != 1)
106 
-			unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
107 
-		else
108 
-			list ($topic) = $smcFunc['db_fetch_row']($request);
111 
+		if ($smcFunc['db_num_rows']($request) != 1) {
112 
+					unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
113 
+		} else {
114 
+					list ($topic) = $smcFunc['db_fetch_row']($request);
115 
+		}
109 116 
 		$smcFunc['db_free_result']($request);
110 117 
 	}
111 118 
 
@@ -132,33 +139,36 @@  discard block
 
 block discarded – undo
132 139 
 		$smcFunc['db_free_result']($request);
133 140
134 141 
 		// If this topic already has a poll, they sure can't add another.
135 
-		if (isset($_REQUEST['poll']) && $pollID > 0)
136 
-			unset($_REQUEST['poll']);
142 
+		if (isset($_REQUEST['poll']) && $pollID > 0) {
143 
+					unset($_REQUEST['poll']);
144 
+		}
137 145
138 146 
 		if (empty($_REQUEST['msg']))
139 147 
 		{
140 
-			if ($user_info['is_guest'] && !allowedTo('post_reply_any') && (!$modSettings['postmod_active'] || !allowedTo('post_unapproved_replies_any')))
141 
-				is_not_guest();
148 
+			if ($user_info['is_guest'] && !allowedTo('post_reply_any') && (!$modSettings['postmod_active'] || !allowedTo('post_unapproved_replies_any'))) {
149 
+							is_not_guest();
150 
+			}
142 151
143 152 
 			// By default the reply will be approved...
144 153 
 			$context['becomes_approved'] = true;
145 154 
 			if ($id_member_poster != $user_info['id'] || $user_info['is_guest'])
146 155 
 			{
147 
-				if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
148 
-					$context['becomes_approved'] = false;
149 
-				else
150 
-					isAllowedTo('post_reply_any');
151 
-			}
152 
-			elseif (!allowedTo('post_reply_any'))
156 
+				if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any')) {
157 
+									$context['becomes_approved'] = false;
158 
+				} else {
159 
+									isAllowedTo('post_reply_any');
160 
+				}
161 
+			} elseif (!allowedTo('post_reply_any'))
153 162 
 			{
154 
-				if ($modSettings['postmod_active'] && ((allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) || allowedTo('post_unapproved_replies_any')))
155 
-					$context['becomes_approved'] = false;
156 
-				else
157 
-					isAllowedTo('post_reply_own');
163 
+				if ($modSettings['postmod_active'] && ((allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) || allowedTo('post_unapproved_replies_any'))) {
164 
+									$context['becomes_approved'] = false;
165 
+				} else {
166 
+									isAllowedTo('post_reply_own');
167 
+				}
158 168 
 			}
169 
+		} else {
170 
+					$context['becomes_approved'] = true;
159 171 
 		}
160 
-		else
161 
-			$context['becomes_approved'] = true;
162 172
163 173 
 		$context['can_lock'] = allowedTo('lock_any') || ($user_info['id'] == $id_member_poster && allowedTo('lock_own'));
164 174 
 		$context['can_sticky'] = allowedTo('make_sticky');
 
@@ -173,17 +183,18 @@  discard block
 
 block discarded – undo
173 183 
 		$context['sticky'] = isset($_REQUEST['sticky']) ? !empty($_REQUEST['sticky']) : $sticky;
174 184
175 185 
 		// Check whether this is a really old post being bumped...
176 
-		if (!empty($modSettings['oldTopicDays']) && $lastPostTime + $modSettings['oldTopicDays'] * 86400 < time() && empty($sticky) && !isset($_REQUEST['subject']))
177 
-			$post_errors[] = array('old_topic', array($modSettings['oldTopicDays']));
178 
-	}
179 
-	else
186 
+		if (!empty($modSettings['oldTopicDays']) && $lastPostTime + $modSettings['oldTopicDays'] * 86400 < time() && empty($sticky) && !isset($_REQUEST['subject'])) {
187 
+					$post_errors[] = array('old_topic', array($modSettings['oldTopicDays']));
188 
+		}
189 
+	} else
180 190 
 	{
181 191 
 		// @todo Should use JavaScript to hide and show the warning based on the selection in the board select menu
182 192 
 		$context['becomes_approved'] = true;
183 
-		if ($modSettings['postmod_active'] && !allowedTo('post_new', $boards, true) && allowedTo('post_unapproved_topics', $boards, true))
184 
-			$context['becomes_approved'] = false;
185 
-		else
186 
-			isAllowedTo('post_new', $boards, true);
193 
+		if ($modSettings['postmod_active'] && !allowedTo('post_new', $boards, true) && allowedTo('post_unapproved_topics', $boards, true)) {
194 
+					$context['becomes_approved'] = false;
195 
+		} else {
196 
+					isAllowedTo('post_new', $boards, true);
197 
+		}
187 198
188 199 
 		$locked = 0;
189 200 
 		$context['already_locked'] = 0;
 
@@ -213,27 +224,32 @@  discard block
 
 block discarded – undo
213 224 
 	if (empty($_REQUEST['message']) && empty($_REQUEST['preview']) && !empty($_SESSION['already_attached']))
214 225 
 	{
215 226 
 		require_once($sourcedir . '/ManageAttachments.php');
216 
-		foreach ($_SESSION['already_attached'] as $attachID => $attachment)
217 
-			removeAttachments(array('id_attach' => $attachID));
227 
+		foreach ($_SESSION['already_attached'] as $attachID => $attachment) {
228 
+					removeAttachments(array('id_attach' => $attachID));
229 
+		}
218 230
219 231 
 		unset($_SESSION['already_attached']);
220 232 
 	}
221 233
222 234 
 	// Don't allow a post if it's locked and you aren't all powerful.
223 
-	if ($locked && !allowedTo('moderate_board'))
224 
-		fatal_lang_error('topic_locked', false);
235 
+	if ($locked && !allowedTo('moderate_board')) {
236 
+			fatal_lang_error('topic_locked', false);
237 
+	}
225 238 
 	// Check the users permissions - is the user allowed to add or post a poll?
226 239 
 	if (isset($_REQUEST['poll']) && $modSettings['pollMode'] == '1')
227 240 
 	{
228 241 
 		// New topic, new poll.
229 
-		if (empty($topic))
230 
-			isAllowedTo('poll_post');
242 
+		if (empty($topic)) {
243 
+					isAllowedTo('poll_post');
244 
+		}
231 245 
 		// This is an old topic - but it is yours!  Can you add to it?
232 
-		elseif ($user_info['id'] == $id_member_poster && !allowedTo('poll_add_any'))
233 
-			isAllowedTo('poll_add_own');
246 
+		elseif ($user_info['id'] == $id_member_poster && !allowedTo('poll_add_any')) {
247 
+					isAllowedTo('poll_add_own');
248 
+		}
234 249 
 		// If you're not the owner, can you add to any poll?
235 
-		else
236 
-			isAllowedTo('poll_add_any');
250 
+		else {
251 
+					isAllowedTo('poll_add_any');
252 
+		}
237 253
238 254 
 		if (!empty($board))
239 255 
 		{
 
@@ -242,8 +258,9 @@  discard block
 
 block discarded – undo
242 258 
 			$guest_vote_enabled = in_array(-1, $allowedVoteGroups['allowed']);
243 259 
 		}
244 260 
 		// No board, so we'll have to check this again in Post2
245 
-		else
246 
-			$guest_vote_enabled = true;
261 
+		else {
262 
+					$guest_vote_enabled = true;
263 
+		}
247 264
248 265 
 		// Set up the poll options.
249 266 
 		$context['poll_options'] = array(
 
@@ -269,8 +286,9 @@  discard block
 
 block discarded – undo
269 286 
 	if ($context['make_event'])
270 287 
 	{
271 288 
 		// They might want to pick a board.
272 
-		if (!isset($context['current_board']))
273 
-			$context['current_board'] = 0;
289 
+		if (!isset($context['current_board'])) {
290 
+					$context['current_board'] = 0;
291 
+		}
274 292
275 293 
 		// Start loading up the event info.
276 294 
 		$context['event'] = array();
 
@@ -284,10 +302,11 @@  discard block
 
 block discarded – undo
284 302 
 		isAllowedTo('calendar_post');
285 303
286 304 
 		// We want a fairly compact version of the time, but as close as possible to the user's settings.
287 
-		if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
288 
-			$time_string = '%k:%M';
289 
-		else
290 
-			$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
305 
+		if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
306 
+					$time_string = '%k:%M';
307 
+		} else {
308 
+					$time_string = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
309 
+		}
291 310
292 311 
 		$js_time_string = str_replace(
293 312 
 			array('%H', '%k', '%I', '%l', '%M', '%p', '%P', '%r',      '%R',  '%S', '%T',    '%X'),
 
@@ -309,8 +328,7 @@  discard block
 
 block discarded – undo
309 328 
 			require_once($sourcedir . '/Subs-Calendar.php');
310 329 
 			$eventProperties = getEventProperties($context['event']['id']);
311 330 
 			$context['event'] = array_merge($context['event'], $eventProperties);
312 
-		}
313 
-		else
331 
+		} else
314 332 
 		{
315 333 
 			// Get the current event information.
316 334 
 			require_once($sourcedir . '/Subs-Calendar.php');
 
@@ -318,10 +336,12 @@  discard block
 
 block discarded – undo
318 336 
 			$context['event'] = array_merge($context['event'], $eventProperties);
319 337
320 338 
 			// Make sure the year and month are in the valid range.
321 
-			if ($context['event']['month'] < 1 || $context['event']['month'] > 12)
322 
-				fatal_lang_error('invalid_month', false);
323 
-			if ($context['event']['year'] < $modSettings['cal_minyear'] || $context['event']['year'] > $modSettings['cal_maxyear'])
324 
-				fatal_lang_error('invalid_year', false);
339 
+			if ($context['event']['month'] < 1 || $context['event']['month'] > 12) {
340 
+							fatal_lang_error('invalid_month', false);
341 
+			}
342 
+			if ($context['event']['year'] < $modSettings['cal_minyear'] || $context['event']['year'] > $modSettings['cal_maxyear']) {
343 
+							fatal_lang_error('invalid_year', false);
344 
+			}
325 345
326 346 
 			$context['event']['categories'] = $board_list;
327 347 
 		}
 
@@ -432,10 +452,11 @@  discard block
 
 block discarded – undo
432 452
433 453 
 			if (!empty($context['new_replies']))
434 454 
 			{
435 
-				if ($context['new_replies'] == 1)
436 
-					$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
437 
-				else
438 
-					$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
455 
+				if ($context['new_replies'] == 1) {
456 
+									$txt['error_new_replies'] = isset($_GET['last_msg']) ? $txt['error_new_reply_reading'] : $txt['error_new_reply'];
457 
+				} else {
458 
+									$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? $txt['error_new_replies_reading'] : $txt['error_new_replies'], $context['new_replies']);
459 
+				}
439 460
440 461 
 				$post_errors[] = 'new_replies';
441 462 
 
@@ -447,9 +468,9 @@  discard block
 
 block discarded – undo
447 468 
 	// Get a response prefix (like 'Re:') in the default forum language.
448 469 
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
449 470 
 	{
450 
-		if ($language === $user_info['language'])
451 
-			$context['response_prefix'] = $txt['response_prefix'];
452 
-		else
471 
+		if ($language === $user_info['language']) {
472 
+					$context['response_prefix'] = $txt['response_prefix'];
473 
+		} else
453 474 
 		{
454 475 
 			loadLanguage('index', $language, false);
455 476 
 			$context['response_prefix'] = $txt['response_prefix'];
 
@@ -462,23 +483,26 @@  discard block
 
 block discarded – undo
462 483 
 	// Do we have a body, but an error happened.
463 484 
 	if (isset($_REQUEST['message']) || isset($_REQUEST['quickReply']) || !empty($context['post_error']))
464 485 
 	{
465 
-		if (isset($_REQUEST['quickReply']))
466 
-			$_REQUEST['message'] = $_REQUEST['quickReply'];
486 
+		if (isset($_REQUEST['quickReply'])) {
487 
+					$_REQUEST['message'] = $_REQUEST['quickReply'];
488 
+		}
467 489
468 490 
 		// Validate inputs.
469 491 
 		if (empty($context['post_error']))
470 492 
 		{
471 493 
 			// This means they didn't click Post and get an error.
472 494 
 			$really_previewing = true;
473 
-		}
474 
-		else
495 
+		} else
475 496 
 		{
476 
-			if (!isset($_REQUEST['subject']))
477 
-				$_REQUEST['subject'] = '';
478 
-			if (!isset($_REQUEST['message']))
479 
-				$_REQUEST['message'] = '';
480 
-			if (!isset($_REQUEST['icon']))
481 
-				$_REQUEST['icon'] = 'xx';
497 
+			if (!isset($_REQUEST['subject'])) {
498 
+							$_REQUEST['subject'] = '';
499 
+			}
500 
+			if (!isset($_REQUEST['message'])) {
501 
+							$_REQUEST['message'] = '';
502 
+			}
503 
+			if (!isset($_REQUEST['icon'])) {
504 
+							$_REQUEST['icon'] = 'xx';
505 
+			}
482 506
483 507 
 			// They are previewing if they asked to preview (i.e. came from quick reply).
484 508 
 			$really_previewing = !empty($_POST['preview']);
 
@@ -494,8 +518,9 @@  discard block
 
 block discarded – undo
494 518 
 		$form_message = $smcFunc['htmlspecialchars']($_REQUEST['message'], ENT_QUOTES);
495 519
496 520 
 		// Make sure the subject isn't too long - taking into account special characters.
497 
-		if ($smcFunc['strlen']($form_subject) > 100)
498 
-			$form_subject = $smcFunc['substr']($form_subject, 0, 100);
521 
+		if ($smcFunc['strlen']($form_subject) > 100) {
522 
+					$form_subject = $smcFunc['substr']($form_subject, 0, 100);
523 
+		}
499 524
500 525 
 		if (isset($_REQUEST['poll']))
501 526 
 		{
 
@@ -507,8 +532,9 @@  discard block
 
 block discarded – undo
507 532 
 			$_POST['options'] = empty($_POST['options']) ? array() : htmlspecialchars__recursive($_POST['options']);
508 533 
 			foreach ($_POST['options'] as $option)
509 534 
 			{
510 
-				if (trim($option) == '')
511 
-					continue;
535 
+				if (trim($option) == '') {
536 
+									continue;
537 
+				}
512 538
513 539 
 				$context['choices'][] = array(
514 540 
 					'id' => $choice_id++,
 
@@ -570,13 +596,14 @@  discard block
 
 block discarded – undo
570 596 
 				$context['preview_subject'] = $form_subject;
571 597
572 598 
 				censorText($context['preview_subject']);
599 
+			} else {
600 
+							$context['preview_subject'] = '<em>' . $txt['no_subject'] . '</em>';
573 601 
 			}
574 
-			else
575 
-				$context['preview_subject'] = '<em>' . $txt['no_subject'] . '</em>';
576 602
577 603 
 			// Protect any CDATA blocks.
578 
-			if (isset($_REQUEST['xml']))
579 
-				$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
604 
+			if (isset($_REQUEST['xml'])) {
605 
+							$context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
606 
+			}
580 607 
 		}
581 608
582 609 
 		// Set up the checkboxes.
 
@@ -615,29 +642,32 @@  discard block
 
 block discarded – undo
615 642 
 			);
616 643 
 			// The message they were trying to edit was most likely deleted.
617 644 
 			// @todo Change this error message?
618 
-			if ($smcFunc['db_num_rows']($request) == 0)
619 
-				fatal_lang_error('no_board', false);
645 
+			if ($smcFunc['db_num_rows']($request) == 0) {
646 
+							fatal_lang_error('no_board', false);
647 
+			}
620 648 
 			$row = $smcFunc['db_fetch_assoc']($request);
621 649
622 650 
 			$attachment_stuff = array($row);
623 
-			while ($row2 = $smcFunc['db_fetch_assoc']($request))
624 
-				$attachment_stuff[] = $row2;
651 
+			while ($row2 = $smcFunc['db_fetch_assoc']($request)) {
652 
+							$attachment_stuff[] = $row2;
653 
+			}
625 654 
 			$smcFunc['db_free_result']($request);
626 655
627 656 
 			if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
628 657 
 			{
629 658 
 				// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
630 
-				if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
631 
-					fatal_lang_error('modify_post_time_passed', false);
632 
-				elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own'))
633 
-					isAllowedTo('modify_replies');
634 
-				else
635 
-					isAllowedTo('modify_own');
659 
+				if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
660 
+									fatal_lang_error('modify_post_time_passed', false);
661 
+				} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own')) {
662 
+									isAllowedTo('modify_replies');
663 
+				} else {
664 
+									isAllowedTo('modify_own');
665 
+				}
666 
+			} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any')) {
667 
+							isAllowedTo('modify_replies');
668 
+			} else {
669 
+							isAllowedTo('modify_any');
636 670 
 			}
637 
-			elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any'))
638 
-				isAllowedTo('modify_replies');
639 
-			else
640 
-				isAllowedTo('modify_any');
641 671
642 672 
 			if ($context['can_announce'] && !empty($row['id_action']))
643 673 
 			{
 
@@ -661,8 +691,9 @@  discard block
 
 block discarded – undo
661 691
662 692 
 				while ($row = $smcFunc['db_fetch_assoc']($request))
663 693 
 				{
664 
-					if ($row['filesize'] <= 0)
665 
-						continue;
694 
+					if ($row['filesize'] <= 0) {
695 
+											continue;
696 
+					}
666 697 
 					$context['current_attachments'][$row['id_attach']] = array(
667 698 
 						'name' => $smcFunc['htmlspecialchars']($row['filename']),
668 699 
 						'size' => $row['filesize'],
 
@@ -732,29 +763,32 @@  discard block
 
 block discarded – undo
732 763 
 			)
733 764 
 		);
734 765 
 		// The message they were trying to edit was most likely deleted.
735 
-		if ($smcFunc['db_num_rows']($request) == 0)
736 
-			fatal_lang_error('no_message', false);
766 
+		if ($smcFunc['db_num_rows']($request) == 0) {
767 
+					fatal_lang_error('no_message', false);
768 
+		}
737 769 
 		$row = $smcFunc['db_fetch_assoc']($request);
738 770
739 771 
 		$attachment_stuff = array($row);
740 
-		while ($row2 = $smcFunc['db_fetch_assoc']($request))
741 
-			$attachment_stuff[] = $row2;
772 
+		while ($row2 = $smcFunc['db_fetch_assoc']($request)) {
773 
+					$attachment_stuff[] = $row2;
774 
+		}
742 775 
 		$smcFunc['db_free_result']($request);
743 776
744 777 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
745 778 
 		{
746 779 
 			// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
747 
-			if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
748 
-				fatal_lang_error('modify_post_time_passed', false);
749 
-			elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own'))
750 
-				isAllowedTo('modify_replies');
751 
-			else
752 
-				isAllowedTo('modify_own');
780 
+			if ($row['approved'] && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
781 
+							fatal_lang_error('modify_post_time_passed', false);
782 
+			} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own')) {
783 
+							isAllowedTo('modify_replies');
784 
+			} else {
785 
+							isAllowedTo('modify_own');
786 
+			}
787 
+		} elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any')) {
788 
+					isAllowedTo('modify_replies');
789 
+		} else {
790 
+					isAllowedTo('modify_any');
753 791 
 		}
754 
-		elseif ($row['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any'))
755 
-			isAllowedTo('modify_replies');
756 
-		else
757 
-			isAllowedTo('modify_any');
758 792
759 793 
 		if ($context['can_announce'] && !empty($row['id_action']))
760 794 
 		{
 
@@ -781,15 +815,17 @@  discard block
 
 block discarded – undo
781 815 
 		$context['icon'] = $row['icon'];
782 816
783 817 
 		// Show an "approve" box if the user can approve it, and the message isn't approved.
784 
-		if (!$row['approved'] && !$context['show_approval'])
785 
-			$context['show_approval'] = allowedTo('approve_posts');
818 
+		if (!$row['approved'] && !$context['show_approval']) {
819 
+					$context['show_approval'] = allowedTo('approve_posts');
820 
+		}
786 821
787 822 
 		// Sort the attachments so they are in the order saved
788 823 
 		$temp = array();
789 824 
 		foreach ($attachment_stuff as $attachment)
790 825 
 		{
791 
-			if ($attachment['filesize'] >= 0 && !empty($modSettings['attachmentEnable']))
792 
-				$temp[$attachment['id_attach']] = $attachment;
826 
+			if ($attachment['filesize'] >= 0 && !empty($modSettings['attachmentEnable'])) {
827 
+							$temp[$attachment['id_attach']] = $attachment;
828 
+			}
793 829 
 		}
794 830 
 		ksort($temp);
795 831 
 
@@ -850,14 +886,16 @@  discard block
 
 block discarded – undo
850 886 
 					'is_approved' => 1,
851 887 
 				)
852 888 
 			);
853 
-			if ($smcFunc['db_num_rows']($request) == 0)
854 
-				fatal_lang_error('quoted_post_deleted', false);
889 
+			if ($smcFunc['db_num_rows']($request) == 0) {
890 
+							fatal_lang_error('quoted_post_deleted', false);
891 
+			}
855 892 
 			list ($form_subject, $mname, $mdate, $form_message) = $smcFunc['db_fetch_row']($request);
856 893 
 			$smcFunc['db_free_result']($request);
857 894
858 895 
 			// Add 'Re: ' to the front of the quoted subject.
859 
-			if (trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
860 
-				$form_subject = $context['response_prefix'] . $form_subject;
896 
+			if (trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
897 
+							$form_subject = $context['response_prefix'] . $form_subject;
898 
+			}
861 899
862 900 
 			// Censor the message and subject.
863 901 
 			censorText($form_message);
 
@@ -870,10 +908,11 @@  discard block
 
 block discarded – undo
870 908 
 				for ($i = 0, $n = count($parts); $i < $n; $i++)
871 909 
 				{
872 910 
 					// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
873 
-					if ($i % 4 == 0)
874 
-						$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m)
911 
+					if ($i % 4 == 0) {
912 
+											$parts[$i] = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m)
875 913 
 						{
876 914 
 							return '[html]' . preg_replace('~<br\s?/?' . '>~i', '&lt;br /&gt;<br>', "$m[1]") . '[/html]';
915 
+					}
877 916 
 						}, $parts[$i]);
878 917 
 				}
879 918 
 				$form_message = implode('', $parts);
 
@@ -882,8 +921,9 @@  discard block
 
 block discarded – undo
882 921 
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $form_message);
883 922
884 923 
 			// Remove any nested quotes, if necessary.
885 
-			if (!empty($modSettings['removeNestedQuotes']))
886 
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
924 
+			if (!empty($modSettings['removeNestedQuotes'])) {
925 
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
926 
+			}
887 927
888 928 
 			// Add a quote string on the front and end.
889 929 
 			$form_message = '[quote author=' . $mname . ' link=msg=' . (int) $_REQUEST['quote'] . ' date=' . $mdate . ']' . "\n" . rtrim($form_message) . "\n" . '[/quote]';
 
@@ -895,15 +935,15 @@  discard block
 
 block discarded – undo
895 935 
 			$form_subject = $first_subject;
896 936
897 937 
 			// Add 'Re: ' to the front of the subject.
898 
-			if (trim($context['response_prefix']) != '' && $form_subject != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
899 
-				$form_subject = $context['response_prefix'] . $form_subject;
938 
+			if (trim($context['response_prefix']) != '' && $form_subject != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
939 
+							$form_subject = $context['response_prefix'] . $form_subject;
940 
+			}
900 941
901 942 
 			// Censor the subject.
902 943 
 			censorText($form_subject);
903 944
904 945 
 			$form_message = '';
905 
-		}
906 
-		else
946 
+		} else
907 947 
 		{
908 948 
 			$form_subject = isset($_GET['subject']) ? $_GET['subject'] : '';
909 949 
 			$form_message = '';
 
@@ -922,13 +962,15 @@  discard block
 
 block discarded – undo
922 962 
 		if (isset($_REQUEST['msg']))
923 963 
 		{
924 964 
 			$context['attachments']['quantity'] = count($context['current_attachments']);
925 
-			foreach ($context['current_attachments'] as $attachment)
926 
-				$context['attachments']['total_size'] += $attachment['size'];
965 
+			foreach ($context['current_attachments'] as $attachment) {
966 
+							$context['attachments']['total_size'] += $attachment['size'];
967 
+			}
927 968 
 		}
928 969
929 970 
 		// A bit of house keeping first.
930 
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
931 
-			unset($_SESSION['temp_attachments']);
971 
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
972 
+					unset($_SESSION['temp_attachments']);
973 
+		}
932 974
933 975 
 		if (!empty($_SESSION['temp_attachments']))
934 976 
 		{
 
@@ -937,9 +979,10 @@  discard block
 
 block discarded – undo
937 979 
 			{
938 980 
 				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
939 981 
 				{
940 
-					if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
941 
-						if (file_exists($attachment['tmp_name']))
982 
+					if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false) {
983 
+											if (file_exists($attachment['tmp_name']))
942 984 
 							unlink($attachment['tmp_name']);
985 
+					}
943 986 
 				}
944 987 
 				$post_errors[] = 'temp_attachments_gone';
945 988 
 				$_SESSION['temp_attachments'] = array();
 
@@ -953,8 +996,9 @@  discard block
 
 block discarded – undo
953 996 
 					// See if any files still exist before showing the warning message and the files attached.
954 997 
 					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
955 998 
 					{
956 
-						if (strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
957 
-							continue;
999 
+						if (strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
1000 
+													continue;
1001 
+						}
958 1002
959 1003 
 						if (file_exists($attachment['tmp_name']))
960 1004 
 						{
 
@@ -964,20 +1008,21 @@  discard block
 
 block discarded – undo
964 1008 
 							break;
965 1009 
 						}
966 1010 
 					}
967 
-				}
968 
-				else
1011 
+				} else
969 1012 
 				{
970 1013 
 					// Since, they don't belong here. Let's inform the user that they exist..
971 
-					if (!empty($topic))
972 
-						$delete_url = $scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
973 
-					else
974 
-						$delete_url = $scripturl . '?action=post' . (!empty($board) ? ';board=' . $board : '') . ';delete_temp';
1014 
+					if (!empty($topic)) {
1015 
+											$delete_url = $scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
1016 
+					} else {
1017 
+											$delete_url = $scripturl . '?action=post' . (!empty($board) ? ';board=' . $board : '') . ';delete_temp';
1018 
+					}
975 1019
976 1020 
 					// Compile a list of the files to show the user.
977 1021 
 					$file_list = array();
978 
-					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
979 
-						if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
1022 
+					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
1023 
+											if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
980 1024 
 							$file_list[] = $attachment['name'];
1025 
+					}
981 1026
982 1027 
 					$_SESSION['temp_attachments']['post']['files'] = $file_list;
983 1028 
 					$file_list = '<div class="attachments">' . implode('<br>', $file_list) . '</div>';
 
@@ -989,8 +1034,7 @@  discard block
 
 block discarded – undo
989 1034
990 1035 
 						$post_errors[] = array('temp_attachments_found', array($delete_url, $goback_url, $file_list));
991 1036 
 						$context['ignore_temp_attachments'] = true;
992 
-					}
993 
-					else
1037 
+					} else
994 1038 
 					{
995 1039 
 						$post_errors[] = array('temp_attachments_lost', array($delete_url, $file_list));
996 1040 
 						$context['ignore_temp_attachments'] = true;
 
@@ -998,16 +1042,19 @@  discard block
 
 block discarded – undo
998 1042 
 				}
999 1043 
 			}
1000 1044
1001 
-			if (!empty($context['we_are_history']))
1002 
-				$post_errors[] = $context['we_are_history'];
1045 
+			if (!empty($context['we_are_history'])) {
1046 
+							$post_errors[] = $context['we_are_history'];
1047 
+			}
1003 1048
1004 1049 
 			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
1005 1050 
 			{
1006 
-				if (isset($context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files']))
1007 
-					break;
1051 
+				if (isset($context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files'])) {
1052 
+									break;
1053 
+				}
1008 1054
1009 
-				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
1010 
-					continue;
1055 
+				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
1056 
+									continue;
1057 
+				}
1011 1058
1012 1059 
 				if ($attachID == 'initial_error')
1013 1060 
 				{
 
@@ -1022,15 +1069,17 @@  discard block
 
 block discarded – undo
1022 1069 
 				{
1023 1070 
 					$txt['error_attach_errors'] = empty($txt['error_attach_errors']) ? '<br>' : '';
1024 1071 
 					$txt['error_attach_errors'] .= vsprintf($txt['attach_warning'], $attachment['name']) . '<div style="padding: 0 1em;">';
1025 
-					foreach ($attachment['errors'] as $error)
1026 
-						$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br >';
1072 
+					foreach ($attachment['errors'] as $error) {
1073 
+											$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br >';
1074 
+					}
1027 1075 
 					$txt['error_attach_errors'] .= '</div>';
1028 1076 
 					$post_errors[] = 'attach_errors';
1029 1077
1030 1078 
 					// Take out the trash.
1031 1079 
 					unset($_SESSION['temp_attachments'][$attachID]);
1032 
-					if (file_exists($attachment['tmp_name']))
1033 
-						unlink($attachment['tmp_name']);
1080 
+					if (file_exists($attachment['tmp_name'])) {
1081 
+											unlink($attachment['tmp_name']);
1082 
+					}
1034 1083 
 					continue;
1035 1084 
 				}
1036 1085 
 
@@ -1043,8 +1092,9 @@  discard block
 
 block discarded – undo
1043 1092
1044 1093 
 				$context['attachments']['quantity']++;
1045 1094 
 				$context['attachments']['total_size'] += $attachment['size'];
1046 
-				if (!isset($context['files_in_session_warning']))
1047 
-					$context['files_in_session_warning'] = $txt['attached_files_in_session'];
1095 
+				if (!isset($context['files_in_session_warning'])) {
1096 
+									$context['files_in_session_warning'] = $txt['attached_files_in_session'];
1097 
+				}
1048 1098
1049 1099 
 				$context['current_attachments'][$attachID] = array(
1050 1100 
 					'name' => '<u>' . $smcFunc['htmlspecialchars']($attachment['name']) . '</u>',
 
@@ -1072,8 +1122,9 @@  discard block
 
 block discarded – undo
1072 1122 
 	}
1073 1123
1074 1124 
 	// If they came from quick reply, and have to enter verification details, give them some notice.
1075 
-	if (!empty($_REQUEST['from_qr']) && !empty($context['require_verification']))
1076 
-		$post_errors[] = 'need_qr_verification';
1125 
+	if (!empty($_REQUEST['from_qr']) && !empty($context['require_verification'])) {
1126 
+			$post_errors[] = 'need_qr_verification';
1127 
+	}
1077 1128
1078 1129 
 	/*
1079 1130 
 	 * There are two error types: serious and minor. Serious errors
 
@@ -1090,52 +1141,56 @@  discard block
 
 block discarded – undo
1090 1141 
 	{
1091 1142 
 		loadLanguage('Errors');
1092 1143 
 		$context['error_type'] = 'minor';
1093 
-		foreach ($post_errors as $post_error)
1094 
-			if (is_array($post_error))
1144 
+		foreach ($post_errors as $post_error) {
1145 
+					if (is_array($post_error))
1095 1146 
 			{
1096 1147 
 				$post_error_id = $post_error[0];
1148 
+		}
1097 1149 
 				$context['post_error'][$post_error_id] = vsprintf($txt['error_' . $post_error_id], $post_error[1]);
1098 1150
1099 1151 
 				// If it's not a minor error flag it as such.
1100 
-				if (!in_array($post_error_id, $minor_errors))
1101 
-					$context['error_type'] = 'serious';
1102 
-			}
1103 
-			else
1152 
+				if (!in_array($post_error_id, $minor_errors)) {
1153 
+									$context['error_type'] = 'serious';
1154 
+				}
1155 
+			} else
1104 1156 
 			{
1105 1157 
 				$context['post_error'][$post_error] = $txt['error_' . $post_error];
1106 1158
1107 1159 
 				// If it's not a minor error flag it as such.
1108 
-				if (!in_array($post_error, $minor_errors))
1109 
-					$context['error_type'] = 'serious';
1160 
+				if (!in_array($post_error, $minor_errors)) {
1161 
+									$context['error_type'] = 'serious';
1162 
+				}
1110 1163 
 			}
1111 1164 
 	}
1112 1165
1113 1166 
 	// What are you doing? Posting a poll, modifying, previewing, new post, or reply...
1114 
-	if (isset($_REQUEST['poll']))
1115 
-		$context['page_title'] = $txt['new_poll'];
1116 
-	elseif ($context['make_event'])
1117 
-		$context['page_title'] = $context['event']['id'] == -1 ? $txt['calendar_post_event'] : $txt['calendar_edit'];
1118 
-	elseif (isset($_REQUEST['msg']))
1119 
-		$context['page_title'] = $txt['modify_msg'];
1120 
-	elseif (isset($_REQUEST['subject'], $context['preview_subject']))
1121 
-		$context['page_title'] = $txt['preview'] . ' - ' . strip_tags($context['preview_subject']);
1122 
-	elseif (empty($topic))
1123 
-		$context['page_title'] = $txt['start_new_topic'];
1124 
-	else
1125 
-		$context['page_title'] = $txt['post_reply'];
1167 
+	if (isset($_REQUEST['poll'])) {
1168 
+			$context['page_title'] = $txt['new_poll'];
1169 
+	} elseif ($context['make_event']) {
1170 
+			$context['page_title'] = $context['event']['id'] == -1 ? $txt['calendar_post_event'] : $txt['calendar_edit'];
1171 
+	} elseif (isset($_REQUEST['msg'])) {
1172 
+			$context['page_title'] = $txt['modify_msg'];
1173 
+	} elseif (isset($_REQUEST['subject'], $context['preview_subject'])) {
1174 
+			$context['page_title'] = $txt['preview'] . ' - ' . strip_tags($context['preview_subject']);
1175 
+	} elseif (empty($topic)) {
1176 
+			$context['page_title'] = $txt['start_new_topic'];
1177 
+	} else {
1178 
+			$context['page_title'] = $txt['post_reply'];
1179 
+	}
1126 1180
1127 1181 
 	// Build the link tree.
1128 
-	if (empty($topic))
1129 
-		$context['linktree'][] = array(
1182 
+	if (empty($topic)) {
1183 
+			$context['linktree'][] = array(
1130 1184 
 			'name' => '<em>' . $txt['start_new_topic'] . '</em>'
1131 1185 
 		);
1132 
-	else
1133 
-		$context['linktree'][] = array(
1186 
+	} else {
1187 
+			$context['linktree'][] = array(
1134 1188 
 			'url' => $scripturl . '?topic=' . $topic . '.' . $_REQUEST['start'],
1135 1189 
 			'name' => $form_subject,
1136 1190 
 			'extra_before' => '<span><strong class="nav">' . $context['page_title'] . ' (</strong></span>',
1137 1191 
 			'extra_after' => '<span><strong class="nav">)</strong></span>'
1138 1192 
 		);
1193 
+	}
1139 1194
1140 1195 
 	$context['subject'] = addcslashes($form_subject, '"');
1141 1196 
 	$context['message'] = str_replace(array('"', '<', '>', '&nbsp;'), array('&quot;', '&lt;', '&gt;', ' '), $form_message);
 
@@ -1179,8 +1234,9 @@  discard block
 
 block discarded – undo
1179 1234 
 	// Message icons - customized icons are off?
1180 1235 
 	$context['icons'] = getMessageIcons(!empty($board) ? $board : 0);
1181 1236
1182 
-	if (!empty($context['icons']))
1183 
-		$context['icons'][count($context['icons']) - 1]['is_last'] = true;
1237 
+	if (!empty($context['icons'])) {
1238 
+			$context['icons'][count($context['icons']) - 1]['is_last'] = true;
1239 
+	}
1184 1240
1185 1241 
 	// Are we starting a poll? if set the poll icon as selected if its available
1186 1242 
 	if (isset($_REQUEST['poll']))
 
@@ -1200,8 +1256,9 @@  discard block
 
 block discarded – undo
1200 1256 
 	for ($i = 0, $n = count($context['icons']); $i < $n; $i++)
1201 1257 
 	{
1202 1258 
 		$context['icons'][$i]['selected'] = $context['icon'] == $context['icons'][$i]['value'];
1203 
-		if ($context['icons'][$i]['selected'])
1204 
-			$context['icon_url'] = $context['icons'][$i]['url'];
1259 
+		if ($context['icons'][$i]['selected']) {
1260 
+					$context['icon_url'] = $context['icons'][$i]['url'];
1261 
+		}
1205 1262 
 	}
1206 1263 
 	if (empty($context['icon_url']))
1207 1264 
 	{
 
@@ -1215,8 +1272,9 @@  discard block
 
 block discarded – undo
1215 1272 
 		));
1216 1273 
 	}
1217 1274
1218 
-	if (!empty($topic) && !empty($modSettings['topicSummaryPosts']))
1219 
-		getTopic();
1275 
+	if (!empty($topic) && !empty($modSettings['topicSummaryPosts'])) {
1276 
+			getTopic();
1277 
+	}
1220 1278
1221 1279 
 	// If the user can post attachments prepare the warning labels.
1222 1280 
 	if ($context['can_post_attachment'])
 
@@ -1227,12 +1285,13 @@  discard block
 
 block discarded – undo
1227 1285 
 		$context['attachment_restrictions'] = array();
1228 1286 
 		$context['allowed_extensions'] = strtr(strtolower($modSettings['attachmentExtensions']), array(',' => ', '));
1229 1287 
 		$attachmentRestrictionTypes = array('attachmentNumPerPostLimit', 'attachmentPostLimit', 'attachmentSizeLimit');
1230 
-		foreach ($attachmentRestrictionTypes as $type)
1231 
-			if (!empty($modSettings[$type]))
1288 
+		foreach ($attachmentRestrictionTypes as $type) {
1289 
+					if (!empty($modSettings[$type]))
1232 1290 
 			{
1233 1291 
 				// Show the max number of attachments if not 0.
1234 1292 
 				if ($type == 'attachmentNumPerPostLimit')
1235 1293 
 					$context['attachment_restrictions'][] = sprintf($txt['attach_remaining'], $modSettings['attachmentNumPerPostLimit'] - $context['attachments']['quantity']);
1294 
+		}
1236 1295 
 			}
1237 1296 
 	}
1238 1297 
 
@@ -1266,8 +1325,8 @@  discard block
 
 block discarded – undo
1266 1325
1267 1326 
 	if (!empty($context['current_attachments']))
1268 1327 
 	{
1269 
-		foreach ($context['current_attachments'] as $key => $mock)
1270 
-			addInlineJavaScript('
1328 
+		foreach ($context['current_attachments'] as $key => $mock) {
1329 
+					addInlineJavaScript('
1271 1330 
 	current_attachments.push({
1272 1331 
 		name: '. JavaScriptEscape($mock['name']) . ',
1273 1332 
 		size: '. $mock['size'] . ',
 
@@ -1276,6 +1335,7 @@  discard block
 
 block discarded – undo
1276 1335 
 		type: '. JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') . ',
1277 1336 
 		thumbID: '. (!empty($mock['thumb']) ? $mock['thumb'] : 0) . '
1278 1337 
 	});');
1338 
+		}
1279 1339 
 	}
1280 1340
1281 1341 
 	// File Upload.
 
@@ -1350,9 +1410,10 @@  discard block
 
 block discarded – undo
1350 1410 
 			$context['posting_fields']['board']['dd'] .= '
1351 1411 
 							<optgroup label="' . $category['name'] . '">';
1352 1412
1353 
-			foreach ($category['boards'] as $brd)
1354 
-				$context['posting_fields']['board']['dd'] .= '
1413 
+			foreach ($category['boards'] as $brd) {
1414 
+							$context['posting_fields']['board']['dd'] .= '
1355 1415 
 								<option value="' . $brd['id'] . '"' . ($brd['selected'] ? ' selected' : '') . '>' . ($brd['child_level'] > 0 ? str_repeat('==', $brd['child_level'] - 1) . '=&gt;' : '') . ' ' . $brd['name'] . '</option>';
1416 
+			}
1356 1417
1357 1418 
 			$context['posting_fields']['board']['dd'] .= '
1358 1419 
 							</optgroup>';
 
@@ -1383,8 +1444,9 @@  discard block
 
 block discarded – undo
1383 1444
1384 1445
1385 1446 
 	// Finally, load the template.
1386 
-	if (!isset($_REQUEST['xml']))
1387 
-		loadTemplate('Post');
1447 
+	if (!isset($_REQUEST['xml'])) {
1448 
+			loadTemplate('Post');
1449 
+	}
1388 1450
1389 1451 
 	call_integration_hook('integrate_post_end');
1390 1452 
 }
 
@@ -1405,13 +1467,14 @@  discard block
 
 block discarded – undo
1405 1467 
 	// Sneaking off, are we?
1406 1468 
 	if (empty($_POST) && empty($topic))
1407 1469 
 	{
1408 
-		if (empty($_SERVER['CONTENT_LENGTH']))
1409 
-			redirectexit('action=post;board=' . $board . '.0');
1410 
-		else
1411 
-			fatal_lang_error('post_upload_error', false);
1470 
+		if (empty($_SERVER['CONTENT_LENGTH'])) {
1471 
+					redirectexit('action=post;board=' . $board . '.0');
1472 
+		} else {
1473 
+					fatal_lang_error('post_upload_error', false);
1474 
+		}
1475 
+	} elseif (empty($_POST) && !empty($topic)) {
1476 
+			redirectexit('action=post;topic=' . $topic . '.0');
1412 1477 
 	}
1413 
-	elseif (empty($_POST) && !empty($topic))
1414 
-		redirectexit('action=post;topic=' . $topic . '.0');
1415 1478
1416 1479 
 	// No need!
1417 1480 
 	$context['robot_no_index'] = true;
 
@@ -1423,8 +1486,9 @@  discard block
 
 block discarded – undo
1423 1486 
 	$post_errors = array();
1424 1487
1425 1488 
 	// If the session has timed out, let the user re-submit their form.
1426 
-	if (checkSession('post', '', false) != '')
1427 
-		$post_errors[] = 'session_timeout';
1489 
+	if (checkSession('post', '', false) != '') {
1490 
+			$post_errors[] = 'session_timeout';
1491 
+	}
1428 1492
1429 1493 
 	// Wrong verification code?
1430 1494 
 	if (!$user_info['is_admin'] && !$user_info['is_mod'] && !empty($modSettings['posts_require_captcha']) && ($user_info['posts'] < $modSettings['posts_require_captcha'] || ($user_info['is_guest'] && $modSettings['posts_require_captcha'] == -1)))
 
@@ -1434,8 +1498,9 @@  discard block
 
 block discarded – undo
1434 1498 
 			'id' => 'post',
1435 1499 
 		);
1436 1500 
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
1437 
-		if (is_array($context['require_verification']))
1438 
-			$post_errors = array_merge($post_errors, $context['require_verification']);
1501 
+		if (is_array($context['require_verification'])) {
1502 
+					$post_errors = array_merge($post_errors, $context['require_verification']);
1503 
+		}
1439 1504 
 	}
1440 1505
1441 1506 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -1444,25 +1509,29 @@  discard block
 
 block discarded – undo
1444 1509 
 	call_integration_hook('integrate_post2_start');
1445 1510
1446 1511 
 	// Drafts enabled and needed?
1447 
-	if (!empty($modSettings['drafts_post_enabled']) && (isset($_POST['save_draft']) || isset($_POST['id_draft'])))
1448 
-		require_once($sourcedir . '/Drafts.php');
1512 
+	if (!empty($modSettings['drafts_post_enabled']) && (isset($_POST['save_draft']) || isset($_POST['id_draft']))) {
1513 
+			require_once($sourcedir . '/Drafts.php');
1514 
+	}
1449 1515
1450 1516 
 	// First check to see if they are trying to delete any current attachments.
1451 1517 
 	if (isset($_POST['attach_del']))
1452 1518 
 	{
1453 1519 
 		$keep_temp = array();
1454 1520 
 		$keep_ids = array();
1455 
-		foreach ($_POST['attach_del'] as $dummy)
1456 
-			if (strpos($dummy, 'post_tmp_' . $user_info['id']) !== false)
1521 
+		foreach ($_POST['attach_del'] as $dummy) {
1522 
+					if (strpos($dummy, 'post_tmp_' . $user_info['id']) !== false)
1457 1523 
 				$keep_temp[] = $dummy;
1458 
-			else
1459 
-				$keep_ids[] = (int) $dummy;
1524 
+		}
1525 
+			else {
1526 
+							$keep_ids[] = (int) $dummy;
1527 
+			}
1460 1528
1461 
-		if (isset($_SESSION['temp_attachments']))
1462 
-			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
1529 
+		if (isset($_SESSION['temp_attachments'])) {
1530 
+					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
1463 1531 
 			{
1464 1532 
 				if ((isset($_SESSION['temp_attachments']['post']['files'], $attachment['name']) && in_array($attachment['name'], $_SESSION['temp_attachments']['post']['files'])) || in_array($attachID, $keep_temp) || strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
1465 1533 
 					continue;
1534 
+		}
1466 1535
1467 1536 
 				unset($_SESSION['temp_attachments'][$attachID]);
1468 1537 
 				unlink($attachment['tmp_name']);
 
@@ -1494,8 +1563,9 @@  discard block
 
 block discarded – undo
1494 1563 
 	{
1495 1564 
 		require_once($sourcedir . '/ManageAttachments.php');
1496 1565
1497 
-		foreach ($_SESSION['already_attached'] as $attachID => $attachment)
1498 
-			removeAttachments(array('id_attach' => $attachID));
1566 
+		foreach ($_SESSION['already_attached'] as $attachID => $attachment) {
1567 
+					removeAttachments(array('id_attach' => $attachID));
1568 
+		}
1499 1569
1500 1570 
 		unset($_SESSION['already_attached']);
1501 1571 
 
@@ -1518,12 +1588,14 @@  discard block
 
 block discarded – undo
1518 1588 
 		$smcFunc['db_free_result']($request);
1519 1589
1520 1590 
 		// Though the topic should be there, it might have vanished.
1521 
-		if (!is_array($topic_info))
1522 
-			fatal_lang_error('topic_doesnt_exist', 404);
1591 
+		if (!is_array($topic_info)) {
1592 
+					fatal_lang_error('topic_doesnt_exist', 404);
1593 
+		}
1523 1594
1524 1595 
 		// Did this topic suddenly move? Just checking...
1525 
-		if ($topic_info['id_board'] != $board)
1526 
-			fatal_lang_error('not_a_topic');
1596 
+		if ($topic_info['id_board'] != $board) {
1597 
+					fatal_lang_error('not_a_topic');
1598 
+		}
1527 1599
1528 1600 
 		// Do the permissions and approval stuff...
1529 1601 
 		$becomesApproved = true;
 
@@ -1546,49 +1618,50 @@  discard block
 
 block discarded – undo
1546 1618 
 	if (!empty($topic) && !isset($_REQUEST['msg']))
1547 1619 
 	{
1548 1620 
 		// Don't allow a post if it's locked.
1549 
-		if ($topic_info['locked'] != 0 && !allowedTo('moderate_board'))
1550 
-			fatal_lang_error('topic_locked', false);
1621 
+		if ($topic_info['locked'] != 0 && !allowedTo('moderate_board')) {
1622 
+					fatal_lang_error('topic_locked', false);
1623 
+		}
1551 1624
1552 1625 
 		// Sorry, multiple polls aren't allowed... yet.  You should stop giving me ideas :P.
1553 
-		if (isset($_REQUEST['poll']) && $topic_info['id_poll'] > 0)
1554 
-			unset($_REQUEST['poll']);
1555 
-
1556 
-		elseif ($topic_info['id_member_started'] != $user_info['id'])
1557 
-		{
1558 
-			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any'))
1559 
-				$becomesApproved = false;
1560 
-
1561 
-			else
1562 
-				isAllowedTo('post_reply_any');
1563 
-		}
1564 
-		elseif (!allowedTo('post_reply_any'))
1626 
+		if (isset($_REQUEST['poll']) && $topic_info['id_poll'] > 0) {
1627 
+					unset($_REQUEST['poll']);
1628 
+		} elseif ($topic_info['id_member_started'] != $user_info['id'])
1629 
+		{
1630 
+			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_any') && !allowedTo('post_reply_any')) {
1631 
+							$becomesApproved = false;
1632 
+			} else {
1633 
+							isAllowedTo('post_reply_any');
1634 
+			}
1635 
+		} elseif (!allowedTo('post_reply_any'))
1565 1636 
 		{
1566 
-			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own'))
1567 
-				$becomesApproved = false;
1568 
-
1569 
-			else
1570 
-				isAllowedTo('post_reply_own');
1637 
+			if ($modSettings['postmod_active'] && allowedTo('post_unapproved_replies_own') && !allowedTo('post_reply_own')) {
1638 
+							$becomesApproved = false;
1639 
+			} else {
1640 
+							isAllowedTo('post_reply_own');
1641 
+			}
1571 1642 
 		}
1572 1643
1573 1644 
 		if (isset($_POST['lock']))
1574 1645 
 		{
1575 1646 
 			// Nothing is changed to the lock.
1576 
-			if (empty($topic_info['locked']) == empty($_POST['lock']))
1577 
-				unset($_POST['lock']);
1647 
+			if (empty($topic_info['locked']) == empty($_POST['lock'])) {
1648 
+							unset($_POST['lock']);
1649 
+			}
1578 1650
1579 1651 
 			// You're have no permission to lock this topic.
1580 
-			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started']))
1581 
-				unset($_POST['lock']);
1652 
+			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started'])) {
1653 
+							unset($_POST['lock']);
1654 
+			}
1582 1655
1583 1656 
 			// You are allowed to (un)lock your own topic only.
1584 1657 
 			elseif (!allowedTo('lock_any'))
1585 1658 
 			{
1586 1659 
 				// You cannot override a moderator lock.
1587 
-				if ($topic_info['locked'] == 1)
1588 
-					unset($_POST['lock']);
1589 
-
1590 
-				else
1591 
-					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
1660 
+				if ($topic_info['locked'] == 1) {
1661 
+									unset($_POST['lock']);
1662 
+				} else {
1663 
+									$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
1664 
+				}
1592 1665 
 			}
1593 1666 
 			// Hail mighty moderator, (un)lock this topic immediately.
1594 1667 
 			else
 
@@ -1596,19 +1669,21 @@  discard block
 
 block discarded – undo
1596 1669 
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
1597 1670
1598 1671 
 				// Did someone (un)lock this while you were posting?
1599 
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked'])
1600 
-					$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
1672 
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked']) {
1673 
+									$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
1674 
+				}
1601 1675 
 			}
1602 1676 
 		}
1603 1677
1604 1678 
 		// So you wanna (un)sticky this...let's see.
1605 
-		if (isset($_POST['sticky']) && ($_POST['sticky'] == $topic_info['is_sticky'] || !allowedTo('make_sticky')))
1606 
-			unset($_POST['sticky']);
1607 
-		elseif (isset($_POST['sticky']))
1679 
+		if (isset($_POST['sticky']) && ($_POST['sticky'] == $topic_info['is_sticky'] || !allowedTo('make_sticky'))) {
1680 
+					unset($_POST['sticky']);
1681 
+		} elseif (isset($_POST['sticky']))
1608 1682 
 		{
1609 1683 
 			// Did someone (un)sticky this while you were posting?
1610 
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky'])
1611 
-				$post_errors[] = 'topic_' . (empty($topic_info['is_sticky']) ? 'un' : '') . 'sticky';
1684 
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky']) {
1685 
+							$post_errors[] = 'topic_' . (empty($topic_info['is_sticky']) ? 'un' : '') . 'sticky';
1686 
+			}
1612 1687 
 		}
1613 1688
1614 1689 
 		// If drafts are enabled, then pass this off
 
@@ -1635,26 +1710,31 @@  discard block
 
 block discarded – undo
1635 1710
1636 1711 
 		// Do like, the permissions, for safety and stuff...
1637 1712 
 		$becomesApproved = true;
1638 
-		if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics'))
1639 
-			$becomesApproved = false;
1640 
-		else
1641 
-			isAllowedTo('post_new');
1713 
+		if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics')) {
1714 
+					$becomesApproved = false;
1715 
+		} else {
1716 
+					isAllowedTo('post_new');
1717 
+		}
1642 1718
1643 1719 
 		if (isset($_POST['lock']))
1644 1720 
 		{
1645 1721 
 			// New topics are by default not locked.
1646 
-			if (empty($_POST['lock']))
1647 
-				unset($_POST['lock']);
1722 
+			if (empty($_POST['lock'])) {
1723 
+							unset($_POST['lock']);
1724 
+			}
1648 1725 
 			// Besides, you need permission.
1649 
-			elseif (!allowedTo(array('lock_any', 'lock_own')))
1650 
-				unset($_POST['lock']);
1726 
+			elseif (!allowedTo(array('lock_any', 'lock_own'))) {
1727 
+							unset($_POST['lock']);
1728 
+			}
1651 1729 
 			// A moderator-lock (1) can override a user-lock (2).
1652 
-			else
1653 
-				$_POST['lock'] = allowedTo('lock_any') ? 1 : 2;
1730 
+			else {
1731 
+							$_POST['lock'] = allowedTo('lock_any') ? 1 : 2;
1732 
+			}
1654 1733 
 		}
1655 1734
1656 
-		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !allowedTo('make_sticky')))
1657 
-			unset($_POST['sticky']);
1735 
+		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !allowedTo('make_sticky'))) {
1736 
+					unset($_POST['sticky']);
1737 
+		}
1658 1738
1659 1739 
 		// Saving your new topic as a draft first?
1660 1740 
 		if (!empty($modSettings['drafts_post_enabled']) && isset($_POST['save_draft']))
 
@@ -1679,31 +1759,37 @@  discard block
 
 block discarded – undo
1679 1759 
 				'id_msg' => $_REQUEST['msg'],
1680 1760 
 			)
1681 1761 
 		);
1682 
-		if ($smcFunc['db_num_rows']($request) == 0)
1683 
-			fatal_lang_error('cant_find_messages', false);
1762 
+		if ($smcFunc['db_num_rows']($request) == 0) {
1763 
+					fatal_lang_error('cant_find_messages', false);
1764 
+		}
1684 1765 
 		$row = $smcFunc['db_fetch_assoc']($request);
1685 1766 
 		$smcFunc['db_free_result']($request);
1686 1767
1687 
-		if (!empty($topic_info['locked']) && !allowedTo('moderate_board'))
1688 
-			fatal_lang_error('topic_locked', false);
1768 
+		if (!empty($topic_info['locked']) && !allowedTo('moderate_board')) {
1769 
+					fatal_lang_error('topic_locked', false);
1770 
+		}
1689 1771
1690 1772 
 		if (isset($_POST['lock']))
1691 1773 
 		{
1692 1774 
 			// Nothing changes to the lock status.
1693 
-			if ((empty($_POST['lock']) && empty($topic_info['locked'])) || (!empty($_POST['lock']) && !empty($topic_info['locked'])))
1694 
-				unset($_POST['lock']);
1775 
+			if ((empty($_POST['lock']) && empty($topic_info['locked'])) || (!empty($_POST['lock']) && !empty($topic_info['locked']))) {
1776 
+							unset($_POST['lock']);
1777 
+			}
1695 1778 
 			// You're simply not allowed to (un)lock this.
1696 
-			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started']))
1697 
-				unset($_POST['lock']);
1779 
+			elseif (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $topic_info['id_member_started'])) {
1780 
+							unset($_POST['lock']);
1781 
+			}
1698 1782 
 			// You're only allowed to lock your own topics.
1699 1783 
 			elseif (!allowedTo('lock_any'))
1700 1784 
 			{
1701 1785 
 				// You're not allowed to break a moderator's lock.
1702 
-				if ($topic_info['locked'] == 1)
1703 
-					unset($_POST['lock']);
1786 
+				if ($topic_info['locked'] == 1) {
1787 
+									unset($_POST['lock']);
1788 
+				}
1704 1789 
 				// Lock it with a soft lock or unlock it.
1705 
-				else
1706 
-					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
1790 
+				else {
1791 
+									$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
1792 
+				}
1707 1793 
 			}
1708 1794 
 			// You must be the moderator.
1709 1795 
 			else
 
@@ -1711,44 +1797,46 @@  discard block
 
 block discarded – undo
1711 1797 
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
1712 1798
1713 1799 
 				// Did someone (un)lock this while you were posting?
1714 
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked'])
1715 
-					$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
1800 
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != $topic_info['locked']) {
1801 
+									$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'locked';
1802 
+				}
1716 1803 
 			}
1717 1804 
 		}
1718 1805
1719 1806 
 		// Change the sticky status of this topic?
1720 
-		if (isset($_POST['sticky']) && (!allowedTo('make_sticky') || $_POST['sticky'] == $topic_info['is_sticky']))
1721 
-			unset($_POST['sticky']);
1722 
-		elseif (isset($_POST['sticky']))
1807 
+		if (isset($_POST['sticky']) && (!allowedTo('make_sticky') || $_POST['sticky'] == $topic_info['is_sticky'])) {
1808 
+					unset($_POST['sticky']);
1809 
+		} elseif (isset($_POST['sticky']))
1723 1810 
 		{
1724 1811 
 			// Did someone (un)sticky this while you were posting?
1725 
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky'])
1726 
-				$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'stickied';
1812 
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != $topic_info['is_sticky']) {
1813 
+							$post_errors[] = 'topic_' . (empty($topic_info['locked']) ? 'un' : '') . 'stickied';
1814 
+			}
1727 1815 
 		}
1728 1816
1729 1817 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
1730 1818 
 		{
1731 
-			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
1732 
-				fatal_lang_error('modify_post_time_passed', false);
1733 
-			elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
1734 
-				isAllowedTo('modify_replies');
1735 
-			else
1736 
-				isAllowedTo('modify_own');
1737 
-		}
1738 
-		elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
1819 
+			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
1820 
+							fatal_lang_error('modify_post_time_passed', false);
1821 
+			} elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_own')) {
1822 
+							isAllowedTo('modify_replies');
1823 
+			} else {
1824 
+							isAllowedTo('modify_own');
1825 
+			}
1826 
+		} elseif ($topic_info['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
1739 1827 
 		{
1740 1828 
 			isAllowedTo('modify_replies');
1741 1829
1742 1830 
 			// If you're modifying a reply, I say it better be logged...
1743 1831 
 			$moderationAction = true;
1744 
-		}
1745 
-		else
1832 
+		} else
1746 1833 
 		{
1747 1834 
 			isAllowedTo('modify_any');
1748 1835
1749 1836 
 			// Log it, assuming you're not modifying your own post.
1750 
-			if ($row['id_member'] != $user_info['id'])
1751 
-				$moderationAction = true;
1837 
+			if ($row['id_member'] != $user_info['id']) {
1838 
+							$moderationAction = true;
1839 
+			}
1752 1840 
 		}
1753 1841
1754 1842 
 		// If drafts are enabled, then lets send this off to save
 
@@ -1775,8 +1863,9 @@  discard block
 
 block discarded – undo
1775 1863 
 		// Update search api
1776 1864 
 		require_once($sourcedir . '/Search.php');
1777 1865 
 		$searchAPI = findSearchAPI();
1778 
-		if ($searchAPI->supportsMethod('postRemoved'))
1779 
-			$searchAPI->postRemoved($_REQUEST['msg']);
1866 
+		if ($searchAPI->supportsMethod('postRemoved')) {
1867 
+					$searchAPI->postRemoved($_REQUEST['msg']);
1868 
+		}
1780 1869
1781 1870 
 	}
1782 1871 
 
@@ -1794,20 +1883,24 @@  discard block
 
 block discarded – undo
1794 1883 
 		$_POST['guestname'] = !isset($_POST['guestname']) ? '' : trim($_POST['guestname']);
1795 1884 
 		$_POST['email'] = !isset($_POST['email']) ? '' : trim($_POST['email']);
1796 1885
1797 
-		if ($_POST['guestname'] == '' || $_POST['guestname'] == '_')
1798 
-			$post_errors[] = 'no_name';
1799 
-		if ($smcFunc['strlen']($_POST['guestname']) > 25)
1800 
-			$post_errors[] = 'long_name';
1886 
+		if ($_POST['guestname'] == '' || $_POST['guestname'] == '_') {
1887 
+					$post_errors[] = 'no_name';
1888 
+		}
1889 
+		if ($smcFunc['strlen']($_POST['guestname']) > 25) {
1890 
+					$post_errors[] = 'long_name';
1891 
+		}
1801 1892
1802 1893 
 		if (empty($modSettings['guest_post_no_email']))
1803 1894 
 		{
1804 1895 
 			// Only check if they changed it!
1805 1896 
 			if (!isset($row) || $row['poster_email'] != $_POST['email'])
1806 1897 
 			{
1807 
-				if (!allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == ''))
1808 
-					$post_errors[] = 'no_email';
1809 
-				if (!allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL))
1810 
-					$post_errors[] = 'bad_email';
1898 
+				if (!allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == '')) {
1899 
+									$post_errors[] = 'no_email';
1900 
+				}
1901 
+				if (!allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
1902 
+									$post_errors[] = 'bad_email';
1903 
+				}
1811 1904 
 			}
1812 1905
1813 1906 
 			// Now make sure this email address is not banned from posting.
 
@@ -1823,76 +1916,90 @@  discard block
 
 block discarded – undo
1823 1916 
 	}
1824 1917
1825 1918 
 	// Coming from the quickReply?
1826 
-	if (isset($_POST['quickReply']))
1827 
-		$_POST['message'] = $_POST['quickReply'];
1919 
+	if (isset($_POST['quickReply'])) {
1920 
+			$_POST['message'] = $_POST['quickReply'];
1921 
+	}
1828 1922
1829 1923 
 	// Check the subject and message.
1830 
-	if (!isset($_POST['subject']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['subject'])) === '')
1831 
-		$post_errors[] = 'no_subject';
1832 
-	if (!isset($_POST['message']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['message']), ENT_QUOTES) === '')
1833 
-		$post_errors[] = 'no_message';
1834 
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
1835 
-		$post_errors[] = array('long_message', array($modSettings['max_messageLength']));
1836 
-	else
1924 
+	if (!isset($_POST['subject']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['subject'])) === '') {
1925 
+			$post_errors[] = 'no_subject';
1926 
+	}
1927 
+	if (!isset($_POST['message']) || $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['message']), ENT_QUOTES) === '') {
1928 
+			$post_errors[] = 'no_message';
1929 
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength']) {
1930 
+			$post_errors[] = array('long_message', array($modSettings['max_messageLength']));
1931 
+	} else
1837 1932 
 	{
1838 1933 
 		// Prepare the message a bit for some additional testing.
1839 1934 
 		$_POST['message'] = $smcFunc['htmlspecialchars']($_POST['message'], ENT_QUOTES);
1840 1935
1841 1936 
 		// Preparse code. (Zef)
1842 
-		if ($user_info['is_guest'])
1843 
-			$user_info['name'] = $_POST['guestname'];
1937 
+		if ($user_info['is_guest']) {
1938 
+					$user_info['name'] = $_POST['guestname'];
1939 
+		}
1844 1940 
 		preparsecode($_POST['message']);
1845 1941
1846 1942 
 		// Let's see if there's still some content left without the tags.
1847 
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), implode('', $context['allowed_html_tags']))) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false))
1848 
-			$post_errors[] = 'no_message';
1943 
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($_POST['message'], false), implode('', $context['allowed_html_tags']))) === '' && (!allowedTo('admin_forum') || strpos($_POST['message'], '[html]') === false)) {
1944 
+					$post_errors[] = 'no_message';
1945 
+		}
1849 1946
1850 1947 
 	}
1851 
-	if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && $smcFunc['htmltrim']($_POST['evtitle']) === '')
1852 
-		$post_errors[] = 'no_event';
1948 
+	if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && $smcFunc['htmltrim']($_POST['evtitle']) === '') {
1949 
+			$post_errors[] = 'no_event';
1950 
+	}
1853 1951 
 	// You are not!
1854 
-	if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !$user_info['is_admin'])
1855 
-		fatal_error('Knave! Masquerader! Charlatan!', false);
1952 
+	if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !$user_info['is_admin']) {
1953 
+			fatal_error('Knave! Masquerader! Charlatan!', false);
1954 
+	}
1856 1955
1857 1956 
 	// Validate the poll...
1858 1957 
 	if (isset($_REQUEST['poll']) && $modSettings['pollMode'] == '1')
1859 1958 
 	{
1860 
-		if (!empty($topic) && !isset($_REQUEST['msg']))
1861 
-			fatal_lang_error('no_access', false);
1959 
+		if (!empty($topic) && !isset($_REQUEST['msg'])) {
1960 
+					fatal_lang_error('no_access', false);
1961 
+		}
1862 1962
1863 1963 
 		// This is a new topic... so it's a new poll.
1864 
-		if (empty($topic))
1865 
-			isAllowedTo('poll_post');
1964 
+		if (empty($topic)) {
1965 
+					isAllowedTo('poll_post');
1966 
+		}
1866 1967 
 		// Can you add to your own topics?
1867 
-		elseif ($user_info['id'] == $topic_info['id_member_started'] && !allowedTo('poll_add_any'))
1868 
-			isAllowedTo('poll_add_own');
1968 
+		elseif ($user_info['id'] == $topic_info['id_member_started'] && !allowedTo('poll_add_any')) {
1969 
+					isAllowedTo('poll_add_own');
1970 
+		}
1869 1971 
 		// Can you add polls to any topic, then?
1870 
-		else
1871 
-			isAllowedTo('poll_add_any');
1972 
+		else {
1973 
+					isAllowedTo('poll_add_any');
1974 
+		}
1872 1975
1873 
-		if (!isset($_POST['question']) || trim($_POST['question']) == '')
1874 
-			$post_errors[] = 'no_question';
1976 
+		if (!isset($_POST['question']) || trim($_POST['question']) == '') {
1977 
+					$post_errors[] = 'no_question';
1978 
+		}
1875 1979
1876 1980 
 		$_POST['options'] = empty($_POST['options']) ? array() : htmltrim__recursive($_POST['options']);
1877 1981
1878 1982 
 		// Get rid of empty ones.
1879 
-		foreach ($_POST['options'] as $k => $option)
1880 
-			if ($option == '')
1983 
+		foreach ($_POST['options'] as $k => $option) {
1984 
+					if ($option == '')
1881 1985 
 				unset($_POST['options'][$k], $_POST['options'][$k]);
1986 
+		}
1882 1987
1883 1988 
 		// What are you going to vote between with one choice?!?
1884 
-		if (count($_POST['options']) < 2)
1885 
-			$post_errors[] = 'poll_few';
1886 
-		elseif (count($_POST['options']) > 256)
1887 
-			$post_errors[] = 'poll_many';
1989 
+		if (count($_POST['options']) < 2) {
1990 
+					$post_errors[] = 'poll_few';
1991 
+		} elseif (count($_POST['options']) > 256) {
1992 
+					$post_errors[] = 'poll_many';
1993 
+		}
1888 1994 
 	}
1889 1995
1890 1996 
 	if ($posterIsGuest)
1891 1997 
 	{
1892 1998 
 		// If user is a guest, make sure the chosen name isn't taken.
1893 1999 
 		require_once($sourcedir . '/Subs-Members.php');
1894 
-		if (isReservedName($_POST['guestname'], 0, true, false) && (!isset($row['poster_name']) || $_POST['guestname'] != $row['poster_name']))
1895 
-			$post_errors[] = 'bad_name';
2000 
+		if (isReservedName($_POST['guestname'], 0, true, false) && (!isset($row['poster_name']) || $_POST['guestname'] != $row['poster_name'])) {
2001 
+					$post_errors[] = 'bad_name';
2002 
+		}
1896 2003 
 	}
1897 2004 
 	// If the user isn't a guest, get his or her name and email.
1898 2005 
 	elseif (!isset($_REQUEST['msg']))
 
@@ -1923,8 +2030,9 @@  discard block
 
 block discarded – undo
1923 2030 
 	}
1924 2031
1925 2032 
 	// Make sure the user isn't spamming the board.
1926 
-	if (!isset($_REQUEST['msg']))
1927 
-		spamProtection('post');
2033 
+	if (!isset($_REQUEST['msg'])) {
2034 
+			spamProtection('post');
2035 
+	}
1928 2036
1929 2037 
 	// At about this point, we're posting and that's that.
1930 2038 
 	ignore_user_abort(true);
 
@@ -1937,32 +2045,36 @@  discard block
 
 block discarded – undo
1937 2045 
 	$_POST['modify_reason'] = empty($_POST['modify_reason']) ? '' : strtr($smcFunc['htmlspecialchars']($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
1938 2046
1939 2047 
 	// At this point, we want to make sure the subject isn't too long.
1940 
-	if ($smcFunc['strlen']($_POST['subject']) > 100)
1941 
-		$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
2048 
+	if ($smcFunc['strlen']($_POST['subject']) > 100) {
2049 
+			$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
2050 
+	}
1942 2051
1943 2052 
 	// Same with the "why did you edit this" text.
1944 
-	if ($smcFunc['strlen']($_POST['modify_reason']) > 100)
1945 
-		$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
2053 
+	if ($smcFunc['strlen']($_POST['modify_reason']) > 100) {
2054 
+			$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
2055 
+	}
1946 2056
1947 2057 
 	// Make the poll...
1948 2058 
 	if (isset($_REQUEST['poll']))
1949 2059 
 	{
1950 2060 
 		// Make sure that the user has not entered a ridiculous number of options..
1951 
-		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0)
1952 
-			$_POST['poll_max_votes'] = 1;
1953 
-		elseif ($_POST['poll_max_votes'] > count($_POST['options']))
1954 
-			$_POST['poll_max_votes'] = count($_POST['options']);
1955 
-		else
1956 
-			$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
2061 
+		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0) {
2062 
+					$_POST['poll_max_votes'] = 1;
2063 
+		} elseif ($_POST['poll_max_votes'] > count($_POST['options'])) {
2064 
+					$_POST['poll_max_votes'] = count($_POST['options']);
2065 
+		} else {
2066 
+					$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
2067 
+		}
1957 2068
1958 2069 
 		$_POST['poll_expire'] = (int) $_POST['poll_expire'];
1959 2070 
 		$_POST['poll_expire'] = $_POST['poll_expire'] > 9999 ? 9999 : ($_POST['poll_expire'] < 0 ? 0 : $_POST['poll_expire']);
1960 2071
1961 2072 
 		// Just set it to zero if it's not there..
1962 
-		if (!isset($_POST['poll_hide']))
1963 
-			$_POST['poll_hide'] = 0;
1964 
-		else
1965 
-			$_POST['poll_hide'] = (int) $_POST['poll_hide'];
2073 
+		if (!isset($_POST['poll_hide'])) {
2074 
+					$_POST['poll_hide'] = 0;
2075 
+		} else {
2076 
+					$_POST['poll_hide'] = (int) $_POST['poll_hide'];
2077 
+		}
1966 2078 
 		$_POST['poll_change_vote'] = isset($_POST['poll_change_vote']) ? 1 : 0;
1967 2079
1968 2080 
 		$_POST['poll_guest_vote'] = isset($_POST['poll_guest_vote']) ? 1 : 0;
 
@@ -1971,16 +2083,19 @@  discard block
 
 block discarded – undo
1971 2083 
 		{
1972 2084 
 			require_once($sourcedir . '/Subs-Members.php');
1973 2085 
 			$allowedVoteGroups = groupsAllowedTo('poll_vote', $board);
1974 
-			if (!in_array(-1, $allowedVoteGroups['allowed']))
1975 
-				$_POST['poll_guest_vote'] = 0;
2086 
+			if (!in_array(-1, $allowedVoteGroups['allowed'])) {
2087 
+							$_POST['poll_guest_vote'] = 0;
2088 
+			}
1976 2089 
 		}
1977 2090
1978 2091 
 		// If the user tries to set the poll too far in advance, don't let them.
1979 
-		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1)
1980 
-			fatal_lang_error('poll_range_error', false);
2092 
+		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1) {
2093 
+					fatal_lang_error('poll_range_error', false);
2094 
+		}
1981 2095 
 		// Don't allow them to select option 2 for hidden results if it's not time limited.
1982 
-		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2)
1983 
-			$_POST['poll_hide'] = 1;
2096 
+		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2) {
2097 
+					$_POST['poll_hide'] = 1;
2098 
+		}
1984 2099
1985 2100 
 		// Clean up the question and answers.
1986 2101 
 		$_POST['question'] = $smcFunc['htmlspecialchars']($_POST['question']);
 
@@ -1994,13 +2109,15 @@  discard block
 
 block discarded – undo
1994 2109 
 	{
1995 2110 
 		$attachIDs = array();
1996 2111 
 		$attach_errors = array();
1997 
-		if (!empty($context['we_are_history']))
1998 
-			$attach_errors[] = '<dd>' . $txt['error_temp_attachments_flushed'] . '<br><br></dd>';
2112 
+		if (!empty($context['we_are_history'])) {
2113 
+					$attach_errors[] = '<dd>' . $txt['error_temp_attachments_flushed'] . '<br><br></dd>';
2114 
+		}
1999 2115
2000 2116 
 		foreach ($_SESSION['temp_attachments'] as  $attachID => $attachment)
2001 2117 
 		{
2002 
-			if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false)
2003 
-				continue;
2118 
+			if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id']) === false) {
2119 
+							continue;
2120 
+			}
2004 2121
2005 2122 
 			// If there was an initial error just show that message.
2006 2123 
 			if ($attachID == 'initial_error')
 
@@ -2029,12 +2146,13 @@  discard block
 
 block discarded – undo
2029 2146 
 				if (createAttachment($attachmentOptions))
2030 2147 
 				{
2031 2148 
 					$attachIDs[] = $attachmentOptions['id'];
2032 
-					if (!empty($attachmentOptions['thumb']))
2033 
-						$attachIDs[] = $attachmentOptions['thumb'];
2149 
+					if (!empty($attachmentOptions['thumb'])) {
2150 
+											$attachIDs[] = $attachmentOptions['thumb'];
2151 
+					}
2034 2152 
 				}
2153 
+			} else {
2154 
+							$attach_errors[] = '<dt>&nbsp;</dt>';
2035 2155 
 			}
2036 
-			else
2037 
-				$attach_errors[] = '<dt>&nbsp;</dt>';
2038 2156
2039 2157 
 			if (!empty($attachmentOptions['errors']))
2040 2158 
 			{
 
@@ -2046,14 +2164,16 @@  discard block
 
 block discarded – undo
2046 2164 
 					if (!is_array($error))
2047 2165 
 					{
2048 2166 
 						$attach_errors[] = '<dd>' . $txt[$error] . '</dd>';
2049 
-						if (in_array($error, $log_these))
2050 
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
2167 
+						if (in_array($error, $log_these)) {
2168 
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
2169 
+						}
2170 
+					} else {
2171 
+											$attach_errors[] = '<dd>' . vsprintf($txt[$error[0]], $error[1]) . '</dd>';
2051 2172 
 					}
2052 
-					else
2053 
-						$attach_errors[] = '<dd>' . vsprintf($txt[$error[0]], $error[1]) . '</dd>';
2054 2173 
 				}
2055 
-				if (file_exists($attachment['tmp_name']))
2056 
-					unlink($attachment['tmp_name']);
2174 
+				if (file_exists($attachment['tmp_name'])) {
2175 
+									unlink($attachment['tmp_name']);
2176 
+				}
2057 2177 
 			}
2058 2178 
 		}
2059 2179 
 		unset($_SESSION['temp_attachments']);
 
@@ -2094,24 +2214,24 @@  discard block
 
 block discarded – undo
2094 2214 
 		);
2095 2215
2096 2216 
 		call_integration_hook('integrate_poll_add_edit', array($id_poll, false));
2217 
+	} else {
2218 
+			$id_poll = 0;
2097 2219 
 	}
2098 
-	else
2099 
-		$id_poll = 0;
2100 2220
2101 2221 
 	// Creating a new topic?
2102 2222 
 	$newTopic = empty($_REQUEST['msg']) && empty($topic);
2103 2223
2104 2224 
 	// Check the icon.
2105 
-	if (!isset($_POST['icon']))
2106 
-		$_POST['icon'] = 'xx';
2107 
-
2108 
-	else
2225 
+	if (!isset($_POST['icon'])) {
2226 
+			$_POST['icon'] = 'xx';
2227 
+	} else
2109 2228 
 	{
2110 2229 
 		$_POST['icon'] = $smcFunc['htmlspecialchars']($_POST['icon']);
2111 2230
2112 2231 
 		// Need to figure it out if this is a valid icon name.
2113 
-		if ((!file_exists($settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')))
2114 
-			$_POST['icon'] = 'xx';
2232 
+		if ((!file_exists($settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png'))) {
2233 
+					$_POST['icon'] = 'xx';
2234 
+		}
2115 2235 
 	}
2116 2236
2117 2237 
 	// Collect all parameters for the creation or modification of a post.
 
@@ -2152,8 +2272,9 @@  discard block
 
 block discarded – undo
2152 2272 
 		}
2153 2273
2154 2274 
 		// This will save some time...
2155 
-		if (empty($approve_has_changed))
2156 
-			unset($msgOptions['approved']);
2275 
+		if (empty($approve_has_changed)) {
2276 
+					unset($msgOptions['approved']);
2277 
+		}
2157 2278
2158 2279 
 		modifyPost($msgOptions, $topicOptions, $posterOptions);
2159 2280 
 	}
 
@@ -2162,8 +2283,9 @@  discard block
 
 block discarded – undo
2162 2283 
 	{
2163 2284 
 		createPost($msgOptions, $topicOptions, $posterOptions);
2164 2285
2165 
-		if (isset($topicOptions['id']))
2166 
-			$topic = $topicOptions['id'];
2286 
+		if (isset($topicOptions['id'])) {
2287 
+					$topic = $topicOptions['id'];
2288 
+		}
2167 2289 
 	}
2168 2290
2169 2291 
 	// Are there attachments already uploaded and waiting to be assigned?
 
@@ -2175,8 +2297,9 @@  discard block
 
 block discarded – undo
2175 2297 
 	}
2176 2298
2177 2299 
 	// If we had a draft for this, its time to remove it since it was just posted
2178 
-	if (!empty($modSettings['drafts_post_enabled']) && !empty($_POST['id_draft']))
2179 
-		DeleteDraft($_POST['id_draft']);
2300 
+	if (!empty($modSettings['drafts_post_enabled']) && !empty($_POST['id_draft'])) {
2301 
+			DeleteDraft($_POST['id_draft']);
2302 
+	}
2180 2303
2181 2304 
 	// Editing or posting an event?
2182 2305 
 	if (isset($_POST['calendar']) && (!isset($_REQUEST['eventid']) || $_REQUEST['eventid'] == -1))
 
@@ -2195,8 +2318,7 @@  discard block
 
 block discarded – undo
2195 2318 
 			'member' => $user_info['id'],
2196 2319 
 		);
2197 2320 
 		insertEvent($eventOptions);
2198 
-	}
2199 
-	elseif (isset($_POST['calendar']))
2321 
+	} elseif (isset($_POST['calendar']))
2200 2322 
 	{
2201 2323 
 		$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
2202 2324 
 
@@ -2224,14 +2346,15 @@  discard block
 
 block discarded – undo
2224 2346 
 		}
2225 2347
2226 2348 
 		// Delete it?
2227 
-		if (isset($_REQUEST['deleteevent']))
2228 
-			$smcFunc['db_query']('', '
2349 
+		if (isset($_REQUEST['deleteevent'])) {
2350 
+					$smcFunc['db_query']('', '
2229 2351 
 				DELETE FROM {db_prefix}calendar
2230 2352 
 				WHERE id_event = {int:id_event}',
2231 2353 
 				array(
2232 2354 
 					'id_event' => $_REQUEST['eventid'],
2233 2355 
 				)
2234 2356 
 			);
2357 
+		}
2235 2358 
 		// ... or just update it?
2236 2359 
 		else
2237 2360 
 		{
 
@@ -2273,9 +2396,8 @@  discard block
 
 block discarded – undo
2273 2396 
 			array($user_info['id'], $topic, 0),
2274 2397 
 			array('id_member', 'id_topic', 'id_board')
2275 2398 
 		);
2276 
-	}
2277 
-	elseif (!$newTopic)
2278 
-		$smcFunc['db_query']('', '
2399 
+	} elseif (!$newTopic) {
2400 
+			$smcFunc['db_query']('', '
2279 2401 
 			DELETE FROM {db_prefix}log_notify
2280 2402 
 			WHERE id_member = {int:current_member}
2281 2403 
 				AND id_topic = {int:current_topic}',
 
@@ -2284,16 +2406,20 @@  discard block
 
 block discarded – undo
2284 2406 
 				'current_topic' => $topic,
2285 2407 
 			)
2286 2408 
 		);
2409 
+	}
2287 2410
2288 2411 
 	// Log an act of moderation - modifying.
2289 
-	if (!empty($moderationAction))
2290 
-		logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $row['id_member'], 'board' => $board));
2412 
+	if (!empty($moderationAction)) {
2413 
+			logAction('modify', array('topic' => $topic, 'message' => (int) $_REQUEST['msg'], 'member' => $row['id_member'], 'board' => $board));
2414 
+	}
2291 2415
2292 
-	if (isset($_POST['lock']) && $_POST['lock'] != 2)
2293 
-		logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
2416 
+	if (isset($_POST['lock']) && $_POST['lock'] != 2) {
2417 
+			logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
2418 
+	}
2294 2419
2295 
-	if (isset($_POST['sticky']))
2296 
-		logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
2420 
+	if (isset($_POST['sticky'])) {
2421 
+			logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
2422 
+	}
2297 2423
2298 2424 
 	// Returning to the topic?
2299 2425 
 	if (!empty($_REQUEST['goback']))
 
@@ -2312,26 +2438,31 @@  discard block
 
 block discarded – undo
2312 2438 
 		);
2313 2439 
 	}
2314 2440
2315 
-	if ($board_info['num_topics'] == 0)
2316 
-		cache_put_data('board-' . $board, null, 120);
2441 
+	if ($board_info['num_topics'] == 0) {
2442 
+			cache_put_data('board-' . $board, null, 120);
2443 
+	}
2317 2444
2318 2445 
 	call_integration_hook('integrate_post2_end');
2319 2446
2320 
-	if (!empty($_POST['announce_topic']) && allowedTo('announce_topic'))
2321 
-		redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
2447 
+	if (!empty($_POST['announce_topic']) && allowedTo('announce_topic')) {
2448 
+			redirectexit('action=announce;sa=selectgroup;topic=' . $topic . (!empty($_POST['move']) && allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
2449 
+	}
2322 2450
2323 
-	if (!empty($_POST['move']) && allowedTo('move_any'))
2324 
-		redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
2451 
+	if (!empty($_POST['move']) && allowedTo('move_any')) {
2452 
+			redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
2453 
+	}
2325 2454
2326 2455 
 	// Return to post if the mod is on.
2327 
-	if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback']))
2328 
-		redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
2329 
-	elseif (!empty($_REQUEST['goback']))
2330 
-		redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
2456 
+	if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback'])) {
2457 
+			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], isBrowser('ie'));
2458 
+	} elseif (!empty($_REQUEST['goback'])) {
2459 
+			redirectexit('topic=' . $topic . '.new#new', isBrowser('ie'));
2460 
+	}
2331 2461 
 	// Dut-dut-duh-duh-DUH-duh-dut-duh-duh!  *dances to the Final Fantasy Fanfare...*
2332 
-	else
2333 
-		redirectexit('board=' . $board . '.0');
2334 
-}
2462 
+	else {
2463 
+			redirectexit('board=' . $board . '.0');
2464 
+	}
2465 
+	}
2335 2466
2336 2467 
 /**
2337 2468 
  * Handle the announce topic function (action=announce).
 
@@ -2349,8 +2480,9 @@  discard block
 
 block discarded – undo
2349 2480
2350 2481 
 	validateSession();
2351 2482
2352 
-	if (empty($topic))
2353 
-		fatal_lang_error('topic_gone', false);
2483 
+	if (empty($topic)) {
2484 
+			fatal_lang_error('topic_gone', false);
2485 
+	}
2354 2486
2355 2487 
 	loadLanguage('Post');
2356 2488 
 	loadTemplate('Post');
 
@@ -2377,8 +2509,9 @@  discard block
 
 block discarded – undo
2377 2509 
 	global $txt, $context, $topic, $board_info, $smcFunc;
2378 2510
2379 2511 
 	$groups = array_merge($board_info['groups'], array(1));
2380 
-	foreach ($groups as $id => $group)
2381 
-		$groups[$id] = (int) $group;
2512 
+	foreach ($groups as $id => $group) {
2513 
+			$groups[$id] = (int) $group;
2514 
+	}
2382 2515
2383 2516 
 	$context['groups'] = array();
2384 2517 
 	if (in_array(0, $groups))
 
@@ -2421,8 +2554,9 @@  discard block
 
 block discarded – undo
2421 2554 
 			'group_list' => $groups,
2422 2555 
 		)
2423 2556 
 	);
2424 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
2425 
-		$context['groups'][$row['id_group']]['name'] = $row['group_name'];
2557 
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
2558 
+			$context['groups'][$row['id_group']]['name'] = $row['group_name'];
2559 
+	}
2426 2560 
 	$smcFunc['db_free_result']($request);
2427 2561
2428 2562 
 	// Get the subject of the topic we're about to announce.
 
@@ -2464,16 +2598,19 @@  discard block
 
 block discarded – undo
2464 2598 
 	$context['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
2465 2599 
 	$groups = array_merge($board_info['groups'], array(1));
2466 2600
2467 
-	if (isset($_POST['membergroups']))
2468 
-		$_POST['who'] = explode(',', $_POST['membergroups']);
2601 
+	if (isset($_POST['membergroups'])) {
2602 
+			$_POST['who'] = explode(',', $_POST['membergroups']);
2603 
+	}
2469 2604
2470 2605 
 	// Check whether at least one membergroup was selected.
2471 
-	if (empty($_POST['who']))
2472 
-		fatal_lang_error('no_membergroup_selected');
2606 
+	if (empty($_POST['who'])) {
2607 
+			fatal_lang_error('no_membergroup_selected');
2608 
+	}
2473 2609
2474 2610 
 	// Make sure all membergroups are integers and can access the board of the announcement.
2475 
-	foreach ($_POST['who'] as $id => $mg)
2476 
-		$_POST['who'][$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
2611 
+	foreach ($_POST['who'] as $id => $mg) {
2612 
+			$_POST['who'][$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
2613 
+	}
2477 2614
2478 2615 
 	// Get the topic subject and censor it.
2479 2616 
 	$request = $smcFunc['db_query']('', '
 
@@ -2519,12 +2656,13 @@  discard block
 
 block discarded – undo
2519 2656 
 	if ($smcFunc['db_num_rows']($request) == 0)
2520 2657 
 	{
2521 2658 
 		logAction('announce_topic', array('topic' => $topic), 'user');
2522 
-		if (!empty($_REQUEST['move']) && allowedTo('move_any'))
2523 
-			redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
2524 
-		elseif (!empty($_REQUEST['goback']))
2525 
-			redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
2526 
-		else
2527 
-			redirectexit('board=' . $board . '.0');
2659 
+		if (!empty($_REQUEST['move']) && allowedTo('move_any')) {
2660 
+					redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
2661 
+		} elseif (!empty($_REQUEST['goback'])) {
2662 
+					redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
2663 
+		} else {
2664 
+					redirectexit('board=' . $board . '.0');
2665 
+		}
2528 2666 
 	}
2529 2667
2530 2668 
 	$announcements = array();
 
@@ -2543,8 +2681,9 @@  discard block
 
 block discarded – undo
2543 2681 
 	foreach ($rows as $row)
2544 2682 
 	{
2545 2683 
 		// Force them to have it?
2546 
-		if (empty($prefs[$row['id_member']]['announcements']))
2547 
-			continue;
2684 
+		if (empty($prefs[$row['id_member']]['announcements'])) {
2685 
+					continue;
2686 
+		}
2548 2687
2549 2688 
 		$cur_language = empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile'];
2550 2689 
 
@@ -2572,8 +2711,9 @@  discard block
 
 block discarded – undo
2572 2711 
 	}
2573 2712
2574 2713 
 	// For each language send a different mail - low priority...
2575 
-	foreach ($announcements as $lang => $mail)
2576 
-		sendmail($mail['recipients'], $mail['subject'], $mail['body'], null, 'ann-' . $lang, $mail['is_html'], 5);
2714 
+	foreach ($announcements as $lang => $mail) {
2715 
+			sendmail($mail['recipients'], $mail['subject'], $mail['body'], null, 'ann-' . $lang, $mail['is_html'], 5);
2716 
+	}
2577 2717
2578 2718 
 	$context['percentage_done'] = round(100 * $context['start'] / $modSettings['latestMember'], 1);
2579 2719 
 
@@ -2583,9 +2723,10 @@  discard block
 
 block discarded – undo
2583 2723 
 	$context['sub_template'] = 'announcement_send';
2584 2724
2585 2725 
 	// Go back to the correct language for the user ;).
2586 
-	if (!empty($modSettings['userLanguage']))
2587 
-		loadLanguage('Post');
2588 
-}
2726 
+	if (!empty($modSettings['userLanguage'])) {
2727 
+			loadLanguage('Post');
2728 
+	}
2729 
+	}
2589 2730
2590 2731 
 /**
2591 2732 
  * Get the topic for display purposes.
 
@@ -2598,12 +2739,13 @@  discard block
 
 block discarded – undo
2598 2739 
 {
2599 2740 
 	global $topic, $modSettings, $context, $smcFunc, $counter, $options;
2600 2741
2601 
-	if (isset($_REQUEST['xml']))
2602 
-		$limit = '
2742 
+	if (isset($_REQUEST['xml'])) {
2743 
+			$limit = '
2603 2744 
 		LIMIT ' . (empty($context['new_replies']) ? '0' : $context['new_replies']);
2604 
-	else
2605 
-		$limit = empty($modSettings['topicSummaryPosts']) ? '' : '
2745 
+	} else {
2746 
+			$limit = empty($modSettings['topicSummaryPosts']) ? '' : '
2606 2747 
 		LIMIT ' . (int) $modSettings['topicSummaryPosts'];
2748 
+	}
2607 2749
2608 2750 
 	// If you're modifying, get only those posts before the current one. (otherwise get all.)
2609 2751 
 	$request = $smcFunc['db_query']('', '
 
@@ -2641,8 +2783,9 @@  discard block
 
 block discarded – undo
2641 2783 
 			'is_ignored' => !empty($modSettings['enable_buddylist']) && !empty($options['posts_apply_ignore_list']) && in_array($row['id_member'], $context['user']['ignoreusers']),
2642 2784 
 		);
2643 2785
2644 
-		if (!empty($context['new_replies']))
2645 
-			$context['new_replies']--;
2786 
+		if (!empty($context['new_replies'])) {
2787 
+					$context['new_replies']--;
2788 
+		}
2646 2789 
 	}
2647 2790 
 	$smcFunc['db_free_result']($request);
2648 2791 
 }
 
@@ -2659,8 +2802,9 @@  discard block
 
 block discarded – undo
2659 2802 
 	global $sourcedir, $smcFunc;
2660 2803
2661 2804 
 	loadLanguage('Post');
2662 
-	if (!isset($_REQUEST['xml']))
2663 
-		loadTemplate('Post');
2805 
+	if (!isset($_REQUEST['xml'])) {
2806 
+			loadTemplate('Post');
2807 
+	}
2664 2808
2665 2809 
 	include_once($sourcedir . '/Subs-Post.php');
2666 2810 
 
@@ -2691,8 +2835,9 @@  discard block
 
 block discarded – undo
2691 2835 
 	$smcFunc['db_free_result']($request);
2692 2836
2693 2837 
 	$context['sub_template'] = 'quotefast';
2694 
-	if (!empty($row))
2695 
-		$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
2838 
+	if (!empty($row)) {
2839 
+			$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == $user_info['id']) || allowedTo('approve_posts', $row['id_board']);
2840 
+	}
2696 2841
2697 2842 
 	if (!empty($can_view_post))
2698 2843 
 	{
 
@@ -2725,8 +2870,9 @@  discard block
 
 block discarded – undo
2725 2870 
 		}
2726 2871
2727 2872 
 		// Remove any nested quotes.
2728 
-		if (!empty($modSettings['removeNestedQuotes']))
2729 
-			$row['body'] = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $row['body']);
2873 
+		if (!empty($modSettings['removeNestedQuotes'])) {
2874 
+					$row['body'] = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $row['body']);
2875 
+		}
2730 2876
2731 2877 
 		$lb = "\n";
2732 2878 
 
@@ -2752,14 +2898,14 @@  discard block
 
 block discarded – undo
2752 2898 
 				'time' => '',
2753 2899 
 			),
2754 2900 
 		);
2755 
-	}
2756 
-	else
2757 
-		$context['quote'] = array(
2901 
+	} else {
2902 
+			$context['quote'] = array(
2758 2903 
 			'xml' => '',
2759 2904 
 			'mozilla' => '',
2760 2905 
 			'text' => '',
2761 2906 
 		);
2762 
-}
2907 
+	}
2908 
+	}
2763 2909
2764 2910 
 /**
2765 2911 
  * Used to edit the body or subject of a message inline
 
@@ -2771,8 +2917,9 @@  discard block
 
 block discarded – undo
2771 2917 
 	global $user_info, $context, $smcFunc, $language, $board_info;
2772 2918
2773 2919 
 	// We have to have a topic!
2774 
-	if (empty($topic))
2775 
-		obExit(false);
2920 
+	if (empty($topic)) {
2921 
+			obExit(false);
2922 
+	}
2776 2923
2777 2924 
 	checkSession('get');
2778 2925 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -2798,31 +2945,35 @@  discard block
 
 block discarded – undo
2798 2945 
 			'guest_id' => 0,
2799 2946 
 		)
2800 2947 
 	);
2801 
-	if ($smcFunc['db_num_rows']($request) == 0)
2802 
-		fatal_lang_error('no_board', false);
2948 
+	if ($smcFunc['db_num_rows']($request) == 0) {
2949 
+			fatal_lang_error('no_board', false);
2950 
+	}
2803 2951 
 	$row = $smcFunc['db_fetch_assoc']($request);
2804 2952 
 	$smcFunc['db_free_result']($request);
2805 2953
2806 2954 
 	// Change either body or subject requires permissions to modify messages.
2807 2955 
 	if (isset($_POST['message']) || isset($_POST['subject']) || isset($_REQUEST['icon']))
2808 2956 
 	{
2809 
-		if (!empty($row['locked']))
2810 
-			isAllowedTo('moderate_board');
2957 
+		if (!empty($row['locked'])) {
2958 
+					isAllowedTo('moderate_board');
2959 
+		}
2811 2960
2812 2961 
 		if ($row['id_member'] == $user_info['id'] && !allowedTo('modify_any'))
2813 2962 
 		{
2814 
-			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
2815 
-				fatal_lang_error('modify_post_time_passed', false);
2816 
-			elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_own'))
2817 
-				isAllowedTo('modify_replies');
2818 
-			else
2819 
-				isAllowedTo('modify_own');
2963 
+			if ((!$modSettings['postmod_active'] || $row['approved']) && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time()) {
2964 
+							fatal_lang_error('modify_post_time_passed', false);
2965 
+			} elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_own')) {
2966 
+							isAllowedTo('modify_replies');
2967 
+			} else {
2968 
+							isAllowedTo('modify_own');
2969 
+			}
2820 2970 
 		}
2821 2971 
 		// Otherwise, they're locked out; someone who can modify the replies is needed.
2822 
-		elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_any'))
2823 
-			isAllowedTo('modify_replies');
2824 
-		else
2825 
-			isAllowedTo('modify_any');
2972 
+		elseif ($row['id_member_started'] == $user_info['id'] && !allowedTo('modify_any')) {
2973 
+					isAllowedTo('modify_replies');
2974 
+		} else {
2975 
+					isAllowedTo('modify_any');
2976 
+		}
2826 2977
2827 2978 
 		// Only log this action if it wasn't your message.
2828 2979 
 		$moderationAction = $row['id_member'] != $user_info['id'];
 
@@ -2834,10 +2985,10 @@  discard block
 
 block discarded – undo
2834 2985 
 		$_POST['subject'] = strtr($smcFunc['htmlspecialchars']($_POST['subject']), array("\r" => '', "\n" => '', "\t" => ''));
2835 2986
2836 2987 
 		// Maximum number of characters.
2837 
-		if ($smcFunc['strlen']($_POST['subject']) > 100)
2838 
-			$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
2839 
-	}
2840 
-	elseif (isset($_POST['subject']))
2988 
+		if ($smcFunc['strlen']($_POST['subject']) > 100) {
2989 
+					$_POST['subject'] = $smcFunc['substr']($_POST['subject'], 0, 100);
2990 
+		}
2991 
+	} elseif (isset($_POST['subject']))
2841 2992 
 	{
2842 2993 
 		$post_errors[] = 'no_subject';
2843 2994 
 		unset($_POST['subject']);
 
@@ -2849,13 +3000,11 @@  discard block
 
 block discarded – undo
2849 3000 
 		{
2850 3001 
 			$post_errors[] = 'no_message';
2851 3002 
 			unset($_POST['message']);
2852 
-		}
2853 
-		elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
3003 
+		} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_POST['message']) > $modSettings['max_messageLength'])
2854 3004 
 		{
2855 3005 
 			$post_errors[] = 'long_message';
2856 3006 
 			unset($_POST['message']);
2857 
-		}
2858 
-		else
3007 
+		} else
2859 3008 
 		{
2860 3009 
 			$_POST['message'] = $smcFunc['htmlspecialchars']($_POST['message'], ENT_QUOTES);
2861 3010 
 
@@ -2871,31 +3020,34 @@  discard block
 
 block discarded – undo
2871 3020
2872 3021 
 	if (isset($_POST['lock']))
2873 3022 
 	{
2874 
-		if (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $row['id_member']))
2875 
-			unset($_POST['lock']);
2876 
-		elseif (!allowedTo('lock_any'))
3023 
+		if (!allowedTo(array('lock_any', 'lock_own')) || (!allowedTo('lock_any') && $user_info['id'] != $row['id_member'])) {
3024 
+					unset($_POST['lock']);
3025 
+		} elseif (!allowedTo('lock_any'))
2877 3026 
 		{
2878 
-			if ($row['locked'] == 1)
2879 
-				unset($_POST['lock']);
2880 
-			else
2881 
-				$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
3027 
+			if ($row['locked'] == 1) {
3028 
+							unset($_POST['lock']);
3029 
+			} else {
3030 
+							$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
3031 
+			}
3032 
+		} elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked']) {
3033 
+					unset($_POST['lock']);
3034 
+		} else {
3035 
+					$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
2882 3036 
 		}
2883 
-		elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked'])
2884 
-			unset($_POST['lock']);
2885 
-		else
2886 
-			$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
2887 3037 
 	}
2888 3038
2889 
-	if (isset($_POST['sticky']) && !allowedTo('make_sticky'))
2890 
-		unset($_POST['sticky']);
3039 
+	if (isset($_POST['sticky']) && !allowedTo('make_sticky')) {
3040 
+			unset($_POST['sticky']);
3041 
+	}
2891 3042
2892 3043 
 	if (isset($_POST['modify_reason']))
2893 3044 
 	{
2894 3045 
 		$_POST['modify_reason'] = strtr($smcFunc['htmlspecialchars']($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
2895 3046
2896 3047 
 		// Maximum number of characters.
2897 
-		if ($smcFunc['strlen']($_POST['modify_reason']) > 100)
2898 
-			$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
3048 
+		if ($smcFunc['strlen']($_POST['modify_reason']) > 100) {
3049 
+					$_POST['modify_reason'] = $smcFunc['substr']($_POST['modify_reason'], 0, 100);
3050 
+		}
2899 3051 
 	}
2900 3052
2901 3053 
 	if (empty($post_errors))
 
@@ -2932,8 +3084,9 @@  discard block
 
 block discarded – undo
2932 3084 
 			}
2933 3085 
 		}
2934 3086 
 		// If nothing was changed there's no need to add an entry to the moderation log.
2935 
-		else
2936 
-			$moderationAction = false;
3087 
+		else {
3088 
+					$moderationAction = false;
3089 
+		}
2937 3090
2938 3091 
 		modifyPost($msgOptions, $topicOptions, $posterOptions);
2939 3092 
 
@@ -2951,9 +3104,9 @@  discard block
 
 block discarded – undo
2951 3104 
 			// Get the proper (default language) response prefix first.
2952 3105 
 			if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
2953 3106 
 			{
2954 
-				if ($language === $user_info['language'])
2955 
-					$context['response_prefix'] = $txt['response_prefix'];
2956 
-				else
3107 
+				if ($language === $user_info['language']) {
3108 
+									$context['response_prefix'] = $txt['response_prefix'];
3109 
+				} else
2957 3110 
 				{
2958 3111 
 					loadLanguage('index', $language, false);
2959 3112 
 					$context['response_prefix'] = $txt['response_prefix'];
 
@@ -2975,8 +3128,9 @@  discard block
 
 block discarded – undo
2975 3128 
 			);
2976 3129 
 		}
2977 3130
2978 
-		if (!empty($moderationAction))
2979 
-			logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
3131 
+		if (!empty($moderationAction)) {
3132 
+					logAction('modify', array('topic' => $topic, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => $board));
3133 
+		}
2980 3134 
 	}
2981 3135
2982 3136 
 	if (isset($_REQUEST['xml']))
 
@@ -3017,8 +3171,7 @@  discard block
 
 block discarded – undo
3017 3171 
 			);
3018 3172
3019 3173 
 			censorText($context['message']['subject']);
3020 
-		}
3021 
-		else
3174 
+		} else
3022 3175 
 		{
3023 3176 
 			$context['message'] = array(
3024 3177 
 				'id' => $row['id_msg'],
 
@@ -3030,15 +3183,16 @@  discard block
 
 block discarded – undo
3030 3183 
 			loadLanguage('Errors');
3031 3184 
 			foreach ($post_errors as $post_error)
3032 3185 
 			{
3033 
-				if ($post_error == 'long_message')
3034 
-					$context['message']['errors'][] = sprintf($txt['error_' . $post_error], $modSettings['max_messageLength']);
3035 
-				else
3036 
-					$context['message']['errors'][] = $txt['error_' . $post_error];
3186 
+				if ($post_error == 'long_message') {
3187 
+									$context['message']['errors'][] = sprintf($txt['error_' . $post_error], $modSettings['max_messageLength']);
3188 
+				} else {
3189 
+									$context['message']['errors'][] = $txt['error_' . $post_error];
3190 
+				}
3037 3191 
 			}
3038 3192 
 		}
3193 
+	} else {
3194 
+			obExit(false);
3195 
+	}
3039 3196 
 	}
3040 
-	else
3041 
-		obExit(false);
3042 
-}
3043 3197
3044 3198 
 ?>
3045 3199 
\ No newline at end of file
Please login to merge, or discard this patch.
Sources/Modlog.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -256,7 +256,7 @@  discard block
 
 block discarded – undo
256 256 
 					'class' => 'centercol',
257 257 
 				),
258 258 
 				'data' => array(
259 
-					'function' => function ($entry)
259 
+					'function' => function($entry)
260 260 
 					{
261 261 
 						return '<input type="checkbox" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled') . '>';
262 262 
 					},
 
@@ -638,7 +638,7 @@  discard block
 
 block discarded – undo
638 638 
 		if (empty($entries[$k]['action_text']))
639 639 
 			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
640 640 
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
641 
-			function ($matches) use ($entries, $k)
641 
+			function($matches) use ($entries, $k)
642 642 
 			{
643 643 
 				return isset($entries[$k]['extra'][$matches[1]]) ? $entries[$k]['extra'][$matches[1]] : '';
644 644 
 			}, $entries[$k]['action_text']);
Please login to merge, or discard this patch.
Braces   +99 added lines, -75 removed lines patch added patch discarded remove patch 
@@ -14,8 +14,9 @@  discard block
 
 block discarded – undo
14 14 
  * @version 2.1 Beta 4
15 15 
  */
16 16
17 
-if (!defined('SMF'))
17 
+if (!defined('SMF')) {
18 18 
 	die('No direct access...');
19 
+}
19 20
20 21 
 /**
21 22 
  * Prepares the information from the moderation log for viewing.
 
@@ -32,14 +33,16 @@  discard block
 
 block discarded – undo
32 33
33 34 
 	// Are we looking at the moderation log or the administration log.
34 35 
 	$context['log_type'] = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 3 : 1;
35 
-	if ($context['log_type'] == 3)
36 
-		isAllowedTo('admin_forum');
36 
+	if ($context['log_type'] == 3) {
37 
+			isAllowedTo('admin_forum');
38 
+	}
37 39
38 40 
 	// These change dependant on whether we are viewing the moderation or admin log.
39 
-	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin')
40 
-		$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
41 
-	else
42 
-		$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
41 
+	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin') {
42 
+			$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
43 
+	} else {
44 
+			$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
45 
+	}
43 46
44 47 
 	$context['can_delete'] = allowedTo('admin_forum');
45 48 
 
@@ -67,8 +70,7 @@  discard block
 
 block discarded – undo
67 70 
 		$log_type = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 'admin' : 'moderate';
68 71 
 		logAction('clearlog_' . $log_type, array(), $log_type);
69 72
70 
-	}
71 
-	elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
73 
+	} elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
72 74 
 	{
73 75 
 		checkSession();
74 76 
 		validateToken('mod-ml');
 
@@ -114,15 +116,17 @@  discard block
 
 block discarded – undo
114 116 
 		'ip' => array('sql' => 'lm.ip', 'label' => $txt['modlog_ip'])
115 117 
 	);
116 118
117 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
118 
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
119 
-	else
120 
-		$search_params_string = $search_params['string'];
119 
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
120 
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
121 
+	} else {
122 
+			$search_params_string = $search_params['string'];
123 
+	}
121 124
122 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
123 
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
124 
-	else
125 
-		$search_params_type = $search_params['type'];
125 
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
126 
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
127 
+	} else {
128 
+			$search_params_type = $search_params['type'];
129 
+	}
126 130
127 131 
 	$search_params_column = $searchTypes[$search_params_type]['sql'];
128 132 
 	$search_params = array(
 
@@ -301,15 +305,16 @@  discard block
 
 block discarded – undo
301 305 
 	$context['default_list'] = 'moderation_log_list';
302 306
303 307 
 	// If a hook has changed this, respect it.
304 
-	if (!empty($moderation_menu_name))
305 
-		$context[$context['moderation_menu_name']]['tab_data'] = $moderation_menu_name;
306 
-	elseif (isset($context['moderation_menu_name']))
307 
-		$context[$context['moderation_menu_name']]['tab_data'] = array(
308 
+	if (!empty($moderation_menu_name)) {
309 
+			$context[$context['moderation_menu_name']]['tab_data'] = $moderation_menu_name;
310 
+	} elseif (isset($context['moderation_menu_name'])) {
311 
+			$context[$context['moderation_menu_name']]['tab_data'] = array(
308 312 
 			'title' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log'],
309 313 
 			'help' => $context['log_type'] == 3 ? 'adminlog' : 'modlog',
310 314 
 			'description' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log_desc']
311 315 
 		);
312 
-}
316 
+	}
317 
+	}
313 318
314 319 
 /**
315 320 
  * Get the number of mod log entries.
 
@@ -413,30 +418,35 @@  discard block
 
 block discarded – undo
413 418 
 		// Add on some of the column stuff info
414 419 
 		if (!empty($row['id_board']))
415 420 
 		{
416 
-			if ($row['action'] == 'move')
417 
-				$row['extra']['board_to'] = $row['id_board'];
418 
-			else
419 
-				$row['extra']['board'] = $row['id_board'];
421 
+			if ($row['action'] == 'move') {
422 
+							$row['extra']['board_to'] = $row['id_board'];
423 
+			} else {
424 
+							$row['extra']['board'] = $row['id_board'];
425 
+			}
420 426 
 		}
421 427
422 
-		if (!empty($row['id_topic']))
423 
-			$row['extra']['topic'] = $row['id_topic'];
424 
-		if (!empty($row['id_msg']))
425 
-			$row['extra']['message'] = $row['id_msg'];
428 
+		if (!empty($row['id_topic'])) {
429 
+					$row['extra']['topic'] = $row['id_topic'];
430 
+		}
431 
+		if (!empty($row['id_msg'])) {
432 
+					$row['extra']['message'] = $row['id_msg'];
433 
+		}
426 434
427 435 
 		// Is this associated with a topic?
428 
-		if (isset($row['extra']['topic']))
429 
-			$topics[(int) $row['extra']['topic']][] = $row['id_action'];
430 
-		if (isset($row['extra']['new_topic']))
431 
-			$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
436 
+		if (isset($row['extra']['topic'])) {
437 
+					$topics[(int) $row['extra']['topic']][] = $row['id_action'];
438 
+		}
439 
+		if (isset($row['extra']['new_topic'])) {
440 
+					$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
441 
+		}
432 442
433 443 
 		// How about a member?
434 444 
 		if (isset($row['extra']['member']))
435 445 
 		{
436 446 
 			// Guests don't have names!
437 
-			if (empty($row['extra']['member']))
438 
-				$row['extra']['member'] = $txt['modlog_parameter_guest'];
439 
-			else
447 
+			if (empty($row['extra']['member'])) {
448 
+							$row['extra']['member'] = $txt['modlog_parameter_guest'];
449 
+			} else
440 450 
 			{
441 451 
 				// Try to find it...
442 452 
 				$members[(int) $row['extra']['member']][] = $row['id_action'];
 
@@ -444,35 +454,42 @@  discard block
 
 block discarded – undo
444 454 
 		}
445 455
446 456 
 		// Associated with a board?
447 
-		if (isset($row['extra']['board_to']))
448 
-			$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
449 
-		if (isset($row['extra']['board_from']))
450 
-			$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
451 
-		if (isset($row['extra']['board']))
452 
-			$boards[(int) $row['extra']['board']][] = $row['id_action'];
457 
+		if (isset($row['extra']['board_to'])) {
458 
+					$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
459 
+		}
460 
+		if (isset($row['extra']['board_from'])) {
461 
+					$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
462 
+		}
463 
+		if (isset($row['extra']['board'])) {
464 
+					$boards[(int) $row['extra']['board']][] = $row['id_action'];
465 
+		}
453 466
454 467 
 		// A message?
455 
-		if (isset($row['extra']['message']))
456 
-			$messages[(int) $row['extra']['message']][] = $row['id_action'];
468 
+		if (isset($row['extra']['message'])) {
469 
+					$messages[(int) $row['extra']['message']][] = $row['id_action'];
470 
+		}
457 471
458 472 
 		// IP Info?
459 
-		if (isset($row['extra']['ip_range']))
460 
-			if ($seeIP)
473 
+		if (isset($row['extra']['ip_range'])) {
474 
+					if ($seeIP)
461 475 
 				$row['extra']['ip_range'] = '<a href="' . $scripturl . '?action=trackip;searchip=' . $row['extra']['ip_range'] . '">' . $row['extra']['ip_range'] . '</a>';
462 
-			else
463 
-				$row['extra']['ip_range'] = $txt['logged'];
476 
+		} else {
477 
+							$row['extra']['ip_range'] = $txt['logged'];
478 
+			}
464 479
465 480 
 		// Email?
466 
-		if (isset($row['extra']['email']))
467 
-			$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
481 
+		if (isset($row['extra']['email'])) {
482 
+					$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
483 
+		}
468 484
469 485 
 		// Bans are complex.
470 486 
 		if ($row['action'] == 'ban' || $row['action'] == 'banremove')
471 487 
 		{
472 488 
 			$row['action_text'] = $txt['modlog_ac_ban' . ($row['action'] == 'banremove' ? '_remove' : '')];
473 
-			foreach (array('member', 'email', 'ip_range', 'hostname') as $type)
474 
-				if (isset($row['extra'][$type]))
489 
+			foreach (array('member', 'email', 'ip_range', 'hostname') as $type) {
490 
+							if (isset($row['extra'][$type]))
475 491 
 					$row['action_text'] .= $txt['modlog_ac_ban_trigger_' . $type];
492 
+			}
476 493 
 		}
477 494
478 495 
 		// The array to go to the template. Note here that action is set to a "default" value of the action doesn't match anything in the descriptions. Allows easy adding of logging events with basic details.
 
@@ -508,12 +525,13 @@  discard block
 
 block discarded – undo
508 525 
 			foreach ($boards[$row['id_board']] as $action)
509 526 
 			{
510 527 
 				// Make the board number into a link - dealing with moving too.
511 
-				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board'])
512 
-					$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
513 
-				elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board'])
514 
-					$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
515 
-				elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board'])
516 
-					$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
528 
+				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board']) {
529 
+									$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
530 
+				} elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board']) {
531 
+									$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
532 
+				} elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board']) {
533 
+									$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
534 
+				}
517 535 
 			}
518 536 
 		}
519 537 
 		$smcFunc['db_free_result']($request);
 
@@ -547,10 +565,11 @@  discard block
 
 block discarded – undo
547 565 
 				);
548 566
549 567 
 				// Make the topic number into a link - dealing with splitting too.
550 
-				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic'])
551 
-					$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
552 
-				elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic'])
553 
-					$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
568 
+				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic']) {
569 
+									$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
570 
+				} elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic']) {
571 
+									$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
572 
+				}
554 573 
 			}
555 574 
 		}
556 575 
 		$smcFunc['db_free_result']($request);
 
@@ -583,8 +602,9 @@  discard block
 
 block discarded – undo
583 602 
 				);
584 603
585 604 
 				// Make the message number into a link.
586 
-				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg'])
587 
-					$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
605 
+				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg']) {
606 
+									$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
607 
+				}
588 608 
 			}
589 609 
 		}
590 610 
 		$smcFunc['db_free_result']($request);
 
@@ -624,25 +644,29 @@  discard block
 
 block discarded – undo
624 644 
 	foreach ($entries as $k => $entry)
625 645 
 	{
626 646 
 		// Make any message info links so its easier to go find that message.
627 
-		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id'])))
628 
-			$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
647 
+		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id']))) {
648 
+					$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
649 
+		}
629 650
630 651 
 		// Mark up any deleted members, topics and boards.
631 
-		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type)
632 
-			if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
652 
+		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type) {
653 
+					if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
633 654 
 				$entries[$k]['extra'][$type] = sprintf($txt['modlog_id'], $entry['extra'][$type]);
655 
+		}
634 656
635 657 
 		if (isset($entry['extra']['report']))
636 658 
 		{
637 659 
 			// Member profile reports go in a different area
638 
-			if (stristr($entry['action'], 'user_report'))
639 
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
640 
-			else
641 
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
660 
+			if (stristr($entry['action'], 'user_report')) {
661 
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
662 
+			} else {
663 
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
664 
+			}
642 665 
 		}
643 666
644 
-		if (empty($entries[$k]['action_text']))
645 
-			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
667 
+		if (empty($entries[$k]['action_text'])) {
668 
+					$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
669 
+		}
646 670 
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
647 671 
 			function ($matches) use ($entries, $k)
648 672 
 			{
Please login to merge, or discard this patch.
Sources/Likes.php 1 patch
Braces   +103 added lines, -75 removed lines patch added patch discarded remove patch 
@@ -13,8 +13,9 @@  discard block
 
 block discarded – undo
13 13 
  * @version 2.1 Beta 4
14 14 
  */
15 15
16 
-if (!defined('SMF'))
16 
+if (!defined('SMF')) {
17 17 
 	die('No direct access...');
18 
+}
18 19
19 20 
 /**
20 21 
  * Class Likes
 
@@ -106,8 +107,9 @@  discard block
 
 block discarded – undo
106 107 
 		$this->_extra = isset($_GET['extra']) ? $_GET['extra'] : false;
107 108
108 109 
 		// We do not want to output debug information here.
109 
-		if ($this->_js)
110 
-			$db_show_debug = false;
110 
+		if ($this->_js) {
111 
+					$db_show_debug = false;
112 
+		}
111 113 
 	}
112 114
113 115 
 	/**
 
@@ -141,8 +143,9 @@  discard block
 
 block discarded – undo
141 143 
 			$call = $this->_sa;
142 144
143 145 
 			// Guest can only view likes.
144 
-			if ($call != 'view')
145 
-				is_not_guest();
146 
+			if ($call != 'view') {
147 
+							is_not_guest();
148 
+			}
146 149
147 150 
 			checkSession('get');
148 151 
 
@@ -180,15 +183,17 @@  discard block
 
 block discarded – undo
180 183 
 		global $smcFunc, $modSettings;
181 184
182 185 
 		// This feature is currently disable.
183 
-		if (empty($modSettings['enable_likes']))
184 
-			return $this->_error = 'like_disable';
186 
+		if (empty($modSettings['enable_likes'])) {
187 
+					return $this->_error = 'like_disable';
188 
+		}
185 189
186 190 
 		// Zerothly, they did indicate some kind of content to like, right?
187 191 
 		preg_match('~^([a-z0-9\-\_]{1,6})~i', $this->_type, $matches);
188 192 
 		$this->_type = isset($matches[1]) ? $matches[1] : '';
189 193
190 
-		if ($this->_type == '' || $this->_content <= 0)
191 
-			return $this->_error = 'cannot_';
194 
+		if ($this->_type == '' || $this->_content <= 0) {
195 
+					return $this->_error = 'cannot_';
196 
+		}
192 197
193 198 
 		// First we need to verify if the user can see the type of content or not. This is set up to be extensible,
194 199 
 		// so we'll check for the one type we do know about, and if it's not that, we'll defer to any hooks.
 
@@ -207,12 +212,14 @@  discard block
 
 block discarded – undo
207 212 
 					'msg' => $this->_content,
208 213 
 				)
209 214 
 			);
210 
-			if ($smcFunc['db_num_rows']($request) == 1)
211 
-				list ($this->_idTopic, $topicOwner) = $smcFunc['db_fetch_row']($request);
215 
+			if ($smcFunc['db_num_rows']($request) == 1) {
216 
+							list ($this->_idTopic, $topicOwner) = $smcFunc['db_fetch_row']($request);
217 
+			}
212 218
213 219 
 			$smcFunc['db_free_result']($request);
214 
-			if (empty($this->_idTopic))
215 
-				return $this->_error = 'cannot_';
220 
+			if (empty($this->_idTopic)) {
221 
+							return $this->_error = 'cannot_';
222 
+			}
216 223
217 224 
 			// So we know what topic it's in and more importantly we know the user can see it.
218 225 
 			// If we're not viewing, we need some info set up.
 
@@ -221,9 +228,7 @@  discard block
 
 block discarded – undo
221 228 
 			$this->_validLikes['redirect'] = 'topic=' . $this->_idTopic . '.msg' . $this->_content . '#msg' . $this->_content;
222 229
223 230 
 			$this->_validLikes['can_like'] = ($this->_user['id'] == $topicOwner ? 'cannot_like_content' : (allowedTo('likes_like') ? true : 'cannot_like_content'));
224 
-		}
225 
-
226 
-		else
231 
+		} else
227 232 
 		{
228 233 
 			// Modders: This will give you whatever the user offers up in terms of liking, e.g. $this->_type=msg, $this->_content=1
229 234 
 			// When you hook this, check $this->_type first. If it is not something your mod worries about, return false.
 
@@ -241,8 +246,9 @@  discard block
 
 block discarded – undo
241 246 
 					if ($result !== false)
242 247 
 					{
243 248 
 						// Match the type with what we already have.
244 
-						if (!isset($result['type']) || $result['type'] != $this->_type)
245 
-							return $this->_error = 'not_valid_like_type';
249 
+						if (!isset($result['type']) || $result['type'] != $this->_type) {
250 
+													return $this->_error = 'not_valid_like_type';
251 
+						}
246 252
247 253 
 						// Fill out the rest.
248 254 
 						$this->_type = $result['type'];
 
@@ -253,13 +259,15 @@  discard block
 
 block discarded – undo
253 259 
 				}
254 260 
 			}
255 261
256 
-			if (!$found)
257 
-				return $this->_error = 'cannot_';
262 
+			if (!$found) {
263 
+							return $this->_error = 'cannot_';
264 
+			}
258 265 
 		}
259 266
260 267 
 		// Does the user can like this? Viewing a list of likes doesn't require this permission.
261 
-			if ($this->_sa != 'view' && isset($this->_validLikes['can_like']) && is_string($this->_validLikes['can_like']))
262 
-				return $this->_error = $this->_validLikes['can_like'];
268 
+			if ($this->_sa != 'view' && isset($this->_validLikes['can_like']) && is_string($this->_validLikes['can_like'])) {
269 
+							return $this->_error = $this->_validLikes['can_like'];
270 
+			}
263 271 
 	}
264 272
265 273 
 	/**
 
@@ -284,8 +292,9 @@  discard block
 
 block discarded – undo
284 292 
 		);
285 293
286 294 
 		// Are we calling this directly? if so, set a proper data for the response. Do note that __METHOD__ returns both the class name and the function name.
287 
-		if ($this->_sa == __FUNCTION__)
288 
-			$this->_data = __FUNCTION__;
295 
+		if ($this->_sa == __FUNCTION__) {
296 
+					$this->_data = __FUNCTION__;
297 
+		}
289 298 
 	}
290 299
291 300 
 	/**
 
@@ -315,8 +324,8 @@  discard block
 
 block discarded – undo
315 324
316 325 
 		// Add a background task to process sending alerts.
317 326 
 		// Mod author, you can add your own background task for your own custom like event using the "integrate_issue_like" hook or your callback, both are immediately called after this.
318 
-		if ($this->_type == 'msg')
319 
-			$smcFunc['db_insert']('insert',
327 
+		if ($this->_type == 'msg') {
328 
+					$smcFunc['db_insert']('insert',
320 329 
 				'{db_prefix}background_tasks',
321 330 
 				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
322 331 
 				array('$sourcedir/tasks/Likes-Notify.php', 'Likes_Notify_Background', $smcFunc['json_encode'](array(
 
@@ -328,10 +337,12 @@  discard block
 
 block discarded – undo
328 337 
 				)), 0),
329 338 
 				array('id_task')
330 339 
 			);
340 
+		}
331 341
332 342 
 		// Are we calling this directly? if so, set a proper data for the response. Do note that __METHOD__ returns both the class name and the function name.
333 
-		if ($this->_sa == __FUNCTION__)
334 
-			$this->_data = __FUNCTION__;
343 
+		if ($this->_sa == __FUNCTION__) {
344 
+					$this->_data = __FUNCTION__;
345 
+		}
335 346 
 	}
336 347
337 348 
 	/**
 
@@ -357,8 +368,9 @@  discard block
 
 block discarded – undo
357 368 
 		$smcFunc['db_free_result']($request);
358 369
359 370 
 		// If you want to call this directly, fill out _data property too.
360 
-		if ($this->_sa == __FUNCTION__)
361 
-			$this->_data = $this->_numLikes;
371 
+		if ($this->_sa == __FUNCTION__) {
372 
+					$this->_data = $this->_numLikes;
373 
+		}
362 374 
 	}
363 375
364 376 
 	/**
 
@@ -371,8 +383,9 @@  discard block
 
 block discarded – undo
371 383 
 		global $smcFunc;
372 384
373 385 
 		// Safety first!
374 
-		if (empty($this->_type) || empty($this->_content))
375 
-			return $this->_error = 'cannot_';
386 
+		if (empty($this->_type) || empty($this->_content)) {
387 
+					return $this->_error = 'cannot_';
388 
+		}
376 389
377 390 
 		// Do we already like this?
378 391 
 		$request = $smcFunc['db_query']('', '
 
@@ -390,26 +403,28 @@  discard block
 
 block discarded – undo
390 403 
 		$this->_alreadyLiked = (bool) $smcFunc['db_num_rows']($request) != 0;
391 404 
 		$smcFunc['db_free_result']($request);
392 405
393 
-		if ($this->_alreadyLiked)
394 
-			$this->delete();
395 
-
396 
-		else
397 
-			$this->insert();
406 
+		if ($this->_alreadyLiked) {
407 
+					$this->delete();
408 
+		} else {
409 
+					$this->insert();
410 
+		}
398 411
399 412 
 		// Now, how many people like this content now? We *could* just +1 / -1 the relevant container but that has proven to become unstable.
400 413 
 		$this->_count();
401 414
402 415 
 		// Update the likes count for messages.
403 
-		if ($this->_type == 'msg')
404 
-			$this->msgIssueLike();
416 
+		if ($this->_type == 'msg') {
417 
+					$this->msgIssueLike();
418 
+		}
405 419
406 420 
 		// Any callbacks?
407 421 
 		elseif (!empty($this->_validLikes['callback']))
408 422 
 		{
409 423 
 			$call = call_helper($this->_validLikes['callback'], true);
410 424
411 
-			if (!empty($call))
412 
-				call_user_func_array($call, array($this));
425 
+			if (!empty($call)) {
426 
+							call_user_func_array($call, array($this));
427 
+			}
413 428 
 		}
414 429
415 430 
 		// Sometimes there might be other things that need updating after we do this like.
 
@@ -418,8 +433,9 @@  discard block
 
 block discarded – undo
418 433 
 		// Now some clean up. This is provided here for any like handlers that want to do any cache flushing.
419 434 
 		// This way a like handler doesn't need to explicitly declare anything in integrate_issue_like, but do so
420 435 
 		// in integrate_valid_likes where it absolutely has to exist.
421 
-		if (!empty($this->_validLikes['flush_cache']))
422 
-			cache_put_data($this->_validLikes['flush_cache'], null);
436 
+		if (!empty($this->_validLikes['flush_cache'])) {
437 
+					cache_put_data($this->_validLikes['flush_cache'], null);
438 
+		}
423 439
424 440 
 		// All done, start building the data to pass as response.
425 441 
 		$this->_data = array(
 
@@ -442,8 +458,9 @@  discard block
 
 block discarded – undo
442 458 
 	{
443 459 
 		global $smcFunc;
444 460
445 
-		if ($this->_type !== 'msg')
446 
-			return;
461 
+		if ($this->_type !== 'msg') {
462 
+					return;
463 
+		}
447 464
448 465 
 		$smcFunc['db_query']('', '
449 466 
 			UPDATE {db_prefix}messages
 
@@ -484,8 +501,9 @@  discard block
 
 block discarded – undo
484 501 
 				'like_type' => $this->_type,
485 502 
 			)
486 503 
 		);
487 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
488 
-			$context['likers'][$row['id_member']] = array('timestamp' => $row['like_time']);
504 
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
505 
+					$context['likers'][$row['id_member']] = array('timestamp' => $row['like_time']);
506 
+		}
489 507
490 508 
 		// Now to get member data, including avatars and so on.
491 509 
 		$members = array_keys($context['likers']);
 
@@ -493,8 +511,9 @@  discard block
 
 block discarded – undo
493 511 
 		if (count($loaded) != count($members))
494 512 
 		{
495 513 
 			$members = array_diff($members, $loaded);
496 
-			foreach ($members as $not_loaded)
497 
-				unset ($context['likers'][$not_loaded]);
514 
+			foreach ($members as $not_loaded) {
515 
+							unset ($context['likers'][$not_loaded]);
516 
+			}
498 517 
 		}
499 518
500 519 
 		foreach ($context['likers'] as $liker => $dummy)
 
@@ -536,12 +555,14 @@  discard block
 
 block discarded – undo
536 555 
 		global $context, $txt;
537 556
538 557 
 		// Don't do anything if someone else has already take care of the response.
539 
-		if (!$this->_setResponse)
540 
-			return;
558 
+		if (!$this->_setResponse) {
559 
+					return;
560 
+		}
541 561
542 562 
 		// Want a json response huh?
543 
-		if ($this->_validLikes['json'])
544 
-			return $this->jsonResponse();
563 
+		if ($this->_validLikes['json']) {
564 
+					return $this->jsonResponse();
565 
+		}
545 566
546 567 
 		// Set everything up for display.
547 568 
 		loadTemplate('Likes');
 
@@ -551,8 +572,9 @@  discard block
 
 block discarded – undo
551 572 
 		if ($this->_error)
552 573 
 		{
553 574 
 			// If this is a generic error, set it up good.
554 
-			if ($this->_error == 'cannot_')
555 
-				$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
575 
+			if ($this->_error == 'cannot_') {
576 
+							$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
577 
+			}
556 578
557 579 
 			// Is this request coming from an ajax call?
558 580 
 			if ($this->_js)
 
@@ -562,8 +584,9 @@  discard block
 
 block discarded – undo
562 584 
 			}
563 585
564 586 
 			// Nope?  then just do a redirect to whatever URL was provided.
565 
-			else
566 
-				redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] . ';error=' . $this->_error : '');
587 
+			else {
588 
+							redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] . ';error=' . $this->_error : '');
589 
+			}
567 590
568 591 
 			return;
569 592 
 		}
 
@@ -572,8 +595,9 @@  discard block
 
 block discarded – undo
572 595 
 		else
573 596 
 		{
574 597 
 			// Not an ajax request so send the user back to the previous location or the main page.
575 
-			if (!$this->_js)
576 
-				redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] : '');
598 
+			if (!$this->_js) {
599 
+							redirectexit(!empty($this->_validLikes['redirect']) ? $this->_validLikes['redirect'] : '');
600 
+			}
577 601
578 602 
 			// These fine gentlemen all share the same template.
579 603 
 			$generic = array('delete', 'insert', '_count');
 
@@ -606,8 +630,9 @@  discard block
 
 block discarded – undo
606 630 
 		// If there is an error, send it.
607 631 
 		if ($this->_error)
608 632 
 		{
609 
-			if ($this->_error == 'cannot_')
610 
-				$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
633 
+			if ($this->_error == 'cannot_') {
634 
+							$this->_error = $this->_sa == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
635 
+			}
611 636
612 637 
 			$print['error'] = $this->_error;
613 638 
 		}
 
@@ -643,33 +668,36 @@  discard block
 
 block discarded – undo
643 668 
 	<body style="background-color: #444455; color: white; font-style: italic; font-family: serif;">
644 669 
 		<div style="margin-top: 12%; font-size: 1.1em; line-height: 1.4; text-align: center;">';
645 670
646 
-	if (!isset($_GET['verse']) || ($_GET['verse'] != '2:18' && $_GET['verse'] != '22:1-2'))
647 
-		$_GET['verse'] = '4:16';
671 
+	if (!isset($_GET['verse']) || ($_GET['verse'] != '2:18' && $_GET['verse'] != '22:1-2')) {
672 
+			$_GET['verse'] = '4:16';
673 
+	}
648 674
649 
-	if ($_GET['verse'] == '2:18')
650 
-		echo '
675 
+	if ($_GET['verse'] == '2:18') {
676 
+			echo '
651 677 
 			Woe, it was that his name wasn\'t <em>known</em>, that he came in mystery, and was recognized by none.&nbsp;And it became to be in those days <em>something</em>.&nbsp; Something not yet <em id="unknown" name="[Unknown]">unknown</em> to mankind.&nbsp; And thus what was to be known the <em>secret project</em> began into its existence.&nbsp; Henceforth the opposition was only <em>weary</em> and <em>fearful</em>, for now their match was at arms against them.';
652 
-	elseif ($_GET['verse'] == '4:16')
653 
-		echo '
678 
+	} elseif ($_GET['verse'] == '4:16') {
679 
+			echo '
654 680 
 			And it came to pass that the <em>unbelievers</em> dwindled in number and saw rise of many <em>proselytizers</em>, and the opposition found fear in the face of the <em>x</em> and the <em>j</em> while those who stood with the <em>something</em> grew stronger and came together.&nbsp; Still, this was only the <em>beginning</em>, and what lay in the future was <em id="unknown" name="[Unknown]">unknown</em> to all, even those on the right side.';
655 
-	elseif ($_GET['verse'] == '22:1-2')
656 
-		echo '
681 
+	} elseif ($_GET['verse'] == '22:1-2') {
682 
+			echo '
657 683 
 			<p>Now <em>behold</em>, that which was once the secret project was <em id="unknown" name="[Unknown]">unknown</em> no longer.&nbsp; Alas, it needed more than <em>only one</em>, but yet even thought otherwise.&nbsp; It became that the opposition <em>rumored</em> and lied, but still to no avail.&nbsp; Their match, though not <em>perfect</em>, had them outdone.</p>
658 684 
 			<p style="margin: 2ex 1ex 0 1ex; font-size: 1.05em; line-height: 1.5; text-align: center;">Let it continue.&nbsp; <em>The end</em>.</p>';
685 
+	}
659 686
660 687 
 	echo '
661 688 
 		</div>
662 689 
 		<div style="margin-top: 2ex; font-size: 2em; text-align: right;">';
663 690
664 
-	if ($_GET['verse'] == '2:18')
665 
-		echo '
691 
+	if ($_GET['verse'] == '2:18') {
692 
+			echo '
666 693 
 			from <span style="font-family: Georgia, serif;"><strong><a href="', $scripturl, '?action=about:unknown;verse=4:16" style="color: white; text-decoration: none; cursor: text;">The Book of Unknown</a></strong>, 2:18</span>';
667 
-	elseif ($_GET['verse'] == '4:16')
668 
-		echo '
694 
+	} elseif ($_GET['verse'] == '4:16') {
695 
+			echo '
669 696 
 			from <span style="font-family: Georgia, serif;"><strong><a href="', $scripturl, '?action=about:unknown;verse=22:1-2" style="color: white; text-decoration: none; cursor: text;">The Book of Unknown</a></strong>, 4:16</span>';
670 
-	elseif ($_GET['verse'] == '22:1-2')
671 
-		echo '
697 
+	} elseif ($_GET['verse'] == '22:1-2') {
698 
+			echo '
672 699 
 			from <span style="font-family: Georgia, serif;"><strong>The Book of Unknown</strong>, 22:1-2</span>';
700 
+	}
673 701
674 702 
 	echo '
675 703 
 		</div>
Please login to merge, or discard this patch.
Sources/Class-CacheAPI.php 1 patch
Braces   +20 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -11,8 +11,9 @@  discard block
 
 block discarded – undo
11 11 
  * @version 2.1 Beta 4
12 12 
  */
13 13
14 
-if (!defined('SMF'))
14 
+if (!defined('SMF')) {
15 15 
 	die('Hacking attempt...');
16 
+}
16 17
17 18 
 /**
18 19 
  * Interface cache_api_interface
 
@@ -182,8 +183,9 @@  discard block
 
 block discarded – undo
182 183 
 	{
183 184 
 		global $cache_enable;
184 185
185 
-		if ($test)
186 
-			return true;
186 
+		if ($test) {
187 
+					return true;
188 
+		}
187 189 
 		return !empty($cache_enable);
188 190 
 	}
189 191 
 
@@ -202,18 +204,20 @@  discard block
 
 block discarded – undo
202 204 
 		global $boardurl, $cachedir;
203 205
204 206 
 		// Find a valid good file to do mtime checks on.
205 
-		if (file_exists($cachedir . '/' . 'index.php'))
206 
-			$filemtime = $cachedir . '/' . 'index.php';
207 
-		elseif (is_dir($cachedir . '/'))
208 
-			$filemtime = $cachedir . '/';
209 
-		else
210 
-			$filemtime = $boardurl . '/index.php';
207 
+		if (file_exists($cachedir . '/' . 'index.php')) {
208 
+					$filemtime = $cachedir . '/' . 'index.php';
209 
+		} elseif (is_dir($cachedir . '/')) {
210 
+					$filemtime = $cachedir . '/';
211 
+		} else {
212 
+					$filemtime = $boardurl . '/index.php';
213 
+		}
211 214
212 215 
 		// Set the default if no prefix was specified.
213 
-		if (empty($prefix))
214 
-			$this->prefix = md5($boardurl . filemtime($filemtime)) . '-SMF-';
215 
-		else
216 
-			$this->prefix = $prefix;
216 
+		if (empty($prefix)) {
217 
+					$this->prefix = md5($boardurl . filemtime($filemtime)) . '-SMF-';
218 
+		} else {
219 
+					$this->prefix = $prefix;
220 
+		}
217 221
218 222 
 		return true;
219 223 
 	}
 
@@ -276,8 +280,9 @@  discard block
 
 block discarded – undo
276 280
277 281 
 		// Invalidate cache, to be sure!
278 282 
 		// ... as long as index.php can be modified, anyway.
279 
-		if (is_writable($cachedir . '/' . 'index.php'))
280 
-			@touch($cachedir . '/' . 'index.php');
283 
+		if (is_writable($cachedir . '/' . 'index.php')) {
284 
+					@touch($cachedir . '/' . 'index.php');
285 
+		}
281 286
282 287 
 		return true;
283 288 
 	}
Please login to merge, or discard this patch.
Sources/Subs-MembersOnline.php 1 patch
Braces   +27 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -13,8 +13,9 @@  discard block
 
 block discarded – undo
13 13 
  * @version 2.1 Beta 4
14 14 
  */
15 15
16 
-if (!defined('SMF'))
16 
+if (!defined('SMF')) {
17 17 
 	die('No direct access...');
18 
+}
18 19
19 20 
 /**
20 21 
  * Retrieve a list and several other statistics of the users currently online.
 
@@ -45,8 +46,9 @@  discard block
 
 block discarded – undo
45 46 
 	}
46 47
47 48 
 	// Not allowed sort method? Bang! Error!
48 
-	elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options))
49 
-		trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
49 
+	elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options)) {
50 
+			trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
51 
+	}
50 52
51 53 
 	// Initialize the array that'll be returned later on.
52 54 
 	$membersOnlineStats = array(
 
@@ -63,8 +65,9 @@  discard block
 
 block discarded – undo
63 65 
 	// Get any spiders if enabled.
64 66 
 	$spiders = array();
65 67 
 	$spider_finds = array();
66 
-	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] < 3 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
67 
-		$spiders = $smcFunc['json_decode']($modSettings['spider_name_cache'], true);
68 
+	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] < 3 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache'])) {
69 
+			$spiders = $smcFunc['json_decode']($modSettings['spider_name_cache'], true);
70 
+	}
68 71
69 72 
 	// Load the users online right now.
70 73 
 	$request = $smcFunc['db_query']('', '
 
@@ -92,9 +95,7 @@  discard block
 
 block discarded – undo
92 95 
 			$membersOnlineStats['num_guests']++;
93 96
94 97 
 			continue;
95 
-		}
96 
-
97 
-		elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden']))
98 
+		} elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden']))
98 99 
 		{
99 100 
 			// Just increase the stats and don't add this hidden user to any list.
100 101 
 			$membersOnlineStats['num_users_hidden']++;
 
@@ -102,10 +103,11 @@  discard block
 
 block discarded – undo
102 103 
 		}
103 104
104 105 
 		// Some basic color coding...
105 
-		if (!empty($row['online_color']))
106 
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
107 
-		else
108 
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
106 
+		if (!empty($row['online_color'])) {
107 
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
108 
+		} else {
109 
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
110 
+		}
109 111
110 112 
 		// Buddies get counted and highlighted.
111 113 
 		$is_buddy = in_array($row['id_member'], $user_info['buddies']);
 
@@ -132,8 +134,8 @@  discard block
 
 block discarded – undo
132 134 
 		$membersOnlineStats['list_users_online'][$row[$membersOnlineOptions['sort']] . '_' . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
133 135
134 136 
 		// Store all distinct (primary) membergroups that are shown.
135 
-		if (!isset($membersOnlineStats['online_groups'][$row['id_group']]))
136 
-			$membersOnlineStats['online_groups'][$row['id_group']] = array(
137 
+		if (!isset($membersOnlineStats['online_groups'][$row['id_group']])) {
138 
+					$membersOnlineStats['online_groups'][$row['id_group']] = array(
137 139 
 				'id' => $row['id_group'],
138 140 
 				'name' => $row['group_name'],
139 141 
 				'color' => $row['online_color'],
 
@@ -141,6 +143,7 @@  discard block
 
 block discarded – undo
141 143 
 				'type' => $row['group_type'],
142 144 
 				'parent' => $row['id_parent'],
143 145 
 			);
146 
+		}
144 147 
 	}
145 148 
 	$smcFunc['db_free_result']($request);
146 149 
 
@@ -201,11 +204,12 @@  discard block
 
 block discarded – undo
201 204 
 	$settingsToUpdate = array();
202 205
203 206 
 	// More members on now than ever were?  Update it!
204 
-	if (!isset($modSettings['mostOnline']) || $total_users_online >= $modSettings['mostOnline'])
205 
-		$settingsToUpdate = array(
207 
+	if (!isset($modSettings['mostOnline']) || $total_users_online >= $modSettings['mostOnline']) {
208 
+			$settingsToUpdate = array(
206 209 
 			'mostOnline' => $total_users_online,
207 210 
 			'mostDate' => time()
208 211 
 		);
212 
+	}
209 213
210 214 
 	$date = strftime('%Y-%m-%d', forum_time(false));
211 215 
 
@@ -237,8 +241,9 @@  discard block
 
 block discarded – undo
237 241 
 		{
238 242 
 			list ($modSettings['mostOnlineToday']) = $smcFunc['db_fetch_row']($request);
239 243
240 
-			if ($total_users_online > $modSettings['mostOnlineToday'])
241 
-				trackStats(array('most_on' => $total_users_online));
244 
+			if ($total_users_online > $modSettings['mostOnlineToday']) {
245 
+							trackStats(array('most_on' => $total_users_online));
246 
+			}
242 247
243 248 
 			$total_users_online = max($total_users_online, $modSettings['mostOnlineToday']);
244 249 
 		}
 
@@ -255,8 +260,9 @@  discard block
 
 block discarded – undo
255 260 
 		$settingsToUpdate['mostOnlineToday'] = $total_users_online;
256 261 
 	}
257 262
258 
-	if (!empty($settingsToUpdate))
259 
-		updateSettings($settingsToUpdate);
260 
-}
263 
+	if (!empty($settingsToUpdate)) {
264 
+			updateSettings($settingsToUpdate);
265 
+	}
266 
+	}
261 267
262 268 
 ?>
263 269 
\ No newline at end of file
Please login to merge, or discard this patch.
Sources/ManageMail.php 1 patch
Braces   +26 added lines, -18 removed lines patch added patch discarded remove patch 
@@ -15,8 +15,9 @@  discard block
 
 block discarded – undo
15 15 
  * @version 2.1 Beta 4
16 16 
  */
17 17
18 
-if (!defined('SMF'))
18 
+if (!defined('SMF')) {
19 19 
 	die('No direct access...');
20 
+}
20 21
21 22 
 /**
22 23 
  * Main dispatcher. This function checks permissions and passes control through to the relevant section.
 
@@ -245,8 +246,9 @@  discard block
 
 block discarded – undo
245 246 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
246 247 
 	{
247 248 
 		// Private PM/email subjects and similar shouldn't be shown in the mailbox area.
248 
-		if (!empty($row['private']))
249 
-			$row['subject'] = $txt['personal_message'];
249 
+		if (!empty($row['private'])) {
250 
+					$row['subject'] = $txt['personal_message'];
251 
+		}
250 252
251 253 
 		$mails[] = $row;
252 254 
 	}
 
@@ -300,8 +302,9 @@  discard block
 
 block discarded – undo
300 302 
 		$element = substr($key, strrpos($key, '_') + 1);
301 303 
 		$processedBirthdayEmails[$index][$element] = $value;
302 304 
 	}
303 
-	foreach ($processedBirthdayEmails as $index => $dummy)
304 
-		$emails[$index] = $index;
305 
+	foreach ($processedBirthdayEmails as $index => $dummy) {
306 
+			$emails[$index] = $index;
307 
+	}
305 308
306 309 
 	$config_vars = array(
307 310 
 			// Mail queue stuff, this rocks ;)
 
@@ -322,8 +325,9 @@  discard block
 
 block discarded – undo
322 325
323 326 
 	call_integration_hook('integrate_modify_mail_settings', array(&$config_vars));
324 327
325 
-	if ($return_config)
326 
-		return $config_vars;
328 
+	if ($return_config) {
329 
+			return $config_vars;
330 
+	}
327 331
328 332 
 	// Saving?
329 333 
 	if (isset($_GET['save']))
 
@@ -398,9 +402,9 @@  discard block
 
 block discarded – undo
398 402 
 		);
399 403 
 		list ($_GET['te']) = $smcFunc['db_fetch_row']($request);
400 404 
 		$smcFunc['db_free_result']($request);
405 
+	} else {
406 
+			$_GET['te'] = (int) $_GET['te'];
401 407 
 	}
402 
-	else
403 
-		$_GET['te'] = (int) $_GET['te'];
404 408
405 409 
 	$_GET['sent'] = isset($_GET['sent']) ? (int) $_GET['sent'] : 0;
406 410 
 
@@ -424,12 +428,14 @@  discard block
 
 block discarded – undo
424 428
425 429 
 	// Try get more time...
426 430 
 	@set_time_limit(600);
427 
-	if (function_exists('apache_reset_timeout'))
428 
-		@apache_reset_timeout();
431 
+	if (function_exists('apache_reset_timeout')) {
432 
+			@apache_reset_timeout();
433 
+	}
429 434
430 435 
 	// Have we already used our maximum time?
431 
-	if ((time() - $time_start) < 5)
432 
-		return;
436 
+	if ((time() - $time_start) < 5) {
437 
+			return;
438 
+	}
433 439
434 440 
 	$context['continue_get_data'] = '?action=admin;area=mailqueue;sa=clear;te=' . $_GET['te'] . ';sent=' . $_GET['sent'] . ';' . $context['session_var'] . '=' . $context['session_id'];
435 441 
 	$context['page_title'] = $txt['not_done_title'];
 
@@ -459,8 +465,9 @@  discard block
 
 block discarded – undo
459 465 
 {
460 466 
 	global $txt;
461 467
462 
-	if ($time_diff < 0)
463 
-		$time_diff = 0;
468 
+	if ($time_diff < 0) {
469 
+			$time_diff = 0;
470 
+	}
464 471
465 472 
 	// Just do a bit of an if fest...
466 473 
 	if ($time_diff > 86400)
 
@@ -481,8 +488,9 @@  discard block
 
 block discarded – undo
481 488 
 		return sprintf($minutes == 1 ? $txt['mq_minute'] : $txt['mq_minutes'], $minutes);
482 489 
 	}
483 490 
 	// Otherwise must be second
484 
-	else
485 
-		return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
486 
-}
491 
+	else {
492 
+			return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
493 
+	}
494 
+	}
487 495
488 496 
 ?>
489 497 
\ No newline at end of file
Please login to merge, or discard this patch.