albertlast / SMF2.1

Sources/Printpage.php

Braces +30 added lines, -23 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Format a topic to be printer friendly.
@@ -32,8 +33,9 @@ 
 	global $board_info, $smcFunc, $modSettings;
 
 	// Redirect to the boardindex if no valid topic id is provided.
-	if (empty($topic))
-		redirectexit();
+	if (empty($topic)) {
+			redirectexit();
+	}
 
 	if (!empty($modSettings['disable_print_topic']))
 	{
@@ -59,8 +61,9 @@ 
 		)
 	);
 	// Redirect to the boardindex if no valid topic id is provided.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		redirectexit();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			redirectexit();
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -134,20 +137,21 @@ 
 				foreach ($guestinfo as $i => $guestvoted)
 				{
 					$guestvoted = explode(',', $guestvoted);
-					if ($guestvoted[0] == $row['id_poll'])
-						break;
+					if ($guestvoted[0] == $row['id_poll']) {
+											break;
+					}
 				}
 				// Has the poll been reset since guest voted?
 				if ($pollinfo['reset_poll'] > $guestvoted[1])
 				{
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
-					if (!empty($guestinfo))
-						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-					else
-						unset($_COOKIE['guest_poll_vote']);
-				}
-				else
+					if (!empty($guestinfo)) {
+											$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+					} else {
+											unset($_COOKIE['guest_poll_vote']);
+					}
+				} else
 				{
 					// What did they vote for?
 					unset($guestvoted[0], $guestvoted[1]);
@@ -233,8 +237,9 @@ 
 	$context['poster_name'] = $row['poster_name'];
 	$context['post_time'] = timeformat($row['poster_time'], false);
 	$context['parent_boards'] = array();
-	foreach ($board_info['parent_boards'] as $parent)
-		$context['parent_boards'][] = $parent['name'];
+	foreach ($board_info['parent_boards'] as $parent) {
+			$context['parent_boards'][] = $parent['name'];
+	}
 
 	// Split the topics up so we can print them.
 	$request = $smcFunc['db_query']('', '
@@ -266,8 +271,9 @@ 
 			'id_msg' => $row['id_msg'],
 		);
 
-		if (!isset($context['topic_subject']))
-			$context['topic_subject'] = $row['subject'];
+		if (!isset($context['topic_subject'])) {
+					$context['topic_subject'] = $row['subject'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -275,8 +281,9 @@ 
 	if (isset($_REQUEST['images']) && !empty($modSettings['attachmentEnable']) && allowedTo('view_attachments'))
 	{
 		$messages = array();
-		foreach ($context['posts'] as $temp)
-			$messages[] = $temp['id_msg'];
+		foreach ($context['posts'] as $temp) {
+					$messages[] = $temp['id_msg'];
+		}
 
 		// build the request
 		$request = $smcFunc['db_query']('', '
@@ -295,8 +302,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			$temp[$row['id_attach']] = $row;
-			if (!isset($context['printattach'][$row['id_msg']]))
-				$context['printattach'][$row['id_msg']] = array();
+			if (!isset($context['printattach'][$row['id_msg']])) {
+							$context['printattach'][$row['id_msg']] = array();
+			}
 		}
 		$smcFunc['db_free_result']($request);
 		ksort($temp);
@@ -313,8 +321,7 @@ 
 						$row['height'] = floor($row['height'] * ($modSettings['max_image_width'] / $row['width']));
 						$row['width'] = $modSettings['max_image_width'];
 					}
-				}
-				elseif (!empty($modSettings['max_image_width']))
+				} elseif (!empty($modSettings['max_image_width']))
 				{
 					if ($row['height'] > $modSettings['max_image_height'])
 					{

Sources/ManageCalendar.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
 					'value' => $txt['date'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						// Recurring every year or just a single year?
 						$year = $rowData['year'] == '1004' ? sprintf('(%1$s)', $txt['every_year']) : $rowData['year'];
@@ -218,7 +218,7 @@ 
 		checkSession();
 
 		// Not too long good sir?
-		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
+		$_REQUEST['title'] = $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
 		if (isset($_REQUEST['delete']))

Braces +37 added lines, -28 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main controlling function doesn't have much to do... yet.
@@ -43,8 +44,7 @@ 
 			'settings' => 'ModifyCalendarSettings'
 		);
 		$default = 'holidays';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ModifyCalendarSettings'
@@ -60,8 +60,8 @@ 
 		'help' => 'calendar',
 		'description' => $txt['calendar_settings_desc'],
 	);
-	if (!empty($modSettings['cal_enabled']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
 			'holidays' => array(
 				'description' => $txt['manage_holidays_desc'],
 			),
@@ -69,6 +69,7 @@ 
 				'description' => $txt['calendar_settings_desc'],
 			),
 		);
+	}
 
 	call_integration_hook('integrate_manage_calendar', array(&$subActions));
 
@@ -88,8 +89,9 @@ 
 		checkSession();
 		validateToken('admin-mc');
 
-		foreach ($_REQUEST['holiday'] as $id => $value)
-			$_REQUEST['holiday'][$id] = (int) $id;
+		foreach ($_REQUEST['holiday'] as $id => $value) {
+					$_REQUEST['holiday'][$id] = (int) $id;
+		}
 
 		// Now the IDs are "safe" do the delete...
 		require_once($sourcedir . '/Subs-Calendar.php');
@@ -209,8 +211,9 @@ 
 	$context['sub_template'] = 'edit_holiday';
 
 	// Cast this for safety...
-	if (isset($_REQUEST['holiday']))
-		$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	if (isset($_REQUEST['holiday'])) {
+			$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	}
 
 	// Submitting?
 	if (isset($_POST[$context['session_var']]) && (isset($_REQUEST['delete']) || $_REQUEST['title'] != ''))
@@ -221,19 +224,19 @@ 
 		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
-		if (isset($_REQUEST['delete']))
-			$smcFunc['db_query']('', '
+		if (isset($_REQUEST['delete'])) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}calendar_holidays
 				WHERE id_holiday = {int:selected_holiday}',
 				array(
 					'selected_holiday' => $_REQUEST['holiday'],
 				)
 			);
-		else
+		} else
 		{
 			$date = strftime($_REQUEST['year'] <= 1004 ? '1004-%m-%d' : '%Y-%m-%d', mktime(0, 0, 0, $_REQUEST['month'], $_REQUEST['day'], $_REQUEST['year']));
-			if (isset($_REQUEST['edit']))
-				$smcFunc['db_query']('', '
+			if (isset($_REQUEST['edit'])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}calendar_holidays
 					SET event_date = {date:holiday_date}, title = {string:holiday_title}
 					WHERE id_holiday = {int:selected_holiday}',
@@ -243,8 +246,8 @@ 
 						'holiday_title' => $_REQUEST['title'],
 					)
 				);
