SimpleMachines / SMF2.1

Sources/index.php

Braces +2 added lines, -1 removed lines

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

avatars/index.php

Braces +2 added lines, -1 removed lines

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

attachments/index.php

Braces +2 added lines, -1 removed lines

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

custom_avatar/index.php

Braces +2 added lines, -1 removed lines

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

Smileys/index.php

Braces +2 added lines, -1 removed lines

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

cache/index.php

Braces +2 added lines, -1 removed lines

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

Themes/index.php

Braces +2 added lines, -1 removed lines

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

Sources/Subs-Db-mysql.php

Braces +254 added lines, -187 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Maps the implementations in this file (smf_db_function_name)
@@ -33,8 +34,8 @@ 
 	global $smcFunc;
 
 	// Map some database specific functions, only do this once.
-	if (!isset($smcFunc['db_fetch_assoc']))
-		$smcFunc += array(
+	if (!isset($smcFunc['db_fetch_assoc'])) {
+			$smcFunc += array(
 			'db_query'                  => 'smf_db_query',
 			'db_quote'                  => 'smf_db_quote',
 			'db_fetch_assoc'            => 'mysqli_fetch_assoc',
@@ -63,9 +64,11 @@ 
 			'db_error_insert'			=> 'smf_db_error_insert',
 			'db_custom_order'			=> 'smf_db_custom_order',
 		);
+	}
 
-	if (!empty($db_options['persist']))
-		$db_server = 'p:' . $db_server;
+	if (!empty($db_options['persist'])) {
+			$db_server = 'p:' . $db_server;
+	}
 
 	$connection = mysqli_init();
 
@@ -74,24 +77,27 @@ 
 	$success = false;
 
 	if ($connection) {
-		if (!empty($db_options['port']))
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, null, $db_options['port'], null, $flags);
-		else
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, null, 0, null, $flags);
+		if (!empty($db_options['port'])) {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, null, $db_options['port'], null, $flags);
+		} else {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, null, 0, null, $flags);
+		}
 	}
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if ($success === false)
 	{
-		if (!empty($db_options['non_fatal']))
-			return null;
-		else
-			display_db_error();
+		if (!empty($db_options['non_fatal'])) {
+					return null;
+		} else {
+					display_db_error();
+		}
 	}
 
 	// Select the database, unless told not to
-	if (empty($db_options['dont_select_db']) && !@mysqli_select_db($connection, $db_name) && empty($db_options['non_fatal']))
-		display_db_error();
+	if (empty($db_options['dont_select_db']) && !@mysqli_select_db($connection, $db_name) && empty($db_options['non_fatal'])) {
+			display_db_error();
+	}
 
 	mysqli_query($connection, 'SET SESSION sql_mode = \'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION\'');
 
@@ -164,34 +170,42 @@ 
 	global $db_callback, $user_info, $db_prefix, $smcFunc;
 
 	list ($values, $connection) = $db_callback;
-	if (!is_object($connection))
-		display_db_error();
+	if (!is_object($connection)) {
+			display_db_error();
+	}
 
-	if ($matches[1] === 'db_prefix')
-		return $db_prefix;
+	if ($matches[1] === 'db_prefix') {
+			return $db_prefix;
+	}
 
-	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false)
-		return $user_info[$matches[1]];
+	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false) {
+			return $user_info[$matches[1]];
+	}
 
-	if ($matches[1] === 'empty')
-		return '\'\'';
+	if ($matches[1] === 'empty') {
+			return '\'\'';
+	}
 
-	if (!isset($matches[2]))
-		smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($matches[2])) {
+			smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
-	if ($matches[1] === 'literal')
-		return '\'' . mysqli_real_escape_string($connection, $matches[2]) . '\'';
+	if ($matches[1] === 'literal') {
+			return '\'' . mysqli_real_escape_string($connection, $matches[2]) . '\'';
+	}
 
-	if (!isset($values[$matches[2]]))
-		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__);
+	if (!isset($values[$matches[2]])) {
+			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__);
+	}
 
 	$replacement = $values[$matches[2]];
 
 	switch ($matches[1])
 	{
 		case 'int':
-			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
-				smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (int) $replacement;
 		break;
 
@@ -203,65 +217,73 @@ 
 		case 'array_int':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if (!is_numeric($value) || (string) $value !== (string) (int) $value)
-						smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
+											smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
 					$replacement[$key] = (string) (int) $value;
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
 		break;
 
 		case 'array_string':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
-				foreach ($replacement as $key => $value)
-					$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $value));
+				foreach ($replacement as $key => $value) {
+									$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $value));
+				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'date':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
+							return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'time':
-			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]);
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
+							return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'datetime':
-			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)
-				return 'str_to_date('.
+			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) {
+							return 'str_to_date('.
 					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]).
 					',\'%Y-%m-%d %h:%i:%s\')';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'float':
