elkarte / Elkarte

sources/controllers/PersonalMessage.controller.php

Spacing +1 added lines, -1 removed lines

@@ -1859,7 +1859,7 @@
 		global $txt, $context, $user_info, $language, $modSettings;
 
 		// Check that this feature is even enabled!
-		$pmsg_check = $this->_req->getPost('pmsg', 'intval',  $this->_req->getQuery('pmsg', 'intval', 0));
+		$pmsg_check = $this->_req->getPost('pmsg', 'intval', $this->_req->getQuery('pmsg', 'intval', 0));
 		if (empty($modSettings['enableReportPM']) || empty($pmsg_check))
 		{
 			throw new Elk_Exception('no_access', false);

Braces +58 added lines, -21 removed lines

@@ -633,7 +633,9 @@ 
 				// Get the order right.
 				$orderBy = array();
 				foreach (array_reverse($pms) as $pm)
-					$orderBy[] = 'pm.id_pm = ' . $pm;
+				{
+									$orderBy[] = 'pm.id_pm = ' . $pm;
+				}
 
 				// Separate query for these bits, preparePMContext_callback will use it as required
 				$subjects_request = loadPMSubjectRequest($pms, $orderBy);
@@ -894,7 +896,9 @@ 
 			// Get a literal name list in case the user has JavaScript disabled.
 			$names = array();
 			foreach ($context['recipients']['to'] as $to)
-				$names[] = $to['name'];
+			{
+							$names[] = $to['name'];
+			}
 			$context['to_value'] = empty($names) ? '' : '"' . implode('", "', $names) . '"';
 		}
 		else
@@ -963,8 +967,7 @@ 
 			&& !allowedTo(array('admin_forum', 'moderate_forum', 'send_mail'))
 			&& $user_info['mod_cache']['bq'] === '0=1'
 			&& $user_info['mod_cache']['gq'] === '0=1'
-		)
-		{
+		) {
 			// How many have they sent this last hour?
 			$pmCount = pmCount($user_info['id'], 3600);
 
@@ -1095,7 +1098,9 @@ 
 					$post_errors->removeError('no_to');
 
 					foreach ($namesNotFound[$recipientType] as $name)
-						$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+					{
+											$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+					}
 				}
 			}
 		}
@@ -1166,7 +1171,9 @@ 
 			{
 				$post_errors->addError('bad_' . $recipientType);
 				foreach ($names as $name)
-					$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				{
+									$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				}
 			}
 
 			$this->messagePostError($namedRecipientList, $recipientList);
@@ -1440,12 +1447,16 @@ 
 		{
 			$pm_actions = array();
 			foreach ($this->_req->post->pms as $pm)
-				$pm_actions[(int) $pm] = $pm_action;
+			{
+							$pm_actions[(int) $pm] = $pm_action;
+			}
 		}
 
 		// No messages to action then bug out
 		if (empty($pm_actions))
-			redirectexit($context['current_label_redirect']);
+		{
+					redirectexit($context['current_label_redirect']);
+		}
 
 		// If we are in conversation, we may need to apply this to every message in that conversation.
 		if ($context['display_mode'] == 2 && isset($this->_req->query->conversation))
@@ -1716,7 +1727,9 @@ 
 				if (!empty($new_labels))
 				{
 					for ($i = max($searchArray) + 1, $n = max(array_keys($new_labels)); $i <= $n; $i++)
-						$searchArray[] = $i;
+					{
+											$searchArray[] = $i;
+					}
 				}
 
 				updateLabelsToPM($searchArray, $new_labels, $user_info['id']);
@@ -1754,9 +1767,11 @@ 
 
 				// Update/delete as appropriate.
 				foreach ($rule_changes as $k => $id)
-					if (!empty($context['rules'][$id]['actions']))
+				{
+									if (!empty($context['rules'][$id]['actions']))
 					{
 						updatePMRuleAction($id, $user_info['id'], $context['rules'][$id]['actions']);
+				}
 						unset($rule_changes[$k]);
 					}
 
@@ -1918,7 +1933,9 @@ 
 			$recipients = array();
 			$temp = loadPMRecipientsAll($context['pm_id'], true);
 			foreach ($temp as $recipient)
