SimpleMachines / SMF2.1

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'] == '0004' ? 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 3
  */
 
-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'] <= 4 ? '0004-%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');

Sources/Subs-Members.php

Spacing +5 added lines, -5 removed lines

@@ -586,7 +586,7 @@ 
 		'member_name' => $regOptions['username'],
 		'email_address' => $regOptions['email'],
 		'passwd' => hash_password($regOptions['username'], $regOptions['password']),
-		'password_salt' => substr(md5(mt_rand()), 0, 4) ,
+		'password_salt' => substr(md5(mt_rand()), 0, 4),
 		'posts' => 0,
 		'date_registered' => time(),
 		'member_ip' => $regOptions['interface'] == 'admin' ? '127.0.0.1' : $user_info['ip'],
@@ -676,7 +676,7 @@ 
 		'time_offset',
 	);
 	$knownInets = array(
-		'member_ip','member_ip2',
+		'member_ip', 'member_ip2',
 	);
 
 	// Call an optional function to validate the users' input.
@@ -904,7 +904,7 @@ 
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
 
 	//when we got no wildcard we can use equal -> fast
-	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=' );
+	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=');
 
 	// Make sure they don't want someone else's name.
 	$request = $smcFunc['db_query']('', '
@@ -1273,7 +1273,7 @@ 
 		$user_info['buddies'][] = $userReceiver;
 
 		// And add a nice alert. Don't abuse though!
-		if ((cache_get_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, 86400)) == null)
+		if ((cache_get_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, 86400)) == null)
 		{
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}background_tasks',
@@ -1288,7 +1288,7 @@ 
 			);
 
 			// Store this in a cache entry to avoid creating multiple alerts. Give it a long life cycle.
-			cache_put_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, '1', 86400);
+			cache_put_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, '1', 86400);
 		}
 	}
 

Braces +208 added lines, -151 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Delete one or more members.
@@ -43,30 +44,32 @@ 
 	setMemoryLimit('128M');
 
 	// If it's not an array, make it so!
-	if (!is_array($users))
-		$users = array($users);
-	else
-		$users = array_unique($users);
+	if (!is_array($users)) {
+			$users = array($users);
+	} else {
+			$users = array_unique($users);
+	}
 
 	// Make sure there's no void user in here.
 	$users = array_diff($users, array(0));
 
 	// How many are they deleting?
-	if (empty($users))
-		return;
-	elseif (count($users) == 1)
+	if (empty($users)) {
+			return;
+	} elseif (count($users) == 1)
 	{
 		list ($user) = $users;
 
-		if ($user == $user_info['id'])
-			isAllowedTo('profile_remove_own');
-		else
-			isAllowedTo('profile_remove_any');
-	}
-	else
+		if ($user == $user_info['id']) {
+					isAllowedTo('profile_remove_own');
+		} else {
+					isAllowedTo('profile_remove_any');
+		}
+	} else
 	{
-		foreach ($users as $k => $v)
-			$users[$k] = (int) $v;
+		foreach ($users as $k => $v) {
+					$users[$k] = (int) $v;
+		}
 
 		// Deleting more than one?  You can't have more than one account...
 		isAllowedTo('profile_remove_any');
@@ -88,26 +91,30 @@ 
 	$user_log_details = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['is_admin'])
-			$admins[] = $row['id_member'];
+		if ($row['is_admin']) {
+					$admins[] = $row['id_member'];
+		}
 		$user_log_details[$row['id_member']] = array($row['id_member'], $row['member_name']);
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($user_log_details))
-		return;
+	if (empty($user_log_details)) {
+			return;
+	}
 
 	// Make sure they aren't trying to delete administrators if they aren't one.  But don't bother checking if it's just themself.
 	if (!empty($admins) && ($check_not_admin || (!allowedTo('admin_forum') && (count($users) != 1 || $users[0] != $user_info['id']))))
 	{
 		$users = array_diff($users, $admins);
-		foreach ($admins as $id)
-			unset($user_log_details[$id]);
+		foreach ($admins as $id) {
+					unset($user_log_details[$id]);
+		}
 	}
 
 	// No one left?
-	if (empty($users))
-		return;
+	if (empty($users)) {
+			return;
+	}
 
 	// Log the action - regardless of who is deleting it.
 	$log_changes = array();
@@ -124,8 +131,9 @@ 
 		);
 
 		// Remove any cached data if enabled.
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('user_settings-' . $user[0], null, 60);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('user_settings-' . $user[0], null, 60);
+		}
 	}
 
 	// Make these peoples' posts guest posts.
@@ -388,8 +396,8 @@ 
 			'buddy_list' => implode(', buddy_list) != 0 OR FIND_IN_SET(', $users),
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$smcFunc['db_query']('', '
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET
 				pm_ignore_list = {string:pm_ignore_list},
@@ -401,6 +409,7 @@ 
 				'buddy_list' => implode(',', array_diff(explode(',', $row['buddy_list']), $users)),
 			)
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure no member's birthday is still sticking in the calendar...
@@ -455,29 +464,34 @@ 
 	elseif ($regOptions['interface'] == 'guest')
 	{
 		// You cannot register twice...
-		if (empty($user_info['is_guest']))
-			redirectexit();
+		if (empty($user_info['is_guest'])) {
+					redirectexit();
+		}
 
 		// Make sure they didn't just register with this session.
-		if (!empty($_SESSION['just_registered']) && empty($modSettings['disableRegisterCheck']))
-			fatal_lang_error('register_only_once', false);
+		if (!empty($_SESSION['just_registered']) && empty($modSettings['disableRegisterCheck'])) {
+					fatal_lang_error('register_only_once', false);
+		}
 	}
 
 	// Spaces and other odd characters are evil...
 	$regOptions['username'] = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $regOptions['username']));
 
 	// @todo Separate the sprintf?
-	if (empty($regOptions['email']) || !filter_var($regOptions['email'], FILTER_VALIDATE_EMAIL) || strlen($regOptions['email']) > 255)
-		$reg_errors[] = array('lang', 'profile_error_bad_email');
+	if (empty($regOptions['email']) || !filter_var($regOptions['email'], FILTER_VALIDATE_EMAIL) || strlen($regOptions['email']) > 255) {
+			$reg_errors[] = array('lang', 'profile_error_bad_email');
+	}
 
 	$username_validation_errors = validateUsername(0, $regOptions['username'], true, !empty($regOptions['check_reserved_name']));
-	if (!empty($username_validation_errors))
-		$reg_errors = array_merge($reg_errors, $username_validation_errors);
+	if (!empty($username_validation_errors)) {
+			$reg_errors = array_merge($reg_errors, $username_validation_errors);
+	}
 
 	// Generate a validation code if it's supposed to be emailed.
 	$validation_code = '';
-	if ($regOptions['require'] == 'activation')
-		$validation_code = generateValidationCode();
+	if ($regOptions['require'] == 'activation') {
+			$validation_code = generateValidationCode();
+	}
 
 	// If you haven't put in a password generate one.
 	if ($regOptions['interface'] == 'admin' && $regOptions['password'] == '')
@@ -487,8 +501,9 @@ 
 		$regOptions['password_check'] = $regOptions['password'];
 	}
 	// Does the first password match the second?
-	elseif ($regOptions['password'] != $regOptions['password_check'])
-		$reg_errors[] = array('lang', 'passwords_dont_match');
+	elseif ($regOptions['password'] != $regOptions['password_check']) {
+			$reg_errors[] = array('lang', 'passwords_dont_match');
+	}
 
 	// That's kind of easy to guess...
 	if ($regOptions['password'] == '')
@@ -502,13 +517,15 @@ 
 		$passwordError = validatePassword($regOptions['password'], $regOptions['username'], array($regOptions['email']));
 
 		// Password isn't legal?
-		if ($passwordError != null)
-			$reg_errors[] = array('lang', 'profile_error_password_' . $passwordError);
+		if ($passwordError != null) {
+					$reg_errors[] = array('lang', 'profile_error_password_' . $passwordError);
+		}
 	}
 
 	// You may not be allowed to register this email.
-	if (!empty($regOptions['check_email_ban']))
-		isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	if (!empty($regOptions['check_email_ban'])) {
+			isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	}
 
 	// Check if the email address is in use.
 	$request = $smcFunc['db_query']('', '
@@ -523,8 +540,9 @@ 
 		)
 	);
 	// @todo Separate the sprintf?
-	if ($smcFunc['db_num_rows']($request) != 0)
-		$reg_errors[] = array('lang', 'email_in_use', false, array($smcFunc['htmlspecialchars']($regOptions['email'])));
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			$reg_errors[] = array('lang', 'email_in_use', false, array($smcFunc['htmlspecialchars']($regOptions['email'])));
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -539,24 +557,27 @@ 
 			1 = The text/index.
 			2 = Whether to log.
 			3 = sprintf data if necessary. */
-		if ($error[0] == 'lang')
-			loadLanguage('Errors');
+		if ($error[0] == 'lang') {
+					loadLanguage('Errors');
+		}
 		$message = $error[0] == 'lang' ? (empty($error[3]) ? $txt[$error[1]] : vsprintf($txt[$error[1]], $error[3])) : $error[1];
 
 		// What to do, what to do, what to do.
 		if ($return_errors)
 		{
-			if (!empty($error[2]))
-				log_error($message, $error[2]);
+			if (!empty($error[2])) {
+							log_error($message, $error[2]);
+			}
 			$reg_errors[$key] = $message;
+		} else {
+					fatal_error($message, empty($error[2]) ? false : $error[2]);
 		}
-		else
-			fatal_error($message, empty($error[2]) ? false : $error[2]);
 	}
 
 	// If there's any errors left return them at once!
-	if (!empty($reg_errors))
-		return $reg_errors;
+	if (!empty($reg_errors)) {
+			return $reg_errors;
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -578,8 +599,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0)
-		fatal_lang_error('no_theme');
+	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0) {
+			fatal_lang_error('no_theme');
+	}
 
 	// Some of these might be overwritten. (the lower ones that are in the arrays below.)
 	$regOptions['register_vars'] = array(
@@ -621,14 +643,17 @@ 
 		$regOptions['register_vars']['validation_code'] = '';
 	}
 	// Maybe it can be activated right away?