-			if (!is_numeric($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (float) $replacement;
 		break;
 
@@ -275,32 +297,37 @@ 
 		break;
 
 		case 'inet':
-			if ($replacement == 'null' || $replacement == '')
-				return 'null';
-			if (!isValidIP($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if ($replacement == 'null' || $replacement == '') {
+							return 'null';
+			}
+			if (!isValidIP($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			//we don't use the native support of mysql > 5.6.2
 			return sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($replacement)));
 
 		case 'array_inet':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if ($replacement == 'null' || $replacement == '')
-						$replacement[$key] = 'null';
-					if (!isValidIP($value))
-						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if ($replacement == 'null' || $replacement == '') {
+											$replacement[$key] = 'null';
+					}
+					if (!isValidIP($value)) {
+											smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 					$replacement[$key] = sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($value)));
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		default:
@@ -371,18 +398,20 @@ 
 	// One more query....
 	$db_count = !isset($db_count) ? 1 : $db_count + 1;
 
-	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
-		smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
+			smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	}
 
 	// Use "ORDER BY null" to prevent Mysql doing filesorts for Group By clauses without an Order By
 	if (strpos($db_string, 'GROUP BY') !== false && strpos($db_string, 'ORDER BY') === false && preg_match('~^\s+SELECT~i', $db_string))
 	{
 		// Add before LIMIT
-		if ($pos = strpos($db_string, 'LIMIT '))
-			$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
-		else
-			// Append it.
+		if ($pos = strpos($db_string, 'LIMIT ')) {
+					$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
+		} else {
+					// Append it.
 			$db_string .= "\n\t\t\tORDER BY null";
+		}
 	}
 
 	if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
@@ -408,17 +437,18 @@ 
 		while (true)
 		{
 			$pos = strpos($db_string_1, '\'', $pos + 1);
-			if ($pos === false)
-				break;
+			if ($pos === false) {
+							break;
+			}
 			$clean .= substr($db_string_1, $old_pos, $pos - $old_pos);
 
 			while (true)
 			{
 				$pos1 = strpos($db_string_1, '\'', $pos + 1);
 				$pos2 = strpos($db_string_1, '\\', $pos + 1);
-				if ($pos1 === false)
-					break;
-				elseif ($pos2 === false || $pos2 > $pos1)
+				if ($pos1 === false) {
+									break;
+				} elseif ($pos2 === false || $pos2 > $pos1)
 				{
 					$pos = $pos1;
 					break;
@@ -434,16 +464,19 @@ 
 		$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
 
 		// Comments?  We don't use comments in our queries, we leave 'em outside!
-		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
-			$fail = true;
+		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
+					$fail = true;
+		}
 		// Trying to change passwords, slow us down, or something?
-		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
-			$fail = true;
-		elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
-			$fail = true;
+		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
+					$fail = true;
+		} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
+					$fail = true;
+		}
 
-		if (!empty($fail) && function_exists('log_error'))
-			smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		if (!empty($fail) && function_exists('log_error')) {
+					smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		}
 	}
 
 	// Debugging.
@@ -453,8 +486,9 @@ 
 		list ($file, $line) = smf_db_error_backtrace('', '', 'return', __FILE__, __LINE__);
 
 		// Initialize $db_cache if not already initialized.
-		if (!isset($db_cache))
-			$db_cache = array();
+		if (!isset($db_cache)) {
+					$db_cache = array();
+		}
 
 		if (!empty($_SESSION['debug_redirect']))
 		{
@@ -470,17 +504,20 @@ 
 		$db_cache[$db_count]['s'] = ($st = microtime(true)) - $time_start;
 	}
 
-	if (empty($db_unbuffered))
-		$ret = @mysqli_query($connection, $db_string);
-	else
-		$ret = @mysqli_query($connection, $db_string, MYSQLI_USE_RESULT);
+	if (empty($db_unbuffered)) {
+			$ret = @mysqli_query($connection, $db_string);
+	} else {
+			$ret = @mysqli_query($connection, $db_string, MYSQLI_USE_RESULT);
+	}
 
-	if ($ret === false && empty($db_values['db_error_skip']))
-		$ret = smf_db_error($db_string, $connection);
+	if ($ret === false && empty($db_values['db_error_skip'])) {
+			$ret = smf_db_error($db_string, $connection);
+	}
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
 
 	return $ret;
 }