-				$recipients[] = $recipient['link'];
+			{
+							$recipients[] = $recipient['link'];
+			}
 
 			// Now let's get out and loop through the admins.
 			$admins = admins(isset($this->_req->post->id_admin) ? (int) $this->_req->post->id_admin : 0);
@@ -1970,7 +1987,9 @@ 
 
 			// Send a different email for each language.
 			foreach ($messagesToSend as $lang => $message)
-				sendpm($message['recipients'], $message['subject'], $message['body']);
+			{
+							sendpm($message['recipients'], $message['subject'], $message['body']);
+			}
 
 			// Give the user their own language back!
 			if (!empty($modSettings['userLanguage']))
@@ -2089,9 +2108,11 @@ 
 
 				// Need to get member names!
 				foreach ($context['rule']['criteria'] as $k => $criteria)
-					if ($criteria['t'] === 'mid' && !empty($criteria['v']))
+				{
+									if ($criteria['t'] === 'mid' && !empty($criteria['v']))
 					{
 						$members[(int) $criteria['v']] = $k;
+				}
 					}
 
 				if (!empty($members))
@@ -2099,7 +2120,9 @@ 
 					require_once(SUBSDIR . '/Members.subs.php');
 					$result = getBasicMemberData(array_keys($members));
 					foreach ($result as $row)
-						$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+					{
+											$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+					}
 				}
 			}
 			else
@@ -2226,7 +2249,9 @@ 
 			checkSession('post');
 			$toDelete = array();
 			foreach ($this->_req->post->delrule as $k => $v)
-				$toDelete[] = (int) $k;
+			{
+							$toDelete[] = (int) $k;
+			}
 
 			if (!empty($toDelete))
 			{
@@ -2621,7 +2646,9 @@ 
 
 				$labelStatements = array();
 				foreach ($this->_req->post->searchlabel as $label)
-					$labelStatements[] = $db->quote('FIND_IN_SET({string:label}, pmr.labels) != 0', array('label' => $label,));
+				{
+									$labelStatements[] = $db->quote('FIND_IN_SET({string:label}, pmr.labels) != 0', array('label' => $label,));
+				}
 
 				$this->_searchq_parameters ['label_implode'] = '(' . implode(' OR ', $labelStatements) . ')';
 			}
@@ -2665,7 +2692,9 @@ 
 			$members = membersBy('member_names', array('member_names' => $possible_users));
 
 			foreach ($possible_users as $key => $possible_user)
-				$this->_searchq_parameters ['guest_user_name_implode_' . $key] = defined('DB_CASE_SENSITIVE') ? strtolower($possible_user) : $possible_user;
+			{
+							$this->_searchq_parameters ['guest_user_name_implode_' . $key] = defined('DB_CASE_SENSITIVE') ? strtolower($possible_user) : $possible_user;
+			}
 
 			// Simply do nothing if there are too many members matching the criteria.
 			if (count($members) > $maxMembersToSearch)
@@ -2679,7 +2708,9 @@ 
 					$uq = array();
 					$name = defined('DB_CASE_SENSITIVE') ? 'LOWER(pm.from_name)' : 'pm.from_name';
 					foreach (array_keys($possible_users) as $key)
-						$uq[] = 'AND pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})';
+					{
+											$uq[] = 'AND pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})';
+					}
 					$userQuery = implode(' ', $uq);
 					$this->_searchq_parameters ['pm_from_name'] = defined('DB_CASE_SENSITIVE') ? 'LOWER(pm.from_name)' : 'pm.from_name';
 				}
@@ -2692,7 +2723,9 @@ 
 			{
 				$memberlist = array();
 				foreach ($members as $id)
-					$memberlist[] = $id;
+				{
+									$memberlist[] = $id;
+				}
 
 				// Use the name as as sent from or sent to
 				if ($context['folder'] === 'inbox')
@@ -2701,7 +2734,9 @@ 
 					$name = defined('DB_CASE_SENSITIVE') ? 'LOWER(pm.from_name)' : 'pm.from_name';
 
 					foreach (array_keys($possible_users) as $key)
-						$uq[] = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})))';
+					{
+											$uq[] = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})))';
+					}
 
 					$userQuery = implode(' ', $uq);
 				}
@@ -2806,7 +2841,9 @@ 
 
 		// Now we have all the parameters, combine them together for pagination and the like...
 		foreach ($this->_search_params as $k => $v)