-	elseif ($regOptions['require'] == 'nothing')
-		$regOptions['register_vars']['is_activated'] = 1;
+	elseif ($regOptions['require'] == 'nothing') {
+			$regOptions['register_vars']['is_activated'] = 1;
+	}
 	// Maybe it must be activated by email?
-	elseif ($regOptions['require'] == 'activation')
-		$regOptions['register_vars']['is_activated'] = 0;
+	elseif ($regOptions['require'] == 'activation') {
+			$regOptions['register_vars']['is_activated'] = 0;
+	}
 	// Otherwise it must be awaiting approval!
-	else
-		$regOptions['register_vars']['is_activated'] = 3;
+	else {
+			$regOptions['register_vars']['is_activated'] = 3;
+	}
 
 	if (isset($regOptions['memberGroup']))
 	{
@@ -647,24 +672,28 @@ 
 				'is_protected' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$unassignableGroups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$unassignableGroups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups))
-			$regOptions['register_vars']['id_group'] = 0;
+		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups)) {
+					$regOptions['register_vars']['id_group'] = 0;
+		}
 	}
 
 	// Integrate optional member settings to be set.
-	if (!empty($regOptions['extra_register_vars']))
-		foreach ($regOptions['extra_register_vars'] as $var => $value)
+	if (!empty($regOptions['extra_register_vars'])) {
+			foreach ($regOptions['extra_register_vars'] as $var => $value)
 			$regOptions['register_vars'][$var] = $value;
+	}
 
 	// Integrate optional user theme options to be set.
 	$theme_vars = array();
