SimpleMachines / SMF2.1

Sources/Subs-Db-postgresql.php

Braces +219 added lines, -163 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)
@@ -34,8 +35,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_insert' => 'smf_db_insert',
@@ -62,11 +63,13 @@ 
 			'db_ping' => 'pg_ping',
 			'db_fetch_all' => 'smf_db_fetch_all',
 		);
+	}
 
-	if (!empty($db_options['persist']))
-		$connection = @pg_pconnect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
-	else
-		$connection = @pg_connect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	if (!empty($db_options['persist'])) {
+			$connection = @pg_pconnect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	} else {
+			$connection = @pg_connect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	}
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if (!$connection)
@@ -74,8 +77,7 @@ 
 		if (!empty($db_options['non_fatal']))
 		{
 			return null;
-		}
-		else
+		} else
 		{
 			display_db_error();
 		}
@@ -126,31 +128,38 @@ 
 
 	list ($values, $connection) = $db_callback;
 
-	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 '\'' . pg_escape_string($matches[2]) . '\'';
+	if ($matches[1] === 'literal') {
+			return '\'' . pg_escape_string($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;
 
@@ -162,65 +171,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\'', pg_escape_string($value));
+				foreach ($replacement as $key => $value) {
+									$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($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]).'::date';
-			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]).'::date';
+			} 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]).'::time';
-			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]).'::time';
+			} 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 'to_timestamp('.
+			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 'to_timestamp('.
 					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]).
 					',\'YYYY-MM-DD HH24:MI:SS\')';
-			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;
 
@@ -233,31 +250,36 @@ 
 		break;
 
 		case 'inet':