-			else
-				$smcFunc['db_insert']('',
+			} else {
+							$smcFunc['db_insert']('',
 					'{db_prefix}calendar_holidays',
 					array(
 						'event_date' => 'date', 'title' => 'string-60',
@@ -254,6 +257,7 @@ 
 					),
 					array('id_holiday')
 				);
+			}
 		}
 
 		updateSettings(array(
@@ -265,14 +269,15 @@ 
 	}
 
 	// Default states...
-	if ($context['is_new'])
-		$context['holiday'] = array(
+	if ($context['is_new']) {
+			$context['holiday'] = array(
 			'id' => 0,
 			'day' => date('d'),
 			'month' => date('m'),
 			'year' => '0000',
 			'title' => ''
 		);
+	}
 	// If it's not new load the data.
 	else
 	{
@@ -285,14 +290,15 @@ 
 				'selected_holiday' => $_REQUEST['holiday'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['holiday'] = array(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['holiday'] = array(
 				'id' => $row['id_holiday'],
 				'day' => $row['day'],
 				'month' => $row['month'],
 				'year' => $row['year'] <= 4 ? 0 : $row['year'],
 				'title' => $row['title']
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -319,16 +325,17 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($boards);
 
 	// Look, all the calendar settings - of which there are many!
-	if (!empty($modSettings['cal_enabled']))
-		$config_vars = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$config_vars = array(
 				array('check', 'cal_enabled'),
 			'',
 				// All the permissions:
@@ -371,14 +378,16 @@ 
 				array('check', 'cal_short_days'),
 				array('check', 'cal_short_months'),
 		);
-	else
-		$config_vars = array(
+	} else {
+			$config_vars = array(
 			array('check', 'cal_enabled'),
 		);
+	}
 
 	call_integration_hook('integrate_modify_calendar_settings', array(&$config_vars));
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template fired up.
 	require_once($sourcedir . '/ManageServer.php');

other/upgrade-helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 /**
  * Make files writable. First try to use regular chmod, but if that fails, try to use FTP.
  *
- * @param $files
+ * @param string[] $files
  * @return bool
  */
 function makeFilesWritable(&$files)
@@ -322,7 +322,7 @@ 
 /**
  * Prints an error to stderr.
  *
- * @param $message
+ * @param string $message
  * @param bool $fatal
  */
 function print_error($message, $fatal = false)

Braces +96 added lines, -68 removed lines

@@ -13,8 +13,9 @@ 
  * This file contains helper functions for upgrade.php
  */
 
-if (!defined('SMF_VERSION'))
+if (!defined('SMF_VERSION')) {
 	die('No direct access!');
+}
 
 /**
  * Clean the cache using the SMF 2.1 CacheAPI.
@@ -45,8 +46,9 @@ 
 	global $smcFunc;
 	static $member_groups = array();
 
-	if (!empty($member_groups))
-		return $member_groups;
+	if (!empty($member_groups)) {
+			return $member_groups;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT group_name, id_group
@@ -71,8 +73,9 @@ 
 			)
 		);
 	}
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$member_groups[trim($row[0])] = $row[1];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$member_groups[trim($row[0])] = $row[1];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $member_groups;
@@ -88,8 +91,9 @@ 
 {
 	global $upcontext, $boarddir, $sourcedir;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	$failure = false;
 	// On linux, it's easy - just use is_writable!
@@ -100,22 +104,25 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Some files won't exist, try to address up front
-			if (!file_exists($file))
-				@touch($file);
+			if (!file_exists($file)) {
+							@touch($file);
+			}
 			// NOW do the writable check...
 			if (!is_writable($file))
 			{
 				@chmod($file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable($file) && !@chmod($file, 0777))
-					$failure = true;
+				if (!is_writable($file) && !@chmod($file, 0777)) {
+									$failure = true;
+				}
 				// Otherwise remove it as it's good!
-				else
-					unset($files[$k]);
+				else {
+									unset($files[$k]);
+				}
+			} else {
+							unset($files[$k]);
 			}
-			else
-				unset($files[$k]);
 		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
@@ -126,30 +133,35 @@ 
 		foreach ($files as $k => $file)
 		{
 			// Folders can't be opened for write... but the index.php in them can ;).
-			if (is_dir($file))
-				$file .= '/index.php';
+			if (is_dir($file)) {
+							$file .= '/index.php';
+			}
 
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
 			@chmod($file, 0777);
 			$fp = @fopen($file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!$fp)
-				$fp = @fopen($file, 'w');
+			if (!$fp) {
+							$fp = @fopen($file, 'w');
+			}
 
-			if (!$fp)
-				$failure = true;
-			else
-				unset($files[$k]);
+			if (!$fp) {
+							$failure = true;
+			} else {
+							unset($files[$k]);
+			}
 			@fclose($fp);
 		}
 	}
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
-	if (!isset($_SERVER))
-		return !$failure;
+	if (!isset($_SERVER)) {
+			return !$failure;
+	}
 
 	// What still needs to be done?
 	$upcontext['chmod']['files'] = $files;
@@ -201,36 +213,40 @@ 
 
 		if (!isset($ftp) || $ftp->error !== false)
 		{
-			if (!isset($ftp))
-				$ftp = new ftp_connection(null);
+			if (!isset($ftp)) {
+							$ftp = new ftp_connection(null);
+			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error']))
-				$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error'])) {
+							$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
+			}
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__));
 
-			if ($found_path || !isset($upcontext['chmod']['path']))
-				$upcontext['chmod']['path'] = $detect_path;
+			if ($found_path || !isset($upcontext['chmod']['path'])) {
+							$upcontext['chmod']['path'] = $detect_path;
+			}
 
-			if (!isset($upcontext['chmod']['username']))
-				$upcontext['chmod']['username'] = $username;
+			if (!isset($upcontext['chmod']['username'])) {
+							$upcontext['chmod']['username'] = $username;
+			}
 
 			// Don't forget the login token.
 			$upcontext += createToken('login');
 
 			return false;
-		}
-		else
+		} else
 		{
 			// We want to do a relative path for FTP.
 			if (!in_array($upcontext['chmod']['path'], array('', '/')))
 			{
 				$ftp_root = strtr($boarddir, array($upcontext['chmod']['path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/'))
-					$ftp_root = substr($ftp_root, 0, -1);
+				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/')) {
+									$ftp_root = substr($ftp_root, 0, -1);
+				}
+			} else {
+							$ftp_root = $boarddir;
 			}
-			else
-				$ftp_root = $boarddir;
 
 			// Save the info for next time!
 			$_SESSION['installer_temp_ftp'] = array(
@@ -244,10 +260,12 @@ 
 
 			foreach ($files as $k => $file)
 			{
-				if (!is_writable($file))
-					$ftp->chmod($file, 0755);
-				if (!is_writable($file))
-					$ftp->chmod($file, 0777);
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0755);
+				}
+				if (!is_writable($file)) {
+									$ftp->chmod($file, 0777);
+				}
 
 				// Assuming that didn't work calculate the path without the boarddir.
 				if (!is_writable($file))
@@ -256,19 +274,23 @@ 
 					{
 						$ftp_file = strtr($file, array($_SESSION['installer_temp_ftp']['root'] => ''));
 						$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 						// Sometimes an extra slash can help...
 						$ftp_file = '/' . $ftp_file;
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0755);
-						if (!is_writable($file))
-							$ftp->chmod($ftp_file, 0777);
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0755);
+						}
+						if (!is_writable($file)) {
+													$ftp->chmod($ftp_file, 0777);
+						}
 					}
 				}
 
-				if (is_writable($file))
-					unset($files[$k]);
+				if (is_writable($file)) {
+									unset($files[$k]);
+				}
 			}
 
 			$ftp->close();
@@ -278,8 +300,9 @@ 
 	// What remains?
 	$upcontext['chmod']['files'] = $files;
 
-	if (empty($files))
-		return true;
+	if (empty($files)) {
+			return true;
+	}
 
 	return false;
 }
@@ -293,12 +316,14 @@ 
 function quickFileWritable($file)
 {
 	// Some files won't exist, try to address up front
-	if (!file_exists($file))
-		@touch($file);
+	if (!file_exists($file)) {
+			@touch($file);
+	}
 
 	// NOW do the writable check...
-	if (is_writable($file))
-		return true;
+	if (is_writable($file)) {
+			return true;
+	}
 
 	@chmod($file, 0755);
 
@@ -308,10 +333,11 @@ 
 	foreach ($chmod_values as $val)
 	{
 		// If it's writable, break out of the loop
-		if (is_writable($file))
-			break;
-		else
-			@chmod($file, $val);
+		if (is_writable($file)) {
+					break;
+		} else {
+					@chmod($file, $val);
+		}
 	}
 
 	return is_writable($file);
@@ -338,14 +364,16 @@ 
 {
 	static $fp = null;
 
-	if ($fp === null)
-		$fp = fopen('php://stderr', 'wb');
+	if ($fp === null) {
+			$fp = fopen('php://stderr', 'wb');
+	}
 
 	fwrite($fp, $message . "\n");
 
-	if ($fatal)
-		exit;
-}
+	if ($fatal) {
+			exit;
+	}
+	}
 
 /**
  * Throws a graphical error message.

Sources/ManageSearchEngines.php

Braces +109 added lines, -77 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point for this section.
@@ -38,8 +39,7 @@ 
 			'stats' => 'SpiderStats',
 		);
 		$default = 'stats';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ManageSearchEngineSettings',
@@ -90,11 +90,12 @@ 
 		{
 			disabledState = document.getElementById(\'spider_mode\').value == 0;';
 
-	foreach ($config_vars as $variable)
-		if ($variable[1] != 'spider_mode')
+	foreach ($config_vars as $variable) {
+			if ($variable[1] != 'spider_mode')
 			$javascript_function .= '
 			if (document.getElementById(\'' . $variable[1] . '\'))
 				document.getElementById(\'' . $variable[1] . '\').disabled = disabledState;';
+	}
 
 	$javascript_function .= '
 		}
@@ -102,8 +103,9 @@ 
 
 	call_integration_hook('integrate_modify_search_engine_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We need to load the groups for the spider group thingy.
 	$request = $smcFunc['db_query']('', '
@@ -116,13 +118,15 @@ 
 			'moderator_group' => 3,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure it's valid - note that regular members are given id_group = 1 which is reversed in Load.php - no admins here!
-	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']]))
-		$_POST['spider_group'] = 0;
+	if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']])) {
+			$_POST['spider_group'] = 0;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -166,8 +170,9 @@ 
 	}
 
 	// Are we adding a new one?
-	if (!empty($_POST['addSpider']))
-		return EditSpider();
+	if (!empty($_POST['addSpider'])) {
+			return EditSpider();
+	}
 	// User pressed the 'remove selection button'.
 	elseif (!empty($_POST['removeSpiders']) && !empty($_POST['remove']) && is_array($_POST['remove']))
 	{
@@ -175,8 +180,9 @@ 
 		validateToken('admin-ser');
 
 		// Make sure every entry is a proper integer.
-		foreach ($_POST['remove'] as $index => $spider_id)
-			$_POST['remove'][(int) $index] = (int) $spider_id;
+		foreach ($_POST['remove'] as $index => $spider_id) {
+					$_POST['remove'][(int) $index] = (int) $spider_id;
+		}
 
 		// Delete them all!
 		$smcFunc['db_query']('', '
@@ -215,8 +221,9 @@ 
 	);
 
 	$context['spider_last_seen'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	createToken('admin-ser');
@@ -346,8 +353,9 @@ 
 		)
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spiders;
@@ -397,14 +405,15 @@ 
 		foreach ($ip_sets as $set)
 		{
 			$test = ip2range(trim($set));
-			if (!empty($test))
-				$ips[] = $set;
+			if (!empty($test)) {
+							$ips[] = $set;
+			}
 		}
 		$ips = implode(',', $ips);
 
 		// Goes in as it is...
-		if ($context['id_spider'])
-			$smcFunc['db_query']('', '
+		if ($context['id_spider']) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}spiders
 				SET spider_name = {string:spider_name}, user_agent = {string:spider_agent},
 					ip_info = {string:ip_info}
@@ -416,8 +425,8 @@ 
 					'ip_info' => $ips,
 				)
 			);
-		else
-			$smcFunc['db_insert']('insert',
+		} else {
+					$smcFunc['db_insert']('insert',
 				'{db_prefix}spiders',
 				array(
 					'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string',
@@ -427,6 +436,7 @@ 
 				),
 				array('id_spider')
 			);
+		}
 
 
 		cache_put_data('spider_search', null);
@@ -454,13 +464,14 @@ 
 				'current_spider' => $context['id_spider'],
 			)
 		);
-		if ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['spider'] = array(
+		if ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['spider'] = array(
 				'id' => $row['id_spider'],
 				'name' => $row['spider_name'],
 				'agent' => $row['user_agent'],
 				'ip_info' => $row['ip_info'],
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -477,8 +488,9 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (isset($_SESSION['id_robot']))
-		unset($_SESSION['id_robot']);
+	if (isset($_SESSION['id_robot'])) {
+			unset($_SESSION['id_robot']);
+	}
 	$_SESSION['robot_check'] = time();
 
 	// We cache the spider data for ten minutes if we can.
@@ -492,15 +504,17 @@ 
 			)
 		);
 		$spider_data = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$spider_data[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$spider_data[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('spider_search', $spider_data, 600);
 	}
 
-	if (empty($spider_data))
-		return false;
+	if (empty($spider_data)) {
+			return false;
+	}
 
 	// Only do these bits once.
 	$ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
@@ -508,33 +522,38 @@ 
 	foreach ($spider_data as $spider)
 	{
 		// User agent is easy.
-		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false)
-			$_SESSION['id_robot'] = $spider['id_spider'];
+		if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false) {
+					$_SESSION['id_robot'] = $spider['id_spider'];
+		}
 		// IP stuff is harder.
 		elseif ($_SERVER['REMOTE_ADDR'])
 		{
 			$ips = explode(',', $spider['ip_info']);
 			foreach ($ips as $ip)
 			{
-				if ($ip === '')
-					continue;
+				if ($ip === '') {
+									continue;
+				}
 
 				$ip = ip2range($ip);
 				if (!empty($ip))
 				{
-					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR']))
-						$_SESSION['id_robot'] = $spider['id_spider'];
+					if (inet_ptod($ip['low']) <= inet_ptod($_SERVER['REMOTE_ADDR']) && inet_ptod($ip['high']) >= inet_ptod($_SERVER['REMOTE_ADDR'])) {
+											$_SESSION['id_robot'] = $spider['id_spider'];
+					}
 				}
 			}
 		}
 
-		if (isset($_SESSION['id_robot']))
-			break;
+		if (isset($_SESSION['id_robot'])) {
+					break;
+		}
 	}
 
 	// If this is low server tracking then log the spider here as opposed to the main logging function.
-	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot']))
-		logSpider();
+	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot'])) {
+			logSpider();
+	}
 
 	return !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 }
@@ -548,8 +567,9 @@ 
 {
 	global $smcFunc, $modSettings, $context;
 
-	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot']))
-		return;
+	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot'])) {
+			return;
+	}
 
 	// Attempt to update today's entry.
 	if ($modSettings['spider_mode'] == 1)
@@ -590,9 +610,9 @@ 
 			$url = $_GET + array('USER_AGENT' => $_SERVER['HTTP_USER_AGENT']);
 			unset($url['sesc'], $url[$context['session_var']]);
 			$url = $smcFunc['json_encode']($url);
+		} else {
+					$url = '';
 		}
-		else
-			$url = '';
 
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}log_spider_hits',
@@ -620,12 +640,14 @@ 
 		)
 	);
 	$spider_hits = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_hits[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_hits[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($spider_hits))
-		return;
+	if (empty($spider_hits)) {
+			return;
+	}
 
 	// Attempt to update the master data.
 	$stat_inserts = array();
@@ -646,18 +668,20 @@ 
 				'hits' => $stat['num_hits'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		if ($smcFunc['db_affected_rows']() == 0) {
+					$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		}
 	}
 
 	// New stats?
-	if (!empty($stat_inserts))
-		$smcFunc['db_insert']('ignore',
+	if (!empty($stat_inserts)) {
+			$smcFunc['db_insert']('ignore',
 			'{db_prefix}log_spider_stats',
 			array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'),
 			$stat_inserts,
 			array('stat_date', 'id_spider')
 		);
+	}
 
 	// All processed.
 	$smcFunc['db_query']('', '
@@ -700,8 +724,7 @@ 
 					'delete_period' => $deleteTime,
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Deleting all of them
 			$smcFunc['db_query']('', '
@@ -791,10 +814,11 @@ 
 		foreach ($context['spider_logs']['rows'] as $k => $row)
 		{
 			// Feature disabled?
-			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3)
-				$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
-			else
-				$urls[$k] = array($row['data']['viewing']['value'], -1);
+			if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3) {
+							$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
+			} else {
+							$urls[$k] = array($row['data']['viewing']['value'], -1);
+			}
 		}
 
 		// Now stick in the new URLs.
@@ -836,8 +860,9 @@ 
 		)
 	);
 	$spider_logs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_logs[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_logs[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_logs;
@@ -913,14 +938,18 @@ 
 
 	// Prepare the dates for the drop down.
 	$date_choices = array();
-	for ($y = $min_year; $y <= $max_year; $y++)
-		for ($m = 1; $m <= 12; $m++)
+	for ($y = $min_year; $y <= $max_year; $y++) {
+			for ($m = 1;
+	}
+	$m <= 12; $m++)
 		{
 			// This doesn't count?
-			if ($y == $min_year && $m < $min_month)
-				continue;
-			if ($y == $max_year && $m > $max_month)
-				break;
+			if ($y == $min_year && $m < $min_month) {
+							continue;
+			}
+			if ($y == $max_year && $m > $max_month) {
+							break;
+			}
 
 			$date_choices[$y . $m] = $txt['months_short'][$m] . ' ' . $y;
 		}
@@ -933,13 +962,14 @@ 
 		' . $txt['spider_stats_select_month'] . ':
 		<select name="new_date" onchange="document.spider_stat_list.submit();">';
 
-	if (empty($date_choices))
-		$date_select .= '
+	if (empty($date_choices)) {
+			$date_select .= '
 			<option></option>';
-	else
-		foreach ($date_choices as $id => $text)
+	} else {
+			foreach ($date_choices as $id => $text)
 			$date_select .= '
 			<option value="' . $id . '"' . ($current_date == $id ? ' selected' : '') . '>' . $text . '</option>';
+	}
 
 	$date_select .= '
 		</select>
@@ -1063,8 +1093,9 @@ 
 		)
 	);
 	$spider_stats = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spider_stats[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spider_stats[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $spider_stats;
@@ -1105,8 +1136,9 @@ 
 		array()
 	);
 	$spiders = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$spiders[$row['id_spider']] = $row['spider_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$spiders[$row['id_spider']] = $row['spider_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	updateSettings(array('spider_name_cache' => $smcFunc['json_encode']($spiders)));

Sources/Who.php

Braces +126 added lines, -95 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Who's online, and what are they doing?
@@ -35,8 +36,9 @@ 
 	isAllowedTo('who_view');
 
 	// You can't do anything if this is off.
-	if (empty($modSettings['who_enabled']))
-		fatal_lang_error('who_off', false);
+	if (empty($modSettings['who_enabled'])) {
+			fatal_lang_error('who_off', false);
+	}
 
 	// Load the 'Who' template.
 	loadTemplate('Who');
@@ -71,9 +73,9 @@ 
 		$show_methods['spiders'] = '(lo.id_member = 0 AND lo.id_spider > 0)';
 		$show_methods['guests'] = '(lo.id_member = 0 AND lo.id_spider = 0)';
 		$context['show_methods']['spiders'] = $txt['who_show_spiders_only'];
+	} elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders') {
+			unset($_SESSION['who_online_filter']);
 	}
-	elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] == 'spiders')
-		unset($_SESSION['who_online_filter']);
 
 	// Does the user prefer a different sort direction?
 	if (isset($_REQUEST['sort']) && isset($sort_methods[$_REQUEST['sort']]))
@@ -97,20 +99,24 @@ 
 	$context['sort_direction'] = isset($_REQUEST['asc']) || (isset($_REQUEST['sort_dir']) && $_REQUEST['sort_dir'] == 'asc') ? 'up' : 'down';
 
 	$conditions = array();
-	if (!allowedTo('moderate_forum'))
-		$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	if (!allowedTo('moderate_forum')) {
+			$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+	}
 
 	// Fallback to top filter?
-	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top']))
-		$_REQUEST['show'] = $_REQUEST['show_top'];
+	if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top'])) {
+			$_REQUEST['show'] = $_REQUEST['show_top'];
+	}
 	// Does the user wish to apply a filter?
-	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']]))
-		$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']])) {
+			$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
+	}
 	// Perhaps we saved a filter earlier in the session?
-	elseif (isset($_SESSION['who_online_filter']))
-		$context['show_by'] = $_SESSION['who_online_filter'];
-	else
-		$context['show_by'] = 'members';
+	elseif (isset($_SESSION['who_online_filter'])) {
+			$context['show_by'] = $_SESSION['who_online_filter'];
+	} else {
+			$context['show_by'] = 'members';
+	}
 
 	$conditions[] = $show_methods[$context['show_by']];
 
@@ -156,8 +162,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$actions = $smcFunc['json_decode']($row['url'], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// Send the information to the template.
 		$context['members'][$row['session']] = array(
@@ -195,8 +202,8 @@ 
 	$spiderContext = array();
 	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] == 2 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
 	{
-		foreach ($smcFunc['json_decode']($modSettings['spider_name_cache'], true) as $id => $name)
-			$spiderContext[$id] = array(
+		foreach ($smcFunc['json_decode']($modSettings['spider_name_cache'], true) as $id => $name) {
+					$spiderContext[$id] = array(
 				'id' => 0,
 				'name' => $name,
 				'group' => $txt['spiders'],
@@ -205,6 +212,7 @@ 
 				'email' => $name,
 				'is_guest' => true
 			);
+		}
 	}
 
 	$url_data = determineActions($url_data);
@@ -219,16 +227,18 @@ 
 	// Put it in the context variables.
 	foreach ($context['members'] as $i => $member)
 	{
-		if ($member['id'] != 0)
-			$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		if ($member['id'] != 0) {
+					$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+		}
 
 		// Keep the IP that came from the database.
 		$memberContext[$member['id']]['ip'] = $member['ip'];
 		$context['members'][$i]['action'] = isset($url_data[$i]) ? $url_data[$i] : $txt['who_hidden'];
-		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']]))
-			$context['members'][$i] += $spiderContext[$member['id_spider']];
-		else
-			$context['members'][$i] += $memberContext[$member['id']];
+		if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']])) {
+					$context['members'][$i] += $spiderContext[$member['id_spider']];
+		} else {
+					$context['members'][$i] += $memberContext[$member['id']];
+		}
 	}
 
 	// Some people can't send personal messages...
@@ -263,8 +273,9 @@ 
 {
 	global $txt, $user_info, $modSettings, $smcFunc;
 
-	if (!allowedTo('who_view'))
-		return array();
+	if (!allowedTo('who_view')) {
+			return array();
+	}
 	loadLanguage('Who');
 
 	// Actions that require a specific permission level.
@@ -292,10 +303,11 @@ 
 	);
 	call_integration_hook('who_allowed', array(&$allowedActions));
 
-	if (!is_array($urls))
-		$url_list = array(array($urls, $user_info['id']));
-	else
-		$url_list = $urls;
+	if (!is_array($urls)) {
+			$url_list = array(array($urls, $user_info['id']));
+	} else {
+			$url_list = $urls;
+	}
 
 	// These are done to later query these in large chunks. (instead of one by one.)
 	$topic_ids = array();
@@ -307,12 +319,14 @@ 
 	{
 		// Get the request parameters..
 		$actions = $smcFunc['json_decode']($url[0], true);
-		if ($actions === false)
-			continue;
+		if ($actions === false) {
+					continue;
+		}
 
 		// If it's the admin or moderation center, and there is an area set, use that instead.
-		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area']))
-			$actions['action'] = $actions['area'];
+		if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area'])) {
+					$actions['action'] = $actions['area'];
+		}
 
 		// Check if there was no action or the action is display.
 		if (!isset($actions['action']) || $actions['action'] == 'display')
@@ -332,12 +346,14 @@ 
 				$board_ids[$actions['board']][$k] = $txt['who_board'];
 			}
 			// It's the board index!!  It must be!
-			else
-				$data[$k] = $txt['who_index'];
+			else {
+							$data[$k] = $txt['who_index'];
+			}
 		}
 		// Probably an error or some goon?
-		elseif ($actions['action'] == '')
-			$data[$k] = $txt['who_index'];
+		elseif ($actions['action'] == '') {
+					$data[$k] = $txt['who_index'];
+		}
 		// Some other normal action...?
 		else
 		{
@@ -345,23 +361,25 @@ 
 			if ($actions['action'] == 'profile')
 			{
 				// Whose?  Their own?
-				if (empty($actions['u']))
-					$actions['u'] = $url[1];
+				if (empty($actions['u'])) {
+									$actions['u'] = $url[1];
+				}
 
 				$data[$k] = $txt['who_hidden'];
 				$profile_ids[(int) $actions['u']][$k] = $actions['u'] == $url[1] ? $txt['who_viewownprofile'] : $txt['who_viewprofile'];
-			}
-			elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
+			} elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
 			{
 				$data[$k] = $txt['who_hidden'];
 				$board_ids[(int) $actions['board']][$k] = isset($actions['poll']) ? $txt['who_poll'] : $txt['who_post'];
 			}
 			// A subaction anyone can view... if the language string is there, show it.
-			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			elseif (isset($actions['sa']) && isset($txt['whoall_' . $actions['action'] . '_' . $actions['sa']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? $txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : $txt['whoall_' . $actions['action'] . '_' . $actions['sa']];
+			}
 			// An action any old fellow can look at. (if ['whoall_' . $action] exists, we know everyone can see it.)
-			elseif (isset($txt['whoall_' . $actions['action']]))
-				$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			elseif (isset($txt['whoall_' . $actions['action']])) {
+							$data[$k] = $preferred_prefix && isset($txt[$preferred_prefix . $actions['action']]) ? $txt[$preferred_prefix . $actions['action']] : $txt['whoall_' . $actions['action']];
+			}
 			// Viewable if and only if they can see the board...
 			elseif (isset($txt['whotopic_' . $actions['action']]))
 			{
@@ -370,8 +388,7 @@ 
 
 				$data[$k] = $txt['who_hidden'];
 				$topic_ids[$topic][$k] = $txt['whotopic_' . $actions['action']];
-			}
-			elseif (isset($txt['whopost_' . $actions['action']]))
+			} elseif (isset($txt['whopost_' . $actions['action']]))
 			{
 				// Find out what message they are accessing.
 				$msgid = (int) (isset($actions['msg']) ? $actions['msg'] : (isset($actions['quote']) ? $actions['quote'] : 0));
@@ -394,41 +411,46 @@ 
 				$data[$k] = sprintf($txt['whopost_' . $actions['action']], $id_topic, $subject);
 				$smcFunc['db_free_result']($result);
 
-				if (empty($id_topic))
-					$data[$k] = $txt['who_hidden'];
+				if (empty($id_topic)) {
+									$data[$k] = $txt['who_hidden'];
+				}
 			}
 			// Viewable only by administrators.. (if it starts with whoadmin, it's admin only!)
-			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']]))
-				$data[$k] = $txt['whoadmin_' . $actions['action']];
+			elseif (allowedTo('moderate_forum') && isset($txt['whoadmin_' . $actions['action']])) {
+							$data[$k] = $txt['whoadmin_' . $actions['action']];
+			}
 			// Viewable by permission level.
 			elseif (isset($allowedActions[$actions['action']]))
 			{
-				if (allowedTo($allowedActions[$actions['action']]))
-					$data[$k] = $txt['whoallow_' . $actions['action']];
-				elseif (in_array('moderate_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_moderate'];
-				elseif (in_array('admin_forum', $allowedActions[$actions['action']]))
-					$data[$k] = $txt['who_admin'];
-				else
-					$data[$k] = $txt['who_hidden'];
+				if (allowedTo($allowedActions[$actions['action']])) {
+									$data[$k] = $txt['whoallow_' . $actions['action']];
+				} elseif (in_array('moderate_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_moderate'];
+				} elseif (in_array('admin_forum', $allowedActions[$actions['action']])) {
+									$data[$k] = $txt['who_admin'];
+				} else {
+									$data[$k] = $txt['who_hidden'];
+				}
+			} elseif (!empty($actions['action'])) {
+							$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
+			} else {
+							$data[$k] = $txt['who_unknown'];
 			}
-			elseif (!empty($actions['action']))
-				$data[$k] = $txt['who_generic'] . ' ' . $actions['action'];
-			else
-				$data[$k] = $txt['who_unknown'];
 		}
 
 		if (isset($actions['error']))
 		{
-			if (isset($txt[$actions['error']]))
-				$error_message = str_replace('"', '"', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
-			elseif ($actions['error'] == 'guest_login')
-				$error_message = str_replace('"', '"', $txt['who_guest_login']);
-			else
-				$error_message = str_replace('"', '"', $actions['error']);
-
-			if (!empty($error_message))
-				$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			if (isset($txt[$actions['error']])) {
+							$error_message = str_replace('"', '&quot;', empty($actions['who_error_params']) ? $txt[$actions['error']] : vsprintf($txt[$actions['error']], $actions['who_error_params']));
+			} elseif ($actions['error'] == 'guest_login') {
+							$error_message = str_replace('"', '&quot;', $txt['who_guest_login']);
+			} else {
+							$error_message = str_replace('"', '&quot;', $actions['error']);
+			}
+
+			if (!empty($error_message)) {
+							$data[$k] .= ' <span class="generic_icons error" title="' . $error_message . '"></span>';
+			}
 		}
 
 		// Maybe the action is integrated into another system?
@@ -439,12 +461,15 @@ 
 				if (!empty($integrate_action))
 				{
 					$data[$k] = $integrate_action;
-					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k]))
-						$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
-					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k]))
-						$board_ids[(int) $actions['board']][$k] = $integrate_action;
-					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k]))
-						$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k])) {
+											$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
+					}
+					if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k])) {
+											$board_ids[(int) $actions['board']][$k] = $integrate_action;
+					}
+					if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k])) {
+											$profile_ids[(int) $actions['u']][$k] = $integrate_action;
+					}
 					break;
 				}
 			}
@@ -472,8 +497,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Show the topic's subject for each of the actions.
-			foreach ($topic_ids[$row['id_topic']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			foreach ($topic_ids[$row['id_topic']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_topic'], censorText($row['subject']));
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -495,8 +521,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Put the board name into the string for each member...
-			foreach ($board_ids[$row['id_board']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			foreach ($board_ids[$row['id_board']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_board'], $row['name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -518,23 +545,26 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// If they aren't allowed to view this person's profile, skip it.
-			if (!$allow_view_any && ($user_info['id'] != $row['id_member']))
-				continue;
+			if (!$allow_view_any && ($user_info['id'] != $row['id_member'])) {
+							continue;
+			}
 
 			// Set their action on each - session/text to sprintf.
-			foreach ($profile_ids[$row['id_member']] as $k => $session_text)
-				$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			foreach ($profile_ids[$row['id_member']] as $k => $session_text) {
+							$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name']);
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
 
 	call_integration_hook('whos_online_after', array(&$urls, &$data));
 
-	if (!is_array($urls))
-		return isset($data[0]) ? $data[0] : false;
-	else
-		return $data;
-}
+	if (!is_array($urls)) {
+			return isset($data[0]) ? $data[0] : false;
+	} else {
+			return $data;
+	}
+	}
 
 /**
  * It prepares credit and copyright information for the credits page or the admin page
@@ -710,8 +740,8 @@ 
 	);
 
 	// Give the translators some credit for their hard work.
-	if (!empty($txt['translation_credits']))
-		$context['credits'][] = array(
+	if (!empty($txt['translation_credits'])) {
+			$context['credits'][] = array(
 			'title' => $txt['credits_groups_translation'],
 			'groups' => array(
 				array(
@@ -720,6 +750,7 @@ 
 				),
 			),
 		);
+	}
 
 	$context['credits'][] = array(
 		'title' => $txt['credits_special'],

Spacing +3 added lines, -3 removed lines

@@ -592,7 +592,7 @@ 
 						'Jessica "Suki" González',
 						'Karl "RegularExpression" Benson',
 						'Matthew "Labradoodle-360" Kerle',
-						$user_info['is_admin'] ? 'Matt "Grudge" Wolf': 'Grudge',
+						$user_info['is_admin'] ? 'Matt "Grudge" Wolf' : 'Grudge',
 						'Michael "Thantos" Miller',
 						'Norv',
 						'Peter "Arantor" Spicer',
@@ -824,13 +824,13 @@ 
 			$credit_info = $smcFunc['json_decode']($row['credits'], true);
 
 			$copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' © ' . $smcFunc['htmlspecialchars']($credit_info['copyright']);
-			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="'. $smcFunc['htmlspecialchars']($credit_info['licenseurl']) .'">'. $smcFunc['htmlspecialchars']($credit_info['license']) .'</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
+			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="' . $smcFunc['htmlspecialchars']($credit_info['licenseurl']) . '">' . $smcFunc['htmlspecialchars']($credit_info['license']) . '</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
 			$version = $txt['credits_version'] . ' ' . $row['version'];
 			$title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version;
 
 			// build this one out and stash it away
 			$mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>';
-			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license  : '') . (!empty($copyright) ? ' | ' . $copyright  : '');
+			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : '');
 		}
 		cache_put_data('mods_credits', $mods, 86400);
 	}

Sources/Drafts.php

Braces +75 added lines, -53 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 loadLanguage('Drafts');
 
@@ -33,8 +34,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings, $board;
 
 	// can you be, should you be ... here?
-	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft']))
-		return false;
+	if (empty($modSettings['drafts_post_enabled']) || !allowedTo('post_draft') || !isset($_POST['save_draft']) || !isset($_POST['id_draft'])) {
+			return false;
+	}
 
 	// read in what they sent us, if anything
 	$id_draft = (int) $_POST['id_draft'];
@@ -46,14 +48,16 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// since we were called from the autosave function, send something back
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
 
-	if (!isset($_POST['message']))
-		$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	if (!isset($_POST['message'])) {
+			$_POST['message'] = isset($_POST['quickReply']) ? $_POST['quickReply'] : '';
+	}
 
 	// prepare any data from the form
 	$topic_id = empty($_REQUEST['topic']) ? 0 : (int) $_REQUEST['topic'];
@@ -66,8 +70,9 @@ 
 
 	// message and subject still need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing draft, like hitting the save draft button or autosave enabled?
 	if (!empty($id_draft) && !empty($draft_info))
@@ -148,9 +153,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_draft'] = $id_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 
 		// cleanup
 		unset($_POST['save_draft']);
@@ -180,8 +185,9 @@ 
 	global $context, $user_info, $smcFunc, $modSettings;
 
 	// PM survey says ... can you stay or must you go
-	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft']))
-		return false;
+	if (empty($modSettings['drafts_pm_enabled']) || !allowedTo('pm_draft') || !isset($_POST['save_draft'])) {
+			return false;
+	}
 
 	// read in what you sent us
 	$id_pm_draft = (int) $_POST['id_pm_draft'];
@@ -193,8 +199,9 @@ 
 		$context['draft_saved_on'] = $draft_info['poster_time'];
 
 		// Send something back to the javascript caller
-		if (!empty($id_draft))
-			XmlDraft($id_draft);
+		if (!empty($id_draft)) {
+					XmlDraft($id_draft);
+		}
 
 		return true;
 	}
@@ -204,9 +211,9 @@ 
 	{
 		$recipientList['to'] = isset($_POST['recipient_to']) ? explode(',', $_POST['recipient_to']) : array();
 		$recipientList['bcc'] = isset($_POST['recipient_bcc']) ? explode(',', $_POST['recipient_bcc']) : array();
+	} elseif (!empty($draft_info['to_list']) && empty($recipientList)) {
+			$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 	}
-	elseif (!empty($draft_info['to_list']) && empty($recipientList))
-		$recipientList = $smcFunc['json_decode']($draft_info['to_list'], true);
 
 	// prepare the data we got from the form
 	$reply_id = empty($_POST['replied_to']) ? 0 : (int) $_POST['replied_to'];
@@ -215,8 +222,9 @@ 
 
 	// message and subject always need a bit more work
 	preparsecode($draft['body']);
-	if ($smcFunc['strlen']($draft['subject']) > 100)
-		$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	if ($smcFunc['strlen']($draft['subject']) > 100) {
+			$draft['subject'] = $smcFunc['substr']($draft['subject'], 0, 100);
+	}
 
 	// Modifying an existing PM draft?
 	if (!empty($id_pm_draft) && !empty($draft_info))
@@ -280,9 +288,9 @@ 
 		{
 			$context['draft_saved'] = true;
 			$context['id_pm_draft'] = $id_pm_draft;
+		} else {
+					$post_errors[] = 'draft_not_saved';
 		}
-		else
-			$post_errors[] = 'draft_not_saved';
 	}
 
 	// if we were called from the autosave function, send something back
@@ -315,8 +323,9 @@ 
 	$type = (int) $type;
 
 	// nothing to read, nothing to do
-	if (empty($id_draft))
-		return false;
+	if (empty($id_draft)) {
+			return false;
+	}
 
 	// load in this draft from the DB
 	$request = $smcFunc['db_query']('', '
@@ -337,8 +346,9 @@ 
 	);
 
 	// no results?
-	if (!$smcFunc['db_num_rows']($request))
-		return false;
+	if (!$smcFunc['db_num_rows']($request)) {
+			return false;
+	}
 
 	// load up the data
 	$draft_info = $smcFunc['db_fetch_assoc']($request);
@@ -358,8 +368,7 @@ 
 			$context['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
 			$context['board'] = !empty($draft_info['id_board']) ? $draft_info['id_board'] : '';
 			$context['id_draft'] = !empty($draft_info['id_draft']) ? $draft_info['id_draft'] : 0;
-		}
-		elseif ($type === 1)
+		} elseif ($type === 1)
 		{
 			// one of those pm drafts? then set it up like we have an error
 			$_REQUEST['subject'] = !empty($draft_info['subject']) ? stripslashes($draft_info['subject']) : '';
@@ -395,12 +404,14 @@ 
 	global $user_info, $smcFunc;
 
 	// Only a single draft.
-	if (is_numeric($id_draft))
-		$id_draft = array($id_draft);
+	if (is_numeric($id_draft)) {
+			$id_draft = array($id_draft);
+	}
 
 	// can't delete nothing
-	if (empty($id_draft) || ($check && empty($user_info['id'])))
-		return false;
+	if (empty($id_draft) || ($check && empty($user_info['id']))) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}user_drafts
@@ -429,14 +440,16 @@ 
 	global $smcFunc, $scripturl, $context, $txt, $modSettings;
 
 	// Permissions
-	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id))
-		return false;
+	if (($draft_type === 0 && empty($context['drafts_save'])) || ($draft_type === 1 && empty($context['drafts_pm_save'])) || empty($member_id)) {
+			return false;
+	}
 
 	$context['drafts'] = array();
 
 	// has a specific draft has been selected?  Load it up if there is not a message already in the editor
-	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-		ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message'])) {
+			ReadDraft((int) $_REQUEST['id_draft'], $draft_type, true, true);
+	}
 
 	// load the drafts this user has available
 	$request = $smcFunc['db_query']('', '
@@ -459,8 +472,9 @@ 
 	// add them to the draft array for display
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		// Post drafts
 		if ($draft_type === 0)
@@ -545,8 +559,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts on the boards they can (still) see ...
 	// @todo .. should we just let them see their drafts even if they have lost board access ?
@@ -611,12 +626,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -648,8 +665,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If the drafts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// Menu tab
 	$context[$context['profile_menu_name']]['tab_data'] = array(
@@ -707,8 +725,9 @@ 
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = 10;
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = 10;
+	}
 
 	// Get the count of applicable drafts
 	$request = $smcFunc['db_query']('', '
@@ -767,12 +786,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Censor....
-		if (empty($row['body']))
-			$row['body'] = '';
+		if (empty($row['body'])) {
+					$row['body'] = '';
+		}
 
 		$row['subject'] = $smcFunc['htmltrim']($row['subject']);
-		if (empty($row['subject']))
-			$row['subject'] = $txt['no_subject'];
+		if (empty($row['subject'])) {
+					$row['subject'] = $txt['no_subject'];
+		}
 
 		censorText($row['body']);
 		censorText($row['subject']);
@@ -827,8 +848,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// if the drafts were retrieved in reverse order, then put them in the right order again.
-	if ($reverse)
-		$context['drafts'] = array_reverse($context['drafts'], true);
+	if ($reverse) {
+			$context['drafts'] = array_reverse($context['drafts'], true);
+	}
 
 	// off to the template we go
 	$context['page_title'] = $txt['drafts'];

Doc Comments +3 added lines, -3 removed lines

@@ -173,7 +173,7 @@ 
  *
  * @param string $post_errors A string of info about errors encountered trying to save this draft
  * @param array $recipientList An array of data about who this PM is being sent to
- * @return boolean false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise
+ * @return boolean|null false if you can't save the draft, true if we're doing this via XML more than 5 seconds after the last save, nothing otherwise
  */
 function SavePMDraft(&$post_errors, $recipientList)
 {
@@ -388,7 +388,7 @@ 
  *
  * @param int $id_draft The ID of the draft to delete
  * @param boolean $check Whether or not to check that the draft belongs to the current user
- * @return boolean False if it couldn't be deleted (doesn't return anything otherwise)
+ * @return false|null False if it couldn't be deleted (doesn't return anything otherwise)
  */
 function DeleteDraft($id_draft, $check = true)
 {
@@ -422,7 +422,7 @@ 
  * @param int $member_id ID of the member to show drafts for
  * @param boolean|integer $topic If $type is 1, this can be set to only load drafts for posts in the specific topic
  * @param int $draft_type The type of drafts to show - 0 for post drafts, 1 for PM drafts
- * @return boolean False if the drafts couldn't be loaded, nothing otherwise
+ * @return false|null False if the drafts couldn't be loaded, nothing otherwise
  */
 function ShowDrafts($member_id, $topic = false, $draft_type = 0)
 {

subscriptions.php

Braces +38 added lines, -28 removed lines

@@ -16,8 +16,9 @@ 
 
 // Start things rolling by getting SMF alive...
 $ssi_guest_access = true;
-if (!file_exists(dirname(__FILE__) . '/SSI.php'))
+if (!file_exists(dirname(__FILE__) . '/SSI.php')) {
 	die('Cannot find SSI.php');
+}
 
 require_once(dirname(__FILE__) . '/SSI.php');
 require_once($sourcedir . '/ManagePaid.php');
@@ -35,20 +36,22 @@ 
 }
 
 // I assume we're even active?
-if (empty($modSettings['paid_enabled']))
+if (empty($modSettings['paid_enabled'])) {
 	exit;
+}
 
 // If we have some custom people who find out about problems load them here.
 $notify_users = array();
 if (!empty($modSettings['paid_email_to']))
 {
-	foreach (explode(',', $modSettings['paid_email_to']) as $email)
-		$notify_users[] = array(
+	foreach (explode(',', $modSettings['paid_email_to']) as $email) {
+			$notify_users[] = array(
 			'email' => $email,
 			'name' => $txt['who_member'],
 			'id' => 0,
 		);
-}
+	}
+	}
 
 // We need to see whether we can find the correct payment gateway,
 // we'll going to go through all our gateway scripts and find out
@@ -65,8 +68,9 @@ 
 	}
 }
 
-if (empty($txnType))
+if (empty($txnType)) {
 	generateSubscriptionError($txt['paid_unknown_transaction_type']);
+}
 
 // Get the subscription and member ID amoungst others...
 @list($subscription_id, $member_id) = $gatewayClass->precheck();
@@ -76,8 +80,9 @@ 
 $member_id = (int) $member_id;
 
 // This would be bad...
-if (empty($member_id))
+if (empty($member_id)) {
 	generateSubscriptionError($txt['paid_empty_member']);
+}
 
 // Verify the member.
 $request = $smcFunc['db_query']('', '
@@ -89,8 +94,9 @@ 
 	)
 );
 // Didn't find them?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_could_not_find_member'], $member_id));
+}
 $member_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -105,8 +111,9 @@ 
 );
 
 // Didn't find it?
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription'], $member_id, $subscription_id));
+}
 
 $subscription_info = $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