-	if (!empty($regOptions['theme_vars']))
-		foreach ($regOptions['theme_vars'] as $var => $value)
+	if (!empty($regOptions['theme_vars'])) {
+			foreach ($regOptions['theme_vars'] as $var => $value)
 			$theme_vars[$var] = $value;
+	}
 
 	// Right, now let's prepare for insertion.
 	$knownInts = array(
@@ -687,14 +716,15 @@ 
 	foreach ($regOptions['register_vars'] as $var => $val)
 	{
 		$type = 'string';
-		if (in_array($var, $knownInts))
-			$type = 'int';
-		elseif (in_array($var, $knownFloats))
-			$type = 'float';
-		elseif (in_array($var, $knownInets))
-			$type = 'inet';
-		elseif ($var == 'birthdate')
-			$type = 'date';
+		if (in_array($var, $knownInts)) {
+					$type = 'int';
+		} elseif (in_array($var, $knownFloats)) {
+					$type = 'float';
+		} elseif (in_array($var, $knownInets)) {
+					$type = 'inet';
+		} elseif ($var == 'birthdate') {
+					$type = 'date';
+		}
 
 		$column_names[$var] = $type;
 		$values[$var] = $val;
@@ -713,17 +743,19 @@ 
 	call_integration_hook('integrate_post_register', array(&$regOptions, &$theme_vars, &$memberID));
 
 	// Update the number of members and latest member's info - and pass the name, but remove the 's.
-	if ($regOptions['register_vars']['is_activated'] == 1)
-		updateStats('member', $memberID, $regOptions['register_vars']['real_name']);
-	else
-		updateStats('member');
+	if ($regOptions['register_vars']['is_activated'] == 1) {
+			updateStats('member', $memberID, $regOptions['register_vars']['real_name']);
+	} else {
+			updateStats('member');
+	}
 
 	// Theme variables too?
 	if (!empty($theme_vars))
 	{
 		$inserts = array();
-		foreach ($theme_vars as $var => $val)
-			$inserts[] = array($memberID, $var, $val);
+		foreach ($theme_vars as $var => $val) {
+					$inserts[] = array($memberID, $var, $val);
+		}
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}themes',
 			array('id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
@@ -738,10 +770,11 @@ 
 	// Administrative registrations are a bit different...
 	if ($regOptions['interface'] == 'admin')
 	{
-		if ($regOptions['require'] == 'activation')
-			$email_message = 'admin_register_activate';
-		elseif (!empty($regOptions['send_welcome_email']))
-			$email_message = 'admin_register_immediate';
+		if ($regOptions['require'] == 'activation') {
+					$email_message = 'admin_register_activate';
+		} elseif (!empty($regOptions['send_welcome_email'])) {
+					$email_message = 'admin_register_immediate';
+		}
 
 		if (isset($email_message))
 		{
@@ -792,16 +825,17 @@ 
 			'FORGOTPASSWORDLINK' => $scripturl . '?action=reminder',
 		);
 
-		if ($regOptions['require'] == 'activation')
-			$replacements += array(
+		if ($regOptions['require'] == 'activation') {
+					$replacements += array(
 				'ACTIVATIONLINK' => $scripturl . '?action=activate;u=' . $memberID . ';code=' . $validation_code,
 				'ACTIVATIONLINKWITHOUTCODE' => $scripturl . '?action=activate;u=' . $memberID,
 				'ACTIVATIONCODE' => $validation_code,
 			);
-		else
-			$replacements += array(
+		} else {
+					$replacements += array(
 				'COPPALINK' => $scripturl . '?action=coppa;u=' . $memberID,
 			);
+		}
 
 		$emaildata = loadEmailTemplate('register_' . ($regOptions['require'] == 'activation' ? 'activate' : 'coppa'), $replacements);
 
@@ -866,39 +900,45 @@ 
 		// Check each name in the list...
 		foreach ($reservedNames as $reserved)
 		{
-			if ($reserved == '')
-				continue;
+			if ($reserved == '') {
+							continue;
+			}
 
 			// The admin might've used entities too, level the playing field.
 			$reservedCheck = preg_replace('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'replaceEntities__callback', $reserved);
 
 			// Case sensitive name?
-			if (empty($modSettings['reserveCase']))
-				$reservedCheck = $smcFunc['strtolower']($reservedCheck);
+			if (empty($modSettings['reserveCase'])) {
+							$reservedCheck = $smcFunc['strtolower']($reservedCheck);
+			}
 
 			// If it's not just entire word, check for it in there somewhere...
-			if ($checkMe == $reservedCheck || ($smcFunc['strpos']($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord'])))
-				if ($fatal)
+			if ($checkMe == $reservedCheck || ($smcFunc['strpos']($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord']))) {
+							if ($fatal)
 					fatal_lang_error('username_reserved', 'password', array($reserved));
-				else
-					return true;
+			} else {
+									return true;
+				}
 		}
 
 		$censor_name = $name;
-		if (censorText($censor_name) != $name)
-			if ($fatal)
+		if (censorText($censor_name) != $name) {
+					if ($fatal)
 				fatal_lang_error('name_censored', 'password', array($name));
-			else
-				return true;
+		} else {
+							return true;
+			}
 	}
 
 	// Characters we just shouldn't allow, regardless.
-	foreach (array('*') as $char)
-		if (strpos($checkName, $char) !== false)
+	foreach (array('*') as $char) {
+			if (strpos($checkName, $char) !== false)
 			if ($fatal)
 				fatal_lang_error('username_reserved', 'password', array($char));
-			else
-				return true;
+	}
+			else {
+							return true;
+			}
 
 	// Get rid of any SQL parts of the reserved name...
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
@@ -980,8 +1020,9 @@ 
 				'permission' => $permission,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -989,9 +1030,9 @@ 
 	else
 	{
 		// First get the profile of the given board.
-		if (isset($board_info['id']) && $board_info['id'] == $board_id)
-			$profile_id = $board_info['profile'];
-		elseif ($board_id !== 0)
+		if (isset($board_info['id']) && $board_info['id'] == $board_id) {
+					$profile_id = $board_info['profile'];
+		} elseif ($board_id !== 0)
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT id_profile
@@ -1002,13 +1043,14 @@ 
 					'id_board' => $board_id,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('no_board');
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('no_board');
+			}
 			list ($profile_id) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
+		} else {
+					$profile_id = 1;
 		}
-		else
-			$profile_id = 1;
 
 		$request = $smcFunc['db_query']('', '
 			SELECT bp.id_group, bp.add_deny
@@ -1020,8 +1062,9 @@ 
 				'permission' => $permission,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$moderator_groups = array();
@@ -1030,8 +1073,7 @@ 
 		if (isset($board_info['moderator_groups']))
 		{
 			$moderator_groups = array_keys($board_info['moderator_groups']);
-		}
-		elseif ($board_id !== 0)
+		} elseif ($board_id !== 0)
 		{
 			// Get the groups that can moderate this board
 			$request = $smcFunc['db_query']('', '
@@ -1116,8 +1158,9 @@ 
 		)
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $members;
@@ -1190,10 +1233,12 @@ 
 	}
 
 	$query_parts = array();
-	if (!empty($email))
-		$query_parts[] = 'poster_email = {string:email_address}';
-	if (!empty($membername))
-		$query_parts[] = 'poster_name = {string:member_name}';
+	if (!empty($email)) {
+			$query_parts[] = 'poster_email = {string:email_address}';
+	}
+	if (!empty($membername)) {
+			$query_parts[] = 'poster_name = {string:member_name}';
+	}
 	$query = implode(' AND ', $query_parts);
 
 	// Finally, update the posts themselves!
@@ -1260,12 +1305,14 @@ 
 
 	$userReceiver = (int) !empty($_REQUEST['u']) ? $_REQUEST['u'] : 0;
 
-	if (empty($userReceiver))
-		fatal_lang_error('no_access', false);
+	if (empty($userReceiver)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Remove if it's already there...
-	if (in_array($userReceiver, $user_info['buddies']))
-		$user_info['buddies'] = array_diff($user_info['buddies'], array($userReceiver));
+	if (in_array($userReceiver, $user_info['buddies'])) {
+			$user_info['buddies'] = array_diff($user_info['buddies'], array($userReceiver));
+	}
 
 	// ...or add if it's not and if it's not you.
 	elseif ($user_info['id'] != $userReceiver)
@@ -1340,8 +1387,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If we want duplicates pass the members array off.
-	if ($get_duplicates)
-		populateDuplicateMembers($members);
+	if ($get_duplicates) {
+			populateDuplicateMembers($members);
+	}
 
 	return $members;
 }
@@ -1358,8 +1406,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// We know how many members there are in total.
-	if (empty($where) || $where == '1=1')
-		$num_members = $modSettings['totalMembers'];
+	if (empty($where) || $where == '1=1') {
+			$num_members = $modSettings['totalMembers'];
+	}
 
 	// The database knows the amount when there are extra conditions.
 	else
@@ -1395,16 +1444,19 @@ 
 		$members[$key]['duplicate_members'] = array();
 
 		// Store the IPs.
-		if (!empty($member['member_ip']))
-			$ips[] = $member['member_ip'];
-		if (!empty($member['member_ip2']))
-			$ips[] = $member['member_ip2'];
+		if (!empty($member['member_ip'])) {
+					$ips[] = $member['member_ip'];
+		}
+		if (!empty($member['member_ip2'])) {
+					$ips[] = $member['member_ip2'];
+		}
 	}
 
 	$ips = array_unique($ips);
 
-	if (empty($ips))
-		return false;
+	if (empty($ips)) {
+			return false;
+	}
 
 	// Fetch all members with this IP address, we'll filter out the current ones in a sec.
 	$request = $smcFunc['db_query']('', '
@@ -1434,10 +1486,12 @@ 
 			'ip2' => $row['member_ip2'],
 		);
 
-		if (in_array($row['member_ip'], $ips))
-			$duplicate_members[$row['member_ip']][] = $member_context;
-		if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips))
-			$duplicate_members[$row['member_ip2']][] = $member_context;
+		if (in_array($row['member_ip'], $ips)) {
+					$duplicate_members[$row['member_ip']][] = $member_context;
+		}
+		if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips)) {
+					$duplicate_members[$row['member_ip2']][] = $member_context;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1462,8 +1516,9 @@ 
 		$row['poster_ip'] = inet_dtop($row['poster_ip']);
 
 		// Don't collect lots of the same.
-		if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']]))
-			continue;
+		if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']])) {
+					continue;
+		}
 		$had_ips[$row['poster_ip']][] = $row['id_member'];
 
 		$duplicate_members[$row['poster_ip']][] = array(
@@ -1478,13 +1533,15 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Now we have all the duplicate members, stick them with their respective member in the list.
-	if (!empty($duplicate_members))
-		foreach ($members as $key => $member)
+	if (!empty($duplicate_members)) {
+			foreach ($members as $key => $member)
 		{
 			if (isset($duplicate_members[$member['member_ip']]))
 				$members[$key]['duplicate_members'] = $duplicate_members[$member['member_ip']];
-			if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']]))
-				$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+	}
+			if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']])) {
+							$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+			}
 
 			// Check we don't have lots of the same member.
 			$member_track = array($member['id_member']);

Sources/Subs-List.php

Braces +85 added lines, -59 removed lines

@@ -12,8 +12,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Create a new list
@@ -41,21 +42,21 @@ 
 	{
 		$list_context['sort'] = array();
 		$sort = '1=1';
-	}
-	else
+	} else
 	{
 		$request_var_sort = isset($listOptions['request_vars']['sort']) ? $listOptions['request_vars']['sort'] : 'sort';
 		$request_var_desc = isset($listOptions['request_vars']['desc']) ? $listOptions['request_vars']['desc'] : 'desc';
-		if (isset($_REQUEST[$request_var_sort], $listOptions['columns'][$_REQUEST[$request_var_sort]], $listOptions['columns'][$_REQUEST[$request_var_sort]]['sort']))
-			$list_context['sort'] = array(
+		if (isset($_REQUEST[$request_var_sort], $listOptions['columns'][$_REQUEST[$request_var_sort]], $listOptions['columns'][$_REQUEST[$request_var_sort]]['sort'])) {
+					$list_context['sort'] = array(
 				'id' => $_REQUEST[$request_var_sort],
 				'desc' => isset($_REQUEST[$request_var_desc]) && isset($listOptions['columns'][$_REQUEST[$request_var_sort]]['sort']['reverse']),
 			);
-		else
-			$list_context['sort'] = array(
+		} else {
+					$list_context['sort'] = array(
 				'id' => $listOptions['default_sort_col'],
 				'desc' => (!empty($listOptions['default_sort_dir']) && $listOptions['default_sort_dir'] == 'desc') || (!empty($listOptions['columns'][$listOptions['default_sort_col']]['sort']['default']) && substr($listOptions['columns'][$listOptions['default_sort_col']]['sort']['default'], -4, 4) == 'desc') ? true : false,
 			);
+		}
 
 		// Set the database column sort.
 		$sort = $listOptions['columns'][$list_context['sort']['id']]['sort'][$list_context['sort']['desc'] ? 'reverse' : 'default'];
@@ -72,8 +73,9 @@ 
 	else
 	{
 		// First get an impression of how many items to expect.
-		if (isset($listOptions['get_count']['file']))
-			require_once($listOptions['get_count']['file']);
+		if (isset($listOptions['get_count']['file'])) {
+					require_once($listOptions['get_count']['file']);
+		}
 
 		$call = call_helper($listOptions['get_count']['function'], true);
 		$list_context['total_num_items'] = call_user_func_array($call, empty($listOptions['get_count']['params']) ? array() : $listOptions['get_count']['params']);
@@ -83,14 +85,15 @@ 
 		$list_context['items_per_page'] = $listOptions['items_per_page'];
 
 		// Then create a page index.
-		if ($list_context['total_num_items'] > $list_context['items_per_page'])
-			$list_context['page_index'] = constructPageIndex($listOptions['base_href'] . (empty($list_context['sort']) ? '' : ';' . $request_var_sort . '=' . $list_context['sort']['id'] . ($list_context['sort']['desc'] ? ';' . $request_var_desc : '')) . ($list_context['start_var_name'] != 'start' ? ';' . $list_context['start_var_name'] . '=%1$d' : ''), $list_context['start'], $list_context['total_num_items'], $list_context['items_per_page'], $list_context['start_var_name'] != 'start');
+		if ($list_context['total_num_items'] > $list_context['items_per_page']) {
+					$list_context['page_index'] = constructPageIndex($listOptions['base_href'] . (empty($list_context['sort']) ? '' : ';' . $request_var_sort . '=' . $list_context['sort']['id'] . ($list_context['sort']['desc'] ? ';' . $request_var_desc : '')) . ($list_context['start_var_name'] != 'start' ? ';' . $list_context['start_var_name'] . '=%1$d' : ''), $list_context['start'], $list_context['total_num_items'], $list_context['items_per_page'], $list_context['start_var_name'] != 'start');
+		}
 	}
 
 	// Prepare the headers of the table.
 	$list_context['headers'] = array();
-	foreach ($listOptions['columns'] as $column_id => $column)
-		$list_context['headers'][] = array(
+	foreach ($listOptions['columns'] as $column_id => $column) {
+			$list_context['headers'][] = array(
 			'id' => $column_id,
 			'label' => isset($column['header']['eval']) ? eval($column['header']['eval']) : (isset($column['header']['value']) ? $column['header']['value'] : ''),
 			'href' => empty($listOptions['default_sort_col']) || empty($column['sort']) ? '' : $listOptions['base_href'] . ';' . $request_var_sort . '=' . $column_id . ($column_id === $list_context['sort']['id'] && !$list_context['sort']['desc'] && isset($column['sort']['reverse']) ? ';' . $request_var_desc : '') . (empty($list_context['start']) ? '' : ';' . $list_context['start_var_name'] . '=' . $list_context['start']),
@@ -99,14 +102,16 @@ 
 			'style' => isset($column['header']['style']) ? $column['header']['style'] : '',
 			'colspan' => isset($column['header']['colspan']) ? $column['header']['colspan'] : '',
 		);
+	}
 
 	// We know the amount of columns, might be useful for the template.
 	$list_context['num_columns'] = count($listOptions['columns']);
 	$list_context['width'] = isset($listOptions['width']) ? $listOptions['width'] : '0';
 
 	// Get the file with the function for the item list.
-	if (isset($listOptions['get_items']['file']))
-		require_once($listOptions['get_items']['file']);
+	if (isset($listOptions['get_items']['file'])) {
+			require_once($listOptions['get_items']['file']);
+	}
 
 	// Call the function and include which items we want and in what order.
 	$call = call_helper($listOptions['get_items']['function'], true);
@@ -123,51 +128,61 @@ 
 			$cur_data = array();
 
 			// A value straight from the database?
-			if (isset($column['data']['db']))
-				$cur_data['value'] = $list_item[$column['data']['db']];
+			if (isset($column['data']['db'])) {
+							$cur_data['value'] = $list_item[$column['data']['db']];
+			}
 
 			// Take the value from the database and make it HTML safe.
-			elseif (isset($column['data']['db_htmlsafe']))
-				$cur_data['value'] = $smcFunc['htmlspecialchars']($list_item[$column['data']['db_htmlsafe']]);
+			elseif (isset($column['data']['db_htmlsafe'])) {
+							$cur_data['value'] = $smcFunc['htmlspecialchars']($list_item[$column['data']['db_htmlsafe']]);
+			}
 
 			// Using sprintf is probably the most readable way of injecting data.
 			elseif (isset($column['data']['sprintf']))
 			{
 				$params = array();
-				foreach ($column['data']['sprintf']['params'] as $sprintf_param => $htmlsafe)
-					$params[] = $htmlsafe ? $smcFunc['htmlspecialchars']($list_item[$sprintf_param]) : $list_item[$sprintf_param];
+				foreach ($column['data']['sprintf']['params'] as $sprintf_param => $htmlsafe) {
+									$params[] = $htmlsafe ? $smcFunc['htmlspecialchars']($list_item[$sprintf_param]) : $list_item[$sprintf_param];
+				}
 				$cur_data['value'] = vsprintf($column['data']['sprintf']['format'], $params);
 			}
 
 			// The most flexible way probably is applying a custom function.
-			elseif (isset($column['data']['function']))
-				$cur_data['value'] = call_user_func_array($column['data']['function'], array($list_item));
+			elseif (isset($column['data']['function'])) {
+							$cur_data['value'] = call_user_func_array($column['data']['function'], array($list_item));
+			}
 
 			// A modified value (inject the database values).
-			elseif (isset($column['data']['eval']))
-				$cur_data['value'] = eval(preg_replace('~%([a-zA-Z0-9\-_]+)%~', '$list_item[\'$1\']', $column['data']['eval']));
+			elseif (isset($column['data']['eval'])) {
+							$cur_data['value'] = eval(preg_replace('~%([a-zA-Z0-9\-_]+)%~', '$list_item[\'$1\']', $column['data']['eval']));
+			}
 
 			// A literal value.
-			elseif (isset($column['data']['value']))
-				$cur_data['value'] = $column['data']['value'];
+			elseif (isset($column['data']['value'])) {
+							$cur_data['value'] = $column['data']['value'];
+			}
 
 			// Empty value.
-			else
-				$cur_data['value'] = '';
+			else {
+							$cur_data['value'] = '';
+			}
 
 			// Allow for basic formatting.
-			if (!empty($column['data']['comma_format']))
-				$cur_data['value'] = comma_format($cur_data['value']);
-			elseif (!empty($column['data']['timeformat']))
-				$cur_data['value'] = timeformat($cur_data['value']);
+			if (!empty($column['data']['comma_format'])) {
+							$cur_data['value'] = comma_format($cur_data['value']);
+			} elseif (!empty($column['data']['timeformat'])) {
+							$cur_data['value'] = timeformat($cur_data['value']);
+			}
 
 			// Set a style class for this column?
-			if (isset($column['data']['class']))
-				$cur_data['class'] = $column['data']['class'];
+			if (isset($column['data']['class'])) {
+							$cur_data['class'] = $column['data']['class'];
+			}
 
 			// Fully customized styling for the cells in this column only.
-			if (isset($column['data']['style']))
-				$cur_data['style'] = $column['data']['style'];
+			if (isset($column['data']['style'])) {
+							$cur_data['style'] = $column['data']['style'];
+			}
 
 			// Add the data cell properties to the current row.
 			$cur_row[$column_id] = $cur_data;
@@ -176,10 +191,12 @@ 
 		// Maybe we wat set a custom class for the row based on the data in the row itself
 		if (isset($listOptions['data_check']))
 		{
-			if (isset($listOptions['data_check']['class']))
-				$list_context['rows'][$item_id]['class'] = $listOptions['data_check']['class']($list_item);
-			if (isset($listOptions['data_check']['style']))
-				$list_context['rows'][$item_id]['style'] = $listOptions['data_check']['style']($list_item);
+			if (isset($listOptions['data_check']['class'])) {
+							$list_context['rows'][$item_id]['class'] = $listOptions['data_check']['class']($list_item);
+			}
+			if (isset($listOptions['data_check']['style'])) {
+							$list_context['rows'][$item_id]['style'] = $listOptions['data_check']['style']($list_item);
+			}
 		}
 
 		// Insert the row into the list.
@@ -187,34 +204,39 @@ 
 	}
 
 	// The title is currently optional.
-	if (isset($listOptions['title']))
-		$list_context['title'] = $listOptions['title'];
+	if (isset($listOptions['title'])) {
+			$list_context['title'] = $listOptions['title'];
+	}
 
 	// In case there's a form, share it with the template context.
 	if (isset($listOptions['form']))
 	{
 		$list_context['form'] = $listOptions['form'];
 
-		if (!isset($list_context['form']['hidden_fields']))
-			$list_context['form']['hidden_fields'] = array();
+		if (!isset($list_context['form']['hidden_fields'])) {
+					$list_context['form']['hidden_fields'] = array();
+		}
 
 		// Always add a session check field.
 		$list_context['form']['hidden_fields'][$context['session_var']] = $context['session_id'];
 
 		// Will this do a token check?
-		if (isset($listOptions['form']['token']))
-			$list_context['form']['hidden_fields'][$context[$listOptions['form']['token'] . '_token_var']] = $context[$listOptions['form']['token'] . '_token'];
+		if (isset($listOptions['form']['token'])) {
+					$list_context['form']['hidden_fields'][$context[$listOptions['form']['token'] . '_token_var']] = $context[$listOptions['form']['token'] . '_token'];
+		}
 
 		// Include the starting page as hidden field?
-		if (!empty($list_context['form']['include_start']) && !empty($list_context['start']))
-			$list_context['form']['hidden_fields'][$list_context['start_var_name']] = $list_context['start'];
+		if (!empty($list_context['form']['include_start']) && !empty($list_context['start'])) {
+					$list_context['form']['hidden_fields'][$list_context['start_var_name']] = $list_context['start'];
+		}
 
 		// If sorting needs to be the same after submitting, add the parameter.
 		if (!empty($list_context['form']['include_sort']) && !empty($list_context['sort']))
 		{
 			$list_context['form']['hidden_fields']['sort'] = $list_context['sort']['id'];
-			if ($list_context['sort']['desc'])
-				$list_context['form']['hidden_fields']['desc'] = 1;
+			if ($list_context['sort']['desc']) {
+							$list_context['form']['hidden_fields']['desc'] = 1;
+			}
 		}
 	}
 
@@ -231,24 +253,28 @@ 
 		$list_context['additional_rows'] = array();
 		foreach ($listOptions['additional_rows'] as $row)
 		{
-			if (empty($row))
-				continue;
+			if (empty($row)) {
+							continue;
+			}
 
 			// Supported row positions: top_of_list, after_title,
 			// above_column_headers, below_table_data, bottom_of_list.
-			if (!isset($list_context['additional_rows'][$row['position']]))
-				$list_context['additional_rows'][$row['position']] = array();
+			if (!isset($list_context['additional_rows'][$row['position']])) {
+							$list_context['additional_rows'][$row['position']] = array();
+			}
 			$list_context['additional_rows'][$row['position']][] = $row;
 		}
 	}
 
 	// Add an option for inline JavaScript.
-	if (isset($listOptions['javascript']))
-		$list_context['javascript'] = $listOptions['javascript'];
+	if (isset($listOptions['javascript'])) {
+			$list_context['javascript'] = $listOptions['javascript'];
+	}
 
 	// We want a menu.
-	if (isset($listOptions['list_menu']))
-		$list_context['list_menu'] = $listOptions['list_menu'];
+	if (isset($listOptions['list_menu'])) {
+			$list_context['list_menu'] = $listOptions['list_menu'];
+	}
 
 	// Make sure the template is loaded.
 	loadTemplate('GenericList');

Sources/Help.php

Braces +29 added lines, -22 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Redirect to the user help ;).
@@ -95,12 +96,13 @@ 
 	);
 
 	// Have we got a localized one?
-	if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt'))
-		$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
-	elseif (file_exists($boarddir . '/agreement.txt'))
-		$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
-	else
-		$context['agreement'] = '';
+	if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) {
+			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
+	} elseif (file_exists($boarddir . '/agreement.txt')) {
+			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
+	} else {
+			$context['agreement'] = '';
+	}
 
 	// Nothing to show, so let's get out of here
 	if (empty($context['agreement']))
@@ -128,18 +130,21 @@ 
 {
 	global $txt, $helptxt, $context, $scripturl;
 
-	if (!isset($_GET['help']) || !is_string($_GET['help']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['help']) || !is_string($_GET['help'])) {
+			fatal_lang_error('no_access', false);
+	}
 
-	if (!isset($helptxt))
-		$helptxt = array();
+	if (!isset($helptxt)) {
+			$helptxt = array();
+	}
 
 	// Load the admin help language file and template.
 	loadLanguage('Help');
 
 	// Permission specific help?
-	if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp')
-		loadLanguage('ManagePermissions');
+	if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp') {
+			loadLanguage('ManagePermissions');
+	}
 
 	loadTemplate('Help');
 
@@ -154,16 +159,18 @@ 
 	$context['sub_template'] = 'popup';
 
 	// What help string should be used?
-	if (isset($helptxt[$_GET['help']]))
-		$context['help_text'] = $helptxt[$_GET['help']];
-	elseif (isset($txt[$_GET['help']]))
-		$context['help_text'] = $txt[$_GET['help']];
-	else
-		$context['help_text'] = $_GET['help'];
+	if (isset($helptxt[$_GET['help']])) {
+			$context['help_text'] = $helptxt[$_GET['help']];
+	} elseif (isset($txt[$_GET['help']])) {
+			$context['help_text'] = $txt[$_GET['help']];
+	} else {
+			$context['help_text'] = $_GET['help'];
+	}
 
 	// Does this text contain a link that we should fill in?
-	if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match))
-		$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
-}
+	if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match)) {
+			$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/SearchAPI-Standard.php

Braces +2 added lines, -1 removed lines

@@ -11,8 +11,9 @@
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Standard non full index, non custom index search

Sources/DbPackages-postgresql.php

Braces +110 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -52,8 +53,9 @@ 
 		'messages', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_recipients', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'themes', 'topics');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -102,8 +104,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -113,10 +116,11 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else
-			return $if_exists == 'ignore';
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else {
+					return $if_exists == 'ignore';
+		}
 	}
 
 	// If we've got this far - good news - no table exists. We can build our own!