-			if ($replacement == 'null' || $replacement == '')
-				return 'null';
-			if (inet_pton($replacement) === false)
-				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 (inet_pton($replacement) === false) {
+							smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return sprintf('\'%1$s\'::inet', pg_escape_string($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('\'%1$s\'::inet', pg_escape_string($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:
@@ -351,14 +373,16 @@ 
 		),
 	);
 
-	if (isset($replacements[$identifier]))
-		$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	if (isset($replacements[$identifier])) {
+			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	}
 
 	// Limits need to be a little different.
 	$db_string = preg_replace('~\sLIMIT\s(\d+|{int:.+}),\s*(\d+|{int:.+})\s*$~i', 'LIMIT $2 OFFSET $1', $db_string);
 
-	if (trim($db_string) == '')
-		return false;
+	if (trim($db_string) == '') {
+			return false;
+	}
 
 	// Comments that are allowed in a query are preg_removed.
 	static $allowed_comments_from = array(
@@ -378,8 +402,9 @@ 
 	$db_count = !isset($db_count) ? 1 : $db_count + 1;
 	$db_replace_result = 0;
 
-	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__);
+	}
 
 	if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
 	{
@@ -400,8 +425,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']))
 		{
@@ -427,17 +453,18 @@ 
 		while (true)
 		{
 			$pos = strpos($db_string, '\'', $pos + 1);
-			if ($pos === false)
-				break;
+			if ($pos === false) {
+							break;
+			}
 			$clean .= substr($db_string, $old_pos, $pos - $old_pos);
 
 			while (true)
 			{
 				$pos1 = strpos($db_string, '\'', $pos + 1);
 				$pos2 = strpos($db_string, '\\', $pos + 1);
-				if ($pos1 === false)
-					break;
-				elseif ($pos2 === false || $pos2 > $pos1)
+				if ($pos1 === false) {
+									break;
+				} elseif ($pos2 === false || $pos2 > $pos1)
 				{
 					$pos = $pos1;
 					break;
@@ -453,16 +480,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__);
+		}
 	}
 
 	// Set optimize stuff
@@ -481,18 +511,21 @@ 
 
 		$db_string = $query_hints_set . $db_string;
 		
-		if (isset($db_show_debug) && $db_show_debug === true && $db_cache[$db_count]['q'] != '...')
-			$db_cache[$db_count]['q'] = "\t\t" . $db_string;
+		if (isset($db_show_debug) && $db_show_debug === true && $db_cache[$db_count]['q'] != '...') {
+					$db_cache[$db_count]['q'] = "\t\t" . $db_string;
+		}
 	}
 
 	$db_last_result = @pg_query($connection, $db_string);
 
-	if ($db_last_result === false && empty($db_values['db_error_skip']))
-		$db_last_result = smf_db_error($db_string, $connection);
+	if ($db_last_result === false && empty($db_values['db_error_skip'])) {
+			$db_last_result = 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 $db_last_result;
 }
@@ -505,10 +538,11 @@ 
 {
 	global $db_last_result, $db_replace_result;
 
-	if ($db_replace_result)
-		return $db_replace_result;
-	elseif ($result === null && !$db_last_result)
-		return 0;
+	if ($db_replace_result) {
+			return $db_replace_result;
+	} elseif ($result === null && !$db_last_result) {
+			return 0;
+	}
 
 	return pg_affected_rows($result === null ? $db_last_result : $result);
 }
@@ -532,8 +566,9 @@ 
 		array(
 		)
 	);
-	if (!$request)
-		return false;
+	if (!$request) {
+			return false;
+	}
 	list ($lastID) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -554,12 +589,13 @@ 
 	// Decide which connection to use
 	$connection = $connection === null ? $db_connection : $connection;
 
-	if ($type == 'begin')
-		return @pg_query($connection, 'BEGIN');
-	elseif ($type == 'rollback')
-		return @pg_query($connection, 'ROLLBACK');
-	elseif ($type == 'commit')
-		return @pg_query($connection, 'COMMIT');
+	if ($type == 'begin') {
+			return @pg_query($connection, 'BEGIN');
+	} elseif ($type == 'rollback') {
+			return @pg_query($connection, 'ROLLBACK');
+	} elseif ($type == 'commit') {
+			return @pg_query($connection, 'COMMIT');
+	}
 
 	return false;
 }
@@ -587,19 +623,22 @@ 
 	$query_error = @pg_last_error($connection);
 
 	// Log the error.
-	if (function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
+	}
 
 	// 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)
 	{
@@ -621,12 +660,14 @@ 
 {
 	global $db_row_count;
 
-	if ($counter !== false)
-		return pg_fetch_row($request, $counter);
+	if ($counter !== false) {
+			return pg_fetch_row($request, $counter);
+	}
 
 	// Reset the row counter...
-	if (!isset($db_row_count[(int) $request]))
-		$db_row_count[(int) $request] = 0;
+	if (!isset($db_row_count[(int) $request])) {
+			$db_row_count[(int) $request] = 0;
+	}
 
 	// Return the right row.
 	return @pg_fetch_row($request, $db_row_count[(int) $request]++);
@@ -643,12 +684,14 @@ 
 {
 	global $db_row_count;
 
-	if ($counter !== false)
-		return pg_fetch_assoc($request, $counter);
+	if ($counter !== false) {
+			return pg_fetch_assoc($request, $counter);
+	}
 
 	// Reset the row counter...
-	if (!isset($db_row_count[(int) $request]))
-		$db_row_count[(int) $request] = 0;
+	if (!isset($db_row_count[(int) $request])) {
+			$db_row_count[(int) $request] = 0;
+	}
 
 	// Return the right row.
 	return @pg_fetch_assoc($request, $db_row_count[(int) $request]++);
@@ -701,11 +744,13 @@ 
 
 	$replace = '';
 
-	if (empty($data))
-		return;
+	if (empty($data)) {
+			return;
+	}
 
-	if (!is_array($data[array_rand($data)]))
-		$data = array($data);
+	if (!is_array($data[array_rand($data)])) {
+			$data = array($data);
+	}
 
 	// Replace the prefix holder with the actual prefix.
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
@@ -724,11 +769,13 @@ 
 			//pg 9.5 got replace support
 			$pg_version = $smcFunc['db_get_version']();
 			// if we got a Beta Version
-			if (stripos($pg_version, 'beta') !== false)
-				$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
+			if (stripos($pg_version, 'beta') !== false) {
+							$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
+			}
 			// or RC
-			if (stripos($pg_version, 'rc') !== false)
-				$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
+			if (stripos($pg_version, 'rc') !== false) {
+							$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
+			}
 
 			$replace_support = (version_compare($pg_version, '9.5.0', '>=') ? true : false);
 		}
@@ -747,8 +794,7 @@ 
 					$key_str .= ($count_pk > 0 ? ',' : '');
 					$key_str .= $columnName;
 					$count_pk++;
-				}
-				else //normal field
+				} else //normal field
 				{
 					$col_str .= ($count > 0 ? ',' : '');
 					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
@@ -756,20 +802,21 @@ 
 				}
 			}
 			$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