@@ -123,8 +130,9 @@ 
 		'current_member' => $member_id,
 	)
 );
-if ($smcFunc['db_num_rows']($request) === 0)
+if ($smcFunc['db_num_rows']($request) === 0) {
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription_log'], $member_id, $subscription_id));
+}
 $subscription_info += $smcFunc['db_fetch_assoc']($request);
 $smcFunc['db_free_result']($request);
 
@@ -139,8 +147,7 @@ 
 		removeSubscription($subscription_id, $member_id);
 		$subscription_act = time();
 		$status = 0;
-	}
-	else
+	} else
 	{
 		loadSubscriptions();
 		$subscription_act = $subscription_info['end_time'] - $context['subscriptions'][$subscription_id]['num_length'];
@@ -188,16 +195,18 @@ 
 	if (!$gatewayClass->isSubscription())
 	{
 		$real_details = $smcFunc['json_decode']($subscription_info['pending_details'], true);
-		if (empty($real_details))
-			generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		if (empty($real_details)) {
+					generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		}
 
 		// Now we just try to find anything pending.
 		// We don't really care which it is as security happens later.
 		foreach ($real_details as $id => $detail)
 		{
 			unset($real_details[$id]);
-			if ($detail[3] == 'payback' && $subscription_info['payments_pending'])
-				$subscription_info['payments_pending']--;
+			if ($detail[3] == 'payback' && $subscription_info['payments_pending']) {
+							$subscription_info['payments_pending']--;
+			}
 			break;
 		}
 
@@ -223,10 +232,11 @@ 
 		// This is a little harder, can we find the right duration?
 		foreach ($cost as $duration => $value)
 		{
-			if ($duration == 'fixed')
-				continue;
-			elseif ((float) $value == (float) $total_cost)
-				$found_duration = strtoupper(substr($duration, 0, 1));
+			if ($duration == 'fixed') {
+							continue;
+			} elseif ((float) $value == (float) $total_cost) {
+							$found_duration = strtoupper(substr($duration, 0, 1));
+			}
 		}
 
 		// If we have the duration then we're done.
@@ -235,8 +245,7 @@ 
 			$notify = true;
 			addSubscription($subscription_id, $member_id, $found_duration);
 		}
-	}
-	else
+	} else
 	{
 		$actual_cost = $cost['fixed'];
 
@@ -268,10 +277,10 @@ 
 // Maybe they're cancelling. Some subscriptions may require actively doing something, but PayPal doesn't, for example.
 elseif ($gatewayClass->isCancellation())
 {
-	if (method_exists($gatewayClass, 'performCancel'))
-		$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
-}
-else
+	if (method_exists($gatewayClass, 'performCancel')) {
+			$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
+	}
+	} else
 {
 	// Some other "valid" transaction such as:
 	//
@@ -308,8 +317,9 @@ 
 	// Maybe we can try to give them the post data?
 	if (!empty($_POST))
 	{
-		foreach ($_POST as $key => $val)
-			$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		foreach ($_POST as $key => $val) {
+					$text .= '<br>' . $smcFunc['htmlspecialchars']($key) . ': ' . $smcFunc['htmlspecialchars']($val);
+		}
 	}
 
 	// Then just log and die.

Sources/Load.php

Doc Comments +5 added lines, -5 removed lines

@@ -2259,9 +2259,9 @@ 
  *
  * @uses the template_include() function to include the file.
  * @param string $template_name The name of the template to load
- * @param array|string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load
+ * @param string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load
  * @param bool $fatal If true, dies with an error message if the template cannot be found
- * @return boolean Whether or not the template was loaded
+ * @return boolean|null Whether or not the template was loaded
  */
 function loadTemplate($template_name, $style_sheets = array(), $fatal = true)
 {
@@ -2444,7 +2444,7 @@ 
  * - all code added with this function is added to the same <style> tag so do make sure your css is valid!
  *
  * @param string $css Some css code
- * @return void|bool Adds the CSS to the $context['css_header'] array or returns if no CSS is specified
+ * @return false|null Adds the CSS to the $context['css_header'] array or returns if no CSS is specified
  */
 function addInlineCss($css)
 {
@@ -2558,7 +2558,7 @@ 
  *
  * @param string $javascript Some JS code
  * @param bool $defer Whether the script should load in <head> or before the closing <html> tag
- * @return void|bool Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified
+ * @return false|null Adds the code to one of the $context['javascript_inline'] arrays or returns if no JS was specified
  */
 function addInlineJavaScript($javascript, $defer = false)
 {
@@ -2791,7 +2791,7 @@ 
  * It will try to choose only utf8 or non-utf8 languages.
  *
  * @param bool $use_cache Whether or not to use the cache
- * @return array An array of information about available languages
+ * @return string An array of information about available languages
  */
 function getLanguages($use_cache = true)
 {

Spacing +3 added lines, -3 removed lines

@@ -1742,7 +1742,7 @@ 
 	}
 		
 	// We already load the basic stuff?
-	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme )
+	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme)
 	{
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
 
@@ -1767,7 +1767,7 @@ 
 				SELECT variable, value, id_member, id_theme
 				FROM {db_prefix}themes
 				WHERE id_member' . (empty($themeData[0]) ? ' IN (-1, 0, {int:id_member})' : ' = {int:id_member}') . '
-					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') .'
+					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') . '
 				ORDER BY id_theme asc',
 				array(
 					'id_theme' => $id_theme,
@@ -1997,7 +1997,7 @@ 
 	if (!isset($context['javascript_vars']))
 		$context['javascript_vars'] = array();
 
-	$context['login_url'] =  $scripturl . '?action=login2';
+	$context['login_url'] = $scripturl . '?action=login2';
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
 	$context['session_var'] = $_SESSION['session_var'];
 	$context['session_id'] = $_SESSION['session_value'];

Braces +792 added lines, -597 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Load the $modSettings array.
@@ -25,13 +26,14 @@ 
 	global $cache_enable, $sourcedir, $context;
 
 	// Most database systems have not set UTF-8 as their default input charset.
-	if (!empty($db_character_set))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set)) {
+			$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_character_set' => $db_character_set,
 			)
 		);
+	}
 
 	// We need some caching support, maybe.
 	loadCacheAccelerator();