@@ -134,17 +138,18 @@ 
 				)
 			);
 			$default = 'default nextval(\'' . $table_name . '_seq\')';
+		} elseif (isset($column['default']) && $column['default'] !== null) {
+					$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+		} else {
+					$default = '';
 		}
-		elseif (isset($column['default']) && $column['default'] !== null)
-			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-		else
-			$default = '';
 
 		// Sort out the size...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column['type'], $column['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// Now just put it together!
 		$table_query .= "\n\t\"" . $column['name'] . '" ' . $type . ' ' . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default . ',';
@@ -157,19 +162,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Primary goes in the table...
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$index_queries[] = 'CREATE ' . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $table_name . '_' . $index['name'] . ' ON ' . $table_name . ' (' . $columns . ')';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	$table_query .= ')';
 
@@ -180,12 +187,13 @@ 
 		)
 	);
 	// And the indexes...
-	foreach ($index_queries as $query)
-		$smcFunc['db_query']('', $query,
+	foreach ($index_queries as $query) {
+			$smcFunc['db_query']('', $query,
 		array(
 			'security_override' => true,
 		)
 	);
+	}
 
 	// Go, go power rangers!
 	$smcFunc['db_transaction']('commit');
@@ -213,8 +221,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -272,21 +281,24 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
 	$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now add the thing!
 	$query = '
@@ -301,11 +313,12 @@ 
 	// If there's more attributes they need to be done via a change on PostgreSQL.
 	unset($column_info['type'], $column_info['size']);
 
-	if (count($column_info) != 1)
-		return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-	else
-		return true;
-}
+	if (count($column_info) != 1) {
+			return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Removes a column.
@@ -324,8 +337,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			// If there is an auto we need remove it!
 			if ($column['auto'])
@@ -335,6 +348,7 @@ 
 						'security_override' => true,
 					)
 				);