@@ -527,12 +564,13 @@ 
 	// Decide which connection to use
 	$connection = $connection === null ? $db_connection : $connection;
 
-	if ($type == 'begin')
-		return @mysqli_query($connection, 'BEGIN');
-	elseif ($type == 'rollback')
-		return @mysqli_query($connection, 'ROLLBACK');
-	elseif ($type == 'commit')
-		return @mysqli_query($connection, 'COMMIT');
+	if ($type == 'begin') {
+			return @mysqli_query($connection, 'BEGIN');
+	} elseif ($type == 'rollback') {
+			return @mysqli_query($connection, 'ROLLBACK');
+	} elseif ($type == 'commit') {
+			return @mysqli_query($connection, 'COMMIT');
+	}
 
 	return false;
 }
@@ -570,8 +608,9 @@ 
 	//    1213: Deadlock found.
 
 	// Log the error.
-	if ($query_errno != 1213 && $query_errno != 1205 && function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+	if ($query_errno != 1213 && $query_errno != 1205 && function_exists('log_error')) {
+			log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+	}
 
 	// Database error auto fixing ;).
 	if (function_exists('cache_get_data') && (!isset($modSettings['autoFixDatabase']) || $modSettings['autoFixDatabase'] == '1'))
@@ -580,8 +619,9 @@ 
 		$old_cache = @$modSettings['cache_enable'];
 		$modSettings['cache_enable'] = '1';
 
-		if (($temp = cache_get_data('db_last_error', 600)) !== null)
-			$db_last_error = max(@$db_last_error, $temp);
+		if (($temp = cache_get_data('db_last_error', 600)) !== null) {
+					$db_last_error = max(@$db_last_error, $temp);
+		}
 
 		if (@$db_last_error < time() - 3600 * 24 * 3)
 		{
@@ -597,8 +637,9 @@ 
 					foreach ($tables as $table)
 					{
 						// Now, it's still theoretically possible this could be an injection.  So backtick it!
-						if (trim($table) != '')
-							$fix_tables[] = '`' . strtr(trim($table), array('`' => '')) . '`';
+						if (trim($table) != '') {
+													$fix_tables[] = '`' . strtr(trim($table), array('`' => '')) . '`';
+						}
 					}
 				}
 
@@ -607,8 +648,9 @@ 
 			// Table crashed.  Let's try to fix it.
 			elseif ($query_errno == 1016)
 			{
-				if (preg_match('~\'([^\.\']+)~', $query_error, $match) != 0)
-					$fix_tables = array('`' . $match[1] . '`');
+				if (preg_match('~\'([^\.\']+)~', $query_error, $match) != 0) {
+									$fix_tables = array('`' . $match[1] . '`');
+				}
 			}
 			// Indexes crashed.  Should be easy to fix!
 			elseif ($query_errno == 1034 || $query_errno == 1035)
@@ -627,13 +669,15 @@ 
 
 			// Make a note of the REPAIR...
 			cache_put_data('db_last_error', time(), 600);
-			if (($temp = cache_get_data('db_last_error', 600)) === null)
-				updateSettingsFile(array('db_last_error' => time()));
+			if (($temp = cache_get_data('db_last_error', 600)) === null) {
+							updateSettingsFile(array('db_last_error' => time()));
+			}
 
 			// Attempt to find and repair the broken table.
-			foreach ($fix_tables as $table)
-				$smcFunc['db_query']('', "
+			foreach ($fix_tables as $table) {
+							$smcFunc['db_query']('', "
 					REPAIR TABLE $table", false, false);
+			}
 
 			// And send off an email!
 			sendmail($webmaster_email, $txt['database_error'], $txt['tried_to_repair'], null, 'dberror');
@@ -642,11 +686,12 @@ 
 
 			// Try the query again...?
 			$ret = $smcFunc['db_query']('', $db_string, false, false);
-			if ($ret !== false)
-				return $ret;
+			if ($ret !== false) {
+							return $ret;
+			}
+		} else {
+					$modSettings['cache_enable'] = $old_cache;
 		}
-		else
-			$modSettings['cache_enable'] = $old_cache;
 
 		// Check for the "lost connection" or "deadlock found" errors - and try it just one more time.
 		if (in_array($query_errno, array(1205, 1213)))
@@ -659,24 +704,27 @@ 
 					$ret = $smcFunc['db_query']('', $db_string, false, false);
 
 					$new_errno = mysqli_errno($db_connection);
-					if ($ret !== false || in_array($new_errno, array(1205, 1213)))
-						break;
+					if ($ret !== false || in_array($new_errno, array(1205, 1213))) {
+											break;
+					}
 				}
 
 				// If it failed again, shucks to be you... we're not trying it over and over.
-				if ($ret !== false)
-					return $ret;
+				if ($ret !== false) {
+									return $ret;
+				}
 			}
 		}
 		// Are they out of space, perhaps?
 		elseif ($query_errno == 1030 && (strpos($query_error, ' -1 ') !== false || strpos($query_error, ' 28 ') !== false || strpos($query_error, ' 12 ') !== false))
 		{
-			if (!isset($txt))
-				$query_error .= ' - check database storage space.';
-			else
+			if (!isset($txt)) {
+							$query_error .= ' - check database storage space.';
+			} else
 			{
-				if (!isset($txt['mysql_error_space']))
-					loadLanguage('Errors');
+				if (!isset($txt['mysql_error_space'])) {
+									loadLanguage('Errors');
+				}
 
 				$query_error .= !isset($txt['mysql_error_space']) ? ' - check database storage space.' : $txt['mysql_error_space'];
 			}
@@ -684,15 +732,17 @@ 
 	}
 
 	// Nothing's defined yet... just die with it.