-			$encoded[] = $k . '|\'|' . $v;
+		{
+					$encoded[] = $k . '|\'|' . $v;
+		}
 
 		// Base64 encode, then replace +/= with uri safe ones that can be reverted
 		$encoded = str_replace(array('+', '/', '='), array('-', '_', '.'), base64_encode(implode('|"|', $encoded)));

sources/subs/Errors/Errors.php

Spacing +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
 			loadUserSettings();
 
 			$_SESSION['session_var'] = isset($_SESSION['session_var']) ? $_SESSION['session_var'] : '';
-			$_SESSION['session_value'] = isset($_SESSION['session_value'] ) ? $_SESSION['session_value'] : '';
+			$_SESSION['session_value'] = isset($_SESSION['session_value']) ? $_SESSION['session_value'] : '';
 			loadTheme();
 
 			// Here lies elkarte, dead from a program error. Just a cryptic message, no output could be better.

Braces +39 added lines, -13 removed lines

@@ -104,7 +104,9 @@ 
 
 		// 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'];
+		{
+					$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+		}
 
 		return $query_string;
 	}
@@ -126,9 +128,13 @@ 
 
 		// Just in case there's no id_member or IP set yet.
 		if (empty($user_info['id']))
-			$user_info['id'] = 0;
+		{
+					$user_info['id'] = 0;
+		}
 		if (empty($user_info['ip']))
-			$user_info['ip'] = '';
+		{
+					$user_info['ip'] = '';
+		}
 
 		// Don't log the same error countless times, as we can get in a cycle of depression...
 		$error_info = array($user_info['id'], time(), $user_info['ip'], $query_string, $error_message, isset($_SESSION['session_value']) ? (string) $_SESSION['session_value'] : 'no_session_data', $error_type, $file, $line);
@@ -164,7 +170,9 @@ 
 	{
 		// Check if error logging is actually on.
 		if (empty($this->_modSettings['enableErrorLogging']))
-			return $error_message;
+		{
+					return $error_message;
+		}
 
 		// Basically, htmlspecialchars it minus &. (for entities!)
 		$error_message = strtr($error_message, array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));
@@ -218,7 +226,9 @@ 
 
 		// Load the language file, only if it needs to be reloaded
 		if ($reload_lang_file)
-			loadLanguage('Errors');
+		{
+					loadLanguage('Errors');
+		}
 
 		// Return the message to make things simpler.
 		return $error_message;
@@ -281,7 +291,9 @@ 
 		// Attempt to prevent a recursive loop.
 		++$level;
 		if ($level > 1)
-			return false;
+		{
+					return false;
+		}
 
 		// Maybe they came from dlattach or similar?
 		if (ELK !== 'SSI' && empty($context['theme_loaded']))
@@ -315,19 +327,27 @@ 
 		$context['sub_template'] = 'fatal_error';
 
 		if (class_exists('Template_Layers'))
-			\Template_Layers::instance()->isError();
+		{
+					\Template_Layers::instance()->isError();
+		}
 
 		// If this is SSI, what do they want us to do?
 		if (ELK === 'SSI')
 		{
 			if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method))
-				call_user_func($ssi_on_error_method);
+			{
+							call_user_func($ssi_on_error_method);
+			}
 			elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-				loadSubTemplate('fatal_error');
+			{
+							loadSubTemplate('fatal_error');
+			}
 
 			// No layers?
 			if (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-				$this->terminate();
+			{
+							$this->terminate();
+			}
 		}
 
 		// We want whatever for the header, and a footer. (footer includes sub template!)
@@ -358,7 +378,8 @@ 
 		$this->_set_fatal_error_headers();
 
 		if (!empty($maintenance))
-			echo '<!DOCTYPE html>
+		{
+					echo '<!DOCTYPE html>
 	<html>
 		<head>
 			<meta name="robots" content="noindex" />
@@ -369,6 +390,7 @@ 
 			', $mmessage, '
 		</body>
 	</html>';
+		}
 
 		$this->terminate();
 	}
@@ -434,7 +456,9 @@ 
 
 		$temp = '';
 		if ($cache->getVar($temp, 'db_last_error', 600))
-			$db_last_error = max($db_last_error, $temp);
+		{
+					$db_last_error = max($db_last_error, $temp);
+		}
 
 		// Perhaps we want to notify by mail that there was a this->_db error
 		if ($db_last_error < time() - 3600 * 24 * 3 && empty($maintenance) && !empty($db_error_send))