+	}
 
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -369,13 +383,15 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Now we check each bit individually and ALTER as required.
 	if (isset($column_info['name']) && $column_info['name'] != $old_column)
@@ -432,8 +448,9 @@ 
 	{
 		$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// The alter is a pain.
 		$smcFunc['db_transaction']('begin');
@@ -527,21 +544,23 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		}
+	} else {
+			$index_info['name'] = $table_name . $index_info['name'];
 	}
-	else
-		$index_info['name'] = $table_name . $index_info['name'];
 
 	// Log that we are going to want to remove this!
 	$db_package_log[] = array('remove_index', $table_name, $index_info['name']);
@@ -554,10 +573,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -571,8 +591,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			CREATE ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $index_info['name'] . ' ON ' . $table_name . ' (' . $columns . ')',
@@ -600,8 +619,9 @@ 
 
 	// Better exist!
 	$indexes = $smcFunc['db_list_indexes']($table_name, true);
-	if ($index_name != 'primary')
-		$index_name = $table_name . '_' . $index_name;
+	if ($index_name != 'primary') {
+			$index_name = $table_name . '_' . $index_name;
+	}
 
 	foreach ($indexes as $index)
 	{
@@ -665,8 +685,7 @@ 
 			'datetime' => 'timestamp without time zone',
 			'timestamp' => 'timestamp without time zone',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'character varying' => 'varchar',
@@ -682,14 +701,16 @@ 
 	// Got it? Change it!
 	if (isset($types[$type_name]))
 	{
-		if ($type_name == 'tinytext')
-			$type_size = 255;
+		if ($type_name == 'tinytext') {
+					$type_size = 255;
+		}
 		$type_name = $types[$type_name];
 	}
 
 	// Only char fields got size
-	if (strpos($type_name, 'char') === false)
-			$type_size = null;
+	if (strpos($type_name, 'char') === false) {
+				$type_size = null;
+	}
 
 
 	return array($type_name, $type_size);
@@ -744,8 +765,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['column_name'];
-		}
-		else
+		} else
 		{
 			$auto = false;
 			// What is the default?
@@ -753,11 +773,11 @@ 
 			{
 				$default = null;
 				$auto = true;
+			} elseif (trim($row['column_default']) != '') {
+							$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
+			} else {
+							$default = null;
 			}
-			elseif (trim($row['column_default']) != '')
-				$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
-			else
-				$default = null;
 
 			// Make the type generic.
 			list ($type, $size) = $smcFunc['db_calculate_type']($row['data_type'], $row['character_maximum_length'], true);
@@ -808,26 +828,30 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// Try get the columns that make it up.
-		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-			continue;
+		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+					continue;
+		}
 
 		$columns = explode(',', $matches[1]);
 
-		if (empty($columns))
-			continue;
+		if (empty($columns)) {
+					continue;
+		}
 
-		foreach ($columns as $k => $v)
-			$columns[$k] = trim($v);
+		foreach ($columns as $k => $v) {
+					$columns[$k] = trim($v);
+		}
 
 		// Fix up the name to be consistent cross databases
-		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1)
-			$row['name'] = 'PRIMARY';
-		else
-			$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1) {
+					$row['name'] = 'PRIMARY';
+		} else {
+					$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		}
 
-		if (!$detail)
-			$indexes[] = $row['name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['name'];
+		} else
 		{
 			$indexes[$row['name']] = array(
 				'name' => $row['name'],

Doc Comments +1 added lines, -1 removed lines

@@ -382,7 +382,7 @@
  * @param array $parameters Not used?
  * @param string $if_exists What to do if the index exists. If 'update', the definition will be updated.
  * @param string $error
- * @return boolean Whether or not the operation was successful
+ * @return false|null Whether or not the operation was successful
  */
 function smf_db_add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
 {

Sources/Recent.php

Spacing +4 added lines, -4 removed lines

@@ -237,7 +237,7 @@ 
 	else
 	{
 		$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
-					AND b.id_board != {int:recycle_board}' : ''). '
+					AND b.id_board != {int:recycle_board}' : '') . '
 					AND m.id_msg >= {int:max_id_msg}';
 		$query_parameters['max_id_msg'] = max(0, $modSettings['maxMsgID'] - 100 - $_REQUEST['start'] * 6);
 		$query_parameters['recycle_board'] = $modSettings['recycle_board'];
@@ -1124,7 +1124,7 @@ 
 			);
 		else
 			$request = $smcFunc['db_query']('', '
-				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
+				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'] . '
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
 					INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)') . (strpos($_REQUEST['sort'], 'mems.') === false ? '' : '
@@ -1391,7 +1391,7 @@ 
 	if ($is_topics)
 	{
 		$context['recent_buttons'] = array(
-			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'.  $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
+			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
 		if ($context['showCheckboxes'])
@@ -1407,7 +1407,7 @@ 
 	elseif (!$is_topics && isset($context['topics_to_mark']))
 	{
 		$context['recent_buttons'] = array(
-			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read']  .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
+			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
 		if ($context['showCheckboxes'])

Braces +208 added lines, -170 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest post made on the system
@@ -44,8 +45,9 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -54,8 +56,9 @@ 
 	censorText($row['body']);
 
 	$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled']), array('<br>' => '&#10;')));
-	if ($smcFunc['strlen']($row['body']) > 128)
-		$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	if ($smcFunc['strlen']($row['body']) > 128) {
+			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+	}
 
 	// Send the data.
 	return array(
@@ -83,15 +86,17 @@ 
 
 	$context['is_redirect'] = false;
 
-	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95)
-		$_REQUEST['start'] = 95;
+	if (isset($_REQUEST['start']) && $_REQUEST['start'] > 95) {
+			$_REQUEST['start'] = 95;
+	}
 
 	$query_parameters = array();
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -107,8 +112,9 @@ 
 			list ($name) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($name))
-				fatal_lang_error('no_access', false);
+			if (empty($name)) {
+							fatal_lang_error('no_access', false);
+			}
 
 			$context['linktree'][] = array(
 				'url' => $scripturl . '#c' . (int) $_REQUEST['c'],
@@ -140,8 +146,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -155,12 +162,12 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;c=' . implode(',', $_REQUEST['c']), $_REQUEST['start'], min(100, $total_cat_posts), 10, false);
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts
@@ -184,8 +191,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'b.id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -199,8 +207,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;boards=' . implode(',', $_REQUEST['boards']), $_REQUEST['start'], min(100, $total_posts), 10, false);
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts, redirect
@@ -233,8 +240,7 @@ 
 		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?action=recent;board=' . $board . '.%1$d', $_REQUEST['start'], min(100, $total_posts), 10, true);
-	}
-	else
+	} else
 	{
 		$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 					AND b.id_board != {int:recycle_board}' : ''). '
@@ -269,8 +275,9 @@ 
 	);
 
 	// If you selected a redirection board, don't try getting posts for it...
-	if ($context['is_redirect'])
-		$messages = 0;
+	if ($context['is_redirect']) {
+			$messages = 0;
+	}
 
 	$key = 'recent-' . $user_info['id'] . '-' . md5(json_encode(array_diff_key($query_parameters, array('max_id_msg' => 0)))) . '-' . (int) $_REQUEST['start'];
 	if (!$context['is_redirect'] && (empty($modSettings['cache_enable']) || ($messages = cache_get_data($key, 120)) == null))
@@ -301,16 +308,18 @@ 
 				$query_this_board = str_replace('AND m.id_msg >= {int:max_id_msg}', '', $query_this_board);
 				$cache_results = true;
 				unset($query_parameters['max_id_msg']);
+			} else {
+							$done = true;
 			}
-			else
-				$done = true;
 		}
 		$messages = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$messages[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$messages[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-		if (!empty($cache_results))
-			cache_put_data($key, $messages, 120);
+		if (!empty($cache_results)) {
+					cache_put_data($key, $messages, 120);
+		}
 	}
 
 	// Nothing here... Or at least, nothing you can see...
@@ -397,8 +406,9 @@ 
 			'css_class' => 'windowbg',
 		);
 
-		if ($user_info['id'] == $row['id_first_member'])
-			$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		if ($user_info['id'] == $row['id_first_member']) {
+					$board_ids['own'][$row['id_board']][] = $row['id_msg'];
+		}
 		$board_ids['any'][$row['id_board']][] = $row['id_msg'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -424,20 +434,23 @@ 
 			$boards = boardsAllowedTo($permission);
 
 			// If 0 is the only thing in the array, they can do it everywhere!
-			if (!empty($boards) && $boards[0] == 0)
-				$boards = array_keys($board_ids[$type]);
+			if (!empty($boards) && $boards[0] == 0) {
+							$boards = array_keys($board_ids[$type]);
+			}
 
 			// Go through the boards, and look for posts they can do this on.
 			foreach ($boards as $board_id)
 			{
 				// Hmm, they have permission, but there are no topics from that board on this page.
-				if (!isset($board_ids[$type][$board_id]))
-					continue;
+				if (!isset($board_ids[$type][$board_id])) {
+									continue;
+				}
 
 				// Okay, looks like they can do it for these posts.
-				foreach ($board_ids[$type][$board_id] as $counter)
-					if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
+				foreach ($board_ids[$type][$board_id] as $counter) {
+									if ($type == 'any' || $context['posts'][$counter]['poster']['id'] == $user_info['id'])
 						$context['posts'][$counter][$allowed] = true;
+				}
 			}
 		}
 	}
@@ -480,17 +493,19 @@ 
 	$context['showing_all_topics'] = isset($_GET['all']);
 	$context['start'] = (int) $_REQUEST['start'];
 	$context['topics_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
-	if ($_REQUEST['action'] == 'unread')
-		$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
-	else
-		$context['page_title'] = $txt['unread_replies'];
+	if ($_REQUEST['action'] == 'unread') {
+			$context['page_title'] = $context['showing_all_topics'] ? $txt['unread_topics_all'] : $txt['unread_topics_visit'];
+	} else {
+			$context['page_title'] = $txt['unread_replies'];
+	}
 
-	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread'])
-		fatal_lang_error('loadavg_allunread_disabled', false);
-	elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies'])
-		fatal_lang_error('loadavg_unreadreplies_disabled', false);
-	elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread'])
-		fatal_lang_error('loadavg_unread_disabled', false);
+	if ($context['showing_all_topics'] && !empty($context['load_average']) && !empty($modSettings['loadavg_allunread']) && $context['load_average'] >= $modSettings['loadavg_allunread']) {
+			fatal_lang_error('loadavg_allunread_disabled', false);
+	} elseif ($_REQUEST['action'] != 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unreadreplies']) && $context['load_average'] >= $modSettings['loadavg_unreadreplies']) {
+			fatal_lang_error('loadavg_unreadreplies_disabled', false);
+	} elseif (!$context['showing_all_topics'] && $_REQUEST['action'] == 'unread' && !empty($context['load_average']) && !empty($modSettings['loadavg_unread']) && $context['load_average'] >= $modSettings['loadavg_unread']) {
+			fatal_lang_error('loadavg_unread_disabled', false);
+	}
 
 	// Parameters for the main query.
 	$query_parameters = array();
@@ -503,12 +518,14 @@ 
 		if (!empty($_REQUEST['boards']))
 		{
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $b)
-				$boards[] = (int) $b;
+			foreach ($_REQUEST['boards'] as $b) {
+							$boards[] = (int) $b;
+			}
 		}
 
-		if (!empty($board))
-			$boards[] = (int) $board;
+		if (!empty($board)) {
+					$boards[] = (int) $board;
+		}
 
 		// The easiest thing is to just get all the boards they can see, but since we've specified the top of tree we ignore some of them
 		$request = $smcFunc['db_query']('', '
@@ -525,30 +542,31 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (in_array($row['id_parent'], $boards))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (in_array($row['id_parent'], $boards))
 				$boards[] = $row['id_board'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%d';
-	}
-	elseif (!empty($board))
+	} elseif (!empty($board))
 	{
 		$query_this_board = 'id_board = {int:board}';
 		$query_parameters['board'] = $board;
 		$context['querystring_board_limits'] = ';board=' . $board . '.%1$d';
-	}
-	elseif (!empty($_REQUEST['boards']))
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board
@@ -560,22 +578,24 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';boards=' . implode(',', $boards) . ';start=%1$d';
-	}
-	elseif (!empty($_REQUEST['c']))
+	} elseif (!empty($_REQUEST['c']))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		$request = $smcFunc['db_query']('', '
@@ -588,18 +608,19 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_selected');
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_selected');
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
 		$context['querystring_board_limits'] = ';c=' . implode(',', $_REQUEST['c']) . ';start=%1$d';
-	}
-	else
+	} else
 	{
 		$see_board = isset($_REQUEST['action']) && $_REQUEST['action'] == 'unreadreplies' ? 'query_see_board' : 'query_wanna_see_board';
 		// Don't bother to show deleted posts!
@@ -613,12 +634,14 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			fatal_lang_error('error_no_boards_available', false);
+		if (empty($boards)) {
+					fatal_lang_error('error_no_boards_available', false);
+		}
 
 		$query_this_board = 'id_board IN ({array_int:boards})';
 		$query_parameters['boards'] = $boards;
@@ -680,13 +703,14 @@ 
 		'name' => $_REQUEST['action'] == 'unread' ? $txt['unread_topics_visit'] : $txt['unread_replies']
 	);
 