-	if (empty($context) || empty($txt))
-		die($query_error);
+	if (empty($context) || empty($txt)) {
+			die($query_error);
+	}
 
 	// Show an error message, if possible.
 	$context['error_title'] = $txt['database_error'];
-	if (allowedTo('admin_forum'))
-		$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
-	else
-		$context['error_message'] = $txt['try_again'];
+	if (allowedTo('admin_forum')) {
+			$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
+	} else {
+			$context['error_message'] = $txt['try_again'];
+	}
 
 	if (allowedTo('admin_forum') && isset($db_show_debug) && $db_show_debug === true)
 	{
@@ -724,8 +774,9 @@ 
 	$return_var = null;
 
 	// With nothing to insert, simply return.
-	if (empty($data))
-		return;
+	if (empty($data)) {
+			return;
+	}
 
 	// Replace the prefix holder with the actual prefix.
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
@@ -735,23 +786,26 @@ 
 	if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
 	{
 		$with_returning = true;
-		if ($returnmode == 2)
-			$return_var = array();
+		if ($returnmode == 2) {
+					$return_var = array();
+		}
 	}
 
 	// Inserting data as a single row can be done as a single array.
-	if (!is_array($data[array_rand($data)]))
-		$data = array($data);
+	if (!is_array($data[array_rand($data)])) {
+			$data = array($data);
+	}
 
 	// Create the mold for a single row insert.
 	$insertData = '(';
 	foreach ($columns as $columnName => $type)
 	{
 		// Are we restricting the length?
-		if (strpos($type, 'string-') !== false)
-			$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-		else
-			$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+		if (strpos($type, 'string-') !== false) {
+					$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
+		} else {
+					$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+		}
 	}
 	$insertData = substr($insertData, 0, -2) . ')';
 
@@ -760,8 +814,9 @@ 
 
 	// Here's where the variables are injected to the query.
 	$insertRows = array();
-	foreach ($data as $dataRow)
-		$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+	foreach ($data as $dataRow) {
+			$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+	}
 
 	// Determine the method of insertion.
 	$queryTitle = $method == 'replace' ? 'REPLACE' : ($method == 'ignore' ? 'INSERT IGNORE' : 'INSERT');
@@ -780,8 +835,7 @@ 
 			),
 			$connection
 		);
-	}
-	else //special way for ignore method with returning
+	} else //special way for ignore method with returning
 	{
 		$count = count($insertRows);
 		$ai = 0;
@@ -801,19 +855,21 @@ 
 			);
 			$new_id = $smcFunc['db_insert_id']();
 
-			if ($last_id != $new_id) //the inserted value was new
+			if ($last_id != $new_id) {
+				//the inserted value was new
 			{
 				$ai = $new_id;
 			}
-			else	// the inserted value already exists we need to find the pk
+			} else	// the inserted value already exists we need to find the pk
 			{
 				$where_string = '';
 				$count2 = count($indexed_columns);
 				for ($x = 0; $x < $count2; $x++)
 				{
 					$where_string += key($indexed_columns[$x]) . ' = '. $insertRows[$i][$x];
-					if (($x + 1) < $count2)
-						$where_string += ' AND ';
+					if (($x + 1) < $count2) {
+											$where_string += ' AND ';
+					}
 				}
 
 				$request = $smcFunc['db_query']('','
@@ -829,25 +885,27 @@ 
 				}
 			}
 
