elkarte / Elkarte

sources/database/Db-abstract.class.php

Braces +72 added lines, -26 removed lines

@@ -84,22 +84,34 @@ 
 
 		// Connection gone???  This should *never* happen at this point, yet it does :'(
 		if (!$this->validConnection($this->_db_callback_connection))
-			Errors::instance()->display_db_error();
+		{
+					Errors::instance()->display_db_error();
+		}
 
 		if ($matches[1] === 'db_prefix')
-			return $db_prefix;
+		{
+					return $db_prefix;
+		}
 
 		if ($matches[1] === 'query_see_board')
-			return $user_info['query_see_board'];
+		{
+					return $user_info['query_see_board'];
+		}
 
 		if ($matches[1] === 'query_wanna_see_board')
-			return $user_info['query_wanna_see_board'];
+		{
+					return $user_info['query_wanna_see_board'];
+		}
 
 		if (!isset($matches[2]))
-			$this->error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+		{
+					$this->error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 
 		if (!isset($this->_db_callback_values[$matches[2]]))
-			$this->error_backtrace('The database value you\'re trying to insert does not exist: ' . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8'), '', E_USER_ERROR, __FILE__, __LINE__);
+		{
+					$this->error_backtrace('The database value you\'re trying to insert does not exist: ' . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8'), '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 
 		$replacement = $this->_db_callback_values[$matches[2]];
 
@@ -174,7 +186,9 @@ 
 
 		$results = $seeds !== null ? $seeds : array();
 		while ($row = $this->fetch_assoc($request))
-			$results[] = $row;
+		{
+					$results[] = $row;
+		}
 		$this->free_result($request);
 
 		return $results;
@@ -186,13 +200,17 @@ 
 	public function fetchQueryCallback($db_string, $db_values = array(), $callback = '', $seeds = null)
 	{
 		if ($callback === '')
-			return $this->fetchQuery($db_string, $db_values);
+		{
+					return $this->fetchQuery($db_string, $db_values);
+		}
 
 		$request = $this->query('', $db_string, $db_values);
 
 		$results = $seeds !== null ? $seeds : array();
 		while ($row = $this->fetch_assoc($request))
-			$results[] = $callback($row);
+		{
+					$results[] = $callback($row);
+		}
 		$this->free_result($request);
 
 		return $results;
@@ -210,14 +228,18 @@ 
 		$is_numeric = array_filter(array_keys($values), 'is_numeric');
 
 		if (!empty($is_numeric))
-			return array_combine($keys, $values);
+		{
+					return array_combine($keys, $values);
+		}
 		else
 		{
 			$combined = array();
 			foreach ($keys as $key)
 			{
 				if (isset($values[$key]))
-					$combined[$key] = $values[$key];
+				{
+									$combined[$key] = $values[$key];
+				}
 			}
 
 			// @todo should throw an E_WARNING if count($combined) != count($keys)
@@ -236,7 +258,9 @@ 
 	protected function _replaceInt($identifier, $replacement)
 	{
 		if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
-			$this->error_backtrace('Wrong value type sent to the database. Integer expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+		{
+					$this->error_backtrace('Wrong value type sent to the database. Integer expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 		return (string) (int) $replacement;
 	}
 
@@ -253,12 +277,16 @@ 
 			if (is_array($replacement))
 			{
 				if (empty($replacement))
-					$this->error_backtrace('Database error, given array of integer values is empty. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				{
+									$this->error_backtrace('Database error, given array of integer values is empty. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
 					if (!is_numeric($value) || (string) $value !== (string) (int) $value)
-						$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					{
+											$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
 					$replacement[$key] = (string) (int) $value;
 				}
@@ -295,10 +323,14 @@ 
 		if (is_array($replacement))
 		{
 			if (empty($replacement))
-				$this->error_backtrace('Database error, given array of string values is empty. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			{
+							$this->error_backtrace('Database error, given array of string values is empty. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 
 			foreach ($replacement as $key => $value)
-				$replacement[$key] = sprintf('\'%1$s\'', $this->escape_string($value));
+			{
+							$replacement[$key] = sprintf('\'%1$s\'', $this->escape_string($value));
+			}
 
 			return implode(', ', $replacement);
 		}
@@ -319,9 +351,12 @@ 
 	protected function _replaceDate($identifier, $replacement)
 	{
 		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
-			$this->error_backtrace('Wrong value type sent to the database. Date expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+		{
+					return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
+		}
+		else {
+					$this->error_backtrace('Wrong value type sent to the database. Date expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 	}
 
 	/**
@@ -335,7 +370,9 @@ 
 	protected function _replaceFloat($identifier, $replacement)
 	{
 		if (!is_numeric($replacement))
-			$this->error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+		{
+					$this->error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $identifier . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 		return (string) (float) $replacement;
 	}
 
@@ -371,7 +408,9 @@ 
 	public function error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 	{
 		if (empty($log_message))
-			$log_message = $error_message;
+		{
+					$log_message = $error_message;
+		}
 
 		foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $step)
 		{
@@ -391,7 +430,9 @@ 
 
 		// A special case - we want the file and line numbers for debugging.
 		if ($error_type === 'return')
-			return array($file, $line);
+		{
+					return array($file, $line);
+		}
 
 		// Is always a critical error.
 		if (class_exists('Errors'))
@@ -404,9 +445,12 @@ 
 			throw new Elk_Exception($error_message, false);
 		}
 		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>' : ''));
+		{
+					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>' : ''));
+		}
 
 		return array('', '');
 	}
@@ -426,9 +470,11 @@ 
 		);
 
 		if ($translate_human_wildcards)
-			$replacements += array(
+		{
+					$replacements += array(
 				'*' => '%',
 			);
+		}
 
 		return strtr($string, $replacements);
 	}

sources/database/DbTable-mysql.php

Braces +111 added lines, -44 removed lines

@@ -51,7 +51,9 @@ 
 			'themes', 'topics');
 
 		foreach ($this->_reservedTables as $k => $table_name)
-			$this->_reservedTables[$k] = strtolower($db_prefix . $table_name);
+		{
+					$this->_reservedTables[$k] = strtolower($db_prefix . $table_name);
+		}
 
 		// let's be sure.
 		$this->_package_log = array();
@@ -104,7 +106,9 @@ 
 
 		// First - no way do we touch our tables.
 		if (in_array(strtolower($table_name), $this->_reservedTables))
-			return false;
+		{
+					return false;
+		}
 
 		// Log that we'll want to remove this on uninstall.
 		$this->_package_log[] = array('remove_table', $table_name);
@@ -114,15 +118,20 @@ 
 		{
 			// This is a sad day... drop the table? If not, return false (error) by default.
 			if ($if_exists == 'overwrite')
-				$this->db_drop_table($table_name);
-			else
-				return $if_exists == 'ignore';
+			{
+							$this->db_drop_table($table_name);
+			}
+			else {
+							return $if_exists == 'ignore';
+			}
 		}
 
 		// Righty - let's do the damn thing!
 		$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
 		foreach ($columns as $column)
-			$table_query .= "\n\t" . $this->_db_create_query_column($column) . ',';
+		{
+					$table_query .= "\n\t" . $this->_db_create_query_column($column) . ',';
+		}
 
 		// Loop through the indexes next...
 		foreach ($indexes as $index)
@@ -131,18 +140,24 @@ 
 
 			// Is it the primary?
 			if (isset($index['type']) && $index['type'] == 'primary')
-				$table_query .= "\n\t" . 'PRIMARY KEY (' . $columns . '),';
+			{
+							$table_query .= "\n\t" . 'PRIMARY KEY (' . $columns . '),';
+			}
 			else
 			{
 				if (empty($index['name']))
-					$index['name'] = implode('_', $index['columns']);
+				{
+									$index['name'] = implode('_', $index['columns']);
+				}
 				$table_query .= "\n\t" . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY') . ' ' . $index['name'] . ' (' . $columns . '),';
 			}
 		}
 
 		// No trailing commas!
 		if (substr($table_query, -1) == ',')
-			$table_query = substr($table_query, 0, -1);
+		{
+					$table_query = substr($table_query, 0, -1);
+		}
 
 		$table_query .= ') DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
 
@@ -176,7 +191,9 @@ 
 
 		// God no - dropping one of these = bad.
 		if (in_array(strtolower($table_name), $this->_reservedTables))
-			return false;
+		{
+					return false;
+		}
 
 		// Does it exist?
 		if ($this->table_exists($full_table_name))
@@ -219,9 +236,12 @@ 
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
-				return $this->db_change_column($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+			{
+							return $this->db_change_column($table_name, $column_info['name'], $column_info);
+			}
+			else {
+							return false;
+			}
 		}
 
 		// Now add the thing!
@@ -279,23 +299,39 @@ 
 
 		// Nothing?
 		if ($old_info === false)
-			return false;
+		{
+					return false;
+		}
 
 		// Get the right bits.
 		if (!isset($column_info['name']))
-			$column_info['name'] = $old_column;
+		{
+					$column_info['name'] = $old_column;
+		}
 		if (!isset($column_info['default']))
-			$column_info['default'] = $old_info['default'];
+		{
+					$column_info['default'] = $old_info['default'];
+		}
 		if (!isset($column_info['null']))
-			$column_info['null'] = $old_info['null'];
+		{
+					$column_info['null'] = $old_info['null'];
+		}
 		if (!isset($column_info['auto']))
-			$column_info['auto'] = $old_info['auto'];
+		{
+					$column_info['auto'] = $old_info['auto'];
+		}
 		if (!isset($column_info['type']))
-			$column_info['type'] = $old_info['type'];
+		{
+					$column_info['type'] = $old_info['type'];
+		}
 		if (!isset($column_info['size']) || !is_numeric($column_info['size']))
-			$column_info['size'] = $old_info['size'];
+		{
+					$column_info['size'] = $old_info['size'];
+		}
 		if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')))
-			$column_info['unsigned'] = '';
+		{
+					$column_info['unsigned'] = '';
+		}
 
 		$this->_alter_table($table_name, '
 			CHANGE COLUMN `' . $old_column . '` ' . $this->_db_create_query_column($column_info));
@@ -318,7 +354,9 @@ 
 
 		// No columns = no index.
 		if (empty($index_info['columns']))
-			return false;
+		{
+					return false;
+		}
 		$columns = implode(',', $index_info['columns']);
 
 		// No name - make it up!
@@ -326,9 +364,12 @@ 
 		{
 			// No need for primary.
 			if (isset($index_info['type']) && $index_info['type'] == 'primary')
-				$index_info['name'] = '';
-			else
-				$index_info['name'] = implode('_', $index_info['columns']);
+			{
+							$index_info['name'] = '';
+			}
+			else {
+							$index_info['name'] = implode('_', $index_info['columns']);
+			}
 		}
 
 		// Log that we are going to want to remove this!
@@ -344,9 +385,12 @@ 
 			{
 				// If we want to overwrite simply remove the current one then continue.
 				if ($if_exists != 'update' || $index['type'] == 'primary')
-					return false;
-				else
-					$this->db_remove_index($table_name, $index_info['name']);
+				{
+									return false;
+				}
+				else {
+									$this->db_remove_index($table_name, $index_info['name']);
+				}
 			}
 		}
 
@@ -477,7 +521,9 @@ 
 					$type = $matches[1];
 					$size = $matches[2];
 					if (!empty($matches[3]) && $matches[3] == 'unsigned')
-						$unsigned = true;
+					{
+											$unsigned = true;
+					}
 				}
 				else
 				{
@@ -531,18 +577,27 @@ 
 		while ($row = $this->_db->fetch_assoc($result))
 		{
 			if (!$detail)
-				$indexes[] = $row['Key_name'];
+			{
+							$indexes[] = $row['Key_name'];
+			}
 			else
 			{
 				// What is the type?
 				if ($row['Key_name'] == 'PRIMARY')
-					$type = 'primary';
+				{
+									$type = 'primary';
+				}
 				elseif (empty($row['Non_unique']))
-					$type = 'unique';
+				{
+									$type = 'unique';
+				}
 				elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT')
-					$type = 'fulltext';
-				else
-					$type = 'index';
+				{
+									$type = 'fulltext';
+				}
+				else {
+									$type = 'index';
+				}
 
 				// This is the first column we've seen?
 				if (empty($indexes[$row['Key_name']]))
@@ -556,9 +611,12 @@ 
 
 				// Is it a partial index?
 				if (!empty($row['Sub_part']))
-					$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
-				else
-					$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+				{
+									$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
+				}
+				else {
+									$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+				}
 			}
 		}
 		$this->_db->free_result($result);
@@ -579,9 +637,12 @@ 
 			$default = 'auto_increment';
 		}
 		elseif (isset($column['default']) && $column['default'] !== null)
-			$default = 'default \'' . $this->_db->escape_string($column['default']) . '\'';
-		else
-			$default = '';
+		{
+					$default = 'default \'' . $this->_db->escape_string($column['default']) . '\'';
+		}
+		else {
+					$default = '';
+		}
 
 		// Sort out the size... and stuff...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
@@ -591,7 +652,9 @@ 
 		$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint', 'float')) && !empty($column['unsigned']) ? 'unsigned ' : '';
 
 		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		{
+					$type = $type . '(' . $size . ')';
+		}
 
 		// Now just put it together!
 		return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;
@@ -631,7 +694,9 @@ 
 				)
 			);
 			if (!$request)
-				return -1;
+			{
+							return -1;
+			}
 
 			// How much left?
 			$request = $this->_db->query('', '
@@ -670,7 +735,9 @@ 
 	public static function db_table($db)
 	{
 		if (is_null(self::$_tbl))
-			self::$_tbl = new DbTable_MySQL($db);
+		{
+					self::$_tbl = new DbTable_MySQL($db);
+		}
 		return self::$_tbl;
 	}
 }
\ No newline at end of file

sources/database/DbTable-postgresql.php

Braces +126 added lines, -52 removed lines

@@ -51,7 +51,9 @@ 
 			'themes', 'topics');
 
 		foreach ($this->_reservedTables as $k => $table_name)
-			$this->_reservedTables[$k] = strtolower($db_prefix . $table_name);
+		{
+					$this->_reservedTables[$k] = strtolower($db_prefix . $table_name);
+		}
 
 		// let's be sure.
 		$this->_package_log = array();
@@ -104,7 +106,9 @@ 
 
 		// First - no way do we touch our tables.
 		if (in_array(strtolower($table_name), $this->_reservedTables))
-			return false;
+		{
+					return false;
+		}
 
 		// Log that we'll want to remove this on uninstall.
 		$this->_package_log[] = array('remove_table', $table_name);
@@ -114,9 +118,12 @@ 
 		{
 			// This is a sad day... drop the table? If not, return false (error) by default.
 			if ($if_exists == 'overwrite')
-				$this->db_drop_table($table_name);
-			else
-				return $if_exists == 'ignore';
+			{
+							$this->db_drop_table($table_name);
+			}
+			else {
+							return $if_exists == 'ignore';
+			}
 		}
 
 		// If we've got this far - good news - no table exists. We can build our own!
@@ -136,15 +143,20 @@ 
 				$default = 'default nextval(\'' . $table_name . '_seq\')';
 			}
 			elseif (isset($column['default']) && $column['default'] !== null)
-				$default = 'default \'' . $this->_db->escape_string($column['default']) . '\'';
-			else
-				$default = '';
+			{
+							$default = 'default \'' . $this->_db->escape_string($column['default']) . '\'';
+			}
+			else {
+							$default = '';
+			}
 
 			// Sort out the size...
 			$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
 			list ($type, $size) = $this->db_calculate_type($column['type'], $column['size']);
 			if ($size !== null)
-				$type = $type . '(' . $size . ')';
+			{
+							$type = $type . '(' . $size . ')';
+			}
 
 			// Now just put it together!
 			$table_query .= "\n\t\"" . $column['name'] . '" ' . $type . ' ' . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default . ',';
@@ -156,25 +168,33 @@ 
 		{
 			// MySQL supports a length argument, postgre no
 			foreach ($index['columns'] as $id => $col)
-				if (strpos($col, '(') !== false)
+			{
+							if (strpos($col, '(') !== false)
 					$index['columns'][$id] = substr($col, 0, strpos($col, '('));
+			}
 
 			$columns = implode(',', $index['columns']);
 
 			// Primary goes in the table...
 			if (isset($index['type']) && $index['type'] == 'primary')
-				$table_query .= "\n\t" . 'PRIMARY KEY (' . $columns . '),';
+			{
+							$table_query .= "\n\t" . 'PRIMARY KEY (' . $columns . '),';
+			}
 			else
 			{
 				if (empty($index['name']))
-					$index['name'] = implode('_', $index['columns']);
+				{
+									$index['name'] = implode('_', $index['columns']);
+				}
 				$index_queries[] = 'CREATE ' . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $table_name . '_' . $index['name'] . ' ON ' . $table_name . ' (' . $columns . ')';
 			}
 		}
 
 		// No trailing commas!
 		if (substr($table_query, -1) == ',')
-			$table_query = substr($table_query, 0, -1);
+		{
+					$table_query = substr($table_query, 0, -1);
+		}
 
 		$table_query .= ')';
 
@@ -220,7 +240,9 @@ 
 
 		// God no - dropping one of these = bad.
 		if (in_array(strtolower($table_name), $this->_reservedTables))
-			return false;
+		{
+					return false;
+		}
 
 		// Does it exist?
 		if ($this->table_exists($full_table_name))
@@ -280,16 +302,21 @@ 
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
-				return $this->db_change_column($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+			{
+							return $this->db_change_column($table_name, $column_info['name'], $column_info);
+			}
+			else {
+							return false;
+			}
 		}
 
 		// Get the specifics...
 		$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 		list ($type, $size) = $this->db_calculate_type($column_info['type'], $column_info['size']);
 		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		{
+					$type = $type . '(' . $size . ')';
+		}
 
 		// Now add the thing!
 		$this->_alter_table($table_name, '
@@ -299,9 +326,12 @@ 
 		unset($column_info['type'], $column_info['size']);
 
 		if (count($column_info) != 1)
-			return $this->db_change_column($table_name, $column_info['name'], $column_info);
-		else
-			return true;
+		{
+					return $this->db_change_column($table_name, $column_info['name'], $column_info);
+		}
+		else {
+					return true;
+		}
 	}
 
 	/**
@@ -324,12 +354,14 @@ 
 		{
 			// If there is an auto we need remove it!
 			if ($column['auto'])
-				$this->_db->query('',
+			{
+							$this->_db->query('',
 					'DROP SEQUENCE ' . $table_name . '_seq',
 					array(
 						'security_override' => true,
 					)
 				);
+			}
 
 			$this->_alter_table($table_name, '
 				DROP COLUMN ' . $column_name);
@@ -361,7 +393,9 @@ 
 
 		// Nothing?
 		if ($old_info === false)
-			return false;
+		{
+					return false;
+		}
 
 		// Now we check each bit individually and ALTER as required.
 		if (isset($column_info['name']) && $column_info['name'] != $old_column)
@@ -407,7 +441,9 @@ 
 			$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 			list ($type, $size) = $this->db_calculate_type($column_info['type'], $column_info['size']);
 			if ($size !== null)
-				$type = $type . '(' . $size . ')';
+			{
+							$type = $type . '(' . $size . ')';
+			}
 
 			// The alter is a pain.
 			$this->_db->db_transaction('begin');
@@ -475,12 +511,16 @@ 
 
 		// No columns = no index.
 		if (empty($index_info['columns']))
-			return false;
+		{
+					return false;
+		}
 
 		// MySQL supports a length argument, postgre no
 		foreach ($index_info['columns'] as $id => $col)
-			if (strpos($col, '(') !== false)
+		{
+					if (strpos($col, '(') !== false)
 				$index_info['columns'][$id] = substr($col, 0, strpos($col, '('));
+		}
 
 		$columns = implode(',', $index_info['columns']);
 
@@ -489,12 +529,16 @@ 
 		{
 			// No need for primary.
 			if (isset($index_info['type']) && $index_info['type'] == 'primary')
-				$index_info['name'] = '';
-			else
-				$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+			{
+							$index_info['name'] = '';
+			}
+			else {
+							$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+			}
+		}
+		else {
+					$index_info['name'] = $table_name . $index_info['name'];
 		}
-		else
-			$index_info['name'] = $table_name . $index_info['name'];
 
 		// Log that we are going to want to remove this!
 		$this->_package_log[] = array('remove_index', $table_name, $index_info['name']);
@@ -509,9 +553,12 @@ 
 			{
 				// If we want to overwrite simply remove the current one then continue.
 				if ($if_exists != 'update' || $index['type'] == 'primary')
-					return false;
-				else
-					$this->db_remove_index($table_name, $index_info['name']);
+				{
+									return false;
+				}
+				else {
+									$this->db_remove_index($table_name, $index_info['name']);
+				}
 			}
 		}
 
@@ -549,7 +596,9 @@ 
 		// Better exist!
 		$indexes = $this->db_list_indexes($table_name, true);
 		if ($index_name != 'primary')
-			$index_name = $table_name . '_' . $index_name;
+		{
+					$index_name = $table_name . '_' . $index_name;
+		}
 
 		foreach ($indexes as $index)
 		{
@@ -619,13 +668,17 @@ 
 		if (isset($types[$type_name]))
 		{
 			if ($type_name == 'tinytext')
-				$type_size = 255;
+			{
+							$type_size = 255;
+			}
 			$type_name = $types[$type_name];
 		}
 
 		// Numbers don't have a size.
 		if (strpos($type_name, 'int') !== false)
-				$type_size = null;
+		{
+						$type_size = null;
+		}
 
 		return array($type_name, $type_size);
 	}
@@ -690,9 +743,12 @@ 
 					$auto = true;
 				}
 				elseif (trim($row['column_default']) != '')
-					$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
-				else
-					$default = null;
+				{
+									$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
+				}
+				else {
+									$default = null;
+				}
 
 				// Make the type generic.
 				list ($type, $size) = $this->db_calculate_type($row['data_type'], $row['character_maximum_length'], true);
@@ -744,24 +800,35 @@ 
 		{
 			// Try get the columns that make it up.
 			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-				continue;
+			{
+							continue;
+			}
 
 			$columns = explode(',', $matches[1]);
 
 			if (empty($columns))
-				continue;
+			{
+							continue;
+			}
 
 			foreach ($columns as $k => $v)
-				$columns[$k] = trim($v);
+			{
+							$columns[$k] = trim($v);
+			}
 
 			// Fix up the name to be consistent cross databases
 			if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1)
-				$row['name'] = 'PRIMARY';
-			else
-				$row['name'] = str_replace($table_name . '_', '', $row['name']);
+			{
+							$row['name'] = 'PRIMARY';
+			}
+			else {
+							$row['name'] = str_replace($table_name . '_', '', $row['name']);
+			}
 
 			if (!$detail)
-				$indexes[] = $row['name'];
+			{
+							$indexes[] = $row['name'];
+			}
 			else
 			{
 				$indexes[$row['name']] = array(
@@ -796,15 +863,20 @@ 
 			)
 		);
 		if (!$request)
-			return -1;
+		{
+					return -1;
+		}
 
 		$row = $this->_db->fetch_assoc($request);
 		$this->_db->free_result($request);
 
 		if (isset($row['Data_free']))
-			return $row['Data_free'] / 1024;
-		else
-			return 0;
+		{
+					return $row['Data_free'] / 1024;
+		}
+		else {
+					return 0;
+		}
 	}
 
 	/**
@@ -823,7 +895,9 @@ 
 	public static function db_table($db)
 	{
 		if (is_null(self::$_tbl))
-			self::$_tbl = new DbTable_PostgreSQL($db);
+		{
+					self::$_tbl = new DbTable_PostgreSQL($db);
+		}
 		return self::$_tbl;
 	}
 }
\ No newline at end of file

sources/database/Database.subs.php

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
 function db_table($db = null)
 {
 	if ($db === null)
-		$db = database();
+	{
+			$db = database();
+	}
 
 	require_once(SOURCEDIR . '/database/DbTable.class.php');
 	require_once(SOURCEDIR . '/database/DbTable-' . strtolower(DB_TYPE) . '.php');

sources/database/DbSearch-mysql.php

Braces +21 added lines, -10 removed lines

@@ -63,7 +63,8 @@ 
 		$table_info = array();
 
 		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $db->query('', '
+		{
+					$request = $db->query('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -72,14 +73,16 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 				)
 			);
-		else
-			$request = $db->query('', '
+		}
+		else {
+					$request = $db->query('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 				)
 			);
+		}
 
 		if ($request !== false && $db->num_rows($request) == 1)
 		{
@@ -93,7 +96,8 @@ 
 
 		// Now check the custom index table, if it exists at all.
 		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $db->query('', '
+		{
+					$request = $db->query('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -102,14 +106,16 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'log_search_words',
 				)
 			);
-		else
-			$request = $db->query('', '
+		}
+		else {
+					$request = $db->query('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'log_search_words',
 				)
 			);
+		}
 
 		if ($request !== false && $db->num_rows($request) == 1)
 		{
@@ -133,11 +139,16 @@ 
 		$db = database();
 
 		if ($size == 'small')
-			$size = 'smallint(5)';
+		{
+					$size = 'smallint(5)';
+		}
 		elseif ($size == 'medium')
-			$size = 'mediumint(8)';
-		else
-			$size = 'int(10)';
+		{
+					$size = 'mediumint(8)';
+		}
+		else {
+					$size = 'int(10)';
+		}
 
 		$db->query('', '
 			CREATE TABLE {db_prefix}log_search_words (

sources/DumpDatabase.php

Braces +24 added lines, -9 removed lines

@@ -39,7 +39,9 @@ 
 
 	// You can't dump nothing!
 	if (!isset($_REQUEST['struct']) && !isset($_REQUEST['data']))
-		$_REQUEST['data'] = true;
+	{
+			$_REQUEST['data'] = true;
+	}
 
 	// Attempt to stop from dying...
 	detectServer()->setTimeLimit(600);
@@ -72,10 +74,14 @@ 
 	{
 		// Get rid of the gzipping already being done.
 		if (!empty($modSettings['enableCompressedOutput']))
-			@ob_end_clean();
+		{
+					@ob_end_clean();
+		}
 		// If we can, clean anything already sent from the output buffer...
 		elseif (ob_get_length() != 0)
-			ob_clean();
+		{
+					ob_clean();
+		}
 
 		// Tell the client to save this file, even though it's text.
 		header('Content-Type: ' . (isBrowser('ie') || isBrowser('opera') ? 'application/octetstream' : 'application/octet-stream'));
@@ -124,13 +130,16 @@ 
 				$crlf .
 				$database->db_table_sql($tableName) . ';' . $crlf;
 		}
-		else
-			// This is needed to speedup things later
+		else {
+					// This is needed to speedup things later
 			$database->db_table_sql($tableName);
+		}
 
 		// How about the data?
 		if (!isset($_REQUEST['data']) || substr($tableName, -10) == 'log_errors')
-			continue;
+		{
+					continue;
+		}
 
 		$first_round = true;
 		$close_table = false;
@@ -139,11 +148,15 @@ 
 		while ($get_rows = $database->insert_sql($tableName, $first_round))
 		{
 			if (empty($get_rows))
-				break;
+			{
+							break;
+			}
 
 			// Time is what we need here!
 			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			{
+							@apache_reset_timeout();
+			}
 			elseif (!empty($time_limit) && (((int) $start_time + (int) $time_limit - 20) > time()))
 			{
 				$start_time = time();
@@ -182,8 +195,10 @@ 
 
 		// No rows to get - skip it.
 		if ($close_table)
-			$db_backup .=
+		{
+					$db_backup .=
 			'-- --------------------------------------------------------' . $crlf;
+		}
 	}
 
 	// write the last line

sources/Load.php

Braces +453 added lines, -177 removed lines

@@ -52,20 +52,32 @@ 
 		);
 		$modSettings = array();
 		if (!$request)
-			Errors::instance()->display_db_error();
+		{
+					Errors::instance()->display_db_error();
+		}
 		while ($row = $db->fetch_row($request))
-			$modSettings[$row[0]] = $row[1];
+		{
+					$modSettings[$row[0]] = $row[1];
+		}
 		$db->free_result($request);
 
 		// Do a few things to protect against missing settings or settings with invalid values...
 		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999)
-			$modSettings['defaultMaxTopics'] = 20;
+		{
+					$modSettings['defaultMaxTopics'] = 20;
+		}
 		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999)
-			$modSettings['defaultMaxMessages'] = 15;
+		{
+					$modSettings['defaultMaxMessages'] = 15;
+		}
 		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999)
-			$modSettings['defaultMaxMembers'] = 30;
+		{
+					$modSettings['defaultMaxMembers'] = 30;
+		}
 		if (empty($modSettings['subject_length']))
-			$modSettings['subject_length'] = 24;
+		{
+					$modSettings['subject_length'] = 24;
+		}
 
 		$modSettings['warning_enable'] = $modSettings['warning_settings'][0];
 
@@ -85,7 +97,9 @@ 
 
 	// Setting the timezone is a requirement for some functions in PHP >= 5.1.
 	if (isset($modSettings['default_timezone']))
-		date_default_timezone_set($modSettings['default_timezone']);
+	{
+			date_default_timezone_set($modSettings['default_timezone']);
+	}
 
 	// Check the load averages?
 	if (!empty($modSettings['loadavg_enable']))
@@ -99,19 +113,27 @@ 
 		}
 
 		if ($modSettings['load_average'] !== false)
-			call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		{
+					call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		}
 
 		// Let's have at least a zero
 		if (empty($modSettings['loadavg_forum']) || $modSettings['load_average'] === false)
-			$modSettings['current_load'] = 0;
-		else
-			$modSettings['current_load'] = $modSettings['load_average'];
+		{
+					$modSettings['current_load'] = 0;
+		}
+		else {
+					$modSettings['current_load'] = $modSettings['load_average'];
+		}
 
 		if (!empty($modSettings['loadavg_forum']) && $modSettings['current_load'] >= $modSettings['loadavg_forum'])
-			Errors::instance()->display_loadavg_error();
+		{
+					Errors::instance()->display_loadavg_error();
+		}
+	}
+	else {
+			$modSettings['current_load'] = 0;
 	}
-	else
-		$modSettings['current_load'] = 0;
 
 	// Is post moderation alive and well?
 	$modSettings['postmod_active'] = isset($modSettings['admin_features']) ? in_array('pm', explode(',', $modSettings['admin_features'])) : true;
@@ -147,7 +169,9 @@ 
 	{
 		$integration_settings = Util::unserialize(ELK_INTEGRATION_SETTINGS);
 		foreach ($integration_settings as $hook => $function)
-			add_integration_function($hook, $function);
+		{
+					add_integration_function($hook, $function);
+		}
 	}
 
 	// Any files to pre include?
@@ -195,8 +219,9 @@ 
 			}
 		}
 	}
-	else
-		$id_member = 0;
+	else {
+			$id_member = 0;
+	}
 
 	// We'll need IPs and user agent and stuff, they came to visit us with!
 	$req = request();
@@ -247,7 +272,9 @@ 
 			}
 
 			if ($cache->levelHigherThan(1))
-				$cache->put('user_settings-' . $id_member, $user_settings, 60);
+			{
+							$cache->put('user_settings-' . $id_member, $user_settings, 60);
+			}
 		}
 
 		// Did we find 'im?  If not, junk it.
@@ -255,22 +282,30 @@ 
 		{
 			// As much as the password should be right, we can assume the integration set things up.
 			if (!empty($already_verified) && $already_verified === true)
-				$check = true;
+			{
+							$check = true;
+			}
 			// SHA-256 passwords should be 64 characters long.
 			elseif (strlen($password) == 64)
-				$check = hash('sha256', ($user_settings['passwd'] . $user_settings['password_salt'])) == $password;
-			else
-				$check = false;
+			{
+							$check = hash('sha256', ($user_settings['passwd'] . $user_settings['password_salt'])) == $password;
+			}
+			else {
+							$check = false;
+			}
 
 			// Wrong password or not activated - either way, you're going nowhere.
 			$id_member = $check && ($user_settings['is_activated'] == 1 || $user_settings['is_activated'] == 11) ? (int) $user_settings['id_member'] : 0;
 		}
-		else
-			$id_member = 0;
+		else {
+					$id_member = 0;
+		}
 
 		// If we no longer have the member maybe they're being all hackey, stop brute force!
 		if (!$id_member)
-			validatePasswordFlood(!empty($user_settings['id_member']) ? $user_settings['id_member'] : $id_member, !empty($user_settings['passwd_flood']) ? $user_settings['passwd_flood'] : false, $id_member != 0);
+		{
+					validatePasswordFlood(!empty($user_settings['id_member']) ? $user_settings['id_member'] : $id_member, !empty($user_settings['passwd_flood']) ? $user_settings['passwd_flood'] : false, $id_member != 0);
+		}
 	}
 
 	// Found 'im, let's set up the variables.
@@ -298,31 +333,40 @@ 
 				$user_settings['last_login'] = time();
 
 				if ($cache->levelHigherThan(1))
-					$cache->put('user_settings-' . $id_member, $user_settings, 60);
+				{
+									$cache->put('user_settings-' . $id_member, $user_settings, 60);
+				}
 
 				$cache->put('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
 			}
 		}
 		elseif (empty($_SESSION['id_msg_last_visit']))
-			$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
+		{
+					$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
+		}
 
 		$username = $user_settings['member_name'];
 
 		if (empty($user_settings['additional_groups']))
-			$user_info = array(
+		{
+					$user_info = array(
 				'groups' => array($user_settings['id_group'], $user_settings['id_post_group'])
 			);
-		else
-			$user_info = array(
+		}
+		else {
+					$user_info = array(
 				'groups' => array_merge(
 					array($user_settings['id_group'], $user_settings['id_post_group']),
 					explode(',', $user_settings['additional_groups'])
 				)
 			);
+		}
 
 		// Because history has proven that it is possible for groups to go bad - clean up in case.
 		foreach ($user_info['groups'] as $k => $v)
-			$user_info['groups'][$k] = (int) $v;
+		{
+					$user_info['groups'][$k] = (int) $v;
+		}
 
 		// This is a logged in user, so definitely not a spider.
 		$user_info['possibly_robot'] = false;
@@ -344,13 +388,18 @@ 
 		$user_settings = array();
 
 		if (isset($_COOKIE[$cookiename]))
-			$_COOKIE[$cookiename] = '';
+		{
+					$_COOKIE[$cookiename] = '';
+		}
 
 		// Create a login token if it doesn't exist yet.
 		if (!isset($_SESSION['token']['post-login']))
-			createToken('login');
-		else
-			list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		{
+					createToken('login');
+		}
+		else {
+					list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		}
 
 		// Do we perhaps think this is a search robot? Check every five minutes just in case...
 		if ((!empty($modSettings['spider_mode']) || !empty($modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300))
@@ -359,7 +408,9 @@ 
 			$user_info['possibly_robot'] = spiderCheck();
 		}
 		elseif (!empty($modSettings['spider_mode']))
-			$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
+		{
+					$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
+		}
 		// If we haven't turned on proper spider hunts then have a guess!
 		else
 		{
@@ -407,11 +458,15 @@ 
 
 	// Make sure that the last item in the ignore boards array is valid.  If the list was too long it could have an ending comma that could cause problems.
 	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1]))
-		unset($user_info['ignoreboards'][$tmp]);
+	{
+			unset($user_info['ignoreboards'][$tmp]);
+	}
 
 	// Do we have any languages to validate this?
 	if (!empty($modSettings['userLanguage']) && (!empty($_GET['language']) || !empty($_SESSION['language'])))
-		$languages = getLanguages();
+	{
+			$languages = getLanguages();
+	}
 
 	// Allow the user to change their language if its valid.
 	if (!empty($modSettings['userLanguage']) && !empty($_GET['language']) && isset($languages[strtr($_GET['language'], './\\:', '____')]))
@@ -420,23 +475,31 @@ 
 		$_SESSION['language'] = $user_info['language'];
 	}
 	elseif (!empty($modSettings['userLanguage']) && !empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')]))
-		$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
+	{
+			$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
+	}
 
 	// Just build this here, it makes it easier to change/use - administrators can see all boards.
 	if ($user_info['is_admin'])
-		$user_info['query_see_board'] = '1=1';
+	{
+			$user_info['query_see_board'] = '1=1';
+	}
 	// Otherwise just the groups in $user_info['groups'].
-	else
-		$user_info['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $user_info['groups']) . ', b.member_groups) != 0)' . (!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $user_info['groups']) . ', b.deny_member_groups) = 0)' : '') . (isset($user_info['mod_cache']) ? ' OR ' . $user_info['mod_cache']['mq'] : '') . ')';
+	else {
+			$user_info['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $user_info['groups']) . ', b.member_groups) != 0)' . (!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $user_info['groups']) . ', b.deny_member_groups) = 0)' : '') . (isset($user_info['mod_cache']) ? ' OR ' . $user_info['mod_cache']['mq'] : '') . ')';
+	}
 	// Build the list of boards they WANT to see.
 	// This will take the place of query_see_boards in certain spots, so it better include the boards they can see also
 
 	// If they aren't ignoring any boards then they want to see all the boards they can see
 	if (empty($user_info['ignoreboards']))
-		$user_info['query_wanna_see_board'] = $user_info['query_see_board'];
+	{
+			$user_info['query_wanna_see_board'] = $user_info['query_see_board'];
+	}
 	// Ok I guess they don't want to see all the boards
-	else
-		$user_info['query_wanna_see_board'] = '(' . $user_info['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $user_info['ignoreboards']) . '))';
+	else {
+			$user_info['query_wanna_see_board'] = '(' . $user_info['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $user_info['ignoreboards']) . '))';
+	}
 
 	if ($user_info['is_guest'] === false)
 	{
@@ -533,7 +596,9 @@ 
 
 		// Remember redirection is the key to avoiding fallout from your bosses.
 		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
+		{
+					redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
+		}
 		else
 		{
 			loadPermissions();
@@ -553,9 +618,12 @@ 
 	{
 		// @todo SLOW?
 		if (!empty($topic))
-			$temp = $cache->get('topic_board-' . $topic, 120);
-		else
-			$temp = $cache->get('board-' . $board, 120);
+		{
+					$temp = $cache->get('topic_board-' . $topic, 120);
+		}
+		else {
+					$temp = $cache->get('board-' . $board, 120);
+		}
 
 		if (!empty($temp))
 		{
@@ -597,7 +665,9 @@ 
 
 			// Set the current board.
 			if (!empty($row['id_board']))
-				$board = (int) $row['id_board'];
+			{
+							$board = (int) $row['id_board'];
+			}
 
 			// Basic operating information. (globals... :/)
 			$board_info = array(
@@ -635,12 +705,14 @@ 
 			do
 			{
 				if (!empty($row['id_moderator']))
-					$board_info['moderators'][$row['id_moderator']] = array(
+				{
+									$board_info['moderators'][$row['id_moderator']] = array(
 						'id' => $row['id_moderator'],
 						'name' => $row['real_name'],
 						'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 						'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 					);
+				}
 			}
 			while ($row = $db->fetch_assoc($request));
 
@@ -673,7 +745,9 @@ 
 			{
 				// @todo SLOW?
 				if (!empty($topic))
-					$cache->put('topic_board-' . $topic, $board_info, 120);
+				{
+									$cache->put('topic_board-' . $topic, $board_info, 120);
+				}
 				$cache->put('board-' . $board, $board_info, 120);
 			}
 		}
@@ -691,7 +765,9 @@ 
 	}
 
 	if (!empty($topic))
-		$_GET['board'] = (int) $board;
+	{
+			$_GET['board'] = (int) $board;
+	}
 
 	if (!empty($board))
 	{
@@ -699,9 +775,13 @@ 
 		$user_info['is_mod'] = isset($board_info['moderators'][$user_info['id']]);
 
 		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
+		{
+					$board_info['error'] = 'access';
+		}
 		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
+		{
+					$board_info['error'] = 'access';
+		}
 
 		// Build up the linktree.
 		$context['linktree'] = array_merge(
@@ -757,13 +837,16 @@ 
 			loadLanguage('Errors');
 			is_not_guest($txt['topic_gone']);
 		}
-		else
-			throw new Elk_Exception('topic_gone', false);
+		else {
+					throw new Elk_Exception('topic_gone', false);
+		}
 	}
 
 	if ($user_info['is_mod'])
-		$user_info['groups'][] = 3;
-}
+	{
+			$user_info['groups'][] = 3;
+	}
+	}
 
 /**
  * Load this user's permissions.
@@ -801,7 +884,9 @@ 
 
 		// If it's a spider then cache it different.
 		if ($user_info['possibly_robot'])
-			$cache_groups .= '-spider';
+		{
+					$cache_groups .= '-spider';
+		}
 
 		$temp = array();
 		if ($cache->levelHigherThan(1) && !empty($board) && $cache->getVar($temp, 'permissions:' . $cache_groups . ':' . $board, 240) && time() - 240 > $modSettings['settings_updated'])
@@ -840,14 +925,19 @@ 
 		while ($row = $db->fetch_assoc($request))
 		{
 			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			{
+							$removals[] = $row['permission'];
+			}
+			else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$db->free_result($request);
 
 		if (isset($cache_groups))
-			$cache->put('permissions:' . $cache_groups, array($user_info['permissions'], !empty($removals) ? $removals : array()), 240);
+		{
+					$cache->put('permissions:' . $cache_groups, array($user_info['permissions'], !empty($removals) ? $removals : array()), 240);
+		}
 	}
 
 	// Get the board permissions.
@@ -855,7 +945,9 @@ 
 	{
 		// Make sure the board (if any) has been loaded by loadBoard().
 		if (!isset($board_info['profile']))
-			throw new Elk_Exception('no_board');
+		{
+					throw new Elk_Exception('no_board');
+		}
 
 		$request = $db->query('', '
 			SELECT 
@@ -873,19 +965,26 @@ 
 		while ($row = $db->fetch_assoc($request))
 		{
 			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			{
+							$removals[] = $row['permission'];
+			}
+			else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$db->free_result($request);
 	}
 
 	// Remove all the permissions they shouldn't have ;).
 	if (!empty($modSettings['permission_enable_deny']))
-		$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	{
+			$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	}
 
 	if (isset($cache_groups) && !empty($board) && $cache->levelHigherThan(1))
-		$cache->put('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	{
+			$cache->put('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	}
 
 	// Banned?  Watch, don't touch..
 	banPermissions();
@@ -899,8 +998,9 @@ 
 			require_once(SUBSDIR . '/Auth.subs.php');
 			rebuildModCache();
 		}
-		else
-			$user_info['mod_cache'] = $_SESSION['mc'];
+		else {
+					$user_info['mod_cache'] = $_SESSION['mc'];
+		}
 	}
 }
 
@@ -927,7 +1027,9 @@ 
 
 	// Can't just look for no users :P.
 	if (empty($users))
-		return false;
+	{
+			return false;
+	}
 
 	// Pass the set value
 	$context['loadMemberContext_set'] = $set;
@@ -943,7 +1045,9 @@ 
 		{
 			$data = $cache->get('member_data-' . $set . '-' . $users[$i], 240);
 			if ($cache->isMiss())
-				continue;
+			{
+							continue;
+			}
 
 			$loaded_ids[] = $data['id_member'];
 			$user_profile[$data['id_member']] = $data;
@@ -1048,12 +1152,16 @@ 
 
 	// Anything else integration may want to add to the user_profile array
 	if (!empty($new_loaded_ids))
-		call_integration_hook('integrate_add_member_data', array($new_loaded_ids, $set));
+	{
+			call_integration_hook('integrate_add_member_data', array($new_loaded_ids, $set));
+	}
 
 	if (!empty($new_loaded_ids) && $cache->levelHigherThan(2))
 	{
 		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++)
-			$cache->put('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		{
+					$cache->put('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		}
 	}
 
 	// Are we loading any moderators?  If so, fix their group data...
@@ -1072,13 +1180,19 @@ 
 		{
 			// By popular demand, don't show admins or global moderators as moderators.
 			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2)
-				$user_profile[$id]['member_group'] = $group_info['group_name'];
+			{
+							$user_profile[$id]['member_group'] = $group_info['group_name'];
+			}
 
 			// If the Moderator group has no color or icons, but their group does... don't overwrite.
 			if (!empty($group_info['icons']))
-				$user_profile[$id]['icons'] = $group_info['icons'];
+			{
+							$user_profile[$id]['icons'] = $group_info['icons'];
+			}
 			if (!empty($group_info['online_color']))
-				$user_profile[$id]['member_group_color'] = $group_info['online_color'];
+			{
+							$user_profile[$id]['member_group_color'] = $group_info['online_color'];
+			}
 		}
 	}
 
@@ -1110,11 +1224,15 @@ 
 
 	// If this person's data is already loaded, skip it.
 	if (isset($dataLoaded[$user]))
-		return true;
+	{
+			return true;
+	}
 
 	// We can't load guests or members not loaded by loadMemberData()!
 	if ($user == 0)
-		return false;
+	{
+			return false;
+	}
 
 	if (!isset($user_profile[$user]))
 	{
@@ -1221,21 +1339,29 @@ 
 	if ($display_custom_fields && !empty($modSettings['displayFields']))
 	{
 		if (!isset($context['display_fields']))
-			$context['display_fields'] = Util::unserialize($modSettings['displayFields']);
+		{
+					$context['display_fields'] = Util::unserialize($modSettings['displayFields']);
+		}
 
 		foreach ($context['display_fields'] as $custom)
 		{
 			if (!isset($custom['title']) || trim($custom['title']) == '' || empty($profile['options'][$custom['colname']]))
-				continue;
+			{
+							continue;
+			}
 
 			$value = $profile['options'][$custom['colname']];
 
 			// BBC?
 			if ($custom['bbc'])
-				$value = $parsers->parseCustomFields($value);
+			{
+							$value = $parsers->parseCustomFields($value);
+			}
 			// ... or checkbox?
 			elseif (isset($custom['type']) && $custom['type'] == 'check')
-				$value = $value ? $txt['yes'] : $txt['no'];
+			{
+							$value = $value ? $txt['yes'] : $txt['no'];
+			}
 
 			// Enclosing the user input within some other text?
 			if (!empty($custom['enclose']))
@@ -1291,7 +1417,9 @@ 
 
 	// The theme was specified by parameter.
 	if (!empty($id_theme))
-		$id_theme = (int) $id_theme;
+	{
+			$id_theme = (int) $id_theme;
+	}
 	// The theme was specified by REQUEST.
 	elseif (!empty($_REQUEST['theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
 	{
@@ -1300,36 +1428,51 @@ 
 	}
 	// The theme was specified by REQUEST... previously.
 	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
-		$id_theme = (int) $_SESSION['id_theme'];
+	{
+			$id_theme = (int) $_SESSION['id_theme'];
+	}
 	// The theme is just the user's choice. (might use ?board=1;theme=0 to force board theme.)
 	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
-		$id_theme = $user_info['theme'];
+	{
+			$id_theme = $user_info['theme'];
+	}
 	// The theme was specified by the board.
 	elseif (!empty($board_info['theme']))
-		$id_theme = $board_info['theme'];
+	{
+			$id_theme = $board_info['theme'];
+	}
 	// The theme is the forum's default.
-	else
-		$id_theme = $modSettings['theme_guests'];
+	else {
+			$id_theme = $modSettings['theme_guests'];
+	}
 
 	call_integration_hook('integrate_customize_theme_id', array(&$id_theme));
 
 	// Verify the id_theme... no foul play.
 	// Always allow the board specific theme, if they are overriding.
 	if (!empty($board_info['theme']) && $board_info['override_theme'])
-		$id_theme = $board_info['theme'];
+	{
+			$id_theme = $board_info['theme'];
+	}
 	// If they have specified a particular theme to use with SSI allow it to be used.
 	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme)
-		$id_theme = (int) $id_theme;
+	{
+			$id_theme = (int) $id_theme;
+	}
 	elseif (!empty($modSettings['knownThemes']) && !allowedTo('admin_forum'))
 	{
 		$themes = explode(',', $modSettings['knownThemes']);
 		if (!in_array($id_theme, $themes))
-			$id_theme = $modSettings['theme_guests'];
-		else
+		{
+					$id_theme = $modSettings['theme_guests'];
+		}
+		else {
+					$id_theme = (int) $id_theme;
+		}
+	}
+	else {
 			$id_theme = (int) $id_theme;
 	}
-	else
-		$id_theme = (int) $id_theme;
 
 	return $id_theme;
 }
@@ -1357,10 +1500,13 @@ 
 	}
 	// Or do we just have the system wide theme settings cached
 	elseif ($cache->getVar($temp, 'theme_settings-' . $id_theme, 90) && time() - 60 > $modSettings['settings_updated'])
-		$themeData = $temp + array($member => array());
+	{
+			$themeData = $temp + array($member => array());
+	}
 	// Nothing at all then
-	else
-		$themeData = array(-1 => array(), 0 => array(), $member => array());
+	else {
+			$themeData = array(-1 => array(), 0 => array(), $member => array());
+	}
 
 	if (empty($flag))
 	{
@@ -1385,15 +1531,21 @@ 
 		{
 			// There are just things we shouldn't be able to change as members.
 			if ($row['id_member'] != 0 && in_array($row['variable'], $immutable_theme_data))
-				continue;
+			{
+							continue;
+			}
 
 			// If this is the theme_dir of the default theme, store it.
 			if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member']))
-				$themeData[0]['default_' . $row['variable']] = $row['value'];
+			{
+							$themeData[0]['default_' . $row['variable']] = $row['value'];
+			}
 
 			// If this isn't set yet, is a theme option, or is not the default theme..
 			if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1')
-				$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+			{
+							$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+			}
 		}
 		$db->free_result($result);
 
@@ -1414,16 +1566,22 @@ 
 			foreach ($themeData[-1] as $k => $v)
 			{
 				if (!isset($themeData[$member][$k]))
-					$themeData[$member][$k] = $v;
+				{
+									$themeData[$member][$k] = $v;
+				}
 			}
 		}
 
 		// If being aggressive we save the site wide and member theme settings
 		if ($cache->levelHigherThan(1))
-			$cache->put('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+		{
+					$cache->put('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+		}
 		// Only if we didn't already load that part of the cache...
 		elseif (!isset($temp))
-			$cache->put('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+		{
+					$cache->put('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+		}
 	}
 
 	return $themeData;
@@ -1509,7 +1667,9 @@ 
 	initTheme($id_theme);
 
 	if (!$initialize)
-		return;
+	{
+			return;
+	}
 
 	loadThemeUrls();
 
@@ -1550,7 +1710,9 @@ 
 	}
 	// Guest may have collapsed the header, check the cookie to prevent collapse jumping
 	elseif ($user_info['is_guest'] && isset($_COOKIE['upshrink']))
-		$context['minmax_preferences'] = array('upshrink' => $_COOKIE['upshrink']);
+	{
+			$context['minmax_preferences'] = array('upshrink' => $_COOKIE['upshrink']);
+	}
 
 	// Load the basic layers
 	theme()->loadDefaultLayers();
@@ -1600,25 +1762,33 @@ 
 	}
 
 	if (!isset($txt))
-		$txt = array();
+	{
+			$txt = array();
+	}
 
 	// Defaults in case of odd things
 	$settings['avatars_on_indexes'] = 0;
 
 	// Initialize the theme.
 	if (function_exists('template_init'))
-		$settings = array_merge($settings, template_init());
+	{
+			$settings = array_merge($settings, template_init());
+	}
 
 	// Call initialization theme integration functions.
 	call_integration_hook('integrate_init_theme', array($id_theme, &$settings));
 
 	// Guests may still need a name.
 	if ($context['user']['is_guest'] && empty($context['user']['name']))
-		$context['user']['name'] = $txt['guest_title'];
+	{
+			$context['user']['name'] = $txt['guest_title'];
+	}
 
 	// Any theme-related strings that need to be loaded?
 	if (!empty($settings['require_theme_strings']))
-		loadLanguage('ThemeStrings', '', false);
+	{
+			loadLanguage('ThemeStrings', '', false);
+	}
 
 	theme()->loadSupportCSS();
 
@@ -1634,7 +1804,9 @@ 
 
 	// Allow overriding the board wide time/number formats.
 	if (empty($user_settings['time_format']) && !empty($txt['time_format']))
-		$user_info['time_format'] = $txt['time_format'];
+	{
+			$user_info['time_format'] = $txt['time_format'];
+	}
 
 	if (isset($settings['use_default_images']) && $settings['use_default_images'] == 'always')
 	{
@@ -1648,19 +1820,25 @@ 
 
 	// RTL languages require an additional stylesheet.
 	if ($context['right_to_left'])
-		loadCSSFile('rtl.css');
+	{
+			loadCSSFile('rtl.css');
+	}
 
 	if (!empty($context['theme_variant']) && $context['right_to_left'])
-		loadCSSFile($context['theme_variant'] . '/rtl' . $context['theme_variant'] . '.css');
+	{
+			loadCSSFile($context['theme_variant'] . '/rtl' . $context['theme_variant'] . '.css');
+	}
 
 	// This allows us to change the way things look for the admin.
 	$context['admin_features'] = explode(',', isset($modSettings['admin_features']) ? $modSettings['admin_features'] : 'cd,cp,k,w,rg,ml,pm');
 
 	if (!empty($modSettings['xmlnews_enable']) && (!empty($modSettings['allow_guestAccess']) || $context['user']['is_logged']))
-		$context['newsfeed_urls'] = array(
+	{
+			$context['newsfeed_urls'] = array(
 			'rss' => $scripturl . '?action=.xml;type=rss2;limit=' . (!empty($modSettings['xmlnews_limit']) ? $modSettings['xmlnews_limit'] : 5),
 			'atom' => $scripturl . '?action=.xml;type=atom;limit=' . (!empty($modSettings['xmlnews_limit']) ? $modSettings['xmlnews_limit'] : 5)
 		);
+	}
 
 	if (!empty($_SESSION['agreement_accepted']))
 	{
@@ -1712,7 +1890,9 @@ 
 		$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
 		$temp = preg_replace('~/' . basename($scripturl) . '(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
 		if ($temp != '/')
-			$detected_url .= $temp;
+		{
+					$detected_url .= $temp;
+		}
 	}
 
 	if (isset($detected_url) && $detected_url != $boardurl)
@@ -1725,7 +1905,9 @@ 
 			{
 				// Rip off all the boring parts, spaces, etc.
 				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias))
-					$do_fix = true;
+				{
+									$do_fix = true;
+				}
 			}
 		}
 
@@ -1734,17 +1916,23 @@ 
 		{
 			// Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;).
 			if (empty($_GET))
-				redirectexit('wwwRedirect');
+			{
+							redirectexit('wwwRedirect');
+			}
 			else
 			{
 				if (key($_GET) !== 'wwwRedirect')
-					redirectexit('wwwRedirect;' . key($_GET) . '=' . current($_GET));
+				{
+									redirectexit('wwwRedirect;' . key($_GET) . '=' . current($_GET));
+				}
 			}
 		}
 
 		// #3 is just a check for SSL...
 		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl)
-			$do_fix = true;
+		{
+					$do_fix = true;
+		}
 
 		// Okay, #4 - perhaps it's an IP address?  We're gonna want to use that one, then. (assuming it's the IP or something...)
 		if (!empty($do_fix) || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) == 1)
@@ -1877,8 +2065,10 @@ 
 	}
 
 	foreach ($context['linktree'] as $k => $dummy)
-		$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
-}
+	{
+			$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+	}
+	}
 
 /**
  * Determine the current user's smiley set
@@ -1939,7 +2129,9 @@ 
 
 			// Is this the default theme?
 			if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1')
-				$settings['default_' . $row['variable']] = $row['value'];
+			{
+							$settings['default_' . $row['variable']] = $row['value'];
+			}
 		}
 	);
 
@@ -2020,13 +2212,19 @@ 
 	global $context;
 
 	if (empty($filenames))
-		return;
+	{
+			return;
+	}
 
 	if (!is_array($filenames))
-		$filenames = array($filenames);
+	{
+			$filenames = array($filenames);
+	}
 
 	if (in_array('admin.css', $filenames))
-		$filenames[] = $context['theme_variant'] . '/admin' . $context['theme_variant'] . '.css';
+	{
+			$filenames[] = $context['theme_variant'] . '/admin' . $context['theme_variant'] . '.css';
+	}
 
 	$params['subdir'] = isset($params['subdir']) ? $params['subdir'] : 'css';
 	$params['extension'] = 'css';
@@ -2063,7 +2261,9 @@ 
 function loadJavascriptFile($filenames, $params = array(), $id = '')
 {
 	if (empty($filenames))
-		return;
+	{
+			return;
+	}
 
 	$params['subdir'] = isset($params['subdir']) ? $params['subdir'] : 'scripts';
 	$params['extension'] = 'js';
@@ -2111,20 +2311,29 @@ 
 	global $settings, $context, $db_show_debug;
 
 	if (empty($filenames))
-		return;
+	{
+			return;
+	}
 
 	$cache = Cache::instance();
 
 	if (!is_array($filenames))
-		$filenames = array($filenames);
+	{
+			$filenames = array($filenames);
+	}
 
 	// Static values for all these settings
 	if (!isset($params['stale']) || $params['stale'] === true)
-		$staler_string = CACHE_STALE;
+	{
+			$staler_string = CACHE_STALE;
+	}
 	elseif (is_string($params['stale']))
-		$staler_string = ($params['stale'][0] === '?' ? $params['stale'] : '?' . $params['stale']);
-	else
-		$staler_string = '';
+	{
+			$staler_string = ($params['stale'][0] === '?' ? $params['stale'] : '?' . $params['stale']);
+	}
+	else {
+			$staler_string = '';
+	}
 
 	$fallback = (!empty($params['fallback']) && ($params['fallback'] === false)) ? false : true;
 	$dir = '/' . $params['subdir'] . '/';
@@ -2135,7 +2344,9 @@ 
 	if ($cache->getVar($temp, $cache_name, 600))
 	{
 		if (empty($context[$params['index_name']]))
-			$context[$params['index_name']] = array();
+		{
+					$context[$params['index_name']] = array();
+		}
 
 		$context[$params['index_name']] += $temp;
 
@@ -2185,11 +2396,13 @@ 
 						$params['dir'] = $settings['default_theme_dir'] . $dir;
 						$params['url'] = $settings['default_theme_url'];
 					}
-					else
-						$filename = false;
+					else {
+											$filename = false;
+					}
+				}
+				else {
+									$filename = $settings['theme_url'] . $dir . $params['basename'] . $cache_staler;
 				}
-				else
-					$filename = $settings['theme_url'] . $dir . $params['basename'] . $cache_staler;
 			}
 
 			// Add it to the array for use in the template
@@ -2256,30 +2469,42 @@ 
 
 	// Default to the user's language.
 	if ($lang == '')
-		$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	{
+			$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	}
 
 	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang)
-		return $lang;
+	{
+			return $lang;
+	}
 
 	// Do we want the English version of language file as fallback?
 	if (empty($modSettings['disable_language_fallback']) && $lang != 'english')
-		loadLanguage($template_name, 'english', false);
+	{
+			loadLanguage($template_name, 'english', false);
+	}
 
 	// Make sure we have $settings - if not we're in trouble and need to find it!
 	if (empty($settings['default_theme_dir']))
-		loadEssentialThemeData();
+	{
+			loadEssentialThemeData();
+	}
 
 	// What theme are we in?
 	$theme_name = basename($settings['theme_url']);
 	if (empty($theme_name))
-		$theme_name = 'unknown';
+	{
+			$theme_name = 'unknown';
+	}
 
 	$fix_arrays = false;
 	// For each file open it up and write it out!
 	foreach (explode('+', $template_name) as $template)
 	{
 		if ($template === 'index')
-			$fix_arrays = true;
+		{
+					$fix_arrays = true;
+		}
 
 		// Obviously, the current theme is most important to check.
 		$attempts = array(
@@ -2343,7 +2568,9 @@ 
 	}
 
 	if ($fix_arrays)
-		fix_calendar_text();
+	{
+			fix_calendar_text();
+	}
 
 	// Keep track of what we're up to soldier.
 	if ($db_show_debug === true)
@@ -2490,7 +2717,8 @@ 
 
 				// If a moderator exists for this board, add that moderator for all children too.
 				if (!empty($row['id_moderator']))
-					foreach ($boards as $id => $dummy)
+				{
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderators'][$row['id_moderator']] = array(
 							'id' => $row['id_moderator'],
@@ -2498,6 +2726,7 @@ 
 							'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 							'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 						);
+				}
 					}
 			}
 			$db->free_result($result);
@@ -2527,7 +2756,9 @@ 
 	{
 		// If we don't have our theme information yet, lets get it.
 		if (empty($settings['default_theme_dir']))
-			loadTheme(0, false);
+		{
+					loadTheme(0, false);
+		}
 
 		// Default language directories to try.
 		$language_directories = array(
@@ -2537,7 +2768,9 @@ 
 
 		// We possibly have a base theme directory.
 		if (!empty($settings['base_theme_dir']))
-			$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		{
+					$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		}
 
 		// Remove any duplicates.
 		$language_directories = array_unique($language_directories);
@@ -2546,14 +2779,18 @@ 
 		{
 			// Can't look in here... doesn't exist!
 			if (!file_exists($language_dir))
-				continue;
+			{
+							continue;
+			}
 
 			$dir = dir($language_dir);
 			while ($entry = $dir->read())
 			{
 				// Only directories are interesting
 				if ($entry == '..' || !is_dir($dir->path . '/' . $entry))
-					continue;
+				{
+									continue;
+				}
 
 				// @todo at some point we may want to simplify that stuff (I mean scanning all the files just for index)
 				$file_dir = dir($dir->path . '/' . $entry);
@@ -2561,7 +2798,9 @@ 
 				{
 					// Look for the index language file....
 					if (!preg_match('~^index\.(.+)\.php$~', $file_entry, $matches))
-						continue;
+					{
+											continue;
+					}
 
 					$languages[$matches[1]] = array(
 						'name' => Util::ucwords(strtr($matches[1], array('_' => ' '))),
@@ -2595,29 +2834,41 @@ 
 
 	// Figure out what type of database we are using.
 	if (empty($db_type) || !file_exists(SOURCEDIR . '/database/Db-' . $db_type . '.class.php'))
-		$db_type = 'mysql';
+	{
+			$db_type = 'mysql';
+	}
 
 	// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
 	if (ELK === 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
-		$connection = elk_db_initiate($db_server, $db_name, $ssi_db_user, $ssi_db_passwd, $db_prefix, array('persist' => $db_persist, 'non_fatal' => true, 'dont_select_db' => true, 'port' => $db_port), $db_type);
+	{
+			$connection = elk_db_initiate($db_server, $db_name, $ssi_db_user, $ssi_db_passwd, $db_prefix, array('persist' => $db_persist, 'non_fatal' => true, 'dont_select_db' => true, 'port' => $db_port), $db_type);
+	}
 
 	// Either we aren't in SSI mode, or it failed.
 	if (empty($connection))
-		$connection = elk_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('persist' => $db_persist, 'dont_select_db' => ELK === 'SSI', 'port' => $db_port), $db_type);
+	{
+			$connection = elk_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('persist' => $db_persist, 'dont_select_db' => ELK === 'SSI', 'port' => $db_port), $db_type);
+	}
 
 	// Safe guard here, if there isn't a valid connection lets put a stop to it.
 	if (!$connection)
-		Errors::instance()->display_db_error();
+	{
+			Errors::instance()->display_db_error();
+	}
 
 	// If in SSI mode fix up the prefix.
 	$db = database();
 	if (ELK === 'SSI')
-		$db_prefix = $db->fix_prefix($db_prefix, $db_name);
+	{
+			$db_prefix = $db->fix_prefix($db_prefix, $db_name);
+	}
 
 	// Case sensitive database? Let's define a constant.
 	if ($db->db_case_sensitive() && !defined('DB_CASE_SENSITIVE'))
-		DEFINE('DB_CASE_SENSITIVE', '1');
-}
+	{
+			DEFINE('DB_CASE_SENSITIVE', '1');
+	}
+	}
 
 /**
  * Determine the user's avatar type and return the information as an array
@@ -2634,7 +2885,9 @@ 
 	global $modSettings, $scripturl, $settings;
 
 	if (empty($profile))
-		return array();
+	{
+			return array();
+	}
 
 	$avatar_protocol = empty($profile['avatar']) ? '' : strtolower(substr($profile['avatar'], 0, 7));
 
@@ -2712,13 +2965,14 @@ 
 		}
 	}
 	// finally ...
-	else
-		$avatar = array(
+	else {
+			$avatar = array(
 			'name' => '',
 			'image' => '',
 			'href' => '',
 			'url' => ''
 		);
+	}
 
 	// Make sure there's a preview for gravatars available.
 	$avatar['gravatar_preview'] = $gravatar;
@@ -2804,7 +3058,9 @@ 
 		}
 
 		if (checkSecurityFiles())
-			$show_warnings = true;
+		{
+					$show_warnings = true;
+		}
 
 		// We are already checking so many files...just few more doesn't make any difference! :P
 		require_once(SUBSDIR . '/Attachments.subs.php');
@@ -2814,11 +3070,15 @@ 
 
 		// Active admin session?
 		if (isAdminSessionActive())
-			$context['warning_controls']['admin_session'] = sprintf($txt['admin_session_active'], ($scripturl . '?action=admin;area=adminlogoff;redir;' . $context['session_var'] . '=' . $context['session_id']));
+		{
+					$context['warning_controls']['admin_session'] = sprintf($txt['admin_session_active'], ($scripturl . '?action=admin;area=adminlogoff;redir;' . $context['session_var'] . '=' . $context['session_id']));
+		}
 
 		// Maintenance mode enabled?
 		if (!empty($maintenance))
-			$context['warning_controls']['maintenance'] = sprintf($txt['admin_maintenance_active'], ($scripturl . '?action=admin;area=serversettings;' . $context['session_var'] . '=' . $context['session_id']));
+		{
+					$context['warning_controls']['maintenance'] = sprintf($txt['admin_maintenance_active'], ($scripturl . '?action=admin;area=serversettings;' . $context['session_var'] . '=' . $context['session_id']));
+		}
 
 		// New updates
 		if (defined('FORUM_VERSION'))
@@ -2843,19 +3103,25 @@ 
 			$context['security_controls_query']['title'] = $txt['query_command_denied'];
 			$show_warnings = true;
 			foreach ($_SESSION['query_command_denied'] as $command => $error)
-				$context['security_controls_query']['errors'][$command] = '<pre>' . Util::htmlspecialchars($error) . '</pre>';
+			{
+							$context['security_controls_query']['errors'][$command] = '<pre>' . Util::htmlspecialchars($error) . '</pre>';
+			}
 		}
 		else
 		{
 			$context['security_controls_query']['title'] = $txt['query_command_denied_guests'];
 			foreach ($_SESSION['query_command_denied'] as $command => $error)
-				$context['security_controls_query']['errors'][$command] = '<pre>' . sprintf($txt['query_command_denied_guests_msg'], Util::htmlspecialchars($command)) . '</pre>';
+			{
+							$context['security_controls_query']['errors'][$command] = '<pre>' . sprintf($txt['query_command_denied_guests_msg'], Util::htmlspecialchars($command)) . '</pre>';
+			}
 		}
 	}
 
 	// Are there any members waiting for approval?
 	if (allowedTo('moderate_forum') && ((!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 2) || !empty($modSettings['approveAccountDeletion'])) && !empty($modSettings['unapprovedMembers']))
-		$context['warning_controls']['unapproved_members'] = sprintf($txt[$modSettings['unapprovedMembers'] == 1 ? 'approve_one_member_waiting' : 'approve_many_members_waiting'], $scripturl . '?action=admin;area=viewmembers;sa=browse;type=approve', $modSettings['unapprovedMembers']);
+	{
+			$context['warning_controls']['unapproved_members'] = sprintf($txt[$modSettings['unapprovedMembers'] == 1 ? 'approve_one_member_waiting' : 'approve_many_members_waiting'], $scripturl . '?action=admin;area=viewmembers;sa=browse;type=approve', $modSettings['unapprovedMembers']);
+	}
 
 	if (!empty($context['open_mod_reports']) && (empty($user_settings['mod_prefs']) || $user_settings['mod_prefs'][0] == 1))
 	{
@@ -2876,18 +3142,25 @@ 
 		$context['security_controls_ban']['errors']['reason'] = '';
 
 		if (!empty($_SESSION['ban']['cannot_post']['reason']))
-			$context['security_controls_ban']['errors']['reason'] = $_SESSION['ban']['cannot_post']['reason'];
+		{
+					$context['security_controls_ban']['errors']['reason'] = $_SESSION['ban']['cannot_post']['reason'];
+		}
 
 		if (!empty($_SESSION['ban']['expire_time']))
-			$context['security_controls_ban']['errors']['reason'] .= '<span class="smalltext">' . sprintf($txt['your_ban_expires'], standardTime($_SESSION['ban']['expire_time'], false)) . '</span>';
-		else
-			$context['security_controls_ban']['errors']['reason'] .= '<span class="smalltext">' . $txt['your_ban_expires_never'] . '</span>';
+		{
+					$context['security_controls_ban']['errors']['reason'] .= '<span class="smalltext">' . sprintf($txt['your_ban_expires'], standardTime($_SESSION['ban']['expire_time'], false)) . '</span>';
+		}
+		else {
+					$context['security_controls_ban']['errors']['reason'] .= '<span class="smalltext">' . $txt['your_ban_expires_never'] . '</span>';
+		}
 	}
 
 	// Finally, let's show the layer.
 	if ($show_warnings || !empty($context['warning_controls']))
-		\Template_Layers::instance()->addAfter('admin_warning', 'body');
-}
+	{
+			\Template_Layers::instance()->addAfter('admin_warning', 'body');
+	}
+	}
 
 /**
  * Load everything necessary for the BBC parsers
@@ -2900,9 +3173,12 @@ 
 	if (!empty($modSettings['disabledBBC']))
 	{
 		if (!is_array($modSettings['disabledBBC']))
-			$disabledBBC = explode(',', $modSettings['disabledBBC']);
-		else
-			$disabledBBC = $modSettings['disabledBBC'];
+		{
+					$disabledBBC = explode(',', $modSettings['disabledBBC']);
+		}
+		else {
+					$disabledBBC = $modSettings['disabledBBC'];
+		}
 		\BBC\ParserWrapper::instance()->setDisabled(empty($disabledBBC) ? array() : (array) $disabledBBC);
 	}
 

Spacing +5 added lines, -5 removed lines

@@ -203,7 +203,7 @@ 
 
 	if (empty($id_member) && isset($_COOKIE[$cookiename]))
 	{
-		list ($id_member, $password) = serializeToJson($_COOKIE[$cookiename], function ($array_from) use ($cookiename) {
+		list ($id_member, $password) = serializeToJson($_COOKIE[$cookiename], function($array_from) use ($cookiename) {
 			global $modSettings;
 
 			require_once(SUBSDIR . '/Auth.subs.php');
@@ -215,7 +215,7 @@ 
 	elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && (!empty($modSettings['disableCheckUA']) || (!empty($_SESSION['USER_AGENT']) && $_SESSION['USER_AGENT'] == $req->user_agent())))
 	{
 		// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
-		list ($id_member, $password, $login_span) = serializeToJson($_SESSION['login_' . $cookiename], function ($array_from) use ($cookiename) {
+		list ($id_member, $password, $login_span) = serializeToJson($_SESSION['login_' . $cookiename], function($array_from) use ($cookiename) {
 			$_SESSION['login_' . $cookiename] = json_encode($array_from);
 		});
 		$id_member = !empty($id_member) && strlen($password) == 64 && $login_span > time() ? (int) $id_member : 0;
@@ -1518,7 +1518,7 @@ 
 	// Set up some additional interface preference context
 	if (!empty($options['admin_preferences']))
 	{
-		$context['admin_preferences'] = serializeToJson($options['admin_preferences'], function ($array_form) {
+		$context['admin_preferences'] = serializeToJson($options['admin_preferences'], function($array_form) {
 			global $context;
 
 			$context['admin_preferences'] = $array_form;
@@ -1535,7 +1535,7 @@ 
 	{
 		if (!empty($options['minmax_preferences']))
 		{
-			$context['minmax_preferences'] = serializeToJson($options['minmax_preferences'], function ($array_form) {
+			$context['minmax_preferences'] = serializeToJson($options['minmax_preferences'], function($array_form) {
 				global $settings, $user_info;
 
 				// Update the option.
@@ -1931,7 +1931,7 @@ 
 			'no_member' => 0,
 			'theme_guests' => $modSettings['theme_guests'],
 		),
-		function ($row)
+		function($row)
 		{
 			global $settings;
 

sources/Debug.class.php

Braces +66 added lines, -24 removed lines

@@ -94,12 +94,17 @@ 
 	public function add($type, $value)
 	{
 		if (!$this->_track)
-			return;
+		{
+					return;
+		}
 
 		if (is_array($value))
-			$this->_debugs[$type] = array_merge($this->_debugs[$type], $value);
-		else
-			$this->_debugs[$type][] = $value;
+		{
+					$this->_debugs[$type] = array_merge($this->_debugs[$type], $value);
+		}
+		else {
+					$this->_debugs[$type][] = $value;
+		}
 	}
 
 	/**
@@ -114,7 +119,9 @@ 
 	public function cache($value)
 	{
 		if (!$this->_track)
-			return;
+		{
+					return;
+		}
 
 		$this->_cache_hits[] = $value;
 		$this->_cache_count++;
@@ -143,7 +150,9 @@ 
 	public function db_query($value)
 	{
 		if (!$this->_track)
-			return;
+		{
+					return;
+		}
 
 		$this->_db_cache[] = $value;
 		$this->_db_count++;
@@ -157,7 +166,9 @@ 
 	public function merge_db($value)
 	{
 		if (!$this->_track)
-			return;
+		{
+					return;
+		}
 
 		$this->_db_cache = array_merge($value, $this->_db_cache);
 		$this->_db_count = count($this->_db_cache) + 1;
@@ -171,7 +182,9 @@ 
 	public function get_db()
 	{
 		if (!$this->_track)
-			return array();
+		{
+					return array();
+		}
 
 		return $this->_db_cache;
 	}
@@ -193,9 +206,12 @@ 
 		}
 
 		if ($rusage === null)
-			$this->_rusage[$point] = getrusage();
-		else
-			$this->_rusage[$point] = $rusage;
+		{
+					$this->_rusage[$point] = getrusage();
+		}
+		else {
+					$this->_rusage[$point] = $rusage;
+		}
 	}
 
 	/**
@@ -231,19 +247,25 @@ 
 		global $context;
 
 		if (empty($_SESSION['view_queries']))
-			$_SESSION['view_queries'] = 0;
+		{
+					$_SESSION['view_queries'] = 0;
+		}
 
 		$files = get_included_files();
 		$total_size = 0;
 		for ($i = 0, $n = count($files); $i < $n; $i++)
 		{
 			if (file_exists($files[$i]))
-				$total_size += filesize($files[$i]);
+			{
+							$total_size += filesize($files[$i]);
+			}
 			$this->add('files_included', strtr($files[$i], array(BOARDDIR => '.')));
 		}
 
 		if (!empty($this->_db_cache))
-			$_SESSION['debug'] = $this->_db_cache;
+		{
+					$_SESSION['debug'] = $this->_db_cache;
+		}
 
 		// Compute some system info, if we can
 		$this->_system['system_type'] = php_uname();
@@ -263,7 +285,9 @@ 
 
 		// What tokens are active?
 		if (isset($_SESSION['token']))
-			$this->add('tokens', array_keys($_SESSION['token']));
+		{
+					$this->add('tokens', array_keys($_SESSION['token']));
+		}
 	}
 
 	/**
@@ -285,9 +309,11 @@ 
 			<div id="debug_logging" class="smalltext">';
 
 		foreach ($this->_system as $key => $value)
-			if (!empty($value))
+		{
+					if (!empty($value))
 				echo '
 				', $txt['debug_' . $key], $value, '<br />';
+		}
 
 		$expandable = array('hooks', 'files_included');
 
@@ -334,7 +360,9 @@ 
 				<a href="', $scripturl, '?action=viewquery" target="_blank" class="new_win">', sprintf($txt['debug_queries_used'], $this->_db_count), '</a><br />';
 
 		if ($_SESSION['view_queries'] == 1 && !empty($this->_db_cache))
-			$this->_show_queries();
+		{
+					$this->_show_queries();
+		}
 
 		// Or show/hide the querys in line with all of this data
 		echo '
@@ -402,30 +430,42 @@ 
 			if ($is_select)
 			{
 				foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp)
-					if (strpos(trim($qq['q']), $tmp) !== false)
+				{
+									if (strpos(trim($qq['q']), $tmp) !== false)
 					{
 						$is_select = false;
+				}
 						break;
 					}
 			}
 			// But actual creation of the temporary tables are.
 			elseif (preg_match('~^CREATE TEMPORARY TABLE .+?SELECT .+$~s', trim($qq['q'])) != 0)
-				$is_select = true;
+			{
+							$is_select = true;
+			}
 
 			// Make the filenames look a bit better.
 			if (isset($qq['f']))
-				$qq['f'] = preg_replace('~^' . preg_quote(BOARDDIR, '~') . '~', '...', $qq['f']);
+			{
+							$qq['f'] = preg_replace('~^' . preg_quote(BOARDDIR, '~') . '~', '...', $qq['f']);
+			}
 
 			echo '
 		<strong>', $is_select ? '<a href="' . $scripturl . '?action=viewquery;qq=' . ($q + 1) . '#qq' . $q . '" target="_blank" class="new_win">' : '', nl2br(str_replace("\t", '&nbsp;&nbsp;&nbsp;', htmlspecialchars(ltrim($qq['q'], "\n\r"), ENT_COMPAT, 'UTF-8'))) . ($is_select ? '</a></strong>' : '</strong>') . '<br />
 		&nbsp;&nbsp;&nbsp;';
 			if (!empty($qq['f']) && !empty($qq['l']))
-				echo sprintf($txt['debug_query_in_line'], $qq['f'], $qq['l']);
+			{
+							echo sprintf($txt['debug_query_in_line'], $qq['f'], $qq['l']);
+			}
 
 			if (isset($qq['s'], $qq['t']) && isset($txt['debug_query_which_took_at']))
-				echo sprintf($txt['debug_query_which_took_at'], round($qq['t'], 8), round($qq['s'], 8)) . '<br />';
+			{
+							echo sprintf($txt['debug_query_which_took_at'], round($qq['t'], 8), round($qq['s'], 8)) . '<br />';
+			}
 			elseif (isset($qq['t']))
-				echo sprintf($txt['debug_query_which_took'], round($qq['t'], 8)) . '<br />';
+			{
+							echo sprintf($txt['debug_query_which_took'], round($qq['t'], 8)) . '<br />';
+			}
 			echo '
 		<br />';
 		}
@@ -438,7 +478,9 @@ 
 	public static function instance()
 	{
 		if (self::$_instance === null)
-			self::$_instance = new Debug();
+		{
+					self::$_instance = new Debug();
+		}
 
 		return self::$_instance;
 	}

sources/QueryString.php

Braces +53 added lines, -22 removed lines

@@ -68,14 +68,18 @@ 
 
 	// Check if we have done this already.
 	if (isset($expanded[$ip]))
-		return $expanded[$ip];
+	{
+			return $expanded[$ip];
+	}
 
 	// Expand the IP out.
 	$expanded_ip = explode(':', expandIPv6($ip));
 
 	$new_ip = array();
 	foreach ($expanded_ip as $int)
-		$new_ip[] = hexdec($int);
+	{
+			$new_ip[] = hexdec($int);
+	}
 
 	// Save this in case of repeated use.
 	$expanded[$ip] = $new_ip;
@@ -97,7 +101,9 @@ 
 
 	// Check if we have done this already.
 	if (isset($converted[$addr]))
-		return $converted[$addr];
+	{
+			return $converted[$addr];
+	}
 
 	// Check if there are segments missing, insert if necessary.
 	if (strpos($addr, '::') !== false)
@@ -123,17 +129,22 @@ 
 
 		$limit = count($part[0]) + count($part[1]);
 		for ($i = 0; $i < (8 - $limit); $i++)
-			array_push($missing, '0000');
+		{
+					array_push($missing, '0000');
+		}
 
 		$part = array_merge($part[0], $missing, $part[1]);
 	}
-	else
-		$part = explode(':', $addr);
+	else {
+			$part = explode(':', $addr);
+	}
 
 	// Pad each segment until it has 4 digits.
 	foreach ($part as &$p)
-		while (strlen($p) < 4)
+	{
+			while (strlen($p) < 4)
 			$p = '0' . $p;
+	}
 
 	unset($p);
 
@@ -145,10 +156,13 @@ 
 
 	// Quick check to make sure the length is as expected.
 	if (!$strict_check || strlen($result) == 39)
-		return $result;
-	else
-		return false;
-}
+	{
+			return $result;
+	}
+	else {
+			return false;
+	}
+	}
 
 /**
  * Adds html entities to the array/variable.  Uses two underscores to guard against overloading.
@@ -168,11 +182,15 @@ 
 function htmlspecialchars__recursive($var, $level = 0)
 {
 	if (!is_array($var))
-		return Util::htmlspecialchars($var, ENT_QUOTES);
+	{
+			return Util::htmlspecialchars($var, ENT_QUOTES);
+	}
 
 	// Add the htmlspecialchars to every element.
 	foreach ($var as $k => $v)
-		$var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1);
+	{
+			$var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1);
+	}
 
 	return $var;
 }
@@ -197,11 +215,15 @@ 
 {
 	// Remove spaces (32), tabs (9), returns (13, 10, and 11), nulls (0), and hard spaces. (160)
 	if (!is_array($var))
-		return Util::htmltrim($var);
+	{
+			return Util::htmltrim($var);
+	}
 
 	// Go through all the elements and remove the whitespace.
 	foreach ($var as $k => $v)
-		$var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1);
+	{
+			$var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1);
+	}
 
 	return $var;
 }
@@ -270,15 +292,21 @@ 
 
 	// If $scripturl is set to nothing, or the SID is not defined (SSI?) just quit.
 	if ($scripturl == '' || !defined('SID'))
-		return $buffer;
+	{
+			return $buffer;
+	}
 
 	// Do nothing if the session is cookied, or they are a crawler - guests are caught by redirectexit().
 	if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot'))
-		$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&amp;', $buffer);
+	{
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&amp;', $buffer);
+	}
 
 	// Debugging templates, are we?
 	elseif (isset($_GET['debug']))
-		$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer);
+	{
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer);
+	}
 
 	// This should work even in 4.2.x, just not CGI without cgi.fix_pathinfo.
 	if (!empty($modSettings['queryless_urls']) && detectServer()->supportRewrite())
@@ -301,7 +329,10 @@ 
 	global $scripturl;
 
 	if (!isBrowser('possibly_robot') && empty($_COOKIE) && defined('SID') && SID != '')
-		return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html?' . SID . (isset($matches[2]) ? $matches[2] : '') . '"';
-	else
-		return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html' . (isset($matches[2]) ? $matches[2] : '') . '"';
-}
+	{
+			return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html?' . SID . (isset($matches[2]) ? $matches[2] : '') . '"';
+	}
+	else {
+			return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html' . (isset($matches[2]) ? $matches[2] : '') . '"';
+	}
+	}