-	if ($context['showing_all_topics'])
-		$context['linktree'][] = array(
+	if ($context['showing_all_topics']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=' . $_REQUEST['action'] . ';all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits'],
 			'name' => $txt['unread_topics_all']
 		);
-	else
-		$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	} else {
+			$txt['unread_topics_visit_none'] = strtr($txt['unread_topics_visit_none'], array('?action=unread;all' => '?action=unread;all' . sprintf($context['querystring_board_limits'], 0) . $context['querystring_sort_limits']));
+	}
 
 	loadTemplate('Recent');
 	loadTemplate('MessageIndex');
@@ -694,8 +718,9 @@ 
 
 	// Setup the default topic icons... for checking they exist and the like ;)
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$is_topics = $_REQUEST['action'] == 'unread';
 
@@ -725,8 +750,7 @@ 
 			);
 			list ($earliest_msg) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT MIN(lmr.id_msg)
@@ -742,14 +766,14 @@ 
 		}
 
 		// This is needed in case of topics marked unread.
-		if (empty($earliest_msg))
-			$earliest_msg = 0;
-		else
+		if (empty($earliest_msg)) {
+					$earliest_msg = 0;
+		} else
 		{
 			// Using caching, when possible, to ignore the below slow query.
-			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time())
-				$earliest_msg2 = $_SESSION['cached_log_time'][1];
-			else
+			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time()) {
+							$earliest_msg2 = $_SESSION['cached_log_time'][1];
+			} else
 			{
 				// This query is pretty slow, but it's needed to ensure nothing crucial is ignored.
 				$request = $smcFunc['db_query']('', '
@@ -764,8 +788,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// In theory this could be zero, if the first ever post is unread, so fudge it ;)
-				if ($earliest_msg2 == 0)
-					$earliest_msg2 = -1;
+				if ($earliest_msg2 == 0) {
+									$earliest_msg2 = -1;
+				}
 
 				$_SESSION['cached_log_time'] = array(time(), $earliest_msg2);
 			}
@@ -803,9 +828,9 @@ 
 				'db_error_skip' => true,
 			))
 		) !== false;
+	} else {
+			$have_temp_table = false;
 	}
-	else
-		$have_temp_table = false;
 
 	if ($context['showing_all_topics'] && $have_temp_table)
 	{
@@ -851,14 +876,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%1$d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%1$d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -887,8 +913,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	elseif ($is_topics)
+	} elseif ($is_topics)
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*), MIN(t.id_last_msg)
@@ -939,14 +964,15 @@ 
 
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
+		} else {
+					$min_message = (int) $min_message;
 		}
-		else
-			$min_message = (int) $min_message;
 
 		$request = $smcFunc['db_query']('substring', '
 			SELECT ' . $select_clause . '
@@ -976,8 +1002,7 @@ 
 				'limit' => $context['topics_per_page'],
 			))
 		);
-	}
-	else
+	} else
 	{
 		if ($modSettings['totalMessages'] > 100000)
 		{
@@ -1029,8 +1054,8 @@ 
 			) !== false;
 
 			// If that worked, create a sample of the log_topics table too.
-			if ($have_temp_table)
-				$have_temp_table = $smcFunc['db_query']('', '
+			if ($have_temp_table) {
+							$have_temp_table = $smcFunc['db_query']('', '
 					CREATE TEMPORARY TABLE {db_prefix}log_topics_posted_in (
 						PRIMARY KEY (id_topic)
 					)
@@ -1043,6 +1068,7 @@ 
 						'db_error_skip' => true,
 					)
 				) !== false;
+			}
 		}
 
 		if (!empty($have_temp_table))
@@ -1058,8 +1084,7 @@ 
 			);
 			list ($num_topics) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('unread_fetch_topic_count', '
 				SELECT COUNT(DISTINCT t.id_topic), MIN(t.id_last_msg)
@@ -1100,15 +1125,16 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
-		if (!empty($have_temp_table))
-			$request = $smcFunc['db_query']('', '
+		if (!empty($have_temp_table)) {
+					$request = $smcFunc['db_query']('', '
 				SELECT t.id_topic
 				FROM {db_prefix}topics_posted_in AS t
 					LEFT JOIN {db_prefix}log_topics_posted_in AS lt ON (lt.id_topic = t.id_topic)
@@ -1122,8 +1148,8 @@ 
 					'limit' => $context['topics_per_page'],
 				))
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
@@ -1147,10 +1173,12 @@ 
 					'sort' => $_REQUEST['sort'],
 				))
 			);
+		}
 
 		$topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topics[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Sanity... where have you gone?
@@ -1158,10 +1186,11 @@ 
 		{
 			$context['topics'] = array();
 			$context['no_topic_listing'] = true;
-			if ($context['querystring_board_limits'] == ';start=%d')
-				$context['querystring_board_limits'] = '';
-			else
-				$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			if ($context['querystring_board_limits'] == ';start=%d') {
+							$context['querystring_board_limits'] = '';
+			} else {
+							$context['querystring_board_limits'] = sprintf($context['querystring_board_limits'], $_REQUEST['start']);
+			}
 			return;
 		}
 
@@ -1195,8 +1224,9 @@ 
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
-			continue;
+		if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
+					continue;
+		}
 
 		$topic_ids[] = $row['id_topic'];
 
@@ -1204,11 +1234,13 @@ 
 		{
 			// Limit them to 128 characters - do this FIRST because it's a lot of wasted censoring otherwise.
 			$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['first_body']) > 128)
-				$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['first_body']) > 128) {
+							$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, 128) . '...';
+			}
 			$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-			if ($smcFunc['strlen']($row['last_body']) > 128)
-				$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			if ($smcFunc['strlen']($row['last_body']) > 128) {
+							$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, 128) . '...';
+			}
 
 			// Censor the subject and message preview.
 			censorText($row['first_subject']);
@@ -1219,23 +1251,22 @@ 
 			{
 				$row['last_subject'] = $row['first_subject'];
 				$row['last_body'] = $row['first_body'];
-			}
-			else
+			} else
 			{
 				censorText($row['last_subject']);
 				censorText($row['last_body']);
 			}
-		}
-		else
+		} else
 		{
 			$row['first_body'] = '';
 			$row['last_body'] = '';
 			censorText($row['first_subject']);
 
-			if ($row['id_first_msg'] == $row['id_last_msg'])
-				$row['last_subject'] = $row['first_subject'];
-			else
-				censorText($row['last_subject']);
+			if ($row['id_first_msg'] == $row['id_last_msg']) {
+							$row['last_subject'] = $row['first_subject'];
+			} else {
+							censorText($row['last_subject']);
+			}
 		}
 
 		// Decide how many pages the topic should have.
@@ -1247,22 +1278,24 @@ 
 			$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $topic_length, $messages_per_page, true, false);
 
 			// If we can use all, show all.
-			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages'])
-				$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			if (!empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']) {
+							$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
+			}
+		} else {
+					$pages = '';
 		}
 