@@ -46,28 +48,36 @@ 
 			)
 		);
 		$modSettings = array();
-		if (!$request)
-			display_db_error();
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$modSettings[$row[0]] = $row[1];
+		if (!$request) {
+					display_db_error();
+		}
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$modSettings[$row[0]] = $row[1];
+		}
 		$smcFunc['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;
-		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999)
-			$modSettings['defaultMaxMessages'] = 15;
-		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999)
-			$modSettings['defaultMaxMembers'] = 30;
-		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999)
-			$modSettings['defaultMaxListItems'] = 15;
+		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999) {
+					$modSettings['defaultMaxTopics'] = 20;
+		}
+		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999) {
+					$modSettings['defaultMaxMessages'] = 15;
+		}
+		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999) {
+					$modSettings['defaultMaxMembers'] = 30;
+		}
+		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999) {
+					$modSettings['defaultMaxListItems'] = 15;
+		}
 
 		// We explicitly do not use $smcFunc['json_decode'] here yet, as $smcFunc is not fully loaded.
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		}
 
-		if (!empty($cache_enable))
-			cache_put_data('modSettings', $modSettings, 90);
+		if (!empty($cache_enable)) {
+					cache_put_data('modSettings', $modSettings, 90);
+		}
 	}
 
 	$modSettings['cache_enable'] = $cache_enable;
@@ -87,8 +97,9 @@ 
 		};
 	$fix_utf8mb4 = function($string) use ($utf8, $smcFunc)
 	{
-		if (!$utf8 || $smcFunc['db_mb4'])
-			return $string;
+		if (!$utf8 || $smcFunc['db_mb4']) {
+					return $string;
+		}
 
 		$i = 0;
 		$len = strlen($string);
@@ -100,18 +111,15 @@ 
 			{
 				$new_string .= $string[$i];
 				$i++;
-			}
-			elseif ($ord < 224)
+			} elseif ($ord < 224)
 			{
 				$new_string .= $string[$i] . $string[$i + 1];
 				$i += 2;
-			}
-			elseif ($ord < 240)
+			} elseif ($ord < 240)
 			{
 				$new_string .= $string[$i] . $string[$i + 1] . $string[$i + 2];
 				$i += 3;
-			}
-			elseif ($ord < 248)
+			} elseif ($ord < 248)
 			{
 				// Magic happens.
 				$val = (ord($string[$i]) & 0x07) << 18;
@@ -155,8 +163,7 @@ 
 			{
 				$result = array_search($needle, array_slice($haystack_arr, $offset));
 				return is_int($result) ? $result + $offset : false;
-			}
-			else
+			} else
 			{
 				$needle_arr = preg_split('~(' . $ent_list . '|.)~' . ($utf8 ? 'u' : '') . '', $ent_check($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 				$needle_size = count($needle_arr);
@@ -165,8 +172,9 @@ 
 				while ((int) $result === $result)
 				{
 					$offset += $result;
-					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr)
-						return $offset;
+					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr) {
+											return $offset;
+					}
 					$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
 				}
 				return false;
@@ -204,8 +212,9 @@ 
 			$string = $ent_check($string);
 			preg_match('~^(' . $ent_list . '|.){' . $smcFunc['strlen'](substr($string, 0, $length)) . '}~' . ($utf8 ? 'u' : ''), $string, $matches);
 			$string = $matches[0];
-			while (strlen($string) > $length)
-				$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			while (strlen($string) > $length) {
+							$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			}
 			return $string;
 		},
 		'ucfirst' => $utf8 ? function($string) use (&$smcFunc)
@@ -215,8 +224,9 @@ 
 		'ucwords' => $utf8 ? function($string) use (&$smcFunc)
 		{
 			$words = preg_split('~([\s\r\n\t]+)~', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
-			for ($i = 0, $n = count($words); $i < $n; $i += 2)
-				$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			for ($i = 0, $n = count($words); $i < $n; $i += 2) {
+							$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			}
 			return implode('', $words);
 		} : 'ucwords',
 		'json_decode' => 'smf_json_decode',
@@ -224,16 +234,17 @@ 
 	);
 
 	// Setting the timezone is a requirement for some functions.
-	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list()))
-		date_default_timezone_set($modSettings['default_timezone']);
-	else
+	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list())) {
+			date_default_timezone_set($modSettings['default_timezone']);
+	} else
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$modSettings['default_timezone'] = $ini_tz;
-		else
-			$modSettings['default_timezone'] = '';
+		if (!empty($ini_tz)) {
+					$modSettings['default_timezone'] = $ini_tz;
+		} else {
+					$modSettings['default_timezone'] = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($modSettings['default_timezone'], timezone_identifiers_list()))
@@ -251,22 +262,26 @@ 
 		if (($modSettings['load_average'] = cache_get_data('loadavg', 90)) == null)
 		{
 			$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
-			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0)
-				$modSettings['load_average'] = (float) $matches[1];
-			elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0)
-				$modSettings['load_average'] = (float) $matches[1];
-			else
-				unset($modSettings['load_average']);
+			if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) != 0) {
+							$modSettings['load_average'] = (float) $matches[1];
+			} elseif (($modSettings['load_average'] = @`uptime`) != null && preg_match('~load average[s]?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) != 0) {
+							$modSettings['load_average'] = (float) $matches[1];
+			} else {
+							unset($modSettings['load_average']);
+			}
 
-			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
-				cache_put_data('loadavg', $modSettings['load_average'], 90);
+			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+							cache_put_data('loadavg', $modSettings['load_average'], 90);
+			}
 		}
 
-		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
-			call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+					call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		}
 
-		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum'])
-			display_loadavg_error();
+		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum']) {
+					display_loadavg_error();
+		}
 	}
 
 	// Is post moderation alive and well? Everywhere else assumes this has been defined, so let's make sure it is.
@@ -287,8 +302,9 @@ 
 	if (defined('SMF_INTEGRATION_SETTINGS'))
 	{
 		$integration_settings = $smcFunc['json_decode'](SMF_INTEGRATION_SETTINGS, true);
-		foreach ($integration_settings as $hook => $function)
-			add_integration_function($hook, $function, '', false);
+		foreach ($integration_settings as $hook => $function) {
+					add_integration_function($hook, $function, '', false);
+		}
 	}
 
 	// Any files to pre include?
@@ -298,8 +314,9 @@ 
 		foreach ($pre_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -410,9 +427,9 @@ 
 				break;
 			}
 		}
+	} else {
+			$id_member = 0;
 	}
-	else
-		$id_member = 0;
 
 	if (empty($id_member) && isset($_COOKIE[$cookiename]))
 	{
@@ -420,8 +437,9 @@ 
 		$cookie_data = $smcFunc['json_decode']($_COOKIE[$cookiename], true, false);
 
 		// Legacy format (for recent 2.0 --> 2.1 upgrades)
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		}
 
 		list($id_member, $password, $login_span, $cookie_domain, $cookie_path) = array_pad((array) $cookie_data, 5, '');
 
@@ -429,16 +447,17 @@ 
 
 		// Make sure the cookie is set to the correct domain and path
 		require_once($sourcedir . '/Subs-Auth.php');
-		if (array($cookie_domain, $cookie_path) !== url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies'])))
-			setLoginCookie((int) $login_span - time(), $id_member);
-	}
-	elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
+		if (array($cookie_domain, $cookie_path) !== url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies']))) {
+					setLoginCookie((int) $login_span - time(), $id_member);
+		}
+	} elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
 	{
 		// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
 		$cookie_data = $smcFunc['json_decode']($_SESSION['login_' . $cookiename], true);
 
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		}
 
 		list($id_member, $password, $login_span) = array_pad((array) $cookie_data, 3, '');
 		$id_member = !empty($id_member) && strlen($password) == 128 && (int) $login_span > time() ? (int) $id_member : 0;
@@ -463,30 +482,34 @@ 
 			$user_settings = $smcFunc['db_fetch_assoc']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
-				$user_settings['avatar'] = get_proxied_url($user_settings['avatar']);
+			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
+							$user_settings['avatar'] = get_proxied_url($user_settings['avatar']);
+			}
 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+							cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			}
 		}
 
 		// Did we find 'im?  If not, junk it.
 		if (!empty($user_settings))
 		{
 			// 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;
+			if (!empty($already_verified) && $already_verified === true) {
+							$check = true;
+			}
 			// SHA-512 hash should be 128 characters long.
-			elseif (strlen($password) == 128)
-				$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
-			else
-				$check = false;
+			elseif (strlen($password) == 128) {
+							$check = hash_salt($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)
@@ -515,8 +538,9 @@ 
 
 					list ($tfamember, $tfasecret) = array_pad((array) $tfa_data, 2, '');
 
-					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member)
-						$tfasecret = null;
+					if (!isset($tfamember, $tfasecret) || (int) $tfamember != $id_member) {
+											$tfasecret = null;
+					}
 				}
 
 				// They didn't finish logging in before coming here? Then they're no one to us.
@@ -538,10 +562,12 @@ 
 		// Are we forcing 2FA? Need to check if the user groups actually require 2FA
 		elseif (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] >= 2 && $id_member && empty($user_settings['tfa_secret']))
 		{
-			if ($modSettings['tfa_mode'] == 2) //only do this if we are just forcing SOME membergroups
+			if ($modSettings['tfa_mode'] == 2) {
+				//only do this if we are just forcing SOME membergroups
 			{
 				//Build an array of ALL user membergroups.
 				$full_groups = array($user_settings['id_group']);
+			}
 				if (!empty($user_settings['additional_groups']))
 				{
 					$full_groups = array_merge($full_groups, explode(',', $user_settings['additional_groups']));
@@ -561,15 +587,17 @@ 
 				);
 				$row = $smcFunc['db_fetch_assoc']($request);
 				$smcFunc['db_free_result']($request);
+			} else {
+							$row['total'] = 1;
 			}
-			else
-				$row['total'] = 1; //simplifies logics in the next "if"
+			//simplifies logics in the next "if"
 
 			$area = !empty($_REQUEST['area']) ? $_REQUEST['area'] : '';
 			$action = !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup'))
-				redirectexit('action=profile;area=tfasetup;forced');
+			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup')) {
+							redirectexit('action=profile;area=tfasetup;forced');
+			}
 		}
 	}
 
@@ -606,29 +634,32 @@ 
 				updateMemberData($id_member, array('id_msg_last_visit' => (int) $modSettings['maxMsgID'], 'last_login' => time(), 'member_ip' => $_SERVER['REMOTE_ADDR'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']));
 				$user_settings['last_login'] = time();
 
-				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-					cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+									cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				}
 
-				if (!empty($modSettings['cache_enable']))
-					cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+				if (!empty($modSettings['cache_enable'])) {
+									cache_put_data('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'];
 		}
-		elseif (empty($_SESSION['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(
+		if (empty($user_settings['additional_groups'])) {
+					$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.
 		$user_info['groups'] = array_map('intval', $user_info['groups']);
@@ -645,8 +676,7 @@ 
 			$time_system = new DateTime('now', $tz_system);
 			$time_user = new DateTime('now', $tz_user);
 			$user_info['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
-		}
-		else
+		} else
 		{
 			// !!! Compatibility.
 			$user_info['time_offset'] = empty($user_settings['time_offset']) ? 0 : $user_settings['time_offset'];
@@ -660,8 +690,9 @@ 
 		$user_info = array('groups' => array(-1));
 		$user_settings = array();
 
-		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member']))
-			$_COOKIE[$cookiename] = '';
+		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member'])) {
+					$_COOKIE[$cookiename] = '';
+		}
 
 		// Expire the 2FA cookie
 		if (isset($_COOKIE[$cookiename . '_tfa']) && empty($context['tfa_member']))
@@ -678,19 +709,20 @@ 
 		}
 
 		// 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'];
+		if (!isset($_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))
 		{
 			require_once($sourcedir . '/ManageSearchEngines.php');
 			$user_info['possibly_robot'] = SpiderCheck();
+		} elseif (!empty($modSettings['spider_mode'])) {
+					$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 		}
-		elseif (!empty($modSettings['spider_mode']))
-			$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
 		{
@@ -738,8 +770,9 @@ 
 	$user_info['groups'] = array_unique($user_info['groups']);
 
 	// 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]);
+	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1])) {
+			unset($user_info['ignoreboards'][$tmp]);
+	}
 
 	// Allow the user to change their language.
 	if (!empty($modSettings['userLanguage']))
@@ -752,13 +785,14 @@ 
 			$user_info['language'] = strtr($_GET['language'], './\\:', '____');
 
 			// Make it permanent for members.
-			if (!empty($user_info['id']))
-				updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
-			else
-				$_SESSION['language'] = $user_info['language'];
+			if (!empty($user_info['id'])) {
+							updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
+			} else {
+							$_SESSION['language'] = $user_info['language'];
+			}
+		} elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')])) {
+					$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 		}
-		elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')]))
-			$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 	}
 
 	$temp = build_query_board($user_info['id']);
@@ -821,9 +855,9 @@ 
 		}
 
 		// Remember redirection is the key to avoiding fallout from your bosses.