-			if ($returnmode == 1)
-				$return_var = $ai;
-			else if ($returnmode == 2)
-				$return_var[] = $ai;
+			if ($returnmode == 1) {
+							$return_var = $ai;
+			} else if ($returnmode == 2) {
+							$return_var[] = $ai;
+			}
 		}
 	}
 
 
 	if ($with_returning)
 	{
-		if ($returnmode == 1 && empty($return_var))
-			$return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1;
-		else if ($returnmode == 2 && empty($return_var))
+		if ($returnmode == 1 && empty($return_var)) {
+					$return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1;
+		} else if ($returnmode == 2 && empty($return_var))
 		{
 			$return_var = array();
 			$count = count($insertRows);
 			$start = smf_db_insert_id($table, $keys[0]);
-			for ($i = 0; $i < $count; $i++ )
-				$return_var[] = $start + $i;
+			for ($i = 0; $i < $count; $i++ ) {
+							$return_var[] = $start + $i;
+			}
 		}
 		return $return_var;
 	}
@@ -865,8 +923,9 @@ 
  */
 function smf_db_error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 {
-	if (empty($log_message))
-		$log_message = $error_message;
+	if (empty($log_message)) {
+			$log_message = $error_message;
+	}
 
 	foreach (debug_backtrace() as $step)
 	{
@@ -885,12 +944,14 @@ 
 	}
 
 	// A special case - we want the file and line numbers for debugging.
-	if ($error_type == 'return')
-		return array($file, $line);
+	if ($error_type == 'return') {
+			return array($file, $line);
+	}
 
 	// Is always a critical error.
-	if (function_exists('log_error'))
-		log_error($log_message, 'critical', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($log_message, 'critical', $file, $line);
+	}
 
 	if (function_exists('fatal_error'))
 	{
@@ -898,12 +959,12 @@ 
 
 		// Cannot continue...
 		exit;
+	} elseif ($error_type) {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
+	} else {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
+	}
 	}
-	elseif ($error_type)
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
-	else
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
-}
 
 /**
  * Escape the LIKE wildcards so that they match the character and not the wildcard.
@@ -920,10 +981,11 @@ 
 		'\\' => '\\\\',
 	);
 
-	if ($translate_human_wildcards)
-		$replacements += array(
+	if ($translate_human_wildcards) {
+			$replacements += array(
 			'*' => '%',
 		);
+	}
 
 	return strtr($string, $replacements);
 }
@@ -937,8 +999,9 @@ 
  */
 function smf_is_resource($result)
 {
-	if ($result instanceof mysqli_result)
-		return true;
+	if ($result instanceof mysqli_result) {
+			return true;
+	}
 
 	return false;
 }
@@ -967,19 +1030,22 @@ 
 	static $mysql_error_data_prep;
 
 	// without database we can't do anything
-	if (empty($db_connection))
-		return;
+	if (empty($db_connection)) {
+			return;
+	}
 
-	if (empty($mysql_error_data_prep))
-			$mysql_error_data_prep = mysqli_prepare($db_connection,
+	if (empty($mysql_error_data_prep)) {
+				$mysql_error_data_prep = mysqli_prepare($db_connection,
 				'INSERT INTO ' . $db_prefix . 'log_errors(id_member, log_time, ip, url, message, session, error_type, file, line)
 													VALUES(		?,		?,		unhex(?), ?, 		?,		?,			?,		?,	?)'
 			);
+	}
 
-	if (filter_var($error_array[2], FILTER_VALIDATE_IP) !== false)
-		$error_array[2] = bin2hex(inet_pton($error_array[2]));
-	else
-		$error_array[2] = null;
+	if (filter_var($error_array[2], FILTER_VALIDATE_IP) !== false) {
+			$error_array[2] = bin2hex(inet_pton($error_array[2]));
+	} else {
+			$error_array[2] = null;
+	}
 	mysqli_stmt_bind_param($mysql_error_data_prep, 'iissssssi',
 		$error_array[0], $error_array[1], $error_array[2], $error_array[3], $error_array[4], $error_array[5], $error_array[6],
 		$error_array[7], $error_array[8]);
@@ -1001,8 +1067,9 @@ 
 	$count = count($array_values);
 	$then = ($desc ? ' THEN -' : ' THEN ');
 
-	for ($i = 0; $i < $count; $i++)
-		$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+	for ($i = 0; $i < $count; $i++) {
+			$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+	}
 
 	$return .= 'END';
 	return $return;

Sources/Errors.php

Braces +130 added lines, -93 removed lines

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