-		else
-			$pages = '';
-
 		// We need to check the topic icons exist... you can never be too sure!
 		if (!empty($modSettings['messageIconChecks_enable']))
 		{
 			// First icon first... as you'd expect.
-			if (!isset($context['icon_sources'][$row['first_icon']]))
-				$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			if (!isset($context['icon_sources'][$row['first_icon']])) {
+							$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
 			// Last icon... last... duh.
-			if (!isset($context['icon_sources'][$row['last_icon']]))
-				$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			if (!isset($context['icon_sources'][$row['last_icon']])) {
+							$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+			}
 		}
 
 		// Force the recycling icon if appropriate
@@ -1276,12 +1309,14 @@ 
 		$colorClass = 'windowbg';
 
 		// Sticky topics should get a different color, too.
-		if ($row['is_sticky'])
-			$colorClass .= ' sticky';
+		if ($row['is_sticky']) {
+					$colorClass .= ' sticky';
+		}
 
 		// Locked topics get special treatment as well.
-		if ($row['locked'])
-			$colorClass .= ' locked';
+		if ($row['locked']) {
+					$colorClass .= ' locked';
+		}
 
 		// And build the array.
 		$context['topics'][$row['id_topic']] = array(
@@ -1378,8 +1413,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if (empty($context['topics'][$row['id_topic']]['is_posted_in']))
-				$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			if (empty($context['topics'][$row['id_topic']]['is_posted_in'])) {
+							$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+			}
 		}
 		$smcFunc['db_free_result']($result);
 	}
@@ -1394,28 +1430,30 @@ 
 			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'.  $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 
-		if (!empty($context['topics']) && !$context['showing_all_topics'])
-			$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
-	}
-	elseif (!$is_topics && isset($context['topics_to_mark']))
+		if (!empty($context['topics']) && !$context['showing_all_topics']) {
+					$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => $scripturl . '?action=unread;all' . $context['querystring_board_limits'], 'active' => true);
+		}
+	} elseif (!$is_topics && isset($context['topics_to_mark']))
 	{
 		$context['recent_buttons'] = array(
 			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read']  .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
-		if ($context['showCheckboxes'])
-			$context['recent_buttons']['markselectread'] = array(
+		if ($context['showCheckboxes']) {
+					$context['recent_buttons']['markselectread'] = array(
 				'text' => 'quick_mod_markread',
 				'image' => 'markselectedread.png',
 				'url' => 'javascript:document.quickModForm.submit();',
 			);
+		}
 	}
 
 	// Allow mods to add additional buttons here

Sources/Modlog.php

Spacing +2 added lines, -2 removed lines

@@ -256,7 +256,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($entry)
+					'function' => function($entry)
 					{
 						return '<input type="checkbox" class="input_check" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled') . '>';
 					},
@@ -638,7 +638,7 @@ 
 		if (empty($entries[$k]['action_text']))
 			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
-			function ($matches) use ($entries, $k)
+			function($matches) use ($entries, $k)
 			{
 				return isset($entries[$k]['extra'][$matches[1]]) ? $entries[$k]['extra'][$matches[1]] : '';
 			}, $entries[$k]['action_text']);

Braces +97 added lines, -73 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Prepares the information from the moderation log for viewing.
@@ -32,14 +33,16 @@ 
 
 	// Are we looking at the moderation log or the administration log.
 	$context['log_type'] = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 3 : 1;
-	if ($context['log_type'] == 3)
-		isAllowedTo('admin_forum');
+	if ($context['log_type'] == 3) {
+			isAllowedTo('admin_forum');
+	}
 
 	// These change dependant on whether we are viewing the moderation or admin log.
-	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin')
-		$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
-	else
-		$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin') {
+			$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
+	} else {
+			$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	}
 
 	$context['can_delete'] = allowedTo('admin_forum');
 
@@ -67,8 +70,7 @@ 
 		$log_type = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 'admin' : 'moderate';
 		logAction('clearlog_' . $log_type, array(), $log_type);
 