-		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
-		else
+		if (!empty($topic)) {
+					redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
+		} else
 		{
 			loadPermissions();
 			loadTheme();
@@ -841,10 +875,11 @@ 
 	if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 	{
 		// @todo SLOW?
-		if (!empty($topic))
-			$temp = cache_get_data('topic_board-' . $topic, 120);
-		else
-			$temp = cache_get_data('board-' . $board, 120);
+		if (!empty($topic)) {
+					$temp = cache_get_data('topic_board-' . $topic, 120);
+		} else {
+					$temp = cache_get_data('board-' . $board, 120);
+		}
 
 		if (!empty($temp))
 		{
@@ -882,8 +917,9 @@ 
 			$row = $smcFunc['db_fetch_assoc']($request);
 
 			// Set the current board.
-			if (!empty($row['id_board']))
-				$board = $row['id_board'];
+			if (!empty($row['id_board'])) {
+							$board = $row['id_board'];
+			}
 
 			// Basic operating information. (globals... :/)
 			$board_info = array(
@@ -919,21 +955,23 @@ 
 
 			do
 			{
-				if (!empty($row['id_moderator']))
-					$board_info['moderators'][$row['id_moderator']] = array(
+				if (!empty($row['id_moderator'])) {
+									$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>'
 					);
+				}
 
-				if (!empty($row['id_moderator_group']))
-					$board_info['moderator_groups'][$row['id_moderator_group']] = array(
+				if (!empty($row['id_moderator_group'])) {
+									$board_info['moderator_groups'][$row['id_moderator_group']] = array(
 						'id' => $row['id_moderator_group'],
 						'name' => $row['group_name'],
 						'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 						'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 					);
+				}
 			}
 			while ($row = $smcFunc['db_fetch_assoc']($request));
 
@@ -965,12 +1003,12 @@ 
 			if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 			{
 				// @todo SLOW?
-				if (!empty($topic))
-					cache_put_data('topic_board-' . $topic, $board_info, 120);
+				if (!empty($topic)) {
+									cache_put_data('topic_board-' . $topic, $board_info, 120);
+				}
 				cache_put_data('board-' . $board, $board_info, 120);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise the topic is invalid, there are no moderators, etc.
 			$board_info = array(
@@ -984,8 +1022,9 @@ 
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($topic))
-		$_GET['board'] = (int) $board;
+	if (!empty($topic)) {
+			$_GET['board'] = (int) $board;
+	}
 
 	if (!empty($board))
 	{
@@ -995,10 +1034,12 @@ 
 		// Now check if the user is a moderator.
 		$user_info['is_mod'] = isset($board_info['moderators'][$user_info['id']]) || count(array_intersect($user_info['groups'], $moderator_groups)) != 0;
 
-		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin'])
-			$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';
+		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin']) {
+					$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';
+		}
 
 		// Build up the linktree.
 		$context['linktree'] = array_merge(
@@ -1021,8 +1062,9 @@ 
 	$context['current_board'] = $board;
 
 	// No posting in redirection boards!
-	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect']))
-		$board_info['error'] == 'post_in_redirect';
+	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect'])) {
+			$board_info['error'] == 'post_in_redirect';
+	}
 
 	// Hacker... you can't see this topic, I'll tell you that. (but moderators can!)
 	if (!empty($board_info['error']) && (!empty($modSettings['deny_boards_access']) || $board_info['error'] != 'access' || !$user_info['is_mod']))
@@ -1048,24 +1090,23 @@ 
 			ob_end_clean();
 			send_http_status(403);
 			die;
-		}
-		elseif ($board_info['error'] == 'post_in_redirect')
+		} elseif ($board_info['error'] == 'post_in_redirect')
 		{
 			// Slightly different error message here...
 			fatal_lang_error('cannot_post_redirect', false);
-		}
-		elseif ($user_info['is_guest'])
+		} elseif ($user_info['is_guest'])
 		{
 			loadLanguage('Errors');
 			is_not_guest($txt['topic_gone']);
+		} else {
+					fatal_lang_error('topic_gone', false);
 		}
-		else
-			fatal_lang_error('topic_gone', false);
 	}
 
-	if ($user_info['is_mod'])
-		$user_info['groups'][] = 3;
-}
+	if ($user_info['is_mod']) {
+			$user_info['groups'][] = 3;
+	}
+	}
 
 /**
  * Load this user's permissions.
@@ -1086,8 +1127,9 @@ 
 		asort($cache_groups);
 		$cache_groups = implode(',', $cache_groups);
 		// If it's a spider then cache it different.
-		if ($user_info['possibly_robot'])
-			$cache_groups .= '-spider';
+		if ($user_info['possibly_robot']) {
+					$cache_groups .= '-spider';
+		}
 
 		if ($modSettings['cache_enable'] >= 2 && !empty($board) && ($temp = cache_get_data('permissions:' . $cache_groups . ':' . $board, 240)) != null && time() - 240 > $modSettings['settings_updated'])
 		{
@@ -1095,9 +1137,9 @@ 
 			banPermissions();
 
 			return;
+		} elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated']) {
+					list ($user_info['permissions'], $removals) = $temp;
 		}
-		elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated'])
-			list ($user_info['permissions'], $removals) = $temp;
 	}
 
 	// If it is detected as a robot, and we are restricting permissions as a special group - then implement this.
@@ -1119,23 +1161,26 @@ 
 		$removals = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (isset($cache_groups))
-			cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		if (isset($cache_groups)) {
+					cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		}
 	}
 
 	// Get the board permissions.
 	if (!empty($board))
 	{
 		// Make sure the board (if any) has been loaded by loadBoard().
-		if (!isset($board_info['profile']))
-			fatal_lang_error('no_board');
+		if (!isset($board_info['profile'])) {
+					fatal_lang_error('no_board');
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT permission, add_deny
@@ -1151,20 +1196,23 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['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);
+	if (!empty($modSettings['permission_enable_deny'])) {
+			$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	}
 
-	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2) {
+			cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	}
 
 	// Banned?  Watch, don't touch..
 	banPermissions();
@@ -1176,17 +1224,18 @@ 
 		{
 			require_once($sourcedir . '/Subs-Auth.php');
 			rebuildModCache();
+		} else {
+					$user_info['mod_cache'] = $_SESSION['mc'];
 		}
-		else
-			$user_info['mod_cache'] = $_SESSION['mc'];
 
 		// This is a useful phantom permission added to the current user, and only the current user while they are logged in.
 		// For example this drastically simplifies certain changes to the profile area.
 		$user_info['permissions'][] = 'is_not_guest';
 		// And now some backwards compatibility stuff for mods and whatnot that aren't expecting the new permissions.
 		$user_info['permissions'][] = 'profile_view_own';
-		if (in_array('profile_view', $user_info['permissions']))
-			$user_info['permissions'][] = 'profile_view_any';
+		if (in_array('profile_view', $user_info['permissions'])) {
+					$user_info['permissions'][] = 'profile_view_any';
+		}
 	}
 }
 
@@ -1204,8 +1253,9 @@ 
 	global $image_proxy_enabled, $user_info;
 
 	// Can't just look for no users :P.
-	if (empty($users))
-		return array();
+	if (empty($users)) {
+			return array();
+	}
 
 	// Pass the set value
 	$context['loadMemberContext_set'] = $set;
@@ -1220,8 +1270,9 @@ 
 		for ($i = 0, $n = count($users); $i < $n; $i++)
 		{
 			$data = cache_get_data('member_data-' . $set . '-' . $users[$i], 240);
-			if ($data == null)
-				continue;
+			if ($data == null) {
+							continue;
+			}
 
 			$loaded_ids[] = $data['id_member'];
 			$user_profile[$data['id_member']] = $data;
@@ -1288,16 +1339,19 @@ 
 			$row['avatar_original'] = !empty($row['avatar']) ? $row['avatar'] : '';
 
 			// Take care of proxying avatar if required, do this here for maximum reach
-			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
-				$row['avatar'] = get_proxied_url($row['avatar']);
+			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
+							$row['avatar'] = get_proxied_url($row['avatar']);
+			}
 
 			// Keep track of the member's normal member group
 			$row['primary_group'] = !empty($row['member_group']) ? $row['member_group'] : '';
 
-			if (isset($row['member_ip']))
-				$row['member_ip'] = inet_dtop($row['member_ip']);
-			if (isset($row['member_ip2']))
-				$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			if (isset($row['member_ip'])) {
+							$row['member_ip'] = inet_dtop($row['member_ip']);
+			}
+			if (isset($row['member_ip2'])) {
+							$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			}
 			$row['id_member'] = (int) $row['id_member'];
 			$new_loaded_ids[] = $row['id_member'];
 			$loaded_ids[] = $row['id_member'];
@@ -1317,8 +1371,9 @@ 
 				'loaded_ids' => $new_loaded_ids,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1329,10 +1384,11 @@ 
 	{
 		foreach ($loaded_ids as $a_member)
 		{
-			if (!empty($user_profile[$a_member]['additional_groups']))
-				$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
-			else
-				$groups = array($user_profile[$a_member]['id_group']);
+			if (!empty($user_profile[$a_member]['additional_groups'])) {
+							$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
+			} else {
+							$groups = array($user_profile[$a_member]['id_group']);
+			}
 
 			$temp = array_intersect($groups, array_keys($board_info['moderator_groups']));
 
@@ -1345,8 +1401,9 @@ 
 
 	if (!empty($new_loaded_ids) && !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
 	{
-		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++)
-			cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++) {
+					cache_put_data('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...
@@ -1372,14 +1429,17 @@ 
 		foreach ($temp_mods as $id)
 		{
 			// 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'] = $row['member_group'];
+			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2) {
+							$user_profile[$id]['member_group'] = $row['member_group'];
+			}
 
 			// If the Moderator group has no color or icons, but their group does... don't overwrite.
-			if (!empty($row['icons']))
-				$user_profile[$id]['icons'] = $row['icons'];
-			if (!empty($row['member_group_color']))
-				$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			if (!empty($row['icons'])) {
+							$user_profile[$id]['icons'] = $row['icons'];
+			}
+			if (!empty($row['member_group_color'])) {
+							$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			}
 		}
 	}
 
@@ -1401,12 +1461,14 @@ 
 	static $loadedLanguages = array();
 
 	// If this person's data is already loaded, skip it.
-	if (isset($dataLoaded[$user]))
-		return true;
+	if (isset($dataLoaded[$user])) {
+			return true;
+	}
 
 	// We can't load guests or members not loaded by loadMemberData()!
-	if ($user == 0)
-		return false;
+	if ($user == 0) {
+			return false;
+	}
 	if (!isset($user_profile[$user]))
 	{
 		trigger_error('loadMemberContext(): member id ' . $user . ' not previously loaded by loadMemberData()', E_USER_WARNING);
@@ -1432,12 +1494,16 @@ 
 	$buddy_list = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
 
 	//We need a little fallback for the membergroup icons. If it doesn't exist in the current theme, fallback to default theme
-	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) //icon is set and exists
+	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) {
+		//icon is set and exists
 		$group_icon_url = $settings['images_url'] . '/membericons/' . $profile['icons'][1];
-	elseif (isset($profile['icons'][1])) //icon is set and doesn't exist, fallback to default
+	} elseif (isset($profile['icons'][1])) {
+		//icon is set and doesn't exist, fallback to default
 		$group_icon_url = $settings['default_images_url'] . '/membericons/' . $profile['icons'][1];
-	else //not set, bye bye
+	} else {
+		//not set, bye bye
 		$group_icon_url = '';
+	}
 
 	// These minimal values are always loaded
 	$memberContext[$user] = array(
@@ -1456,8 +1522,9 @@ 
 	if ($context['loadMemberContext_set'] != 'minimal')
 	{
 		// Go the extra mile and load the user's native language name.
-		if (empty($loadedLanguages))
-			$loadedLanguages = getLanguages();
+		if (empty($loadedLanguages)) {
+					$loadedLanguages = getLanguages();
+		}
 
 		$memberContext[$user] += array(
 			'username_color' => '<span ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['member_name'] . '</span>',
@@ -1512,31 +1579,33 @@ 
 	{
 		if (!empty($modSettings['gravatarOverride']) || (!empty($modSettings['gravatarEnabled']) && stristr($profile['avatar'], 'gravatar://')))
 		{
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11)
-				$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
-			else
-				$image = get_gravatar_url($profile['email_address']);
-		}
-		else
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11) {
+							$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
+			} else {
+							$image = get_gravatar_url($profile['email_address']);
+			}
+		} else
 		{
 			// So it's stored in the member table?
 			if (!empty($profile['avatar']))
 			{
 				$image = (stristr($profile['avatar'], 'http://') || stristr($profile['avatar'], 'https://')) ? $profile['avatar'] : $modSettings['avatar_url'] . '/' . $profile['avatar'];
+			} elseif (!empty($profile['filename'])) {
+							$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			}
-			elseif (!empty($profile['filename']))
-				$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			// Right... no avatar...use the default one
-			else
-				$image = $modSettings['avatar_url'] . '/default.png';
+			else {
+							$image = $modSettings['avatar_url'] . '/default.png';
+			}
 		}
-		if (!empty($image))
-			$memberContext[$user]['avatar'] = array(
+		if (!empty($image)) {
+					$memberContext[$user]['avatar'] = array(
 				'name' => $profile['avatar'],
 				'image' => '<img class="avatar" src="' . $image . '" alt="avatar_' . $profile['member_name'] . '">',
 				'href' => $image,
 				'url' => $image,
 			);
+		}
 	}
 
 	// Are we also loading the members custom fields into context?
@@ -1544,13 +1613,15 @@ 
 	{
 		$memberContext[$user]['custom_fields'] = array();
 
-		if (!isset($context['display_fields']))
-			$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
+		if (!isset($context['display_fields'])) {
+					$context['display_fields'] = $smcFunc['json_decode']($modSettings['displayFields'], true);
+		}
 
 		foreach ($context['display_fields'] as $custom)
 		{
-			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']]))
-				continue;
+			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']])) {
+							continue;
+			}
 
 			$value = $profile['options'][$custom['col_name']];
 
@@ -1558,31 +1629,36 @@ 
 			$currentKey = 0;
 
 			// Create a key => value array for multiple options fields
-			if (!empty($custom['options']))
-				foreach ($custom['options'] as $k => $v)
+			if (!empty($custom['options'])) {
+							foreach ($custom['options'] as $k => $v)
 				{
 					$fieldOptions[] = $v;
-					if (empty($currentKey))
-						$currentKey = $v == $value ? $k : 0;
+			}
+					if (empty($currentKey)) {
+											$currentKey = $v == $value ? $k : 0;
+					}
 				}
 
 			// BBC?
-			if ($custom['bbc'])
-				$value = parse_bbc($value);
+			if ($custom['bbc']) {
+							$value = parse_bbc($value);
+			}
 
 			// ... or checkbox?
-			elseif (isset($custom['type']) && $custom['type'] == 'check')
-				$value = $value ? $txt['yes'] : $txt['no'];
+			elseif (isset($custom['type']) && $custom['type'] == 'check') {
+							$value = $value ? $txt['yes'] : $txt['no'];
+			}
 
 			// Enclosing the user input within some other text?
-			if (!empty($custom['enclose']))
-				$value = strtr($custom['enclose'], array(
+			if (!empty($custom['enclose'])) {
+							$value = strtr($custom['enclose'], array(
 					'{SCRIPTURL}' => $scripturl,
 					'{IMAGES_URL}' => $settings['images_url'],
 					'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 					'{INPUT}' => $value,
 					'{KEY}' => $currentKey,
 				));
+			}
 
 			$memberContext[$user]['custom_fields'][] = array(
 				'title' => !empty($custom['title']) ? $custom['title'] : $custom['col_name'],
@@ -1609,8 +1685,9 @@ 
 	global $smcFunc, $txt, $scripturl, $settings;
 
 	// Do not waste my time...
-	if (empty($users) || empty($params))
-		return false;
+	if (empty($users) || empty($params)) {
+			return false;
+	}
 
 	// Make sure it's an array.
 	$users = !is_array($users) ? array($users) : array_unique($users);
@@ -1637,41 +1714,48 @@ 
 		$currentKey = 0;
 
 		// Create a key => value array for multiple options fields
-		if (!empty($row['field_options']))
-			foreach (explode(',', $row['field_options']) as $k => $v)
+		if (!empty($row['field_options'])) {
+					foreach (explode(',', $row['field_options']) as $k => $v)
 			{
 				$fieldOptions[] = $v;
-				if (empty($currentKey))
-					$currentKey = $v == $row['value'] ? $k : 0;
+		}
+				if (empty($currentKey)) {
+									$currentKey = $v == $row['value'] ? $k : 0;
+				}
 			}
 
 		// BBC?
-		if (!empty($row['bbc']))
-			$row['value'] = parse_bbc($row['value']);
+		if (!empty($row['bbc'])) {
+					$row['value'] = parse_bbc($row['value']);
+		}
 
 		// ... or checkbox?
-		elseif (isset($row['type']) && $row['type'] == 'check')
-			$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		elseif (isset($row['type']) && $row['type'] == 'check') {
+					$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']))
-			$row['value'] = strtr($row['enclose'], array(
+		if (!empty($row['enclose'])) {
+					$row['value'] = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($row['value']),
 				'{KEY}' => $currentKey,
 			));
+		}
 
 		// Send a simple array if there is just 1 param
-		if (count($params) == 1)
-			$return[$row['id_member']] = $row;
+		if (count($params) == 1) {
+					$return[$row['id_member']] = $row;
+		}
 
 		// More than 1? knock yourself out...
 		else
 		{
-			if (!isset($return[$row['id_member']]))
-				$return[$row['id_member']] = array();
+			if (!isset($return[$row['id_member']])) {
+							$return[$row['id_member']] = array();
+			}
 
 			$return[$row['id_member']][$row['variable']] = $row;
 		}
@@ -1705,8 +1789,9 @@ 
 	global $context;
 
 	// Don't know any browser!
-	if (empty($context['browser']))
-		detectBrowser();
+	if (empty($context['browser'])) {
+			detectBrowser();
+	}
 
 	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_' . $browser]) ? true : false;
 }
@@ -1724,8 +1809,9 @@ 
 	global $context, $settings, $options, $sourcedir, $ssi_theme, $smcFunc, $language, $board, $image_proxy_enabled;
 
 	// The theme was specified by parameter.
-	if (!empty($id_theme))
-		$id_theme = (int) $id_theme;
+	if (!empty($id_theme)) {
+			$id_theme = (int) $id_theme;
+	}
 	// The theme was specified by REQUEST.
 	elseif (!empty($_REQUEST['theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
 	{
@@ -1733,32 +1819,38 @@ 
 		$_SESSION['id_theme'] = $id_theme;
 	}
 	// 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'];
+	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum'))) {
+			$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']))
-		$id_theme = $user_info['theme'];
+	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme'])) {
+			$id_theme = $user_info['theme'];
+	}
 	// The theme was specified by the board.
-	elseif (!empty($board_info['theme']))
-		$id_theme = $board_info['theme'];
+	elseif (!empty($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'];
+	}
 
 	// 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'];
+	if (!empty($board_info['theme']) && $board_info['override_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;
-	elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
+	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme) {
+			$id_theme = (int) $id_theme;
+	} elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
 	{
 		$themes = explode(',', $modSettings['enableThemes']);
-		if (!in_array($id_theme, $themes))
-			$id_theme = $modSettings['theme_guests'];
-		else
-			$id_theme = (int) $id_theme;
+		if (!in_array($id_theme, $themes)) {
+					$id_theme = $modSettings['theme_guests'];
+		} else {
+					$id_theme = (int) $id_theme;
+		}
 	}
 		
 	// We already load the basic stuff?
@@ -1767,18 +1859,19 @@ 
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
 
 		// Disable image proxy if we don't have SSL enabled
-		if (empty($modSettings['force_ssl']))
-			$image_proxy_enabled = false;
+		if (empty($modSettings['force_ssl'])) {
+					$image_proxy_enabled = false;
+		}
 
 		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && ($temp = cache_get_data('theme_settings-' . $id_theme . ':' . $member, 60)) != null && time() - 60 > $modSettings['settings_updated'])
 		{
 			$themeData = $temp;
 			$flag = true;
+		} elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated']) {
+					$themeData = $temp + array($member => array());
+		} else {
+					$themeData = array(-1 => array(), 0 => array(), $member => array());
 		}
-		elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated'])
-			$themeData = $temp + array($member => array());
-		else
-			$themeData = array(-1 => array(), 0 => array(), $member => array());
 
 		if (empty($flag))
 		{
@@ -1798,31 +1891,37 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				// There are just things we shouldn't be able to change as members.
-				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url')))
-					continue;
+				if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url'))) {
+									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'];
+				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'];
+				}
 
 				// 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'];
+				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'];
+				}
 			}
 			$smcFunc['db_free_result']($result);
 
-			if (!empty($themeData[-1]))
-				foreach ($themeData[-1] as $k => $v)
+			if (!empty($themeData[-1])) {
+							foreach ($themeData[-1] as $k => $v)
 				{
 					if (!isset($themeData[$member][$k]))
 						$themeData[$member][$k] = $v;
+			}
 				}
 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+							cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+			}
 			// Only if we didn't already load that part of the cache...
-			elseif (!isset($temp))
-				cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+			elseif (!isset($temp)) {
+							cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+			}
 		}
 
 		$settings = $themeData[0];
@@ -1839,17 +1938,20 @@ 
 		$settings['template_dirs'][] = $settings['theme_dir'];
 
 		// Based on theme (if there is one).
-		if (!empty($settings['base_theme_dir']))
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
+		if (!empty($settings['base_theme_dir'])) {
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
+		}
 	}
 
 
-	if (!$initialize)
-		return;
+	if (!$initialize) {
+			return;
+	}
 
 	// Check to see if we're forcing SSL
 	if (!empty($modSettings['force_ssl']) && empty($maintenance) &&
@@ -1870,8 +1972,9 @@ 
 		$detected_url = httpsOn() ? 'https://' : 'http://';
 		$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;
+		if ($temp != '/') {
+					$detected_url .= $temp;
+		}
 	}
 	if (isset($detected_url) && $detected_url != $boardurl)
 	{
@@ -1883,8 +1986,9 @@ 
 			foreach ($aliases as $alias)
 			{
 				// Rip off all the boring parts, spaces, etc.
-				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias))
-					$do_fix = true;
+				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias)) {
+									$do_fix = true;
+				}
 			}
 		}
 
@@ -1892,21 +1996,23 @@ 
 		if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == $boardurl && (empty($_GET) || count($_GET) == 1) && SMF != 'SSI')
 		{
 			// Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;).
-			if (empty($_GET))
-				redirectexit('wwwRedirect');
-			else
+			if (empty($_GET)) {
+							redirectexit('wwwRedirect');
+			} else
 			{
 				$k = key($_GET);
 				$v = current($_GET);
 
-				if ($k != 'wwwRedirect')
-					redirectexit('wwwRedirect;' . $k . '=' . $v);
+				if ($k != 'wwwRedirect') {
+									redirectexit('wwwRedirect;' . $k . '=' . $v);
+				}
 			}
 		}
 
 		// #3 is just a check for SSL...
-		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl)
-			$do_fix = true;
+		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl) {
+					$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)
@@ -1941,8 +2047,9 @@ 
 					$board_info['moderators'][$k]['link'] = strtr($dummy['link'], array('"' . $oldurl => '"' . $boardurl));
 				}
 			}
-			foreach ($context['linktree'] as $k => $dummy)
-				$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			foreach ($context['linktree'] as $k => $dummy) {
+							$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			}
 		}
 	}
 	// Set up the contextual user array.
@@ -1961,16 +2068,16 @@ 
 			'email' => $user_info['email'],
 			'ignoreusers' => $user_info['ignoreusers'],
 		);
-		if (!$context['user']['is_guest'])
-			$context['user']['name'] = $user_info['name'];
-		elseif ($context['user']['is_guest'] && !empty($txt['guest_title']))
-			$context['user']['name'] = $txt['guest_title'];
+		if (!$context['user']['is_guest']) {
+					$context['user']['name'] = $user_info['name'];
+		} elseif ($context['user']['is_guest'] && !empty($txt['guest_title'])) {
+					$context['user']['name'] = $txt['guest_title'];
+		}
 
 		// Determine the current smiley set.
 		$user_info['smiley_set'] = (!in_array($user_info['smiley_set'], explode(',', $modSettings['smiley_sets_known'])) && $user_info['smiley_set'] != 'none') || empty($modSettings['smiley_sets_enable']) ? (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default']) : $user_info['smiley_set'];
 		$context['user']['smiley_set'] = $user_info['smiley_set'];
-	}
-	else
+	} else
 	{
 		// What to do when there is no $user_info (e.g., an error very early in the login process)
 		$context['user'] = array(
@@ -2004,18 +2111,24 @@ 
 	}
 
 	// Some basic information...
-	if (!isset($context['html_headers']))
-		$context['html_headers'] = '';
-	if (!isset($context['javascript_files']))
-		$context['javascript_files'] = array();
-	if (!isset($context['css_files']))
-		$context['css_files'] = array();
-	if (!isset($context['css_header']))
-		$context['css_header'] = array();
-	if (!isset($context['javascript_inline']))
-		$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
-	if (!isset($context['javascript_vars']))
-		$context['javascript_vars'] = array();
+	if (!isset($context['html_headers'])) {
+			$context['html_headers'] = '';
+	}
+	if (!isset($context['javascript_files'])) {
+			$context['javascript_files'] = array();
+	}
+	if (!isset($context['css_files'])) {
+			$context['css_files'] = array();
+	}
+	if (!isset($context['css_header'])) {
+			$context['css_header'] = array();
+	}
+	if (!isset($context['javascript_inline'])) {
+			$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
+	}
+	if (!isset($context['javascript_vars'])) {
+			$context['javascript_vars'] = array();
+	}
 
 	$context['login_url'] =  $scripturl . '?action=login2';
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
@@ -2027,16 +2140,18 @@ 
 	$context['current_action'] = isset($_REQUEST['action']) ? $smcFunc['htmlspecialchars']($_REQUEST['action']) : null;
 	$context['current_subaction'] = isset($_REQUEST['sa']) ? $_REQUEST['sa'] : null;
 	$context['can_register'] = empty($modSettings['registration_method']) || $modSettings['registration_method'] != 3;
-	if (isset($modSettings['load_average']))
-		$context['load_average'] = $modSettings['load_average'];
+	if (isset($modSettings['load_average'])) {
+			$context['load_average'] = $modSettings['load_average'];
+	}
 
 	// Detect the browser. This is separated out because it's also used in attachment downloads
 	detectBrowser();
 
 	// Set the top level linktree up.
 	// Note that if we're dealing with certain very early errors (e.g., login) the linktree might not be set yet...
-	if (empty($context['linktree']))
-		$context['linktree'] = array();
+	if (empty($context['linktree'])) {
+			$context['linktree'] = array();
+	}
 	array_unshift($context['linktree'], array(
 		'url' => $scripturl,
 		'name' => $context['forum_name_html_safe']
@@ -2045,8 +2160,9 @@ 
 	// This allows sticking some HTML on the page output - useful for controls.
 	$context['insert_after_template'] = '';
 
-	if (!isset($txt))
-		$txt = array();
+	if (!isset($txt)) {
+			$txt = array();
+	}
 
 	$simpleActions = array(
 		'findmember',
@@ -2092,9 +2208,10 @@ 
 
 	// See if theres any extra param to check.
 	$requiresXML = false;
-	foreach ($extraParams as $key => $extra)
-		if (isset($_REQUEST[$extra]))
+	foreach ($extraParams as $key => $extra) {
+			if (isset($_REQUEST[$extra]))
 			$requiresXML = true;
+	}
 
 	// Output is fully XML, so no need for the index template.
 	if (isset($_REQUEST['xml']) && (in_array($context['current_action'], $xmlActions) || $requiresXML))
@@ -2109,37 +2226,39 @@ 
 	{
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
-	}
-
-	else
+	} else
 	{
 		// Custom templates to load, or just default?
-		if (isset($settings['theme_templates']))
-			$templates = explode(',', $settings['theme_templates']);
-		else
-			$templates = array('index');
+		if (isset($settings['theme_templates'])) {
+					$templates = explode(',', $settings['theme_templates']);
+		} else {
+					$templates = array('index');
+		}
 
 		// Load each template...
-		foreach ($templates as $template)
-			loadTemplate($template);
+		foreach ($templates as $template) {
+					loadTemplate($template);
+		}
 
 		// ...and attempt to load their associated language files.
 		$required_files = implode('+', array_merge($templates, array('Modifications')));
 		loadLanguage($required_files, '', false);
 
 		// Custom template layers?
-		if (isset($settings['theme_layers']))
-			$context['template_layers'] = explode(',', $settings['theme_layers']);
-		else
-			$context['template_layers'] = array('html', 'body');
+		if (isset($settings['theme_layers'])) {
+					$context['template_layers'] = explode(',', $settings['theme_layers']);
+		} else {
+					$context['template_layers'] = array('html', 'body');
+		}
 	}
 
 	// Initialize the theme.
 	loadSubTemplate('init', 'ignore');
 
 	// 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'];
+	if (empty($user_settings['time_format']) && !empty($txt['time_format'])) {
+			$user_info['time_format'] = $txt['time_format'];
+	}
 
 	// Set the character set from the template.
 	$context['character_set'] = empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set'];
@@ -2147,12 +2266,14 @@ 
 	$context['right_to_left'] = !empty($txt['lang_rtl']);
 
 	// Guests may still need a name.
-	if ($context['user']['is_guest'] && empty($context['user']['name']))
-		$context['user']['name'] = $txt['guest_title'];
+	if ($context['user']['is_guest'] && empty($context['user']['name'])) {
+			$context['user']['name'] = $txt['guest_title'];
+	}
 
 	// Any theme-related strings that need to be loaded?
-	if (!empty($settings['require_theme_strings']))
-		loadLanguage('ThemeStrings', '', false);
+	if (!empty($settings['require_theme_strings'])) {
+			loadLanguage('ThemeStrings', '', false);
+	}
 
 	// Make a special URL for the language.
 	$settings['lang_images_url'] = $settings['images_url'] . '/' . (!empty($txt['image_lang']) ? $txt['image_lang'] : $user_info['language']);
@@ -2163,8 +2284,9 @@ 
 	// Here is my luvly Responsive CSS
 	loadCSSFile('responsive.css', array('force_current' => false, 'validate' => true, 'minimize' => true, 'order_pos' => 9000), 'smf_responsive');
 
-	if ($context['right_to_left'])
-		loadCSSFile('rtl.css', array('order_pos' => 200), 'smf_rtl');
+	if ($context['right_to_left']) {
+			loadCSSFile('rtl.css', array('order_pos' => 200), 'smf_rtl');
+	}
 
 	// We allow theme variants, because we're cool.
 	$context['theme_variant'] = '';
@@ -2172,14 +2294,17 @@ 
 	if (!empty($settings['theme_variants']))
 	{
 		// Overriding - for previews and that ilk.
-		if (!empty($_REQUEST['variant']))
-			$_SESSION['id_variant'] = $_REQUEST['variant'];
+		if (!empty($_REQUEST['variant'])) {
+					$_SESSION['id_variant'] = $_REQUEST['variant'];
+		}
 		// User selection?
-		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum'))
-			$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum')) {
+					$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		}
 		// If not a user variant, select the default.
-		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants']))
-			$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants'])) {
+					$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		}
 
 		// Do this to keep things easier in the templates.
 		$context['theme_variant'] = '_' . $context['theme_variant'];
@@ -2188,20 +2313,23 @@ 
 		if (!empty($context['theme_variant']))
 		{
 			loadCSSFile('index' . $context['theme_variant'] . '.css', array('order_pos' => 300), 'smf_index' . $context['theme_variant']);
-			if ($context['right_to_left'])
-				loadCSSFile('rtl' . $context['theme_variant'] . '.css', array('order_pos' => 400), 'smf_rtl' . $context['theme_variant']);
+			if ($context['right_to_left']) {
+							loadCSSFile('rtl' . $context['theme_variant'] . '.css', array('order_pos' => 400), 'smf_rtl' . $context['theme_variant']);
+			}
 		}
 	}
 
 	// Let's be compatible with old themes!
-	if (!function_exists('template_html_above') && in_array('html', $context['template_layers']))
-		$context['template_layers'] = array('main');
+	if (!function_exists('template_html_above') && in_array('html', $context['template_layers'])) {
+			$context['template_layers'] = array('main');
+	}
 
 	$context['tabindex'] = 1;
 
 	// Compatibility.
-	if (!isset($settings['theme_version']))
-		$modSettings['memberCount'] = $modSettings['totalMembers'];
+	if (!isset($settings['theme_version'])) {
+			$modSettings['memberCount'] = $modSettings['totalMembers'];
+	}
 
 	// Default JS variables for use in every theme
 	$context['javascript_vars'] = array(
@@ -2222,18 +2350,18 @@ 
 	);
 
 	// Add the JQuery library to the list of files to load.
-	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn')
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local')
-		loadJavaScriptFile('jquery-3.2.1.min.js', array('seed' => false), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom')
-		loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
+	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn') {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local') {
+			loadJavaScriptFile('jquery-3.2.1.min.js', array('seed' => false), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom') {
+			loadJavaScriptFile($modSettings['jquery_custom'], array('external' => true), 'smf_jquery');
+	}
 
 	// Auto loading? template_javascript() will take care of the local half of this.
-	else
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	else {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js', array('external' => true), 'smf_jquery');
+	}
 
 	// Queue our JQuery plugins!
 	loadJavaScriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
@@ -2256,12 +2384,12 @@ 
 			require_once($sourcedir . '/ScheduledTasks.php');
 
 			// What to do, what to do?!
-			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time())
-				AutoTask();
-			else
-				ReduceMailQueue();
-		}
-		else
+			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time()) {
+							AutoTask();
+			} else {
+							ReduceMailQueue();
+			}
+		} else
 		{
 			$type = empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time() ? 'task' : 'mailq';
 			$ts = $type == 'mailq' ? $modSettings['mail_next_send'] : $modSettings['next_task_time'];
@@ -2312,8 +2440,9 @@ 
 		foreach ($theme_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -2343,16 +2472,19 @@ 
 	// Do any style sheets first, cause we're easy with those.
 	if (!empty($style_sheets))
 	{
-		if (!is_array($style_sheets))
-			$style_sheets = array($style_sheets);
+		if (!is_array($style_sheets)) {
+					$style_sheets = array($style_sheets);
+		}
 
-		foreach ($style_sheets as $sheet)
-			loadCSSFile($sheet . '.css', array(), $sheet);
+		foreach ($style_sheets as $sheet) {
+					loadCSSFile($sheet . '.css', array(), $sheet);
+		}
 	}
 
 	// No template to load?
-	if ($template_name === false)
-		return true;
+	if ($template_name === false) {
+			return true;
+	}
 
 	$loaded = false;
 	foreach ($settings['template_dirs'] as $template_dir)
@@ -2367,12 +2499,14 @@ 
 
 	if ($loaded)
 	{
-		if ($db_show_debug === true)
-			$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		if ($db_show_debug === true) {
+					$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		}
 
 		// If they have specified an initialization function for this template, go ahead and call it now.
-		if (function_exists('template_' . $template_name . '_init'))
-			call_user_func('template_' . $template_name . '_init');
+		if (function_exists('template_' . $template_name . '_init')) {
+					call_user_func('template_' . $template_name . '_init');
+		}
 	}
 	// Hmmm... doesn't exist?!  I don't suppose the directory is wrong, is it?
 	elseif (!file_exists($settings['default_theme_dir']) && file_exists($boarddir . '/Themes/default'))
@@ -2392,13 +2526,14 @@ 
 		loadTemplate($template_name);
 	}
 	// Cause an error otherwise.
-	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal)
-		fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
-	elseif ($fatal)
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
-	else
-		return false;
-}
+	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
+	} elseif ($fatal) {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Load a sub-template.
@@ -2416,17 +2551,19 @@ 
 {
 	global $context, $txt, $db_show_debug;
 
-	if ($db_show_debug === true)
-		$context['debug']['sub_templates'][] = $sub_template_name;
+	if ($db_show_debug === true) {
+			$context['debug']['sub_templates'][] = $sub_template_name;
+	}
 
 	// Figure out what the template function is named.
 	$theme_function = 'template_' . $sub_template_name;
-	if (function_exists($theme_function))
-		$theme_function();
-	elseif ($fatal === false)
-		fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
-	elseif ($fatal !== 'ignore')
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	if (function_exists($theme_function)) {
+			$theme_function();
+	} elseif ($fatal === false) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
+	} elseif ($fatal !== 'ignore') {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	}
 
 	// Are we showing debugging for templates?  Just make sure not to do it before the doctype...
 	if (allowedTo('admin_forum') && isset($_REQUEST['debug']) && !in_array($sub_template_name, array('init', 'main_below')) && ob_get_length() > 0 && !isset($_REQUEST['xml']))
@@ -2456,8 +2593,9 @@ 
 {
 	global $settings, $context, $modSettings;
 
-	if (empty($context['css_files_order']))
-		$context['css_files_order'] = array();
+	if (empty($context['css_files_order'])) {
+			$context['css_files_order'] = array();
+	}
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? (array_key_exists('browser_cache', $modSettings) ? $modSettings['browser_cache'] : '') : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
@@ -2468,8 +2606,9 @@ 
 	$params['order_pos'] = isset($params['order_pos']) ? (int) $params['order_pos'] : 3000;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.css?alp21 filenames
 	$has_seed = strpos($fileName, '.css?');
@@ -2486,16 +2625,12 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
-			}
-
-			else
+			} else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2513,16 +2648,18 @@ 
 	if (!empty($fileName))
 	{
 		// find a free number/position
-		while (isset($context['css_files_order'][$params['order_pos']]))
-			$params['order_pos']++;
+		while (isset($context['css_files_order'][$params['order_pos']])) {
+					$params['order_pos']++;
+		}
 		$context['css_files_order'][$params['order_pos']] = $id;
 
 		$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
 	}
 
-	if (!empty($context['right_to_left']) && !empty($params['rtl']))
-		loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
-}
+	if (!empty($context['right_to_left']) && !empty($params['rtl'])) {
+			loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
+	}
+	}
 
 /**
  * Add a block of inline css code to be executed later
@@ -2539,8 +2676,9 @@ 
 	global $context;
 
 	// Gotta add something...
-	if (empty($css))
-		return false;
+	if (empty($css)) {
+			return false;
+	}
 
 	$context['css_header'][] = $css;
 }
@@ -2576,8 +2714,9 @@ 
 	$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.js?alp21 filenames
 	$has_seed = strpos($fileName, '.js?');
@@ -2594,16 +2733,12 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
-			}
-
-			else
+			} else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2618,9 +2753,10 @@ 
 	}
 
 	// Add it to the array for use in the template
-	if (!empty($fileName))
-		$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
-}
+	if (!empty($fileName)) {
+			$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	}
+	}
 
 /**
  * Add a Javascript variable for output later (for feeding text strings and similar to JS)
@@ -2634,9 +2770,10 @@ 
 {
 	global $context;
 
-	if (!empty($key) && (!empty($value) || $value === '0'))
-		$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
-}
+	if (!empty($key) && (!empty($value) || $value === '0')) {
+			$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
+	}
+	}
 
 /**
  * Add a block of inline Javascript code to be executed later
@@ -2653,8 +2790,9 @@ 
 {
 	global $context;
 
-	if (empty($javascript))
-		return false;
+	if (empty($javascript)) {
+			return false;
+	}
 
 	$context['javascript_inline'][($defer === true ? 'defer' : 'standard')][] = $javascript;
 }
@@ -2675,15 +2813,18 @@ 
 	static $already_loaded = array();
 
 	// Default to the user's language.
-	if ($lang == '')
-		$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	if ($lang == '') {
+			$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	}
 
 	// Do we want the English version of language file as fallback?
-	if (empty($modSettings['disable_language_fallback']) && $lang != 'english')
-		loadLanguage($template_name, 'english', false);
+	if (empty($modSettings['disable_language_fallback']) && $lang != 'english') {
+			loadLanguage($template_name, 'english', false);
+	}
 
-	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang)
-		return $lang;
+	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang) {
+			return $lang;
+	}
 
 	// Make sure we have $settings - if not we're in trouble and need to find it!
 	if (empty($settings['default_theme_dir']))
@@ -2694,8 +2835,9 @@ 
 
 	// What theme are we in?
 	$theme_name = basename($settings['theme_url']);
-	if (empty($theme_name))
-		$theme_name = 'unknown';
+	if (empty($theme_name)) {
+			$theme_name = 'unknown';
+	}
 
 	// For each file open it up and write it out!
 	foreach (explode('+', $template_name) as $template)
@@ -2737,8 +2879,9 @@ 
 				$found = true;
 
 				// setlocale is required for basename() & pathinfo() to work properly on the selected language
-				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set']))
-					setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
+				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set'])) {
+									setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
+				}
 
 				break;
 			}
@@ -2778,8 +2921,9 @@ 
 	}
 
 	// Keep track of what we're up to soldier.
-	if ($db_show_debug === true)
-		$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	if ($db_show_debug === true) {
+			$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	}
 
 	// Remember what we have loaded, and in which language.
 	$already_loaded[$template_name] = $lang;
@@ -2825,8 +2969,9 @@ 
 				)
 			);
 			// In the EXTREMELY unlikely event this happens, give an error message.
-			if ($smcFunc['db_num_rows']($result) == 0)
-				fatal_lang_error('parent_not_found', 'critical');
+			if ($smcFunc['db_num_rows']($result) == 0) {
+							fatal_lang_error('parent_not_found', 'critical');
+			}
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				if (!isset($boards[$row['id_board']]))
@@ -2843,8 +2988,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)
+				if (!empty($row['id_moderator'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderators'][$row['id_moderator']] = array(
 							'id' => $row['id_moderator'],
@@ -2852,11 +2997,12 @@ 
 							'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 							'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 						);
+				}
 					}
 
 				// If a moderator group exists for this board, add that moderator group for all children too
-				if (!empty($row['id_moderator_group']))
-					foreach ($boards as $id => $dummy)
+				if (!empty($row['id_moderator_group'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderator_groups'][$row['id_moderator_group']] = array(
 							'id' => $row['id_moderator_group'],
@@ -2864,6 +3010,7 @@ 
 							'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 							'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 						);
+				}
 					}
 			}
 			$smcFunc['db_free_result']($result);
@@ -2890,23 +3037,27 @@ 
 	if (!$use_cache || ($context['languages'] = cache_get_data('known_languages', !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600)) == null)
 	{
 		// If we don't have our ucwords function defined yet, let's load the settings data.
-		if (empty($smcFunc['ucwords']))
-			reloadSettings();
+		if (empty($smcFunc['ucwords'])) {
+					reloadSettings();
+		}
 
 		// If we don't have our theme information yet, let's get it.
-		if (empty($settings['default_theme_dir']))
-			loadTheme(0, false);
+		if (empty($settings['default_theme_dir'])) {
+					loadTheme(0, false);
+		}
 
 		// Default language directories to try.
 		$language_directories = array(
 			$settings['default_theme_dir'] . '/languages',
 		);
-		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir'])
-			$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir']) {
+					$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		}
 
 		// We possibly have a base theme directory.
-		if (!empty($settings['base_theme_dir']))
-			$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		if (!empty($settings['base_theme_dir'])) {
+					$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		}
 
 		// Remove any duplicates.
 		$language_directories = array_unique($language_directories);
@@ -2920,20 +3071,21 @@ 
 		foreach ($language_directories as $language_dir)
 		{
 			// Can't look in here... doesn't exist!
-			if (!file_exists($language_dir))
-				continue;
+			if (!file_exists($language_dir)) {
+							continue;
+			}
 
 			$dir = dir($language_dir);
 			while ($entry = $dir->read())
 			{
 				// Look for the index language file... For good measure skip any "index.language-utf8.php" files
-				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches))
-					continue;
-
-				if (!empty($langList) && !empty($langList[$matches[1]]))
-					$langName = $langList[$matches[1]];
+				if (!preg_match('~^index\.(.+[^-utf8])\.php$~', $entry, $matches)) {
+									continue;
+				}
 
-				else
+				if (!empty($langList) && !empty($langList[$matches[1]])) {
+									$langName = $langList[$matches[1]];
+				} else
 				{
 					$langName = $smcFunc['ucwords'](strtr($matches[1], array('_' => ' ')));
 
@@ -2974,12 +3126,14 @@ 
 		}
 
 		// Do we need to store the lang list?
-		if (empty($langList))
-			updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
+		if (empty($langList)) {
+					updateSettings(array('langList' => $smcFunc['json_encode']($catchLang)));
+		}
 
 		// Let's cash in on this deal.
-		if (!empty($modSettings['cache_enable']))
-			cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		if (!empty($modSettings['cache_enable'])) {
+					cache_put_data('known_languages', $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		}
 	}
 
 	return $context['languages'];
@@ -3002,8 +3156,9 @@ 
 	global $modSettings, $options, $txt;
 	static $censor_vulgar = null, $censor_proper;
 
-	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '')
-		return $text;
+	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '') {
+			return $text;
+	}
 
 	// If they haven't yet been loaded, load them.
 	if ($censor_vulgar == null)
@@ -3034,9 +3189,9 @@ 
 	{
 		$func = !empty($modSettings['censorIgnoreCase']) ? 'str_ireplace' : 'str_replace';
 		$text = $func($censor_vulgar, $censor_proper, $text);
+	} else {
+			$text = preg_replace($censor_vulgar, $censor_proper, $text);
 	}
-	else
-		$text = preg_replace($censor_vulgar, $censor_proper, $text);
 
 	return $text;
 }
@@ -3062,30 +3217,35 @@ 
 	@ini_set('track_errors', '1');
 
 	// Don't include the file more than once, if $once is true.
-	if ($once && in_array($filename, $templates))
-		return;
+	if ($once && in_array($filename, $templates)) {
+			return;
+	}
 	// Add this file to the include list, whether $once is true or not.
-	else
-		$templates[] = $filename;
+	else {
+			$templates[] = $filename;
+	}
 
 
 	$file_found = file_exists($filename);
 
-	if ($once && $file_found)
-		require_once($filename);
-	elseif ($file_found)
-		require($filename);
+	if ($once && $file_found) {
+			require_once($filename);
+	} elseif ($file_found) {
+			require($filename);
+	}
 
 	if ($file_found !== true)
 	{
 		ob_end_clean();
-		if (!empty($modSettings['enableCompressedOutput']))
-			@ob_start('ob_gzhandler');
-		else
-			ob_start();
+		if (!empty($modSettings['enableCompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
-		if (isset($_GET['debug']))
-			header('content-type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		if (isset($_GET['debug'])) {
+					header('content-type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		}
 
 		// Don't cache error pages!!
 		header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -3104,12 +3264,13 @@ 
 		echo '<!DOCTYPE html>
 <html', !empty($context['right_to_left']) ? ' dir="rtl"' : '', '>
 	<head>';
-		if (isset($context['character_set']))
-			echo '
+		if (isset($context['character_set'])) {
+					echo '
 		<meta charset="', $context['character_set'], '">';
+		}
 
-		if (!empty($maintenance) && !allowedTo('admin_forum'))
-			echo '
+		if (!empty($maintenance) && !allowedTo('admin_forum')) {
+					echo '
 		<title>', $mtitle, '</title>
 	</head>
 	<body>
@@ -3117,8 +3278,8 @@ 
 		', $mmessage, '
 	</body>
 </html>';
-		elseif (!allowedTo('admin_forum'))
-			echo '
+		} elseif (!allowedTo('admin_forum')) {
+					echo '
 		<title>', $txt['template_parse_error'], '</title>
 	</head>
 	<body>
@@ -3126,14 +3287,16 @@ 
 		', $txt['template_parse_error_message'], '
 	</body>
 </html>';
-		else
+		} else
 		{
 			$error = fetch_web_data($boardurl . strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 			$error_array = error_get_last();
-			if (empty($error) && ini_get('track_errors') && !empty($error_array))
-				$error = $error_array['message'];
-			if (empty($error))
-				$error = $txt['template_parse_errmsg'];
+			if (empty($error) && ini_get('track_errors') && !empty($error_array)) {
+							$error = $error_array['message'];
+			}
+			if (empty($error)) {
+							$error = $txt['template_parse_errmsg'];
+			}
 
 			$error = strtr($error, array('<b>' => '<strong>', '</b>' => '</strong>'));
 
@@ -3144,11 +3307,12 @@ 
 		<h3>', $txt['template_parse_error'], '</h3>
 		', sprintf($txt['template_parse_error_details'], strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 
-			if (!empty($error))
-				echo '
+			if (!empty($error)) {
+							echo '
 		<hr>
 
 		<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>' . $boarddir => '<strong>...', '<strong>' . strtr($boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
+			}
 
 			// I know, I know... this is VERY COMPLICATED.  Still, it's good.
 			if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0)
@@ -3158,10 +3322,11 @@ 
 				$data2 = preg_split('~\<br( /)?\>~', $data2);
 
 				// Fix the PHP code stuff...
-				if (!isBrowser('gecko'))
-					$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
-				else
-					$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				if (!isBrowser('gecko')) {
+									$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
+				} else {
+									$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				}
 
 				// Now we get to work around a bug in PHP where it doesn't escape <br>s!
 				$j = -1;
@@ -3169,8 +3334,9 @@ 
 				{
 					$j++;
 
-					if (substr_count($line, '<br>') == 0)
-						continue;
+					if (substr_count($line, '<br>') == 0) {
+											continue;
+					}
 
 					$n = substr_count($line, '<br>');
 					for ($i = 0; $i < $n; $i++)
@@ -3189,38 +3355,42 @@ 
 				// Figure out what the color coding was before...
 				$line = max($match[1] - 9, 1);
 				$last_line = '';
-				for ($line2 = $line - 1; $line2 > 1; $line2--)
-					if (strpos($data2[$line2], '<') !== false)
+				for ($line2 = $line - 1; $line2 > 1; $line2--) {
+									if (strpos($data2[$line2], '<') !== false)
 					{
 						if (preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line2], $color_match) != 0)
 							$last_line = $color_match[1];
+				}
 						break;
 					}
 
 				// Show the relevant lines...
 				for ($n = min($match[1] + 4, count($data2) + 1); $line <= $n; $line++)
 				{
-					if ($line == $match[1])
-						echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					if ($line == $match[1]) {
+											echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					}
 
 					echo '<span style="color: black;">', sprintf('%' . strlen($n) . 's', $line), ':</span> ';
-					if (isset($data2[$line]) && $data2[$line] != '')
-						echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					if (isset($data2[$line]) && $data2[$line] != '') {
+											echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					}
 
 					if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0)
 					{
 						$last_line = $color_match[1];
 						echo '</', substr($last_line, 1, 4), '>';
+					} elseif ($last_line != '' && strpos($data2[$line], '<') !== false) {
+											$last_line = '';
+					} elseif ($last_line != '' && $data2[$line] != '') {
+											echo '</', substr($last_line, 1, 4), '>';
 					}
-					elseif ($last_line != '' && strpos($data2[$line], '<') !== false)
-						$last_line = '';
-					elseif ($last_line != '' && $data2[$line] != '')
-						echo '</', substr($last_line, 1, 4), '>';
 
-					if ($line == $match[1])
-						echo '</pre></div><pre style="margin: 0;">';
-					else
-						echo "\n";
+					if ($line == $match[1]) {
+											echo '</pre></div><pre style="margin: 0;">';
+					} else {
+											echo "\n";
+					}
 				}
 
 				echo '</pre></div>';
@@ -3244,8 +3414,9 @@ 
 	global $db_type, $db_name, $ssi_db_user, $ssi_db_passwd, $sourcedir, $db_prefix, $db_port, $db_mb4;
 
 	// Figure out what type of database we are using.
-	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
-		$db_type = 'mysql';
+	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php')) {
+			$db_type = 'mysql';
+	}
 
 	// Load the file for the database.
 	require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
@@ -3253,11 +3424,13 @@ 
 	$db_options = array();
 
 	// Add in the port if needed
-	if (!empty($db_port))
-		$db_options['port'] = $db_port;
+	if (!empty($db_port)) {
+			$db_options['port'] = $db_port;
+	}
 
-	if (!empty($db_mb4))
-		$db_options['db_mb4'] = $db_mb4;
+	if (!empty($db_mb4)) {
+			$db_options['db_mb4'] = $db_mb4;
+	}
 
 	// 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 (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
@@ -3276,13 +3449,15 @@ 
 	}
 
 	// Safe guard here, if there isn't a valid connection lets put a stop to it.
-	if (!$db_connection)
-		display_db_error();
+	if (!$db_connection) {
+			display_db_error();
+	}
 
 	// If in SSI mode fix up the prefix.
-	if (SMF == 'SSI')
-		db_fix_prefix($db_prefix, $db_name);
-}
+	if (SMF == 'SSI') {
+			db_fix_prefix($db_prefix, $db_name);
+	}
+	}
 
 /**
  * Try to load up a supported caching method. This is saved in $cacheAPI if we are not overriding it.
@@ -3296,10 +3471,11 @@ 
 	global $sourcedir, $cacheAPI, $cache_accelerator;
 
 	// Not overriding this and we have a cacheAPI, send it back.
-	if (empty($overrideCache) && is_object($cacheAPI))
-		return $cacheAPI;
-	elseif (is_null($cacheAPI))
-		$cacheAPI = false;
+	if (empty($overrideCache) && is_object($cacheAPI)) {
+			return $cacheAPI;
+	} elseif (is_null($cacheAPI)) {
+			$cacheAPI = false;
+	}
 
 	// Make sure our class is in session.
 	require_once($sourcedir . '/Class-CacheAPI.php');
@@ -3320,8 +3496,9 @@ 
 		if (!$testAPI->isSupported())
 		{
 			// Can we save ourselves?
-			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf')
-				return loadCacheAccelerator(null, false);
+			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf') {
+							return loadCacheAccelerator(null, false);
+			}
 			return false;
 		}
 
@@ -3333,9 +3510,9 @@ 
 		{
 			$cacheAPI = $testAPI;
 			return $cacheAPI;
+		} else {
+					return $testAPI;
 		}
-		else
-			return $testAPI;
 	}
 }
 
@@ -3355,8 +3532,9 @@ 
 
 	// @todo Why are we doing this if caching is disabled?
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	}
 
 	/* Refresh the cache if either:
 		1. Caching is disabled.
@@ -3370,16 +3548,19 @@ 
 		require_once($sourcedir . '/' . $file);
 		$cache_block = call_user_func_array($function, $params);
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level)
-			cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level) {
+					cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		}
 	}
 
 	// Some cached data may need a freshening up after retrieval.
-	if (!empty($cache_block['post_retri_eval']))
-		eval($cache_block['post_retri_eval']);
+	if (!empty($cache_block['post_retri_eval'])) {
+			eval($cache_block['post_retri_eval']);
+	}
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	}
 
 	return $cache_block['data'];
 }
@@ -3406,8 +3587,9 @@ 
 	global $smcFunc, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3420,12 +3602,14 @@ 
 	$value = $value === null ? null : (isset($smcFunc['json_encode']) ? $smcFunc['json_encode']($value) : json_encode($value));
 	$cacheAPI->putData($key, $value, $ttl);
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	}
 
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
-}
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
+	}
 
 /**
  * Gets the value from the cache specified by key, so long as it is not older than ttl seconds.
@@ -3441,8 +3625,9 @@ 
 	global $smcFunc, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $cache_misses, $cache_count_misses, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3462,16 +3647,18 @@ 
 
 		if (empty($value))
 		{
-			if (!is_array($cache_misses))
-				$cache_misses = array();
+			if (!is_array($cache_misses)) {
+							$cache_misses = array();
+			}
 
 			$cache_count_misses = isset($cache_count_misses) ? $cache_count_misses + 1 : 1;
 			$cache_misses[$cache_count_misses] = array('k' => $original_key, 'd' => 'get');
 		}
 	}
 
-	if (function_exists('call_integration_hook') && isset($value))
-		call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	if (function_exists('call_integration_hook') && isset($value)) {
+			call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	}
 
 	return empty($value) ? null : (isset($smcFunc['json_decode']) ? $smcFunc['json_decode']($value, true) : smf_json_decode($value, true));
 }
@@ -3493,8 +3680,9 @@ 
 	global $cacheAPI;
 
 	// If we can't get to the API, can't do this.
-	if (empty($cacheAPI))
-		return;
+	if (empty($cacheAPI)) {
+			return;
+	}
 
 	// Ask the API to do the heavy lifting. cleanCache also calls invalidateCache to be sure.
 	$cacheAPI->cleanCache($type);
@@ -3519,8 +3707,9 @@ 
 	global $modSettings, $smcFunc, $image_proxy_enabled, $user_info;
 
 	// Come on!
-	if (empty($data))
-		return array();
+	if (empty($data)) {
+			return array();
+	}
 
 	// Set a nice default var.
 	$image = '';
@@ -3528,11 +3717,11 @@ 
 	// Gravatar has been set as mandatory!
 	if (!empty($modSettings['gravatarOverride']))
 	{
-		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://'))
-			$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
-
-		else if (!empty($data['email']))
-			$image = get_gravatar_url($data['email']);
+		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://')) {
+					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+		} else if (!empty($data['email'])) {
+					$image = get_gravatar_url($data['email']);
+		}
 	}
 
 	// Look if the user has a gravatar field or has set an external url as avatar.
@@ -3544,54 +3733,60 @@ 
 			// Gravatar.
 			if (stristr($data['avatar'], 'gravatar://'))
 			{
-				if ($data['avatar'] == 'gravatar://')
-					$image = get_gravatar_url($data['email']);
-
-				elseif (!empty($modSettings['gravatarAllowExtraEmail']))
-					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				if ($data['avatar'] == 'gravatar://') {
+									$image = get_gravatar_url($data['email']);
+				} elseif (!empty($modSettings['gravatarAllowExtraEmail'])) {
+									$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				}
 			}
 
 			// External url.
 			else
 			{
 				// Using ssl?
-				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false && empty($user_info['possibly_robot']))
-					$image = get_proxied_url($data['avatar']);
+				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) {
+									$image = get_proxied_url($data['avatar']);
+				}
 
 				// Just a plain external url.
-				else
-					$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				else {
+									$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				}
 			}
 		}
 
 		// Perhaps this user has an attachment as avatar...
-		else if (!empty($data['filename']))
-			$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		else if (!empty($data['filename'])) {
+					$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		}
 
 		// Right... no avatar... use our default image.
-		else
-			$image = $modSettings['avatar_url'] . '/default.png';
+		else {
+					$image = $modSettings['avatar_url'] . '/default.png';
+		}
 	}
 
 	call_integration_hook('integrate_set_avatar_data', array(&$image, &$data));
 
 	// At this point in time $image has to be filled unless you chose to force gravatar and the user doesn't have the needed data to retrieve it... thus a check for !empty() is still needed.
-	if (!empty($image))
-		return array(
+	if (!empty($image)) {
+			return array(
 			'name' => !empty($data['avatar']) ? $data['avatar'] : '',
 			'image' => '<img class="avatar" src="' . $image . '" />',
 			'href' => $image,
 			'url' => $image,
 		);
+	}
 
 	// Fallback to make life easier for everyone...
-	else
-		return array(
+	else {
+			return array(
 			'name' => '',
 			'image' => '',
 			'href' => '',
 			'url' => '',
 		);
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Subs-Db-postgresql.php

Doc Comments +2 added lines, -2 removed lines

@@ -500,7 +500,7 @@ 
 /**
  * Returns the amount of affected rows for a query.
  *
- * @param mixed $result
+ * @param resource|null $result
  *
  * @return int
  *
@@ -869,7 +869,7 @@ 
  *
  * @param string $db_name The database name
  * @param resource $db_connection The database connection
- * @return true Always returns true
+ * @return boolean Always returns true
  */
 function smf_db_select_db($db_name, $db_connection)
 {

Spacing +9 added lines, -9 removed lines

@@ -199,22 +199,22 @@ 
 
 		case 'date':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
+				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]) . '::date';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'time':
 			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