@@ -442,7 +466,9 @@ 
 			// Try using shared memory if possible.
 			$cache->put('db_last_error', time(), 600);
 			if (!$cache->getVar($temp, 'db_last_error', 600))
-				logLastDatabaseError();
+			{
+							logLastDatabaseError();
+			}
 
 			// Language files aren't loaded yet :'(
 			$db_error = $this->_db->last_error($this->_db->connection());

sources/subs/ManageSearch.subs.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	{
 		while ($row = $db->fetch_assoc($request))
 		{
-			foreach(array('body', 'subject') as $column)
+			foreach (array('body', 'subject') as $column)
 			{
 				if ($row['Column_name'] === $column && (isset($row['Index_type']) && $row['Index_type'] === 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] === 'FULLTEXT'))
 				{

Braces +27 added lines, -10 removed lines

@@ -131,7 +131,9 @@ 
 
 	// Set up to output a file to the users browser
 	while (ob_get_level() > 0)
-		@ob_end_clean();
+	{
+			@ob_end_clean();
+	}
 
 	header('Content-Encoding: none');
 	header('Pragma: no-cache');
@@ -349,11 +351,15 @@ 
 
 		// Temporarily switch back to not using a search index.
 		if (!empty($modSettings['search_index']) && $modSettings['search_index'] === 'custom')
-			updateSettings(array('search_index' => ''));
+		{
+					updateSettings(array('search_index' => ''));
+		}
 
 		// Don't let simultaneous processes be updating the search index.
 		if (!empty($modSettings['search_custom_index_config']))
-			updateSettings(array('search_custom_index_config' => ''));
+		{
+					updateSettings(array('search_custom_index_config' => ''));
+		}
 	}
 
 	$num_messages = array(
@@ -370,7 +376,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+	{
+			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+	}
 
 	// Done with indexing the messages, on to the next step
 	if (empty($num_messages['todo']))
@@ -411,7 +419,9 @@ 
 
 				$number_processed++;
 				foreach (text2words($row['body'], $index_settings['bytes_per_word'], true) as $id_word)
-					$inserts[] = array($id_word, $row['id_msg']);
+				{
+									$inserts[] = array($id_word, $row['id_msg']);
+				}
 			}
 			$num_messages['done'] += $number_processed;
 			$num_messages['todo'] -= $number_processed;
@@ -420,12 +430,14 @@ 
 			$start += $forced_break ? $number_processed : $messages_per_batch;
 
 			if (!empty($inserts))
-				$db->insert('ignore',
+			{
+							$db->insert('ignore',
 					'{db_prefix}log_search_words',
 					array('id_word' => 'int', 'id_msg' => 'int'),
 					$inserts,
 					array('id_word', 'id_msg')
 				);
+			}
 
 			// Done then set up for the next step, set up for the next loop.
 			if ($num_messages['todo'] === 0)
@@ -434,8 +446,9 @@ 
 				$start = 0;
 				break;
 			}
-			else
-				updateSettings(array('search_custom_index_resume' => serialize(array_merge($index_settings, array('resume_at' => $start)))));
+			else {
+							updateSettings(array('search_custom_index_resume' => serialize(array_merge($index_settings, array('resume_at' => $start)))));
+			}
 		}
 
 		// Since there are still steps to go, 80% is the maximum here.
@@ -478,19 +491,23 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$stop_words[] = $row['id_word'];
+		{
+					$stop_words[] = $row['id_word'];
+		}
 		$db->free_result($request);
 
 		updateSettings(array('search_stopwords' => implode(',', $stop_words)));
 
 		if (!empty($stop_words))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}log_search_words
 				WHERE id_word in ({array_int:stop_words})',
 				array(
 					'stop_words' => $stop_words,
 				)
 			);
+		}
 
 		$start += $column_definition['step_size'];
 		if ($start > $column_definition['max_size'])

sources/database/Db-postgresql.class.php

Spacing +2 added lines, -2 removed lines