-		}
-		else
+		} else
 		{
 			foreach ($columns as $columnName => $type)
 			{
 				// Are we restricting the length?
-				if (strpos($type, 'string-') !== false)
-					$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
-				else
-					$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				if (strpos($type, 'string-') !== false) {
+									$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
+				} else {
+									$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				}
 
 				// A key? That's what we were looking for.
-				if (in_array($columnName, $keys))
-					$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				if (in_array($columnName, $keys)) {
+									$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				}
 				$count++;
 			}
 
@@ -805,10 +852,11 @@ 
 		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) . ')';
 
@@ -817,8 +865,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);
+		}
 
 		// Do the insert.
 		$request = $smcFunc['db_query']('', '
@@ -835,19 +884,21 @@ 
 
 		if ($with_returning && $request !== false)
 		{
-			if ($returnmode === 2)
-				$return_var = array();
+			if ($returnmode === 2) {
+							$return_var = array();
+			}
 
 			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
 			{
-				if (is_numeric($row[0])) // try to emulate mysql limitation
+				if (is_numeric($row[0])) {
+					// try to emulate mysql limitation
 				{
 					if ($returnmode === 1)
 						$return_var = $row[0];
-					elseif ($returnmode === 2)
-						$return_var[] = $row[0];
-				}
-				else
+				} elseif ($returnmode === 2) {
+											$return_var[] = $row[0];
+					}
+				} else
 				{
 					$with_returning = false;
 					trigger_error('trying to returning ID Field which is not a Int field', E_USER_ERROR);
@@ -856,9 +907,10 @@ 
 		}
 	}
 
-	if ($with_returning && !empty($return_var))
-		return $return_var;
-}
+	if ($with_returning && !empty($return_var)) {
+			return $return_var;
+	}
+	}
 
 /**
  * Dummy function really. Doesn't do anything on PostgreSQL.
@@ -895,8 +947,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)
 	{
@@ -915,12 +968,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'))
 	{
@@ -928,12 +983,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.
@@ -950,10 +1005,11 @@ 
 		'\\' => '\\\\',
 	);
 
-	if ($translate_human_wildcards)
-		$replacements += array(
+	if ($translate_human_wildcards) {
+			$replacements += array(
 			'*' => '%',
 		);
+	}
 
 	return strtr($string, $replacements);
 }

Sources/Subs-Db-mysql.php

Braces +266 added lines, -197 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',
@@ -61,9 +62,11 @@ 
 			'db_ping'                   => 'mysqli_ping',
 			'db_fetch_all'              => 'smf_db_fetch_all',
 		);
+	}
 
-	if (!empty($db_options['persist']))
-		$db_server = 'p:' . $db_server;
+	if (!empty($db_options['persist'])) {
+			$db_server = 'p:' . $db_server;
+	}
 
 	$connection = mysqli_init();
 
@@ -72,24 +75,27 @@ 
 	$success = false;
 
 	if ($connection) {
-		if (!empty($db_options['port']))
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', $db_options['port'], null, $flags);
-		else
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', 0, null, $flags);
+		if (!empty($db_options['port'])) {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', $db_options['port'], null, $flags);
+		} else {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', 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();
+	}
 
 	$smcFunc['db_query']('', '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\'',
 		array(),
@@ -165,34 +171,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;
 
@@ -204,65 +218,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;
 
@@ -276,32 +298,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:
@@ -377,22 +404,25 @@ 
 		// Are we in SSI mode?  If so try that username and password first
 		if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
 		{
-			if (empty($db_persist))
-				$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
-			else
-				$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+			if (empty($db_persist)) {
+							$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
+			} else {
+							$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+			}
 		}
 		// Fall back to the regular username and password if need be
 		if (!$db_connection)
 		{
-			if (empty($db_persist))
-				$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
-			else
-				$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+			if (empty($db_persist)) {
+							$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
+			} else {
+							$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+			}
 		}
 
-		if (!$db_connection || !@mysqli_select_db($db_connection, $db_name))
-			$db_connection = false;
+		if (!$db_connection || !@mysqli_select_db($db_connection, $db_name)) {
+					$db_connection = false;
+		}
 
 		$connection = $db_connection;
 	}
@@ -400,18 +430,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))
@@ -433,8 +465,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']))
 		{
@@ -460,17 +493,18 @@ 
 		while (true)
 		{
 			$pos = strpos($db_string, '\'', $pos + 1);
-			if ($pos === false)
-				break;
+			if ($pos === false) {
+							break;
+			}
 			$clean .= substr($db_string, $old_pos, $pos - $old_pos);
 
 			while (true)
 			{
 				$pos1 = strpos($db_string, '\'', $pos + 1);
 				$pos2 = strpos($db_string, '\\', $pos + 1);
-				if ($pos1 === false)
-					break;
-				elseif ($pos2 === false || $pos2 > $pos1)
+				if ($pos1 === false) {
+									break;
+				} elseif ($pos2 === false || $pos2 > $pos1)
 				{
 					$pos = $pos1;
 					break;
@@ -486,29 +520,35 @@ 
 		$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__);
+		}
 	}
 
-	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;
 }
@@ -555,12 +595,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;
 }
@@ -600,8 +641,9 @@ 
 	//    2013: Lost connection to server during query.
 
 	// 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'))
@@ -610,8 +652,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)
 		{
@@ -627,8 +670,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('`' => '')) . '`';
+						}
 					}
 				}
 
@@ -637,8 +681,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)
@@ -657,13 +702,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');
@@ -672,11 +719,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, 2006, 2013)))
@@ -686,22 +734,25 @@ 
 				// Are we in SSI mode?  If so try that username and password first
 				if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
 				{
-					if (empty($db_persist))
-						$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
-					else
-						$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+					if (empty($db_persist)) {
+											$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
+					} else {
+											$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+					}
 				}
 				// Fall back to the regular username and password if need be
 				if (!$db_connection)
 				{
-					if (empty($db_persist))
-						$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
-					else
-						$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+					if (empty($db_persist)) {
+											$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
+					} else {
+											$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+					}
 				}
 
-				if (!$db_connection || !@mysqli_select_db($db_connection, $db_name))
-					$db_connection = false;
+				if (!$db_connection || !@mysqli_select_db($db_connection, $db_name)) {
+									$db_connection = false;
+				}
 			}
 
 			if ($db_connection)
@@ -712,24 +763,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'];
 			}
@@ -737,15 +791,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)
 	{
@@ -777,8 +833,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);
@@ -788,23 +845,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) . ')';
 
@@ -813,8 +873,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');
@@ -833,8 +894,7 @@ 
 			),
 			$connection
 		);
-	}
-	else //special way for ignore method with returning
+	} else //special way for ignore method with returning
 	{
 		$count = count($insertRows);
 		$ai = 0;
@@ -854,19 +914,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']('','
@@ -882,25 +944,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;
 	}
@@ -918,8 +982,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)
 	{
@@ -938,12 +1003,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'))
 	{
@@ -951,12 +1018,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.
@@ -973,10 +1040,11 @@ 
 		'\\' => '\\\\',
 	);
 
-	if ($translate_human_wildcards)
-		$replacements += array(
+	if ($translate_human_wildcards) {
+			$replacements += array(
 			'*' => '%',
 		);
+	}
 
 	return strtr($string, $replacements);
 }
@@ -990,8 +1058,9 @@ 
  */
 function smf_is_resource($result)
 {
-	if ($result instanceof mysqli_result)
-		return true;
+	if ($result instanceof mysqli_result) {
+			return true;
+	}
 
 	return false;
 }