+				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]) . '::time';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'datetime':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'to_timestamp('.
-					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
+				return 'to_timestamp(' .
+					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
 					',\'YYYY-MM-DD HH24:MI:SS\')';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
@@ -424,7 +424,7 @@ 
 		$old_pos = 0;
 		$pos = -1;
 		// Remove the string escape for better runtime
-		$db_string_1 = str_replace('\'\'','',$db_string);
+		$db_string_1 = str_replace('\'\'', '', $db_string);
 		while (true)
 		{
 			$pos = strpos($db_string_1, '\'', $pos + 1);
@@ -802,7 +802,7 @@ 
 	if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
 	{
 		// we only take the first key
-		$returning = ' RETURNING '.$keys[0];
+		$returning = ' RETURNING ' . $keys[0];
 		$with_returning = true;
 	}
 
@@ -833,7 +833,7 @@ 
 			INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
 			VALUES
 				' . implode(',
-				', $insertRows).$replace.$returning,
+				', $insertRows) . $replace . $returning,
 			array(
 				'security_override' => true,
 				'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
@@ -846,7 +846,7 @@ 
 			if ($returnmode === 2)
 				$return_var = array();
 
-			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
+			while (($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
 			{
 				if (is_numeric($row[0])) // try to emulate mysql limitation
 				{
@@ -1009,7 +1009,7 @@ 
  */
 function smf_db_custom_order($field, $array_values, $desc = false)
 {
-	$return = 'CASE '. $field . ' ';
+	$return = 'CASE ' . $field . ' ';
 	$count = count($array_values);
 	$then = ($desc ? ' THEN -' : ' THEN ');
 

Braces +238 added lines, -175 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Maps the implementations in this file (smf_db_function_name)
@@ -34,8 +35,8 @@ 
 	global $smcFunc;
 
 	// Map some database specific functions, only do this once.
-	if (!isset($smcFunc['db_fetch_assoc']))
-		$smcFunc += array(
+	if (!isset($smcFunc['db_fetch_assoc'])) {
+			$smcFunc += array(
 			'db_query'					=> 'smf_db_query',
 			'db_quote'					=> 'smf_db_quote',
 			'db_insert'					=> 'smf_db_insert',
@@ -66,15 +67,18 @@ 
 			'db_native_replace'			=> 'smf_db_native_replace',
 			'db_cte_support'			=> 'smf_db_cte_support',
 		);
+	}
 
 	// We are not going to make it very far without these.
-	if (!function_exists('pg_pconnect'))
-		display_db_error();
+	if (!function_exists('pg_pconnect')) {
+			display_db_error();
+	}
 
-	if (!empty($db_options['persist']))
-		$connection = @pg_pconnect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
-	else
-		$connection = @pg_connect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	if (!empty($db_options['persist'])) {
+			$connection = @pg_pconnect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	} else {
+			$connection = @pg_connect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+	}
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if (!$connection)
@@ -82,15 +86,15 @@ 
 		if (!empty($db_options['non_fatal']))
 		{
 			return null;
-		}
-		else
+		} else
 		{
 			display_db_error();
 		}
 	}
 
-	if (!empty($db_options['db_mb4']))
-		$smcFunc['db_mb4'] = (bool) $db_options['db_mb4'];
+	if (!empty($db_options['db_mb4'])) {
+			$smcFunc['db_mb4'] = (bool) $db_options['db_mb4'];
+	}
 
 	return $connection;
 }
@@ -137,31 +141,38 @@ 
 
 	list ($values, $connection) = $db_callback;
 
-	if ($matches[1] === 'db_prefix')
-		return $db_prefix;
+	if ($matches[1] === 'db_prefix') {
+			return $db_prefix;
+	}
 
-	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false)
-		return $user_info[$matches[1]];
+	if (isset($user_info[$matches[1]]) && strpos($matches[1], 'query_') !== false) {
+			return $user_info[$matches[1]];
+	}
 
-	if ($matches[1] === 'empty')
-		return '\'\'';
+	if ($matches[1] === 'empty') {
+			return '\'\'';
+	}
 
-	if (!isset($matches[2]))
-		smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($matches[2])) {
+			smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
-	if ($matches[1] === 'literal')
-		return '\'' . pg_escape_string($matches[2]) . '\'';
+	if ($matches[1] === 'literal') {
+			return '\'' . pg_escape_string($matches[2]) . '\'';
+	}
 
-	if (!isset($values[$matches[2]]))
-		smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($values[$matches[2]])) {
+			smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
 	$replacement = $values[$matches[2]];
 
 	switch ($matches[1])
 	{
 		case 'int':
-			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
-				smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (int) $replacement;
 		break;
 
@@ -173,65 +184,73 @@ 
 		case 'array_int':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if (!is_numeric($value) || (string) $value !== (string) (int) $value)
-						smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
+											smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
 					$replacement[$key] = (string) (int) $value;
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
 		break;
 
 		case 'array_string':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
-				foreach ($replacement as $key => $value)
-					$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($value));
+				foreach ($replacement as $key => $value) {
+									$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($value));
+				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'date':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
+							return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]).'::date';
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'time':
-			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
+							return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]).'::time';
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'datetime':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'to_timestamp('.
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) {
+							return 'to_timestamp('.
 					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
 					',\'YYYY-MM-DD HH24:MI:SS\')';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'float':
-			if (!is_numeric($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (float) $replacement;
 		break;
 
@@ -244,31 +263,36 @@ 
 		break;
 
 		case 'inet':
-			if ($replacement == 'null' || $replacement == '')
-				return 'null';
-			if (inet_pton($replacement) === false)
-				smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if ($replacement == 'null' || $replacement == '') {
+							return 'null';
+			}
+			if (inet_pton($replacement) === false) {
+							smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return sprintf('\'%1$s\'::inet', pg_escape_string($replacement));
 
 		case 'array_inet':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if ($replacement == 'null' || $replacement == '')
-						$replacement[$key] = 'null';
-					if (!isValidIP($value))
-						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if ($replacement == 'null' || $replacement == '') {
+											$replacement[$key] = 'null';
+					}
+					if (!isValidIP($value)) {
+											smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 					$replacement[$key] = sprintf('\'%1$s\'::inet', pg_escape_string($value));
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		default:
@@ -356,14 +380,16 @@ 
 		),
 	);
 
-	if (isset($replacements[$identifier]))
-		$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	if (isset($replacements[$identifier])) {
+			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	}
 
 	// Limits need to be a little different.
 	$db_string = preg_replace('~\sLIMIT\s(\d+|{int:.+}),\s*(\d+|{int:.+})\s*$~i', 'LIMIT $2 OFFSET $1', $db_string);
 
-	if (trim($db_string) == '')
-		return false;
+	if (trim($db_string) == '') {
+			return false;
+	}
 
 	// Comments that are allowed in a query are preg_removed.
 	static $allowed_comments_from = array(
@@ -383,8 +409,9 @@ 
 	$db_count = !isset($db_count) ? 1 : $db_count + 1;
 	$db_replace_result = 0;
 
-	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
-		smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
+			smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	}
 
 	if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
 	{
@@ -409,17 +436,18 @@ 
 		while (true)
 		{
 			$pos = strpos($db_string_1, '\'', $pos + 1);
-			if ($pos === false)
-				break;
+			if ($pos === false) {
+							break;
+			}
 			$clean .= substr($db_string_1, $old_pos, $pos - $old_pos);
 
 			while (true)
 			{
 				$pos1 = strpos($db_string_1, '\'', $pos + 1);
 				$pos2 = strpos($db_string_1, '\\', $pos + 1);
-				if ($pos1 === false)
-					break;
-				elseif ($pos2 === false || $pos2 > $pos1)
+				if ($pos1 === false) {
+									break;
+				} elseif ($pos2 === false || $pos2 > $pos1)
 				{
 					$pos = $pos1;
 					break;
@@ -435,16 +463,19 @@ 
 		$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
 
 		// Comments?  We don't use comments in our queries, we leave 'em outside!
-		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
-			$fail = true;
+		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
+					$fail = true;
+		}
 		// Trying to change passwords, slow us down, or something?
-		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
-			$fail = true;
-		elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
-			$fail = true;
+		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
+					$fail = true;
+		} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
+					$fail = true;
+		}
 
-		if (!empty($fail) && function_exists('log_error'))
-			smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		if (!empty($fail) && function_exists('log_error')) {
+					smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		}
 	}
 
 	// Set optimize stuff
@@ -471,8 +502,9 @@ 
 		list ($file, $line) = smf_db_error_backtrace('', '', 'return', __FILE__, __LINE__);
 
 		// Initialize $db_cache if not already initialized.
-		if (!isset($db_cache))
-			$db_cache = array();
+		if (!isset($db_cache)) {
+					$db_cache = array();
+		}
 
 		if (!empty($_SESSION['debug_redirect']))
 		{
@@ -490,12 +522,14 @@ 
 
 	$db_last_result = @pg_query($connection, $db_string);
 
-	if ($db_last_result === false && empty($db_values['db_error_skip']))
-		$db_last_result = smf_db_error($db_string, $connection);
+	if ($db_last_result === false && empty($db_values['db_error_skip'])) {
+			$db_last_result = smf_db_error($db_string, $connection);
+	}
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
 
 	return $db_last_result;
 }
@@ -512,10 +546,11 @@ 
 {
 	global $db_last_result, $db_replace_result;
 
-	if ($db_replace_result)
-		return $db_replace_result;
-	elseif ($result === null && !$db_last_result)
-		return 0;
+	if ($db_replace_result) {
+			return $db_replace_result;
+	} elseif ($result === null && !$db_last_result) {
+			return 0;
+	}
 
 	return pg_affected_rows($result === null ? $db_last_result : $result);
 }
@@ -539,8 +574,9 @@ 
 		array(
 		)
 	);
-	if (!$request)
-		return false;
+	if (!$request) {
+			return false;
+	}
 	list ($lastID) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -561,12 +597,13 @@ 
 	// Decide which connection to use
 	$connection = $connection === null ? $db_connection : $connection;
 
-	if ($type == 'begin')
-		return @pg_query($connection, 'BEGIN');
-	elseif ($type == 'rollback')
-		return @pg_query($connection, 'ROLLBACK');
-	elseif ($type == 'commit')
-		return @pg_query($connection, 'COMMIT');
+	if ($type == 'begin') {
+			return @pg_query($connection, 'BEGIN');
+	} elseif ($type == 'rollback') {
+			return @pg_query($connection, 'ROLLBACK');
+	} elseif ($type == 'commit') {
+			return @pg_query($connection, 'COMMIT');
+	}
 
 	return false;
 }
@@ -594,19 +631,22 @@ 
 	$query_error = @pg_last_error($connection);
 
 	// Log the error.
-	if (function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
+	}
 
 	// Nothing's defined yet... just die with it.
-	if (empty($context) || empty($txt))
-		die($query_error);
+	if (empty($context) || empty($txt)) {
+			die($query_error);
+	}
 
 	// Show an error message, if possible.
 	$context['error_title'] = $txt['database_error'];
-	if (allowedTo('admin_forum'))
-		$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
-	else
-		$context['error_message'] = $txt['try_again'];
+	if (allowedTo('admin_forum')) {
+			$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
+	} else {
+			$context['error_message'] = $txt['try_again'];
+	}
 
 	if (allowedTo('admin_forum') && isset($db_show_debug) && $db_show_debug === true)
 	{
@@ -628,12 +668,14 @@ 
 {
 	global $db_row_count;
 
-	if ($counter !== false)
-		return pg_fetch_row($request, $counter);
+	if ($counter !== false) {
+			return pg_fetch_row($request, $counter);
+	}
 
 	// Reset the row counter...
-	if (!isset($db_row_count[(int) $request]))
-		$db_row_count[(int) $request] = 0;
+	if (!isset($db_row_count[(int) $request])) {
+			$db_row_count[(int) $request] = 0;
+	}
 
 	// Return the right row.
 	return @pg_fetch_row($request, $db_row_count[(int) $request]++);
@@ -650,12 +692,14 @@ 
 {
 	global $db_row_count;
 
-	if ($counter !== false)
-		return pg_fetch_assoc($request, $counter);
+	if ($counter !== false) {
+			return pg_fetch_assoc($request, $counter);
+	}
 
 	// Reset the row counter...
-	if (!isset($db_row_count[(int) $request]))
-		$db_row_count[(int) $request] = 0;
+	if (!isset($db_row_count[(int) $request])) {
+			$db_row_count[(int) $request] = 0;
+	}
 
 	// Return the right row.
 	return @pg_fetch_assoc($request, $db_row_count[(int) $request]++);
@@ -708,11 +752,13 @@ 
 
 	$replace = '';
 
-	if (empty($data))
-		return;
+	if (empty($data)) {
+			return;
+	}
 
-	if (!is_array($data[array_rand($data)]))
-		$data = array($data);
+	if (!is_array($data[array_rand($data)])) {
+			$data = array($data);
+	}
 
 	// Replace the prefix holder with the actual prefix.
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
@@ -738,32 +784,35 @@ 
 					$key_str .= ($count_pk > 0 ? ',' : '');
 					$key_str .= $columnName;
 					$count_pk++;
-				}
-				else if ($method == 'replace') //normal field
+				} else if ($method == 'replace') {
+					//normal field
 				{
 					$col_str .= ($count > 0 ? ',' : '');
+				}
 					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
 					$count++;
 				}
 			}
-			if ($method == 'replace')
-				$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
-			else
-				$replace = ' ON CONFLICT (' . $key_str . ') DO NOTHING';
-		}
-		else if ($method == 'replace')
+			if ($method == 'replace') {
+							$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
+			} else {
+							$replace = ' ON CONFLICT (' . $key_str . ') DO NOTHING';
+			}
+		} else if ($method == 'replace')
 		{
 			foreach ($columns as $columnName => $type)
 			{
 				// Are we restricting the length?
-				if (strpos($type, 'string-') !== false)
-					$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
-				else
-					$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				if (strpos($type, 'string-') !== false) {
+									$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
+				} else {
+									$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				}
 
 				// A key? That's what we were looking for.
-				if (in_array($columnName, $keys))
-					$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				if (in_array($columnName, $keys)) {
+									$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				}
 				$count++;
 			}
 
@@ -799,10 +848,11 @@ 
 		foreach ($columns as $columnName => $type)
 		{
 			// Are we restricting the length?
-			if (strpos($type, 'string-') !== false)
-				$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-			else
-				$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+			if (strpos($type, 'string-') !== false) {
+							$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
+			} else {
+							$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+			}
 		}
 		$insertData = substr($insertData, 0, -2) . ')';
 
@@ -811,8 +861,9 @@ 
 
 		// Here's where the variables are injected to the query.
 		$insertRows = array();
-		foreach ($data as $dataRow)
-			$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+		foreach ($data as $dataRow) {
+					$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+		}
 
 		// Do the insert.
 		$request = $smcFunc['db_query']('', '
@@ -829,19 +880,21 @@ 
 
 		if ($with_returning && $request !== false)
 		{
-			if ($returnmode === 2)
-				$return_var = array();
+			if ($returnmode === 2) {
+							$return_var = array();
+			}
 
 			while(($row = $smcFunc['db_fetch_row']($request)) && $with_returning)
 			{
-				if (is_numeric($row[0])) // try to emulate mysql limitation
+				if (is_numeric($row[0])) {
+					// try to emulate mysql limitation
 				{
 					if ($returnmode === 1)
 						$return_var = $row[0];
-					elseif ($returnmode === 2)
-						$return_var[] = $row[0];
-				}
-				else
+				} elseif ($returnmode === 2) {
+											$return_var[] = $row[0];
+					}
+				} else
 				{
 					$with_returning = false;
 					trigger_error('trying to returning ID Field which is not a Int field', E_USER_ERROR);
@@ -850,9 +903,10 @@ 
 		}
 	}
 
-	if ($with_returning && !empty($return_var))
-		return $return_var;
-}
+	if ($with_returning && !empty($return_var)) {
+			return $return_var;
+	}
+	}
 
 /**
  * Dummy function really. Doesn't do anything on PostgreSQL.
@@ -889,8 +943,9 @@ 
  */
 function smf_db_error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 {
-	if (empty($log_message))
-		$log_message = $error_message;
+	if (empty($log_message)) {
+			$log_message = $error_message;
+	}
 
 	foreach (debug_backtrace() as $step)
 	{
@@ -909,12 +964,14 @@ 
 	}
 
 	// A special case - we want the file and line numbers for debugging.
-	if ($error_type == 'return')
-		return array($file, $line);
+	if ($error_type == 'return') {
+			return array($file, $line);
+	}
 
 	// Is always a critical error.
-	if (function_exists('log_error'))
-		log_error($log_message, 'critical', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($log_message, 'critical', $file, $line);
+	}
 
 	if (function_exists('fatal_error'))
 	{
@@ -922,12 +979,12 @@ 
 
 		// Cannot continue...
 		exit;
+	} elseif ($error_type) {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
+	} else {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
+	}
 	}