-	}
-	elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
+	} elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
 	{
 		checkSession();
 		validateToken('mod-ml');
@@ -114,15 +116,17 @@ 
 		'ip' => array('sql' => 'lm.ip', 'label' => $txt['modlog_ip'])
 	);
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params_column = $searchTypes[$search_params_type]['sql'];
 	$search_params = array(
@@ -297,13 +301,14 @@ 
 	$context['sub_template'] = 'show_list';
 	$context['default_list'] = 'moderation_log_list';
 
-	if (isset($context['moderation_menu_name']))
-		$context[$context['moderation_menu_name']]['tab_data'] = array(
+	if (isset($context['moderation_menu_name'])) {
+			$context[$context['moderation_menu_name']]['tab_data'] = array(
 			'title' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log'],
 			'help' => $context['log_type'] == 3 ? 'adminlog' : 'modlog',
 			'description' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log_desc']
 		);
-}
+	}
+	}
 
 /**
  * Get the number of mod log entries.
@@ -407,30 +412,35 @@ 
 		// Add on some of the column stuff info
 		if (!empty($row['id_board']))
 		{
-			if ($row['action'] == 'move')
-				$row['extra']['board_to'] = $row['id_board'];
-			else
-				$row['extra']['board'] = $row['id_board'];
+			if ($row['action'] == 'move') {
+							$row['extra']['board_to'] = $row['id_board'];
+			} else {
+							$row['extra']['board'] = $row['id_board'];
+			}
 		}
 
-		if (!empty($row['id_topic']))
-			$row['extra']['topic'] = $row['id_topic'];
-		if (!empty($row['id_msg']))
-			$row['extra']['message'] = $row['id_msg'];
+		if (!empty($row['id_topic'])) {
+					$row['extra']['topic'] = $row['id_topic'];
+		}
+		if (!empty($row['id_msg'])) {
+					$row['extra']['message'] = $row['id_msg'];
+		}
 
 		// Is this associated with a topic?
-		if (isset($row['extra']['topic']))
-			$topics[(int) $row['extra']['topic']][] = $row['id_action'];
-		if (isset($row['extra']['new_topic']))
-			$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		if (isset($row['extra']['topic'])) {
+					$topics[(int) $row['extra']['topic']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['new_topic'])) {
+					$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		}
 
 		// How about a member?
 		if (isset($row['extra']['member']))
 		{
 			// Guests don't have names!
-			if (empty($row['extra']['member']))
-				$row['extra']['member'] = $txt['modlog_parameter_guest'];
-			else
+			if (empty($row['extra']['member'])) {
+							$row['extra']['member'] = $txt['modlog_parameter_guest'];
+			} else
 			{
 				// Try to find it...
 				$members[(int) $row['extra']['member']][] = $row['id_action'];
@@ -438,35 +448,42 @@ 
 		}
 
 		// Associated with a board?
-		if (isset($row['extra']['board_to']))
-			$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
-		if (isset($row['extra']['board_from']))
-			$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
-		if (isset($row['extra']['board']))
-			$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		if (isset($row['extra']['board_to'])) {
+					$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board_from'])) {
+					$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board'])) {
+					$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		}
 
 		// A message?
-		if (isset($row['extra']['message']))
-			$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		if (isset($row['extra']['message'])) {
+					$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		}
 
 		// IP Info?
-		if (isset($row['extra']['ip_range']))
-			if ($seeIP)
+		if (isset($row['extra']['ip_range'])) {
+					if ($seeIP)
 				$row['extra']['ip_range'] = '<a href="' . $scripturl . '?action=trackip;searchip=' . $row['extra']['ip_range'] . '">' . $row['extra']['ip_range'] . '</a>';
-			else
-				$row['extra']['ip_range'] = $txt['logged'];
+		} else {
+							$row['extra']['ip_range'] = $txt['logged'];
+			}
 
 		// Email?
-		if (isset($row['extra']['email']))
-			$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		if (isset($row['extra']['email'])) {
+					$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		}
 
 		// Bans are complex.
 		if ($row['action'] == 'ban' || $row['action'] == 'banremove')
 		{
 			$row['action_text'] = $txt['modlog_ac_ban' . ($row['action'] == 'banremove' ? '_remove' : '')];
-			foreach (array('member', 'email', 'ip_range', 'hostname') as $type)
-				if (isset($row['extra'][$type]))
+			foreach (array('member', 'email', 'ip_range', 'hostname') as $type) {
+							if (isset($row['extra'][$type]))
 					$row['action_text'] .= $txt['modlog_ac_ban_trigger_' . $type];
+			}
 		}
 
 		// The array to go to the template. Note here that action is set to a "default" value of the action doesn't match anything in the descriptions. Allows easy adding of logging events with basic details.
@@ -502,12 +519,13 @@ 
 			foreach ($boards[$row['id_board']] as $action)
 			{
 				// Make the board number into a link - dealing with moving too.
-				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board'])
-					$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board'])
-					$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board'])
-					$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board']) {
+									$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board']) {
+									$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board']) {
+									$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -541,10 +559,11 @@ 
 				);
 
 				// Make the topic number into a link - dealing with splitting too.
-				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic'])
-					$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
-				elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic'])
-					$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic']) {
+									$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				} elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic']) {
+									$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -577,8 +596,9 @@ 
 				);
 
 				// Make the message number into a link.
-				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg'])
-					$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg']) {
+									$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -618,25 +638,29 @@ 
 	foreach ($entries as $k => $entry)
 	{
 		// Make any message info links so its easier to go find that message.
-		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id'])))
-			$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id']))) {
+					$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		}
 
 		// Mark up any deleted members, topics and boards.
-		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type)
-			if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
+		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type) {
+					if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
 				$entries[$k]['extra'][$type] = sprintf($txt['modlog_id'], $entry['extra'][$type]);
+		}
 
 		if (isset($entry['extra']['report']))
 		{
 			// Member profile reports go in a different area
-			if (stristr($entry['action'], 'user_report'))
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
-			else
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			if (stristr($entry['action'], 'user_report')) {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			} else {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			}
 		}
 
-		if (empty($entries[$k]['action_text']))
-			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		if (empty($entries[$k]['action_text'])) {
+					$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		}
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
 			function ($matches) use ($entries, $k)
 			{

Sources/Class-BrowserDetect.php

Indentation +33 added lines, -33 removed lines

@@ -101,9 +101,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera or not
-	* @return boolean Whether or not this is Opera
-	*/
+	 * Determine if the browser is Opera or not
+	 * @return boolean Whether or not this is Opera
+	 */
 	function isOpera()
 	{
 		if (!isset($this->_browsers['is_opera']))
@@ -112,9 +112,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is IE or not
-	* @return boolean true Whether or not the browser is IE
-	*/
+	 * Determine if the browser is IE or not
+	 * @return boolean true Whether or not the browser is IE
+	 */
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
@@ -124,9 +124,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is IE11 or not
-	* @return boolean Whether or not the browser is IE11
-	*/
+	 * Determine if the browser is IE11 or not
+	 * @return boolean Whether or not the browser is IE11
+	 */
 	function isIe11()
 	{
 		// IE11 is a bit different than earlier versions
@@ -137,9 +137,9 @@ 
  	}
 
 	/**
-	* Determine if the browser is Edge or not
-	* @return boolean Whether or not the browser is Edge
-	*/
+	 * Determine if the browser is Edge or not
+	 * @return boolean Whether or not the browser is Edge
+	 */
 	function isEdge()
 	{
 		if (!isset($this->_browsers['is_edge']))
@@ -148,9 +148,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is a Webkit based one or not
-	* @return boolean Whether or not this is a Webkit-based browser
-	*/
+	 * Determine if the browser is a Webkit based one or not
+	 * @return boolean Whether or not this is a Webkit-based browser
+	 */
 	function isWebkit()
 	{
 		if (!isset($this->_browsers['is_webkit']))
@@ -159,9 +159,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Firefox or one of its variants
-	* @return boolean Whether or not this is Firefox (or one of its variants)
-	*/
+	 * Determine if the browser is Firefox or one of its variants
+	 * @return boolean Whether or not this is Firefox (or one of its variants)
+	 */
 	function isFirefox()
 	{
 		if (!isset($this->_browsers['is_firefox']))
@@ -170,9 +170,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is WebTv or not
-	* @return boolean Whether or not this is WebTV
-	*/
+	 * Determine if the browser is WebTv or not
+	 * @return boolean Whether or not this is WebTV
+	 */
 	function isWebTv()
 	{
 		if (!isset($this->_browsers['is_web_tv']))
@@ -181,9 +181,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is konqueror or not
-	* @return boolean Whether or not this is Konqueror
-	*/
+	 * Determine if the browser is konqueror or not
+	 * @return boolean Whether or not this is Konqueror
+	 */
 	function isKonqueror()
 	{
 		if (!isset($this->_browsers['is_konqueror']))
@@ -192,9 +192,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Gecko or not
-	* @return boolean Whether or not this is a Gecko-based browser
-	*/
+	 * Determine if the browser is Gecko or not
+	 * @return boolean Whether or not this is a Gecko-based browser
+	 */
 	function isGecko()
 	{
 		if (!isset($this->_browsers['is_gecko']))
@@ -203,9 +203,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera Mini or not
-	* @return boolean Whether or not this is Opera Mini
-	*/
+	 * Determine if the browser is Opera Mini or not
+	 * @return boolean Whether or not this is Opera Mini
+	 */
 	function isOperaMini()
 	{
 		if (!isset($this->_browsers['is_opera_mini']))
@@ -216,9 +216,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera Mobile or not
-	* @return boolean Whether or not this is Opera Mobile
-	*/
+	 * Determine if the browser is Opera Mobile or not
+	 * @return boolean Whether or not this is Opera Mobile
+	 */
 	function isOperaMobi()
 	{
 		if (!isset($this->_browsers['is_opera_mobi']))

Braces +88 added lines, -60 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class browser_detector
@@ -55,20 +56,25 @@ 
 		$this->_browsers['needs_size_fix'] = false;
 
 		// One at a time, one at a time, and in this order too
-		if ($this->isOpera())
-			$this->setupOpera();
+		if ($this->isOpera()) {
+					$this->setupOpera();
+		}
 		// Meh...
-		elseif ($this->isEdge())
-			$this->setupEdge();
+		elseif ($this->isEdge()) {
+					$this->setupEdge();
+		}
 		// Them webkits need to be set up too
-		elseif ($this->isWebkit())
-			$this->setupWebkit();
+		elseif ($this->isWebkit()) {
+					$this->setupWebkit();
+		}
 		// We may have work to do on Firefox...
-		elseif ($this->isFirefox())
-			$this->setupFirefox();
+		elseif ($this->isFirefox()) {
+					$this->setupFirefox();
+		}
 		// Old friend, old frenemy
-		elseif ($this->isIe())
-			$this->setupIe();
+		elseif ($this->isIe()) {
+					$this->setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -84,11 +90,12 @@ 
 			$this->_browsers['possibly_robot'] = !empty($user_info['possibly_robot']);
 
 			// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
-			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest'])
-				$this->_browsers['possibly_robot'] = false;
+			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest']) {
+							$this->_browsers['possibly_robot'] = false;
+			}
+		} else {
+					$this->_browsers['possibly_robot'] = false;
 		}
-		else
-			$this->_browsers['possibly_robot'] = false;
 
 		// Fill out the historical array as needed to support old mods that don't use isBrowser
 		$this->fillInformation();
@@ -106,8 +113,9 @@ 
 	*/
 	function isOpera()
 	{
-		if (!isset($this->_browsers['is_opera']))
-			$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		if (!isset($this->_browsers['is_opera'])) {
+					$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		}
 		return $this->_browsers['is_opera'];
 	}
 
@@ -118,8 +126,9 @@ 
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
-		if (!isset($this->_browsers['is_ie']))
-			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		if (!isset($this->_browsers['is_ie'])) {
+					$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		}
 		return $this->_browsers['is_ie'];
 	}
 
@@ -131,8 +140,9 @@ 
 	{
 		// IE11 is a bit different than earlier versions
 		// The isGecko() part is to ensure we get this right...
-		if (!isset($this->_browsers['is_ie11']))
-			$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		if (!isset($this->_browsers['is_ie11'])) {
+					$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		}
 		return $this->_browsers['is_ie11'];
  	}
 
@@ -142,8 +152,9 @@ 
 	*/
 	function isEdge()
 	{
-		if (!isset($this->_browsers['is_edge']))
-			$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		if (!isset($this->_browsers['is_edge'])) {
+					$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		}
 		return $this->_browsers['is_edge'];
 	}
 
@@ -153,8 +164,9 @@ 
 	*/
 	function isWebkit()
 	{
-		if (!isset($this->_browsers['is_webkit']))
-			$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		if (!isset($this->_browsers['is_webkit'])) {
+					$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		}
 		return $this->_browsers['is_webkit'];
 	}
 
@@ -164,8 +176,9 @@ 
 	*/
 	function isFirefox()
 	{
-		if (!isset($this->_browsers['is_firefox']))
-			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		if (!isset($this->_browsers['is_firefox'])) {
+					$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		}
 		return $this->_browsers['is_firefox'];
 	}
 
@@ -175,8 +188,9 @@ 
 	*/
 	function isWebTv()
 	{
-		if (!isset($this->_browsers['is_web_tv']))
-			$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		if (!isset($this->_browsers['is_web_tv'])) {
+					$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		}
 		return $this->_browsers['is_web_tv'];
 	}
 
@@ -186,8 +200,9 @@ 
 	*/
 	function isKonqueror()
 	{
-		if (!isset($this->_browsers['is_konqueror']))
-			$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		if (!isset($this->_browsers['is_konqueror'])) {
+					$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		}
 		return $this->_browsers['is_konqueror'];
 	}
 
@@ -197,8 +212,9 @@ 
 	*/
 	function isGecko()
 	{
-		if (!isset($this->_browsers['is_gecko']))
-			$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		if (!isset($this->_browsers['is_gecko'])) {
+					$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		}
 		return $this->_browsers['is_gecko'];
 	}
 
@@ -208,10 +224,12 @@ 
 	*/
 	function isOperaMini()
 	{
-		if (!isset($this->_browsers['is_opera_mini']))
-			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
-		if ($this->_browsers['is_opera_mini'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mini'])) {
+					$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
+		}
+		if ($this->_browsers['is_opera_mini']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -221,10 +239,12 @@ 
 	*/
 	function isOperaMobi()
 	{
-		if (!isset($this->_browsers['is_opera_mobi']))
-			$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
-		if ($this->_browsers['is_opera_mobi'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mobi'])) {
+					$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
+		}
+		if ($this->_browsers['is_opera_mobi']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -244,8 +264,9 @@ 
 		);
 
 		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
-		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
-			$this->_is_mobile = true;
+		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia']) {
+					$this->_is_mobile = true;
+		}
 
 		// @todo what to do with the blaPad? ... for now leave it detected as Safari ...
 		$this->_browsers['is_safari'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false && !$this->_browsers['is_chrome'] && !$this->_browsers['is_iphone'];
@@ -254,15 +275,17 @@ 
 		// if Chrome, get the major version
 		if ($this->_browsers['is_chrome'])
 		{
-			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 
 		// or if Safari get its major version
 		if ($this->_browsers['is_safari'])
 		{
-			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 	}
 
@@ -291,8 +314,9 @@ 
 			$this->_browsers['is_ie' . ((int) $trident_match[1] + 4)] = true;
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
-			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
-				$this->_browsers['is_ie_compat_view'] = true;
+			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4)) {
+							$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// Detect true IE6 and IE7 and not IE in compat mode.
@@ -326,8 +350,9 @@ 
 	 */
 	private function setupFirefox()
 	{
-		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -338,11 +363,13 @@ 
 	private function setupOpera()
 	{
 		// Opera 10+ uses the version tag at the end of the string
-		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
-		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 
 		// Needs size fix?
 		$this->_browsers['needs_size_fix'] = !empty($this->_browsers['is_opera6']);
@@ -353,8 +380,9 @@ 
 	 */
 	private function setupEdge()
 	{
-		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_edge' . (int) $match[1]] = true;
+		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_edge' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -367,9 +395,9 @@ 
 	{
 		global $context;
 
-		if ($this->_is_mobile)
-			$context['browser_body_id'] = 'mobile';
-		else
+		if ($this->_is_mobile) {
+					$context['browser_body_id'] = 'mobile';
+		} else
 		{
 			// add in any specific detection conversions here if you want a special body id e.g. 'is_opera9' => 'opera9'
 			$browser_priority = array(