@@ -1078,13 +1078,13 @@
 	{
 		global $db_row_count;
 
-		if(!is_resource($resource) && ($resource instanceof \PgSql\Result))
+		if (!is_resource($resource) && ($resource instanceof \PgSql\Result))
 		{
 			$id = spl_object_id($resource);
 		}
 		else
 		{
-			$id = (int)$resource;
+			$id = (int) $resource;
 		}
 
 		return $id;

Braces +161 added lines, -61 removed lines

@@ -17,7 +17,9 @@ 
 
 // Let's define the name of the class so that we will be able to use it in the instantiations
 if (!defined('DB_TYPE'))
+{
 	define('DB_TYPE', 'PostgreSQL');
+}
 
 /**
  * PostgreSQL database class, implements database class to control mysql functions
@@ -67,25 +69,36 @@ 
 	{
 		// initialize the instance... if not done already!
 		if (self::$_db === null)
-			self::$_db = new self();
+		{
+					self::$_db = new self();
+		}
 
 		if (!empty($db_options['port']))
-			$db_port = ' port=' . (int) $db_options['port'];
-		else
-			$db_port = '';
+		{
+					$db_port = ' port=' . (int) $db_options['port'];
+		}
+		else {
+					$db_port = '';
+		}
 
 		if (!empty($db_options['persist']))
-			$connection = @pg_pconnect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
-		else
-			$connection = @pg_connect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
+		{
+					$connection = @pg_pconnect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
+		}
+		else {
+					$connection = @pg_connect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
+		}
 
 		// Something's wrong, show an error if its fatal (which we assume it is)
 		if (!$connection)
 		{
 			if (!empty($db_options['non_fatal']))
-				return null;
-			else
-				Errors::instance()->display_db_error();
+			{
+							return null;
+			}
+			else {
+							Errors::instance()->display_db_error();
+			}
 		}
 
 		self::$_db->_connection = $connection;
@@ -179,13 +192,17 @@ 
 		);
 
 		if (isset($replacements[$identifier]))
-			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+		{
+					$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:.+})(.*)~i', 'LIMIT $2 OFFSET $1 $3', $db_string);
 
 		if (trim($db_string) == '')
-			return false;
+		{
+					return false;
+		}
 
 		// Comments that are allowed in a query are preg_removed.
 		static $allowed_comments_from = array(
@@ -206,7 +223,9 @@ 
 		$this->_db_replace_result = null;
 
 		if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
-			$this->error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+		{
+					$this->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))
 		{
@@ -257,7 +276,9 @@ 
 			{
 				$pos = strpos($db_string, '\'', $pos + 1);
 				if ($pos === false)
-					break;
+				{
+									break;
+				}
 				$clean .= substr($db_string, $old_pos, $pos - $old_pos);
 
 				while (true)
@@ -266,7 +287,9 @@ 
 					$pos2 = strpos($db_string, '\'\'', $pos + 1);
 
 					if ($pos1 === false)
-						break;
+					{
+											break;
+					}
 					elseif ($pos2 === false || $pos2 > $pos1)
 					{
 						$pos = $pos1;
@@ -285,19 +308,29 @@ 
 
 			// 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;
+			{
+							$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;
+			{
+							$fail = true;
+			}
 			elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
-				$fail = true;
+			{
+							$fail = true;
+			}
 
 			if (!empty($fail) && class_exists('Errors'))
-				$this->error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+			{
+							$this->error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+			}
 
 			// If we are updating something, better start a transaction so that indexes may be kept consistent
 			if (!$this->_in_transaction && strpos($clean, 'update') !== false)
-				$this->db_transaction('begin', $connection);
+			{
+							$this->db_transaction('begin', $connection);
+			}
 		}
 
 		$this->_db_last_result = @pg_query($connection, $db_string);
@@ -320,7 +353,9 @@ 
 		}
 
 		if ($this->_in_transaction)
-			$this->db_transaction('commit', $connection);
+		{
+					$this->db_transaction('commit', $connection);
+		}
 
 		// Debugging.
 		if ($db_show_debug === true)
@@ -340,9 +375,13 @@ 
 	public function affected_rows($result = null)
 	{
 		if ($this->_db_replace_result !== null)
-			return $this->_db_replace_result;
+		{
+					return $this->_db_replace_result;
+		}
 		elseif ($result === null && !$this->_db_last_result)
-			return 0;
+		{
+					return 0;
+		}
 
 		return pg_affected_rows($result === null ? $this->_db_last_result : $result);
 	}
@@ -371,7 +410,9 @@ 
 		);
 
 		if (!$request)
-			return false;
+		{
+					return false;
+		}
 
 		list ($lastID) = $this->fetch_row($request);
 		$this->free_result($request);
@@ -391,11 +432,15 @@ 
 		global $db_row_count;
 
 		if ($counter !== false)
-			return pg_fetch_row($result, $counter);
+		{
+					return pg_fetch_row($result, $counter);
+		}
 
 		// Reset the row counter...
 		if (!isset($db_row_count[$this->seekCounter($result)]))
-			$db_row_count[$this->seekCounter($result)] = 0;
+		{
+					$db_row_count[$this->seekCounter($result)] = 0;
+		}
 
 		// Return the right row.
 		return @pg_fetch_row($result, $db_row_count[$this->seekCounter($result)]++);
@@ -413,7 +458,9 @@ 
 		$id = $this->seekCounter($result);
 		// Reset the row counter...
 		if (isset($db_row_count[$id]))
-			unset($db_row_count[$id]);
+		{
+					unset($db_row_count[$id]);
+		}
 
 		// Just delegate to the native function
 		pg_free_result($result);
@@ -472,7 +519,9 @@ 
 			return @pg_query($connection, 'BEGIN');
 		}
 		elseif ($type == 'rollback')
-			return @pg_query($connection, 'ROLLBACK');
+		{
+					return @pg_query($connection, 'ROLLBACK');
+		}
 		elseif ($type == 'commit')
 		{
 			$this->_in_transaction = false;
@@ -493,7 +542,9 @@ 
 		$connection = $connection === null ? $this->_connection : $connection;
 
 		if (is_resource($connection) || $connection instanceof \PgSql\Connection)
-			return pg_last_error($connection);
+		{
+					return pg_last_error($connection);
+		}
 	}
 
 	/**
@@ -526,21 +577,30 @@ 
 
 		// Nothing's defined yet... just die with it.
 		if (empty($context) || empty($txt))
-			die($query_error);
+		{
+					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'];
+		{
+					$context['error_message'] = nl2br($query_error) . '<br />' . $txt['file'] . ': ' . $file . '<br />' . $txt['line'] . ': ' . $line;
+		}
+		else {
+					$context['error_message'] = $txt['try_again'];
+		}
 
 		// Add database version that we know of, for the admin to know. (and ask for support)
 		if (allowedTo('admin_forum'))
-			$context['error_message'] .= '<br /><br />' . sprintf($txt['database_error_versions'], $modSettings['elkVersion']);
+		{
+					$context['error_message'] .= '<br /><br />' . sprintf($txt['database_error_versions'], $modSettings['elkVersion']);
+		}
 
 		if (allowedTo('admin_forum') && $db_show_debug === true)
-			$context['error_message'] .= '<br /><br />' . nl2br($db_string);
+		{
+					$context['error_message'] .= '<br /><br />' . nl2br($db_string);
+		}
 
 		// It's already been logged... don't log it again.
 		throw new Elk_Exception($context['error_message'], false);
@@ -566,11 +626,15 @@ 
 
 		// With nothing to insert, simply return.
 		if (empty($data))
-			return;
+		{
+					return;
+		}
 
 		// Inserting data as a single row can be done as a single array.
 		if (!is_array($data[array_rand($data)]))
-			$data = array($data);
+		{
+					$data = array($data);
+		}
 
 		// Replace the prefix holder with the actual prefix.
 		$table = str_replace('{db_prefix}', $db_prefix, $table);
@@ -592,13 +656,18 @@ 
 			{
 				// 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);
+				{
+									$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);
+				{
+									$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				}
 				$count++;
 			}
 
@@ -625,9 +694,12 @@ 
 			{
 				// 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);
+				{
+									$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) . ')';
 
@@ -637,7 +709,9 @@ 
 			// Here's where the variables are injected to the query.
 			$insertRows = array();
 			foreach ($data as $dataRow)
-				$insertRows[] = $this->quote($insertData, $this->_array_combine($indexed_columns, $dataRow), $connection);
+			{
+							$insertRows[] = $this->quote($insertData, $this->_array_combine($indexed_columns, $dataRow), $connection);
+			}
 
 			$inserted_results = 0;
 			$skip_error = $method == 'ignore' || $table === $db_prefix . 'log_errors';
@@ -658,11 +732,15 @@ 
 				$inserted_results += (!$this->_db_last_result ? 0 : pg_affected_rows($this->_db_last_result));
 			}
 			if (isset($db_replace_result))
-				$this->_db_replace_result = $db_replace_result + $inserted_results;
+			{
+							$this->_db_replace_result = $db_replace_result + $inserted_results;
+			}
 		}
 
 		if ($priv_trans)
-			$this->db_transaction('commit', $connection);
+		{
+					$this->db_transaction('commit', $connection);
+		}
 	}
 
 	/**
@@ -726,7 +804,9 @@ 
 		$num_rows = $this->num_rows($result);
 
 		if ($num_rows == 0)
-			return '';
+		{
+					return '';
+		}
 
 		if ($new_table)
 		{
@@ -747,11 +827,16 @@ 
 			{
 				// Try to figure out the type of each field. (NULL, number, or 'string'.)
 				if (!isset($item))
-					$field_list[] = 'NULL';
+				{
+									$field_list[] = 'NULL';
+				}
 				elseif (is_numeric($item) && (int) $item == $item)
-					$field_list[] = $item;
-				else
-					$field_list[] = '\'' . $this->escape_string($item) . '\'';
+				{
+									$field_list[] = $item;
+				}
+				else {
+									$field_list[] = '\'' . $this->escape_string($item) . '\'';
+				}
 			}
 
 			// 'Insert' the data.
@@ -801,12 +886,18 @@ 
 		while ($row = $this->fetch_assoc($result))
 		{
 			if ($row['data_type'] == 'character varying')
-				$row['data_type'] = 'varchar';
+			{
+							$row['data_type'] = 'varchar';
+			}
 			elseif ($row['data_type'] == 'character')
-				$row['data_type'] = 'char';
+			{
+							$row['data_type'] = 'char';
+			}
 
 			if ($row['character_maximum_length'])
-				$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+			{
+							$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+			}
 
 			// Make the CREATE for this column.
 			$schema_create .= ' "' . $row['column_name'] . '" ' . $row['data_type'] . ($row['is_nullable'] != 'YES' ? ' NOT NULL' : '');
@@ -859,12 +950,15 @@ 
 			if ($row['is_primary'])
 			{
 				if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-					continue;
+				{
+									continue;
+				}
 
 				$index_create .= $crlf . 'ALTER TABLE ' . $tableName . ' ADD PRIMARY KEY ("' . $matches[1] . '");';
 			}
-			else
-				$index_create .= $crlf . $row['inddef'] . ';';
+			else {
+							$index_create .= $crlf . $row['inddef'] . ';';
+			}
 		}
 		$this->free_result($result);
 
@@ -892,7 +986,9 @@ 
 		);
 		$tables = array();
 		while ($row = $this->fetch_row($request))
-			$tables[] = $row[0];
+		{
+					$tables[] = $row[0];
+		}
 		$this->free_result($request);
 
 		return $tables;
@@ -1008,11 +1104,15 @@ 
 		global $db_row_count;
 
 		if ($counter !== false)
-			return pg_fetch_assoc($request, $counter);
+		{
+					return pg_fetch_assoc($request, $counter);
+		}
 
 		// Reset the row counter...
 		if (!isset($db_row_count[$this->seekCounter($request)]))
-			$db_row_count[$this->seekCounter($request)] = 0;
+		{
+					$db_row_count[$this->seekCounter($request)] = 0;
+		}
 
 		// Return the right row.
 		return @pg_fetch_assoc($request, $db_row_count[$this->seekCounter($request)]++);

addons/index.php

Braces +3 added lines, -2 removed lines

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

SSI.php

Braces +3 added lines, -1 removed lines

@@ -803,8 +803,10 @@
 	global $txt, $context;
 
 	if ($output_method === 'echo')
-		echo '
+	{
+			echo '
 		', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br />';
+	}
 	else
 	{
 		return $context['common_stats']['latest_member'];

themes/index.php

Braces +2 added lines, -1 removed lines

@@ -12,5 +12,6 @@
 	header('Location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}

themes/default/css/index.php

Braces +5 added lines, -2 removed lines

@@ -2,6 +2,9 @@
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}

themes/default/images/post/index.php

Braces +5 added lines, -2 removed lines

@@ -2,6 +2,9 @@
 
 // Try to handle it with the upper level index.php.  (it should know what to do.)
 if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+{
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
\ No newline at end of file
+}
+else {
+	exit;
+}