-	elseif ($error_type)
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
-	else
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
-}
 
 /**
  * Escape the LIKE wildcards so that they match the character and not the wildcard.
@@ -944,10 +1001,11 @@ 
 		'\\' => '\\\\',
 	);
 
-	if ($translate_human_wildcards)
-		$replacements += array(
+	if ($translate_human_wildcards) {
+			$replacements += array(
 			'*' => '%',
 		);
+	}
 
 	return strtr($string, $replacements);
 }
@@ -976,14 +1034,16 @@ 
 	static $pg_error_data_prep;
 
 	// without database we can't do anything
-	if (empty($db_connection))
-		return;
+	if (empty($db_connection)) {
+			return;
+	}
 
-	if (empty($pg_error_data_prep))
-			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
+	if (empty($pg_error_data_prep)) {
+				$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
 				'INSERT INTO ' . $db_prefix . 'log_errors(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)
 													VALUES(		$1,		$2,		$3, $4, 	$5,		$6,			$7,		$8,	$9, $10)'
 			);
+	}
 
 	pg_execute($db_connection, 'smf_log_errors', $error_array);
 }
@@ -1003,8 +1063,9 @@ 
 	$count = count($array_values);
 	$then = ($desc ? ' THEN -' : ' THEN ');
 
-	for ($i = 0; $i < $count; $i++)
-		$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+	for ($i = 0; $i < $count; $i++) {
+			$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+	}
 
 	$return .= 'END';
 	return $return;
@@ -1027,11 +1088,13 @@ 
 		//pg 9.5 got replace support
 		$pg_version = $smcFunc['db_get_version']();
 		// if we got a Beta Version
-		if (stripos($pg_version, 'beta') !== false)
-			$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
+		if (stripos($pg_version, 'beta') !== false) {
+					$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
+		}
 		// or RC
-		if (stripos($pg_version, 'rc') !== false)
-			$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
+		if (stripos($pg_version, 'rc') !== false) {
+					$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
+		}
 
 		$replace_support = (version_compare($pg_version, '9.5.0', '>=') ? true : false);
 	}