SimpleMachines / SMF2.1

Sources/ManageCalendar.php

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

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/ManageServer.php

Braces +253 added lines, -196 removed lines

@@ -59,8 +59,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the main dispatcher. Sets up all the available sub-actions, all the tabs and selects
@@ -111,10 +112,11 @@ 
 	$settings_not_writable = !is_writable($boarddir . '/Settings.php');
 	$settings_backup_fail = !@is_writable($boarddir . '/Settings_bak.php') || !@copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php');
 
-	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
-	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	if ($settings_not_writable) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+	} elseif ($settings_backup_fail) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	}
 
 	$context['settings_not_writable'] = $settings_not_writable;
 
@@ -166,8 +168,9 @@ 
 
 	call_integration_hook('integrate_general_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=general;save';
@@ -232,8 +235,9 @@ 
 
 	call_integration_hook('integrate_database_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=database;save';
@@ -308,13 +312,15 @@ 
 		hideGlobalCookies();
 	});', true);
 
-	if (empty($user_settings['tfa_secret']))
-		addInlineJavaScript('');
+	if (empty($user_settings['tfa_secret'])) {
+			addInlineJavaScript('');
+	}
 
 	call_integration_hook('integrate_cookie_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=cookie;save';
 	$context['settings_title'] = $txt['cookies_sessions_settings'];
@@ -325,11 +331,13 @@ 
 		call_integration_hook('integrate_save_cookie_settings');
 
 		// Local and global do not play nicely together.
-		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies']))
-			unset ($_POST['globalCookies']);
+		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies'])) {
+					unset ($_POST['globalCookies']);
+		}
 
-		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false)
-			fatal_lang_error('invalid_cookie_domain', false);
+		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false) {
+					fatal_lang_error('invalid_cookie_domain', false);
+		}
 
 		saveSettings($config_vars);
 
@@ -412,8 +420,9 @@ 
 
 	call_integration_hook('integrate_general_security_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -452,8 +461,7 @@ 
 		$txt['cache_settings_message'] = $txt['detected_no_caching'];
 		$cache_level = array($txt['cache_off']);
 		$detected['none'] = $txt['cache_off'];
-	}
-	else
+	} else
 	{
 		$txt['cache_settings_message'] = sprintf($txt['detected_accelerators'], implode(', ', $detected));
 		$cache_level = array($txt['cache_off'], $txt['cache_level1'], $txt['cache_level2'], $txt['cache_level3']);
@@ -490,8 +498,9 @@ 
 			}
 		}
 	}
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving again?
 	if (isset($_GET['save']))
@@ -519,8 +528,9 @@ 
 	$context['save_disabled'] = $context['settings_not_writable'];
 
 	// Decide what message to show.
-	if (!$context['save_disabled'])
-		$context['settings_message'] = $txt['caching_information'];
+	if (!$context['save_disabled']) {
+			$context['settings_message'] = $txt['caching_information'];
+	}
 
 	// Prepare the template.
 	prepareServerSettingsContext($config_vars);
@@ -543,24 +553,25 @@ 
 	if (stripos(PHP_OS, 'win') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_windows'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
-	}
-	elseif (stripos(PHP_OS, 'darwin') === 0)
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
+		}
+	} elseif (stripos(PHP_OS, 'darwin') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_osx'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
-	}
-	else
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
+		}
+	} else
 	{
 		$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
-		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		else
-			unset($modSettings['load_average']);
+		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} else {
+					unset($modSettings['load_average']);
+		}
 
 		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
 		{
@@ -596,8 +607,9 @@ 
 
 	call_integration_hook('integrate_loadavg_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=loads;save';
 	$context['settings_title'] = $txt['load_balancing_settings'];
@@ -608,24 +620,27 @@ 
 		// Stupidity is not allowed.
 		foreach ($_POST as $key => $value)
 		{
-			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values)))
-				continue;
-			else
-				$_POST[$key] = (float) $value;
-
-			if ($key == 'loadavg_auto_opt' && $value <= 1)
-				$_POST['loadavg_auto_opt'] = 1.0;
-			elseif ($key == 'loadavg_forum' && $value < 10)
-				$_POST['loadavg_forum'] = 10.0;
-			elseif ($value < 2)
-				$_POST[$key] = 2.0;
+			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values))) {
+							continue;
+			} else {
+							$_POST[$key] = (float) $value;
+			}
+
+			if ($key == 'loadavg_auto_opt' && $value <= 1) {
+							$_POST['loadavg_auto_opt'] = 1.0;
+			} elseif ($key == 'loadavg_forum' && $value < 10) {
+							$_POST['loadavg_forum'] = 10.0;
+			} elseif ($value < 2) {
+							$_POST[$key] = 2.0;
+			}
 		}
 
 		call_integration_hook('integrate_save_loadavg_settings');
 
 		saveDBSettings($config_vars);
-		if (!isset($_SESSION['adm-save']))
-			$_SESSION['adm-save'] = true;
+		if (!isset($_SESSION['adm-save'])) {
+					$_SESSION['adm-save'] = true;
+		}
 		redirectexit('action=admin;area=serversettings;sa=loads;' . $context['session_var'] . '=' . $context['session_id']);
 	}
 
@@ -661,10 +676,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -672,9 +688,9 @@ 
 	$context['config_vars'] = array();
 	foreach ($config_vars as $identifier => $config_var)
 	{
-		if (!is_array($config_var) || !isset($config_var[1]))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var) || !isset($config_var[1])) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			$varname = $config_var[0];
 			global $$varname;
@@ -709,16 +725,19 @@ 
 			if ($config_var[3] == 'int' || $config_var[3] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[0]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[0]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -726,12 +745,13 @@ 
 			{
 				// If it's associative
 				$config_values = array_values($config_var[4]);
-				if (isset($config_values[0]) && is_array($config_values[0]))
-					$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
-				else
+				if (isset($config_values[0]) && is_array($config_values[0])) {
+									$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
+				} else
 				{
-					foreach ($config_var[4] as $key => $item)
-						$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					foreach ($config_var[4] as $key => $item) {
+											$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					}
 				}
 			}
 		}
@@ -756,10 +776,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -771,26 +792,30 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// HR?
-		if (!is_array($config_var))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var)) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			// If it has no name it doesn't have any purpose!
-			if (empty($config_var[1]))
-				continue;
+			if (empty($config_var[1])) {
+							continue;
+			}
 
 			// Special case for inline permissions
-			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions'))
-				$inlinePermissions[] = $config_var[1];
-			elseif ($config_var[0] == 'permissions')
-				continue;
+			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions')) {
+							$inlinePermissions[] = $config_var[1];
+			} elseif ($config_var[0] == 'permissions') {
+							continue;
+			}
 
-			if ($config_var[0] == 'boards')
-				$board_list = true;
+			if ($config_var[0] == 'boards') {
+							$board_list = true;
+			}
 
 			// Are we showing the BBC selection box?
-			if ($config_var[0] == 'bbc')
-				$bbcChoice[] = $config_var[1];
+			if ($config_var[0] == 'bbc') {
+							$bbcChoice[] = $config_var[1];
+			}
 
 			// We need to do some parsing of the value before we pass it in.
 			if (isset($modSettings[$config_var[1]]))
@@ -809,8 +834,7 @@ 
 					default:
 						$value = $smcFunc['htmlspecialchars']($modSettings[$config_var[1]]);
 				}
-			}
-			else
+			} else
 			{
 				// Darn, it's empty. What type is expected?
 				switch ($config_var[0])
@@ -850,16 +874,19 @@ 
 			if ($config_var[0] == 'int' || $config_var[0] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[1]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[1]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -873,12 +900,13 @@ 
 				}
 
 				// If it's associative
-				if (isset($config_var[2][0]) && is_array($config_var[2][0]))
-					$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
-				else
+				if (isset($config_var[2][0]) && is_array($config_var[2][0])) {
+									$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
+				} else
 				{
-					foreach ($config_var[2] as $key => $item)
-						$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					foreach ($config_var[2] as $key => $item) {
+											$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					}
 				}
 			}
 
@@ -887,17 +915,19 @@ 
 			{
 				if (!is_numeric($k))
 				{
-					if (substr($k, 0, 2) == 'on')
-						$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
-					else
-						$context['config_vars'][$config_var[1]][$k] = $v;
+					if (substr($k, 0, 2) == 'on') {
+											$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
+					} else {
+											$context['config_vars'][$config_var[1]][$k] = $v;
+					}
 				}
 
 				// See if there are any other labels that might fit?
-				if (isset($txt['setting_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
-				elseif (isset($txt['groups_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				if (isset($txt['setting_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
+				} elseif (isset($txt['groups_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				}
 			}
 
 			// Set the subtext in case it's part of the label.
@@ -930,8 +960,9 @@ 
 		// What are the options, eh?
 		$temp = parse_bbc(false);
 		$bbcTags = array();
-		foreach ($temp as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach ($temp as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
 		$bbcTags = array_unique($bbcTags);
 		$totalTags = count($bbcTags);
@@ -946,8 +977,9 @@ 
 		$col = 0; $i = 0;
 		foreach ($bbcTags as $tag)
 		{
-			if ($i % $tagsPerColumn == 0 && $i != 0)
-				$col++;
+			if ($i % $tagsPerColumn == 0 && $i != 0) {
+							$col++;
+			}
 
 			$context['bbc_columns'][$col][] = array(
 				'tag' => $tag,
@@ -990,18 +1022,21 @@ 
 	validateToken('admin-ssc');
 
 	// Fix the darn stupid cookiename! (more may not be allowed, but these for sure!)
-	if (isset($_POST['cookiename']))
-		$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	if (isset($_POST['cookiename'])) {
+			$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	}
 
 	// Fix the forum's URL if necessary.
 	if (isset($_POST['boardurl']))
 	{
-		if (substr($_POST['boardurl'], -10) == '/index.php')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
-		elseif (substr($_POST['boardurl'], -1) == '/')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
-		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://')
-			$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		if (substr($_POST['boardurl'], -10) == '/index.php') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
+		} elseif (substr($_POST['boardurl'], -1) == '/') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
+		}
+		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') {
+					$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		}
 	}
 
 	// Any passwords?
@@ -1036,21 +1071,21 @@ 
 	// Figure out which config vars we're saving here...
 	foreach ($config_vars as $var)
 	{
-		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]])))
-			continue;
+		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]]))) {
+					continue;
+		}
 
 		$config_var = $var[0];
 
 		if (in_array($config_var, $config_passwords))
 		{
-			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1])
-				$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_strs))
+			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1]) {
+							$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
+			}
+		} elseif (in_array($config_var, $config_strs))
 		{
 			$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_ints))
+		} elseif (in_array($config_var, $config_ints))
 		{
 			$new_settings[$config_var] = (int) $_POST[$config_var];
 
@@ -1059,17 +1094,17 @@ 
 			$new_settings[$config_var] = max($min, $new_settings[$config_var]);
 
 			// Is there a max value for this as well?
-			if (isset($var['max']))
-				$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
-		}
-		elseif (in_array($config_var, $config_bools))
+			if (isset($var['max'])) {
+							$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
+			}
+		} elseif (in_array($config_var, $config_bools))
 		{
-			if (!empty($_POST[$config_var]))
-				$new_settings[$config_var] = '1';
-			else
-				$new_settings[$config_var] = '0';
-		}
-		else
+			if (!empty($_POST[$config_var])) {
+							$new_settings[$config_var] = '1';
+			} else {
+							$new_settings[$config_var] = '0';
+			}
+		} else
 		{
 			// This shouldn't happen, but it might...
 			fatal_error('Unknown config_var \'' . $config_var . '\'');
@@ -1085,30 +1120,35 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// We just saved the file-based settings, so skip their definitions.
-		if (!is_array($config_var) || $config_var[2] == 'file')
-			continue;
+		if (!is_array($config_var) || $config_var[2] == 'file') {
+					continue;
+		}
 
 		$new_setting = array($config_var[3], $config_var[0]);
 
 		// Select options need carried over, too.
-		if (isset($config_var[4]))
-			$new_setting[] = $config_var[4];
+		if (isset($config_var[4])) {
+					$new_setting[] = $config_var[4];
+		}
 
 		// Include min and max if necessary
-		if (isset($config_var['min']))
-			$new_setting['min'] = $config_var['min'];
+		if (isset($config_var['min'])) {
+					$new_setting['min'] = $config_var['min'];
+		}
 
-		if (isset($config_var['max']))
-			$new_setting['max'] = $config_var['max'];
+		if (isset($config_var['max'])) {
+					$new_setting['max'] = $config_var['max'];
+		}
 
 		// Rewrite the definition a bit.
 		$new_settings[] = $new_setting;
 	}
 
 	// Save the new database-based settings, if any.
-	if (!empty($new_settings))
-		saveDBSettings($new_settings);
-}
+	if (!empty($new_settings)) {
+			saveDBSettings($new_settings);
+	}
+	}
 
 /**
  * Helper function for saving database settings.
@@ -1126,22 +1166,25 @@ 
 	$inlinePermissions = array();
 	foreach ($config_vars as $var)
 	{
-		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags']))))
-			continue;
+		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags'])))) {
+					continue;
+		}
 
 		// Checkboxes!
-		elseif ($var[0] == 'check')
-			$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		elseif ($var[0] == 'check') {
+					$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		}
 		// Select boxes!
-		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2])))
-			$setArray[$var[1]] = $_POST[$var[1]];
-		elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
+		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2]))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		} elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
 		{
 			// For security purposes we validate this line by line.
 			$lOptions = array();
-			foreach ($_POST[$var[1]] as $invar)
-				if (in_array($invar, array_keys($var[2])))
+			foreach ($_POST[$var[1]] as $invar) {
+							if (in_array($invar, array_keys($var[2])))
 					$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = json_encode($lOptions);
 		}
@@ -1155,18 +1198,20 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_row']($request))
-					$board_list[$row[0]] = true;
+				while ($row = $smcFunc['db_fetch_row']($request)) {
+									$board_list[$row[0]] = true;
+				}
 
 				$smcFunc['db_free_result']($request);
 			}
 
 			$lOptions = array();
 
-			if (!empty($_POST[$var[1]]))
-				foreach ($_POST[$var[1]] as $invar => $dummy)
+			if (!empty($_POST[$var[1]])) {
+							foreach ($_POST[$var[1]] as $invar => $dummy)
 					if (isset($board_list[$invar]))
 						$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = !empty($lOptions) ? implode(',', $lOptions) : '';
 		}
@@ -1180,8 +1225,9 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Floating point!
 		elseif ($var[0] == 'float')
@@ -1193,40 +1239,47 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Text!
-		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time')))
-			$setArray[$var[1]] = $_POST[$var[1]];
+		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		}
 		// Passwords!
 		elseif ($var[0] == 'password')
 		{
-			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1])
-				$setArray[$var[1]] = $_POST[$var[1]][0];
+			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1]) {
+							$setArray[$var[1]] = $_POST[$var[1]][0];
+			}
 		}
 		// BBC.
 		elseif ($var[0] == 'bbc')
 		{
 
 			$bbcTags = array();
-			foreach (parse_bbc(false) as $tag)
-				$bbcTags[] = $tag['tag'];
+			foreach (parse_bbc(false) as $tag) {
+							$bbcTags[] = $tag['tag'];
+			}
 
-			if (!isset($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array();
-			elseif (!is_array($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			if (!isset($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array();
+			} elseif (!is_array($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			}
 
 			$setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1] . '_enabledTags']));
 		}
 		// Permissions?
-		elseif ($var[0] == 'permissions')
-			$inlinePermissions[] = $var[1];
+		elseif ($var[0] == 'permissions') {
+					$inlinePermissions[] = $var[1];
+		}
 	}
 
-	if (!empty($setArray))
-		updateSettings($setArray);
+	if (!empty($setArray)) {
+			updateSettings($setArray);
+	}
 
 	// If we have inline permissions we need to save them.
 	if (!empty($inlinePermissions) && allowedTo('manage_permissions'))
@@ -1264,18 +1317,21 @@ 
 	// put all of it into an array
 	foreach ($info_lines as $line)
 	{
-		if (preg_match('~(' . $remove . ')~', $line))
-			continue;
+		if (preg_match('~(' . $remove . ')~', $line)) {
+					continue;
+		}
 
 		// new category?
-		if (strpos($line, '<h2>') !== false)
-			$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		if (strpos($line, '<h2>') !== false) {
+					$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		}
 
 		// load it as setting => value or the old setting local master
-		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = $val[2];
-		elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = $val[2];
+		} elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		}
 	}
 
 	// load it in to context and display it
@@ -1310,8 +1366,9 @@ 
 				$testAPI = new $cache_class_name();
 
 				// No Support?  NEXT!
-				if (!$testAPI->isSupported(true))
-					continue;
+				if (!$testAPI->isSupported(true)) {
+									continue;
+				}
 
 				$apis[$tryCache] = isset($txt[$tryCache . '_cache']) ? $txt[$tryCache . '_cache'] : $tryCache;
 			}

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/Subs-Package.php

Braces +853 added lines, -669 removed lines

@@ -16,8 +16,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Reads a .tar.gz file, filename, in and extracts file(s) from it.
@@ -67,47 +68,53 @@ 
 	loadLanguage('Packages');
 
 	// This function sorta needs gzinflate!
-	if (!function_exists('gzinflate'))
-		fatal_lang_error('package_no_zlib', 'critical');
+	if (!function_exists('gzinflate')) {
+			fatal_lang_error('package_no_zlib', 'critical');
+	}
 
 	if (substr($gzfilename, 0, 7) == 'http://' || substr($gzfilename, 0, 8) == 'https://')
 	{
 		$data = fetch_web_data($gzfilename);
 
-		if ($data === false)
-			return false;
-	}
-	else
+		if ($data === false) {
+					return false;
+		}
+	} else
 	{
 		$data = @file_get_contents($gzfilename);
 
-		if ($data === false)
-			return false;
+		if ($data === false) {
+					return false;
+		}
 	}
 
 	umask(0);
-	if (!$single_file && $destination !== null && !file_exists($destination))
-		mktree($destination, 0777);
+	if (!$single_file && $destination !== null && !file_exists($destination)) {
+			mktree($destination, 0777);
+	}
 
 	// No signature?
-	if (strlen($data) < 2)
-		return false;
+	if (strlen($data) < 2) {
+			return false;
+	}
 
 	$id = unpack('H2a/H2b', substr($data, 0, 2));
 	if (strtolower($id['a'] . $id['b']) != '1f8b')
 	{
 		// Okay, this ain't no tar.gz, but maybe it's a zip file.
-		if (substr($data, 0, 2) == 'PK')
-			return read_zip_file($gzfilename, $destination, $single_file, $overwrite, $files_to_extract);
-		else
-			return false;
+		if (substr($data, 0, 2) == 'PK') {
+					return read_zip_file($gzfilename, $destination, $single_file, $overwrite, $files_to_extract);
+		} else {
+					return false;
+		}
 	}
 
 	$flags = unpack('Ct/Cf', substr($data, 2, 2));
 
 	// Not deflate!
-	if ($flags['t'] != 8)
-		return false;
+	if ($flags['t'] != 8) {
+			return false;
+	}
 	$flags = $flags['f'];
 
 	$offset = 10;
@@ -117,18 +124,21 @@ 
 	// @todo Might be mussed.
 	if ($flags & 12)
 	{
-		while ($flags & 8 && $data{$offset++} != "\0")
-			continue;
-		while ($flags & 4 && $data{$offset++} != "\0")
-			continue;
+		while ($flags & 8 && $data{$offset++} != "\0") {
+					continue;
+		}
+		while ($flags & 4 && $data{$offset++} != "\0") {
+					continue;
+		}
 	}
 
 	$crc = unpack('Vcrc32/Visize', substr($data, strlen($data) - 8, 8));
 	$data = @gzinflate(substr($data, $offset, strlen($data) - 8 - $offset));
 
 	// smf_crc32 and crc32 may not return the same results, so we accept either.
-	if ($crc['crc32'] != smf_crc32($data) && $crc['crc32'] != crc32($data))
-		return false;
+	if ($crc['crc32'] != smf_crc32($data) && $crc['crc32'] != crc32($data)) {
+			return false;
+	}
 
 	$blocks = strlen($data) / 512 - 1;
 	$offset = 0;
@@ -149,83 +159,98 @@ 
 
 		foreach ($current as $k => $v)
 		{
-			if (in_array($k, $octdec))
-				$current[$k] = octdec(trim($v));
-			else
-				$current[$k] = trim($v);
+			if (in_array($k, $octdec)) {
+							$current[$k] = octdec(trim($v));
+			} else {
+							$current[$k] = trim($v);
+			}
 		}
 
-		if ($current['type'] == 5 && substr($current['filename'], -1) != '/')
-			$current['filename'] .= '/';
+		if ($current['type'] == 5 && substr($current['filename'], -1) != '/') {
+					$current['filename'] .= '/';
+		}
 
 		$checksum = 256;
-		for ($i = 0; $i < 148; $i++)
-			$checksum += ord($header{$i});
-		for ($i = 156; $i < 512; $i++)
-			$checksum += ord($header{$i});
+		for ($i = 0; $i < 148; $i++) {
+					$checksum += ord($header{$i});
+		}
+		for ($i = 156; $i < 512; $i++) {
+					$checksum += ord($header{$i});
+		}
 
-		if ($current['checksum'] != $checksum)
-			break;
+		if ($current['checksum'] != $checksum) {
+					break;
+		}
 
 		$size = ceil($current['size'] / 512);
 		$current['data'] = substr($data, ++$offset << 9, $current['size']);
 		$offset += $size;
 
 		// Not a directory and doesn't exist already...
-		if (substr($current['filename'], -1, 1) != '/' && !file_exists($destination . '/' . $current['filename']))
-			$write_this = true;
+		if (substr($current['filename'], -1, 1) != '/' && !file_exists($destination . '/' . $current['filename'])) {
+					$write_this = true;
+		}
 		// File exists... check if it is newer.
-		elseif (substr($current['filename'], -1, 1) != '/')
-			$write_this = $overwrite || filemtime($destination . '/' . $current['filename']) < $current['mtime'];
+		elseif (substr($current['filename'], -1, 1) != '/') {
+					$write_this = $overwrite || filemtime($destination . '/' . $current['filename']) < $current['mtime'];
+		}
 		// Folder... create.
 		elseif ($destination !== null && !$single_file)
 		{
 			// Protect from accidental parent directory writing...
 			$current['filename'] = strtr($current['filename'], array('../' => '', '/..' => ''));
 
-			if (!file_exists($destination . '/' . $current['filename']))
-				mktree($destination . '/' . $current['filename'], 0777);
+			if (!file_exists($destination . '/' . $current['filename'])) {
+							mktree($destination . '/' . $current['filename'], 0777);
+			}
 			$write_this = false;
+		} else {
+					$write_this = false;
 		}
-		else
-			$write_this = false;
 
 		if ($write_this && $destination !== null)
 		{
-			if (strpos($current['filename'], '/') !== false && !$single_file)
-				mktree($destination . '/' . dirname($current['filename']), 0777);
+			if (strpos($current['filename'], '/') !== false && !$single_file) {
+							mktree($destination . '/' . dirname($current['filename']), 0777);
+			}
 
 			// Is this the file we're looking for?
-			if ($single_file && ($destination == $current['filename'] || $destination == '*/' . basename($current['filename'])))
-				return $current['data'];
+			if ($single_file && ($destination == $current['filename'] || $destination == '*/' . basename($current['filename']))) {
+							return $current['data'];
+			}
 			// If we're looking for another file, keep going.
-			elseif ($single_file)
-				continue;
+			elseif ($single_file) {
+							continue;
+			}
 			// Looking for restricted files?
-			elseif ($files_to_extract !== null && !in_array($current['filename'], $files_to_extract))
-				continue;
+			elseif ($files_to_extract !== null && !in_array($current['filename'], $files_to_extract)) {
+							continue;
+			}
 
 			package_put_contents($destination . '/' . $current['filename'], $current['data']);
 		}
 
-		if (substr($current['filename'], -1, 1) != '/')
-			$return[] = array(
+		if (substr($current['filename'], -1, 1) != '/') {
+					$return[] = array(
 				'filename' => $current['filename'],
 				'md5' => md5($current['data']),
 				'preview' => substr($current['data'], 0, 100),
 				'size' => $current['size'],
 				'skipped' => false
 			);
+		}
 	}
 
-	if ($destination !== null && !$single_file)
-		package_flush_cache();
+	if ($destination !== null && !$single_file) {
+			package_flush_cache();
+	}
 
-	if ($single_file)
-		return false;
-	else
-		return $return;
-}
+	if ($single_file) {
+			return false;
+	} else {
+			return $return;
+	}
+	}
 
 /**
  * Extract zip data. A functional copy of {@list read_zip_data()}.
@@ -254,65 +279,74 @@ 
 			{
 				$i = $iterator->getSubPathname();
 				// If this is a file, and it doesn't exist.... happy days!
-				if (substr($i, -1) != '/' && !file_exists($destination . '/' . $i))
-					$write_this = true;
+				if (substr($i, -1) != '/' && !file_exists($destination . '/' . $i)) {
+									$write_this = true;
+				}
 				// If the file exists, we may not want to overwrite it.
-				elseif (substr($i, -1) != '/')
-					$write_this = $overwrite;
-				else
-					$write_this = false;
+				elseif (substr($i, -1) != '/') {
+									$write_this = $overwrite;
+				} else {
+									$write_this = false;
+				}
 
 				// Get the actual compressed data.
-				if (!$file_info->isDir())
-					$file_data = file_get_contents($file_info);
-				elseif ($destination !== null && !$single_file)
+				if (!$file_info->isDir()) {
+									$file_data = file_get_contents($file_info);
+				} elseif ($destination !== null && !$single_file)
 				{
 					// Folder... create.
-					if (!file_exists($destination . '/' . $i))
-						mktree($destination . '/' . $i, 0777);
+					if (!file_exists($destination . '/' . $i)) {
+											mktree($destination . '/' . $i, 0777);
+					}
 					$file_data = null;
+				} else {
+									$file_data = null;
 				}
-				else
-					$file_data = null;
 
 				// Okay!  We can write this file, looks good from here...
 				if ($write_this && $destination !== null)
 				{
-					if (!$single_file && !is_dir($destination . '/' . dirname($i)))
-						mktree($destination . '/' . dirname($i), 0777);
+					if (!$single_file && !is_dir($destination . '/' . dirname($i))) {
+											mktree($destination . '/' . dirname($i), 0777);
+					}
 
 					// If we're looking for a specific file, and this is it... ka-bam, baby.
-					if ($single_file && ($destination == $i || $destination == '*/' . basename($i)))
-						return $file_data;
+					if ($single_file && ($destination == $i || $destination == '*/' . basename($i))) {
+											return $file_data;
+					}
 					// Oh?  Another file.  Fine.  You don't like this file, do you?  I know how it is.  Yeah... just go away.  No, don't apologize.  I know this file's just not *good enough* for you.
-					elseif ($single_file)
-						continue;
+					elseif ($single_file) {
+											continue;
+					}
 					// Don't really want this?
-					elseif ($files_to_extract !== null && !in_array($i, $files_to_extract))
-						continue;
+					elseif ($files_to_extract !== null && !in_array($i, $files_to_extract)) {
+											continue;
+					}
 
 					package_put_contents($destination . '/' . $i, $file_data);
 				}
 
-				if (substr($i, -1, 1) != '/')
-					$return[] = array(
+				if (substr($i, -1, 1) != '/') {
+									$return[] = array(
 						'filename' => $i,
 						'md5' => md5($file_data),
 						'preview' => substr($file_data, 0, 100),
 						'size' => strlen($file_data),
 						'skipped' => false
 					);
+				}
 			}
 
-		if ($destination !== null && !$single_file)
-			package_flush_cache();
+		if ($destination !== null && !$single_file) {
+					package_flush_cache();
+		}
 
-		if ($single_file)
-			return false;
-		else
-			return $return;
-	}
-	catch (Exception $e)
+		if ($single_file) {
+					return false;
+		} else {
+					return $return;
+		}
+	} catch (Exception $e)
 	{
 		return false;
 	}
@@ -334,13 +368,15 @@ 
 function read_zip_data($data, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {
 	umask(0);
-	if ($destination !== null && !file_exists($destination) && !$single_file)
-		mktree($destination, 0777);
+	if ($destination !== null && !file_exists($destination) && !$single_file) {
+			mktree($destination, 0777);
+	}
 
 	// Look for the end of directory signature 0x06054b50
 	$data_ecr = explode("\x50\x4b\x05\x06", $data);
-	if (!isset($data_ecr[1]))
-		return false;
+	if (!isset($data_ecr[1])) {
+			return false;
+	}
 
 	$return = array();
 
@@ -355,8 +391,9 @@ 
 	array_shift($file_sections);
 
 	// sections and count from the signature must match or the zip file is bad
-	if (count($file_sections) != $zip_info['files'])
-		return false;
+	if (count($file_sections) != $zip_info['files']) {
+			return false;
+	}
 
 	// go though each file in the archive
 	foreach ($file_sections as $data)
@@ -378,68 +415,79 @@ 
 		}
 
 		// If this is a file, and it doesn't exist.... happy days!
-		if (substr($file_info['filename'], -1) != '/' && !file_exists($destination . '/' . $file_info['filename']))
-			$write_this = true;
+		if (substr($file_info['filename'], -1) != '/' && !file_exists($destination . '/' . $file_info['filename'])) {
+					$write_this = true;
+		}
 		// If the file exists, we may not want to overwrite it.
-		elseif (substr($file_info['filename'], -1) != '/')
-			$write_this = $overwrite;
+		elseif (substr($file_info['filename'], -1) != '/') {
+					$write_this = $overwrite;
+		}
 		// This is a directory, so we're gonna want to create it. (probably...)
 		elseif ($destination !== null && !$single_file)
 		{
 			// Just a little accident prevention, don't mind me.
 			$file_info['filename'] = strtr($file_info['filename'], array('../' => '', '/..' => ''));
 
-			if (!file_exists($destination . '/' . $file_info['filename']))
-				mktree($destination . '/' . $file_info['filename'], 0777);
+			if (!file_exists($destination . '/' . $file_info['filename'])) {
+							mktree($destination . '/' . $file_info['filename'], 0777);
+			}
 			$write_this = false;
+		} else {
+					$write_this = false;
 		}
-		else
-			$write_this = false;
 
 		// Get the actual compressed data.
 		$file_info['data'] = substr($data, 26 + $file_info['filename_length'] + $file_info['extrafield_length']);
 
 		// Only inflate it if we need to ;)
-		if (!empty($file_info['compress_method']) || ($file_info['compressed_size'] != $file_info['size']))
-			$file_info['data'] = gzinflate($file_info['data']);
+		if (!empty($file_info['compress_method']) || ($file_info['compressed_size'] != $file_info['size'])) {
+					$file_info['data'] = gzinflate($file_info['data']);
+		}
 
 		// Okay!  We can write this file, looks good from here...
 		if ($write_this && $destination !== null)
 		{
-			if ((strpos($file_info['filename'], '/') !== false && !$single_file) || (!$single_file && !is_dir($file_info['dir'])))
-				mktree($file_info['dir'], 0777);
+			if ((strpos($file_info['filename'], '/') !== false && !$single_file) || (!$single_file && !is_dir($file_info['dir']))) {
+							mktree($file_info['dir'], 0777);
+			}
 
 			// If we're looking for a specific file, and this is it... ka-bam, baby.
-			if ($single_file && ($destination == $file_info['filename'] || $destination == '*/' . basename($file_info['filename'])))
-				return $file_info['data'];
+			if ($single_file && ($destination == $file_info['filename'] || $destination == '*/' . basename($file_info['filename']))) {
+							return $file_info['data'];
+			}
 			// Oh?  Another file.  Fine.  You don't like this file, do you?  I know how it is.  Yeah... just go away.  No, don't apologize.  I know this file's just not *good enough* for you.
-			elseif ($single_file)
-				continue;
+			elseif ($single_file) {
+							continue;
+			}
 			// Don't really want this?
-			elseif ($files_to_extract !== null && !in_array($file_info['filename'], $files_to_extract))
-				continue;
+			elseif ($files_to_extract !== null && !in_array($file_info['filename'], $files_to_extract)) {
+							continue;
+			}
 
 			package_put_contents($destination . '/' . $file_info['filename'], $file_info['data']);
 		}
 
-		if (substr($file_info['filename'], -1, 1) != '/')
-			$return[] = array(
+		if (substr($file_info['filename'], -1, 1) != '/') {
+					$return[] = array(
 				'filename' => $file_info['filename'],
 				'md5' => md5($file_info['data']),
 				'preview' => substr($file_info['data'], 0, 100),
 				'size' => $file_info['size'],
 				'skipped' => false
 			);
+		}
 	}
 
-	if ($destination !== null && !$single_file)
-		package_flush_cache();
+	if ($destination !== null && !$single_file) {
+			package_flush_cache();
+	}
 
-	if ($single_file)
-		return false;
-	else
-		return $return;
-}
+	if ($single_file) {
+			return false;
+	} else {
+			return $return;
+	}
+	}
 
 /**
  * Checks the existence of a remote file since file_exists() does not do remote.
@@ -451,14 +499,16 @@ 
 {
 	$a_url = parse_url($url);
 
-	if (!isset($a_url['scheme']))
-		return false;
+	if (!isset($a_url['scheme'])) {
+			return false;
+	}
 
 	// Attempt to connect...
 	$temp = '';
 	$fid = fsockopen($a_url['host'], !isset($a_url['port']) ? 80 : $a_url['port'], $temp, $temp, 8);
-	if (!$fid)
-		return false;
+	if (!$fid) {
+			return false;
+	}
 
 	fputs($fid, 'HEAD ' . $a_url['path'] . ' HTTP/1.0' . "\r\n" . 'Host: ' . $a_url['host'] . "\r\n\r\n");
 	$head = fread($fid, 1024);
@@ -493,8 +543,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Already found this? If so don't add it twice!
-		if (in_array($row['package_id'], $found))
-			continue;
+		if (in_array($row['package_id'], $found)) {
+					continue;
+		}
 
 		$found[] = $row['package_id'];
 
@@ -529,19 +580,21 @@ 
 	global $sourcedir, $packagesdir, $smcFunc;
 
 	// Extract package-info.xml from downloaded file. (*/ is used because it could be in any directory.)
-	if (strpos($gzfilename, 'http://') !== false || strpos($gzfilename, 'https://') !== false)
-		$packageInfo = read_tgz_data($gzfilename, 'package-info.xml', true);
-	else
+	if (strpos($gzfilename, 'http://') !== false || strpos($gzfilename, 'https://') !== false) {
+			$packageInfo = read_tgz_data($gzfilename, 'package-info.xml', true);
+	} else
 	{
-		if (!file_exists($packagesdir . '/' . $gzfilename))
-			return 'package_get_error_not_found';
+		if (!file_exists($packagesdir . '/' . $gzfilename)) {
+					return 'package_get_error_not_found';
+		}
 
-		if (is_file($packagesdir . '/' . $gzfilename))
-			$packageInfo = read_tgz_file($packagesdir . '/' . $gzfilename, '*/package-info.xml', true);
-		elseif (file_exists($packagesdir . '/' . $gzfilename . '/package-info.xml'))
-			$packageInfo = file_get_contents($packagesdir . '/' . $gzfilename . '/package-info.xml');
-		else
-			return 'package_get_error_missing_xml';
+		if (is_file($packagesdir . '/' . $gzfilename)) {
+					$packageInfo = read_tgz_file($packagesdir . '/' . $gzfilename, '*/package-info.xml', true);
+		} elseif (file_exists($packagesdir . '/' . $gzfilename . '/package-info.xml')) {
+					$packageInfo = file_get_contents($packagesdir . '/' . $gzfilename . '/package-info.xml');
+		} else {
+					return 'package_get_error_missing_xml';
+		}
 	}
 
 	// Nothing?
@@ -549,10 +602,11 @@ 
 	{
 		// Perhaps they are trying to install a theme, lets tell them nicely this is the wrong function
 		$packageInfo = read_tgz_file($packagesdir . '/' . $gzfilename, '*/theme_info.xml', true);
-		if (!empty($packageInfo))
-			return 'package_get_error_is_theme';
-		else
-			return 'package_get_error_is_zero';
+		if (!empty($packageInfo)) {
+					return 'package_get_error_is_theme';
+		} else {
+					return 'package_get_error_is_zero';
+		}
 	}
 
 	// Parse package-info.xml into an xmlArray.
@@ -560,8 +614,9 @@ 
 	$packageInfo = new xmlArray($packageInfo);
 
 	// @todo Error message of some sort?
-	if (!$packageInfo->exists('package-info[0]'))
-		return 'package_get_error_packageinfo_corrupt';
+	if (!$packageInfo->exists('package-info[0]')) {
+			return 'package_get_error_packageinfo_corrupt';
+	}
 
 	$packageInfo = $packageInfo->path('package-info[0]');
 
@@ -580,8 +635,9 @@ 
 		}
 	}
 
-	if (!isset($package['type']))
-		$package['type'] = 'modification';
+	if (!isset($package['type'])) {
+			$package['type'] = 'modification';
+	}
 
 	return $package;
 }
@@ -634,15 +690,14 @@ 
 					{
 						$ftp_file = strtr($file, array($_SESSION['pack_ftp']['root'] => ''));
 						$package_ftp->chmod($ftp_file, $perms);
+					} else {
+											smf_chmod($file, $perms);
 					}
-					else
-						smf_chmod($file, $perms);
 
 					$new_permissions = @fileperms($file);
 					$result = $new_permissions == $perms ? 'success' : 'failure';
 					unset($_SESSION['pack_ftp']['original_perms'][$file]);
-				}
-				elseif ($do_change)
+				} elseif ($do_change)
 				{
 					$new_permissions = '';
 					$result = 'skipped';
@@ -758,8 +813,7 @@ 
 
 			$context['sub_template'] = 'show_list';
 			$context['default_list'] = 'restore_file_permissions';
-		}
-		else
+		} else
 		{
 			unset($listOptions['columns']['result']);
 		}
@@ -769,12 +823,14 @@ 
 		createList($listOptions);
 
 		// If we just restored permissions then whereever we are, we are now done and dusted.
-		if (!empty($_POST['restore_perms']))
-			obExit();
+		if (!empty($_POST['restore_perms'])) {
+					obExit();
+		}
 	}
 	// Otherwise, it's entirely irrelevant?
-	elseif ($restore_write_status)
-		return true;
+	elseif ($restore_write_status) {
+			return true;
+	}
 
 	// This is where we report what we got up to.
 	$return_data = array(
@@ -812,11 +868,12 @@ 
 			if (!in_array($_POST['ftp_path'], array('', '/')))
 			{
 				$ftp_root = strtr($boarddir, array($_POST['ftp_path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || substr($_POST['ftp_path'], 0, 1) == '/'))
-					$ftp_root = substr($ftp_root, 0, -1);
+				if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || substr($_POST['ftp_path'], 0, 1) == '/')) {
+									$ftp_root = substr($ftp_root, 0, -1);
+				}
+			} else {
+							$ftp_root = $boarddir;
 			}
-			else
-				$ftp_root = $boarddir;
 
 			$_SESSION['pack_ftp'] = array(
 				'server' => $_POST['ftp_server'],
@@ -828,8 +885,9 @@ 
 				'connected' => true,
 			);
 
-			if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path'])
-				updateSettings(array('package_path' => $_POST['ftp_path']));
+			if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path']) {
+							updateSettings(array('package_path' => $_POST['ftp_path']));
+			}
 
 			// This is now the primary connection.
 			$package_ftp = $ftp;
@@ -842,12 +900,13 @@ 
 		foreach ($chmodFiles as $k => $file)
 		{
 			// Sometimes this can somehow happen maybe?
-			if (empty($file))
-				unset($chmodFiles[$k]);
+			if (empty($file)) {
+							unset($chmodFiles[$k]);
+			}
 			// Already writable?
-			elseif (@is_writable($file))
-				$return_data['files']['writable'][] = $file;
-			else
+			elseif (@is_writable($file)) {
+							$return_data['files']['writable'][] = $file;
+			} else
 			{
 				// Now try to change that.
 				$return_data['files'][package_chmod($file, 'writable', true) ? 'writable' : 'notwritable'][] = $file;
@@ -864,19 +923,21 @@ 
 			{
 				require_once($sourcedir . '/Class-Package.php');
 				$ftp = new ftp_connection(null);
+			} elseif ($ftp->error !== false && !isset($ftp_error)) {
+							$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 			}
-			elseif ($ftp->error !== false && !isset($ftp_error))
-				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path($boarddir);
 
-			if ($found_path)
-				$_POST['ftp_path'] = $detect_path;
-			elseif (!isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+			if ($found_path) {
+							$_POST['ftp_path'] = $detect_path;
+			} elseif (!isset($_POST['ftp_path'])) {
+							$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 		}
 
 		$context['package_ftp'] = array(
@@ -889,8 +950,9 @@ 
 		);
 
 		// Which files failed?
-		if (!isset($context['notwritable_files']))
-			$context['notwritable_files'] = array();
+		if (!isset($context['notwritable_files'])) {
+					$context['notwritable_files'] = array();
+		}
 		$context['notwritable_files'] = array_merge($context['notwritable_files'], $return_data['files']['notwritable']);
 
 		// Sent here to die?
@@ -923,40 +985,48 @@ 
 		foreach ($files as $k => $file)
 		{
 			// If this file doesn't exist, then we actually want to look at the directory, no?
-			if (!file_exists($file))
-				$file = dirname($file);
+			if (!file_exists($file)) {
+							$file = dirname($file);
+			}
 
 			// This looks odd, but it's an attempt to work around PHP suExec.
-			if (!@is_writable($file))
-				smf_chmod($file, 0755);
-			if (!@is_writable($file))
-				smf_chmod($file, 0777);
-			if (!@is_writable(dirname($file)))
-				smf_chmod($file, 0755);
-			if (!@is_writable(dirname($file)))
-				smf_chmod($file, 0777);
+			if (!@is_writable($file)) {
+							smf_chmod($file, 0755);
+			}
+			if (!@is_writable($file)) {
+							smf_chmod($file, 0777);
+			}
+			if (!@is_writable(dirname($file))) {
+							smf_chmod($file, 0755);
+			}
+			if (!@is_writable(dirname($file))) {
+							smf_chmod($file, 0777);
+			}
 
 			$fp = is_dir($file) ? @opendir($file) : @fopen($file, 'rb');
 			if (@is_writable($file) && $fp)
 			{
 				unset($files[$k]);
-				if (!is_dir($file))
-					fclose($fp);
-				else
-					closedir($fp);
+				if (!is_dir($file)) {
+									fclose($fp);
+				} else {
+									closedir($fp);
+				}
 			}
 		}
 
 		// No FTP required!
-		if (empty($files))
-			return array();
+		if (empty($files)) {
+					return array();
+		}
 	}
 
 	// They've opted to not use FTP, and try anyway.
 	if (isset($_SESSION['pack_ftp']) && $_SESSION['pack_ftp'] == false)
 	{
-		if ($files === null)
-			return array();
+		if ($files === null) {
+					return array();
+		}
 
 		foreach ($files as $k => $file)
 		{
@@ -968,26 +1038,29 @@ 
 				smf_chmod($file, 0755);
 			}
 
-			if (!@is_writable($file))
-				smf_chmod($file, 0777);
-			if (!@is_writable(dirname($file)))
-				smf_chmod(dirname($file), 0777);
+			if (!@is_writable($file)) {
+							smf_chmod($file, 0777);
+			}
+			if (!@is_writable(dirname($file))) {
+							smf_chmod(dirname($file), 0777);
+			}
 
-			if (@is_writable($file))
-				unset($files[$k]);
+			if (@is_writable($file)) {
+							unset($files[$k]);
+			}
 		}
 
 		return $files;
-	}
-	elseif (isset($_SESSION['pack_ftp']))
+	} elseif (isset($_SESSION['pack_ftp']))
 	{
 		// Load the file containing the ftp_connection class.
 		require_once($sourcedir . '/Class-Package.php');
 
 		$package_ftp = new ftp_connection($_SESSION['pack_ftp']['server'], $_SESSION['pack_ftp']['port'], $_SESSION['pack_ftp']['username'], package_crypt($_SESSION['pack_ftp']['password']));
 
-		if ($files === null)
-			return array();
+		if ($files === null) {
+					return array();
+		}
 
 		foreach ($files as $k => $file)
 		{
@@ -1001,13 +1074,16 @@ 
 				$package_ftp->chmod($ftp_file, 0755);
 			}
 
-			if (!@is_writable($file))
-				$package_ftp->chmod($ftp_file, 0777);
-			if (!@is_writable(dirname($file)))
-				$package_ftp->chmod(dirname($ftp_file), 0777);
+			if (!@is_writable($file)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
+			if (!@is_writable(dirname($file))) {
+							$package_ftp->chmod(dirname($ftp_file), 0777);
+			}
 
-			if (@is_writable($file))
-				unset($files[$k]);
+			if (@is_writable($file)) {
+							unset($files[$k]);
+			}
 		}
 
 		return $files;
@@ -1019,8 +1095,7 @@ 
 
 		$files = packageRequireFTP($destination_url, $files, $return);
 		return $files;
-	}
-	elseif (isset($_POST['ftp_username']))
+	} elseif (isset($_POST['ftp_username']))
 	{
 		require_once($sourcedir . '/Class-Package.php');
 		$ftp = new ftp_connection($_POST['ftp_server'], $_POST['ftp_port'], $_POST['ftp_username'], $_POST['ftp_password']);
@@ -1042,19 +1117,21 @@ 
 		{
 			require_once($sourcedir . '/Class-Package.php');
 			$ftp = new ftp_connection(null);
+		} elseif ($ftp->error !== false && !isset($ftp_error)) {
+					$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 		}
-		elseif ($ftp->error !== false && !isset($ftp_error))
-			$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 
 		list ($username, $detect_path, $found_path) = $ftp->detect_path($boarddir);
 
-		if ($found_path)
-			$_POST['ftp_path'] = $detect_path;
-		elseif (!isset($_POST['ftp_path']))
-			$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+		if ($found_path) {
+					$_POST['ftp_path'] = $detect_path;
+		} elseif (!isset($_POST['ftp_path'])) {
+					$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+		}
 
-		if (!isset($_POST['ftp_username']))
-			$_POST['ftp_username'] = $username;
+		if (!isset($_POST['ftp_username'])) {
+					$_POST['ftp_username'] = $username;
+		}
 
 		$context['package_ftp'] = array(
 			'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset($modSettings['package_server']) ? $modSettings['package_server'] : 'localhost'),
@@ -1066,23 +1143,24 @@ 
 		);
 
 		// If we're returning dump out here.
-		if ($return)
-			return $files;
+		if ($return) {
+					return $files;
+		}
 
 		$context['page_title'] = $txt['package_ftp_necessary'];
 		$context['sub_template'] = 'ftp_required';
 		obExit();
-	}
-	else
+	} else
 	{
 		if (!in_array($_POST['ftp_path'], array('', '/')))
 		{
 			$ftp_root = strtr($boarddir, array($_POST['ftp_path'] => ''));
-			if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || $_POST['ftp_path'][0] == '/'))
-				$ftp_root = substr($ftp_root, 0, -1);
+			if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || $_POST['ftp_path'][0] == '/')) {
+							$ftp_root = substr($ftp_root, 0, -1);
+			}
+		} else {
+					$ftp_root = $boarddir;
 		}
-		else
-			$ftp_root = $boarddir;
 
 		$_SESSION['pack_ftp'] = array(
 			'server' => $_POST['ftp_server'],
@@ -1093,8 +1171,9 @@ 
 			'root' => $ftp_root,
 		);
 
-		if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path'])
-			updateSettings(array('package_path' => $_POST['ftp_path']));
+		if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path']) {
+					updateSettings(array('package_path' => $_POST['ftp_path']));
+		}
 
 		$files = packageRequireFTP($destination_url, $files, $return);
 	}
@@ -1122,16 +1201,18 @@ 
 	global $packagesdir, $forum_version, $context, $temp_path, $language, $smcFunc;
 
 	// Mayday!  That action doesn't exist!!
-	if (empty($packageXML) || !$packageXML->exists($method))
-		return array();
+	if (empty($packageXML) || !$packageXML->exists($method)) {
+			return array();
+	}
 
 	// We haven't found the package script yet...
 	$script = false;
 	$the_version = strtr($forum_version, array('SMF ' => ''));
 
 	// Emulation support...
-	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	if (!empty($_SESSION['version_emulate'])) {
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	// Single package emulation
 	if (!empty($_REQUEST['ve']) && !empty($_REQUEST['package']))
@@ -1139,8 +1220,9 @@ 
 		$the_version = $_REQUEST['ve'];
 		$_SESSION['single_version_emulate'][$_REQUEST['package']] = $the_version;
 	}
-	if (!empty($_REQUEST['package']) && (!empty($_SESSION['single_version_emulate'][$_REQUEST['package']])))
-		$the_version = $_SESSION['single_version_emulate'][$_REQUEST['package']];
+	if (!empty($_REQUEST['package']) && (!empty($_SESSION['single_version_emulate'][$_REQUEST['package']]))) {
+			$the_version = $_SESSION['single_version_emulate'][$_REQUEST['package']];
+	}
 
 	// Get all the versions of this method and find the right one.
 	$these_methods = $packageXML->set($method);
@@ -1150,16 +1232,18 @@ 
 		if ($this_method->exists('@for'))
 		{
 			// Don't keep going if this won't work for this version of SMF.
-			if (!matchPackageVersion($the_version, $this_method->fetch('@for')))
-				continue;
+			if (!matchPackageVersion($the_version, $this_method->fetch('@for'))) {
+							continue;
+			}
 		}
 
 		// Upgrades may go from a certain old version of the mod.
 		if ($method == 'upgrade' && $this_method->exists('@from'))
 		{
 			// Well, this is for the wrong old version...
-			if (!matchPackageVersion($previous_version, $this_method->fetch('@from')))
-				continue;
+			if (!matchPackageVersion($previous_version, $this_method->fetch('@from'))) {
+							continue;
+			}
 		}
 
 		// We've found it!
@@ -1168,8 +1252,9 @@ 
 	}
 
 	// Bad news, a matching script wasn't found!
-	if ($script === false)
-		return array();
+	if ($script === false) {
+			return array();
+	}
 
 	// Find all the actions in this method - in theory, these should only be allowed actions. (* means all.)
 	$actions = $script->set('*');
@@ -1198,12 +1283,12 @@ 
 					if ((isset($_REQUEST['readme']) && $action->fetch('@lang') == $_REQUEST['readme']) || (isset($_REQUEST['license']) && $action->fetch('@lang') == $_REQUEST['license']) || (!isset($_REQUEST['readme']) && $action->fetch('@lang') == $language)	|| (!isset($_REQUEST['license']) && $action->fetch('@lang') == $language))
 					{
 						// In case the user put the blocks in the wrong order.
-						if (isset($context[$type]['selected']) && $context[$type]['selected'] == 'default')
-							$context[$type][] = 'default';
+						if (isset($context[$type]['selected']) && $context[$type]['selected'] == 'default') {
+													$context[$type][] = 'default';
+						}
 
 						$context[$type]['selected'] = $smcFunc['htmlspecialchars']($action->fetch('@lang'));
-					}
-					else
+					} else
 					{
 						// We don't want this now, but we'll allow the user to select to read it.
 						$context[$type][] = $smcFunc['htmlspecialchars']($action->fetch('@lang'));
@@ -1218,9 +1303,9 @@ 
 					{
 						$context[$type][] = 'default';
 						continue;
+					} else {
+											$context[$type]['selected'] = 'default';
 					}
-					else
-						$context[$type]['selected'] = 'default';
 				}
 			}
 
@@ -1230,9 +1315,9 @@ 
 				$filename = $temp_path . '$auto_' . $temp_auto++ . (in_array($actionType, array('readme', 'redirect', 'license')) ? '.txt' : ($actionType == 'code' || $actionType == 'database' ? '.php' : '.mod'));
 				package_put_contents($filename, $action->fetch('.'));
 				$filename = strtr($filename, array($temp_path => ''));
+			} else {
+							$filename = $action->fetch('.');
 			}
-			else
-				$filename = $action->fetch('.');
 
 			$return[] = array(
 				'type' => $actionType,
@@ -1247,8 +1332,7 @@ 
 			);
 
 			continue;
-		}
-		elseif ($actionType == 'hook')
+		} elseif ($actionType == 'hook')
 		{
 			$return[] = array(
 				'type' => $actionType,
@@ -1260,16 +1344,16 @@ 
 				'description' => '',
 			);
 			continue;
-		}
-		elseif ($actionType == 'credits')
+		} elseif ($actionType == 'credits')
 		{
 			// quick check of any supplied url
 			$url = $action->exists('@url') ? $action->fetch('@url') : '';
 			if (strlen(trim($url)) > 0 && substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://')
 			{
 				$url = 'http://' . $url;
-				if (strlen($url) < 8 || (substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://'))
-					$url = '';
+				if (strlen($url) < 8 || (substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://')) {
+									$url = '';
+				}
 			}
 
 			$return[] = array(
@@ -1281,8 +1365,7 @@ 
 				'title' => $action->fetch('.'),
 			);
 			continue;
-		}
-		elseif ($actionType == 'requires')
+		} elseif ($actionType == 'requires')
 		{
 			$return[] = array(
 				'type' => $actionType,
@@ -1291,14 +1374,12 @@ 
 				'description' => '',
 			);
 			continue;
-		}
-		elseif ($actionType == 'error')
+		} elseif ($actionType == 'error')
 		{
 			$return[] = array(
 				'type' => 'error',
 			);
-		}
-		elseif (in_array($actionType, array('require-file', 'remove-file', 'require-dir', 'remove-dir', 'move-file', 'move-dir', 'create-file', 'create-dir')))
+		} elseif (in_array($actionType, array('require-file', 'remove-file', 'require-dir', 'remove-dir', 'move-file', 'move-dir', 'create-file', 'create-dir')))
 		{
 			$this_action = &$return[];
 			$this_action = array(
@@ -1312,8 +1393,7 @@ 
 			{
 				$this_action['unparsed_destination'] = $action->fetch('@destination');
 				$this_action['destination'] = parse_path($action->fetch('@destination')) . '/' . basename($this_action['filename']);
-			}
-			else
+			} else
 			{
 				$this_action['unparsed_filename'] = $this_action['filename'];
 				$this_action['filename'] = parse_path($this_action['filename']);
@@ -1322,10 +1402,11 @@ 
 			// If we're moving or requiring (copying) a file.
 			if (substr($actionType, 0, 4) == 'move' || substr($actionType, 0, 7) == 'require')
 			{
-				if ($action->exists('@from'))
-					$this_action['source'] = parse_path($action->fetch('@from'));
-				else
-					$this_action['source'] = $temp_path . $this_action['filename'];
+				if ($action->exists('@from')) {
+									$this_action['source'] = parse_path($action->fetch('@from'));
+				} else {
+									$this_action['source'] = $temp_path . $this_action['filename'];
+				}
 			}
 
 			// Check if these things can be done. (chmod's etc.)
@@ -1334,22 +1415,23 @@ 
 				if (!mktree($this_action['destination'], false))
 				{
 					$temp = $this_action['destination'];
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
 						'filename' => $temp
 					);
 				}
-			}
-			elseif ($actionType == 'create-file')
+			} elseif ($actionType == 'create-file')
 			{
 				if (!mktree(dirname($this_action['destination']), false))
 				{
 					$temp = dirname($this_action['destination']);
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1357,36 +1439,38 @@ 
 					);
 				}
 
-				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
-			}
-			elseif ($actionType == 'require-dir')
+				}
+			} elseif ($actionType == 'require-dir')
 			{
 				if (!mktree($this_action['destination'], false))
 				{
 					$temp = $this_action['destination'];
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
 						'filename' => $temp
 					);
 				}
-			}
-			elseif ($actionType == 'require-file')
+			} elseif ($actionType == 'require-file')
 			{
-				if ($action->exists('@theme'))
-					$this_action['theme_action'] = $action->fetch('@theme');
+				if ($action->exists('@theme')) {
+									$this_action['theme_action'] = $action->fetch('@theme');
+				}
 
 				if (!mktree(dirname($this_action['destination']), false))
 				{
 					$temp = dirname($this_action['destination']);
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1394,19 +1478,20 @@ 
 					);
 				}
 
-				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
-			}
-			elseif ($actionType == 'move-dir' || $actionType == 'move-file')
+				}
+			} elseif ($actionType == 'move-dir' || $actionType == 'move-file')
 			{
 				if (!mktree(dirname($this_action['destination']), false))
 				{
 					$temp = dirname($this_action['destination']);
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1414,30 +1499,30 @@ 
 					);
 				}
 
-				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
-			}
-			elseif ($actionType == 'remove-dir')
+				}
+			} elseif ($actionType == 'remove-dir')
 			{
-				if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-					$return[] = array(
+				if (!is_writable($this_action['filename']) && file_exists($this_action['filename'])) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['filename']
 					);
-			}
-			elseif ($actionType == 'remove-file')
+				}
+			} elseif ($actionType == 'remove-file')
 			{
-				if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-					$return[] = array(
+				if (!is_writable($this_action['filename']) && file_exists($this_action['filename'])) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['filename']
 					);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$return[] = array(
 				'type' => 'error',
@@ -1448,8 +1533,9 @@ 
 	}
 
 	// Only testing - just return a list of things to be done.
-	if ($testing_only)
-		return $return;
+	if ($testing_only) {
+			return $return;
+	}
 
 	umask(0);
 
@@ -1457,78 +1543,81 @@ 
 	$not_done = array(array('type' => '!'));
 	foreach ($return as $action)
 	{
-		if (in_array($action['type'], array('modification', 'code', 'database', 'redirect', 'hook', 'credits')))
-			$not_done[] = $action;
+		if (in_array($action['type'], array('modification', 'code', 'database', 'redirect', 'hook', 'credits'))) {
+					$not_done[] = $action;
+		}
 
 		if ($action['type'] == 'create-dir')
 		{
-			if (!mktree($action['destination'], 0755) || !is_writable($action['destination']))
-				$failure |= !mktree($action['destination'], 0777);
-		}
-		elseif ($action['type'] == 'create-file')
+			if (!mktree($action['destination'], 0755) || !is_writable($action['destination'])) {
+							$failure |= !mktree($action['destination'], 0777);
+			}
+		} elseif ($action['type'] == 'create-file')
 		{
-			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			// Create an empty file.
 			package_put_contents($action['destination'], package_get_contents($action['source']), $testing_only);
 
-			if (!file_exists($action['destination']))
-				$failure = true;
-		}
-		elseif ($action['type'] == 'require-dir')
+			if (!file_exists($action['destination'])) {
+							$failure = true;
+			}
+		} elseif ($action['type'] == 'require-dir')
 		{
 			copytree($action['source'], $action['destination']);
 			// Any other theme folders?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']]))
-				foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
 					copytree($action['source'], $theme_destination);
-		}
-		elseif ($action['type'] == 'require-file')
+			}
+		} elseif ($action['type'] == 'require-file')
 		{
-			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			package_put_contents($action['destination'], package_get_contents($action['source']), $testing_only);
 
 			$failure |= !copy($action['source'], $action['destination']);
 
 			// Any other theme files?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']]))
-				foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
 				{
 					if (!mktree(dirname($theme_destination), 0755) || !is_writable(dirname($theme_destination)))
 						$failure |= !mktree(dirname($theme_destination), 0777);
+			}
 
 					package_put_contents($theme_destination, package_get_contents($action['source']), $testing_only);
 
 					$failure |= !copy($action['source'], $theme_destination);
 				}
-		}
-		elseif ($action['type'] == 'move-file')
+		} elseif ($action['type'] == 'move-file')
 		{
-			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			$failure |= !rename($action['source'], $action['destination']);
-		}
-		elseif ($action['type'] == 'move-dir')
+		} elseif ($action['type'] == 'move-dir')
 		{
-			if (!mktree($action['destination'], 0755) || !is_writable($action['destination']))
-				$failure |= !mktree($action['destination'], 0777);
+			if (!mktree($action['destination'], 0755) || !is_writable($action['destination'])) {
+							$failure |= !mktree($action['destination'], 0777);
+			}
 
 			$failure |= !rename($action['source'], $action['destination']);
-		}
-		elseif ($action['type'] == 'remove-dir')
+		} elseif ($action['type'] == 'remove-dir')
 		{
 			deltree($action['filename']);
 
 			// Any other theme folders?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']]))
-				foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
 					deltree($theme_destination);
-		}
-		elseif ($action['type'] == 'remove-file')
+			}
+		} elseif ($action['type'] == 'remove-file')
 		{
 			// Make sure the file exists before deleting it.
 			if (file_exists($action['filename']))
@@ -1537,16 +1626,18 @@ 
 				$failure |= !unlink($action['filename']);
 			}
 			// The file that was supposed to be deleted couldn't be found.
-			else
-				$failure = true;
+			else {
+							$failure = true;
+			}
 
 			// Any other theme folders?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']]))
-				foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
 					if (file_exists($theme_destination))
 						$failure |= !unlink($theme_destination);
-					else
-						$failure = true;
+			} else {
+											$failure = true;
+					}
 		}
 	}
 
@@ -1568,8 +1659,9 @@ 
 {
 	static $near_version = 0;
 
-	if ($reset)
-		$near_version = 0;
+	if ($reset) {
+			$near_version = 0;
+	}
 
 	// Normalize the $versions while we remove our previous Doh!
 	$versions = explode(',', str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($versions)));
@@ -1578,16 +1670,19 @@ 
 	foreach ($versions as $for)
 	{
 		// Adjust for those wild cards
-		if (strpos($for, '*') !== false)
-			$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		if (strpos($for, '*') !== false) {
+					$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		}
 
 		// If we have a range, grab the lower value, done this way so it looks normal-er to the user e.g. 2.0 vs 2.0.99
-		if (strpos($for, '-') !== false)
-			list ($for, $higher) = explode('-', $for);
+		if (strpos($for, '-') !== false) {
+					list ($for, $higher) = explode('-', $for);
+		}
 
 		// Do the compare, if the for is greater, than what we have but not greater than what we are running .....
-		if (compareVersions($near_version, $for) === -1 && compareVersions($for, $the_version) !== 1)
-			$near_version = $for;
+		if (compareVersions($near_version, $for) === -1 && compareVersions($for, $the_version) !== 1) {
+					$near_version = $for;
+		}
 	}
 
 	return !empty($near_version) ? $near_version : false;
@@ -1610,15 +1705,17 @@ 
 	$versions = explode(',', str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($versions)));
 
 	// Perhaps we do accept anything?
-	if (in_array('all', $versions))
-		return true;
+	if (in_array('all', $versions)) {
+			return true;
+	}
 
 	// Loop through each version.
 	foreach ($versions as $for)
 	{
 		// Wild card spotted?
-		if (strpos($for, '*') !== false)
-			$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		if (strpos($for, '*') !== false) {
+					$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		}
 
 		// Do we have a range?
 		if (strpos($for, '-') !== false)
@@ -1626,12 +1723,14 @@ 
 			list ($lower, $upper) = explode('-', $for);
 
 			// Compare the version against lower and upper bounds.
-			if (compareVersions($version, $lower) > -1 && compareVersions($version, $upper) < 1)
-				return true;
+			if (compareVersions($version, $lower) > -1 && compareVersions($version, $upper) < 1) {
+							return true;
+			}
 		}
 		// Otherwise check if they are equal...
-		elseif (compareVersions($version, $for) === 0)
-			return true;
+		elseif (compareVersions($version, $for) === 0) {
+					return true;
+		}
 	}
 
 	return false;
@@ -1671,12 +1770,14 @@ 
 	}
 
 	// Are they the same, perhaps?
-	if ($versions[1] === $versions[2])
-		return 0;
+	if ($versions[1] === $versions[2]) {
+			return 0;
+	}
 
 	// Get version numbering categories...
-	if (!isset($categories))
-		$categories = array_keys($versions[1]);
+	if (!isset($categories)) {
+			$categories = array_keys($versions[1]);
+	}
 
 	// Loop through each category.
 	foreach ($categories as $category)
@@ -1686,13 +1787,15 @@ 
 		{
 			// Dev builds are a problematic exception.
 			// (stable) dev < (stable) but (unstable) dev = (unstable)
-			if ($category == 'type')
-				return $versions[1][$category] > $versions[2][$category] ? ($versions[1]['dev'] ? -1 : 1) : ($versions[2]['dev'] ? 1 : -1);
-			elseif ($category == 'dev')
-				return $versions[1]['dev'] ? ($versions[2]['type'] == 'stable' ? -1 : 0) : ($versions[1]['type'] == 'stable' ? 1 : 0);
+			if ($category == 'type') {
+							return $versions[1][$category] > $versions[2][$category] ? ($versions[1]['dev'] ? -1 : 1) : ($versions[2]['dev'] ? 1 : -1);
+			} elseif ($category == 'dev') {
+							return $versions[1]['dev'] ? ($versions[2]['type'] == 'stable' ? -1 : 0) : ($versions[1]['type'] == 'stable' ? 1 : 0);
+			}
 			// Otherwise a simple comparison.
-			else
-				return $versions[1][$category] > $versions[2][$category] ? 1 : -1;
+			else {
+							return $versions[1][$category] > $versions[2][$category] ? 1 : -1;
+			}
 		}
 	}
 
@@ -1726,11 +1829,13 @@ 
 	);
 
 	// do we parse in a package directory?
-	if (!empty($temp_path))
-		$dirs['$package'] = $temp_path;
+	if (!empty($temp_path)) {
+			$dirs['$package'] = $temp_path;
+	}
 
-	if (strlen($path) == 0)
-		trigger_error('parse_path(): There should never be an empty filename', E_USER_ERROR);
+	if (strlen($path) == 0) {
+			trigger_error('parse_path(): There should never be an empty filename', E_USER_ERROR);
+	}
 
 	return strtr($path, $dirs);
 }
@@ -1746,8 +1851,9 @@ 
 {
 	global $package_ftp;
 
-	if (!file_exists($dir))
-		return;
+	if (!file_exists($dir)) {
+			return;
+	}
 
 	$current_dir = @opendir($dir);
 	if ($current_dir == false)
@@ -1755,8 +1861,9 @@ 
 		if ($delete_dir && isset($package_ftp))
 		{
 			$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
-			if (!is_dir($dir))
-				$package_ftp->chmod($ftp_file, 0777);
+			if (!is_dir($dir)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
 			$package_ftp->unlink($ftp_file);
 		}
 
@@ -1765,26 +1872,28 @@ 
 
 	while ($entryname = readdir($current_dir))
 	{
-		if (in_array($entryname, array('.', '..')))
-			continue;
+		if (in_array($entryname, array('.', '..'))) {
+					continue;
+		}
 
-		if (is_dir($dir . '/' . $entryname))
-			deltree($dir . '/' . $entryname);
-		else
+		if (is_dir($dir . '/' . $entryname)) {
+					deltree($dir . '/' . $entryname);
+		} else
 		{
 			// Here, 755 doesn't really matter since we're deleting it anyway.
 			if (isset($package_ftp))
 			{
 				$ftp_file = strtr($dir . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
 
-				if (!is_writable($dir . '/' . $entryname))
-					$package_ftp->chmod($ftp_file, 0777);
+				if (!is_writable($dir . '/' . $entryname)) {
+									$package_ftp->chmod($ftp_file, 0777);
+				}
 				$package_ftp->unlink($ftp_file);
-			}
-			else
+			} else
 			{
-				if (!is_writable($dir . '/' . $entryname))
-					smf_chmod($dir . '/' . $entryname, 0777);
+				if (!is_writable($dir . '/' . $entryname)) {
+									smf_chmod($dir . '/' . $entryname, 0777);
+				}
 				unlink($dir . '/' . $entryname);
 			}
 		}
@@ -1797,14 +1906,15 @@ 
 		if (isset($package_ftp))
 		{
 			$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
-			if (!is_writable($dir . '/' . $entryname))
-				$package_ftp->chmod($ftp_file, 0777);
+			if (!is_writable($dir . '/' . $entryname)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
 			$package_ftp->unlink($ftp_file);
-		}
-		else
+		} else
 		{
-			if (!is_writable($dir))
-				smf_chmod($dir, 0777);
+			if (!is_writable($dir)) {
+							smf_chmod($dir, 0777);
+			}
 			@rmdir($dir);
 		}
 	}
@@ -1826,10 +1936,11 @@ 
 	{
 		if (!is_writable($strPath) && $mode !== false)
 		{
-			if (isset($package_ftp))
-				$package_ftp->chmod(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')), $mode);
-			else
-				smf_chmod($strPath, $mode);
+			if (isset($package_ftp)) {
+							$package_ftp->chmod(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')), $mode);
+			} else {
+							smf_chmod($strPath, $mode);
+			}
 		}
 
 		$test = @opendir($strPath);
@@ -1837,36 +1948,37 @@ 
 		{
 			closedir($test);
 			return is_writable($strPath);
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 	// Is this an invalid path and/or we can't make the directory?
-	if ($strPath == dirname($strPath) || !mktree(dirname($strPath), $mode))
-		return false;
+	if ($strPath == dirname($strPath) || !mktree(dirname($strPath), $mode)) {
+			return false;
+	}
 
 	if (!is_writable(dirname($strPath)) && $mode !== false)
 	{
-		if (isset($package_ftp))
-			$package_ftp->chmod(dirname(strtr($strPath, array($_SESSION['pack_ftp']['root'] => ''))), $mode);
-		else
-			smf_chmod(dirname($strPath), $mode);
+		if (isset($package_ftp)) {
+					$package_ftp->chmod(dirname(strtr($strPath, array($_SESSION['pack_ftp']['root'] => ''))), $mode);
+		} else {
+					smf_chmod(dirname($strPath), $mode);
+		}
 	}
 
-	if ($mode !== false && isset($package_ftp))
-		return $package_ftp->create_dir(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')));
-	elseif ($mode === false)
+	if ($mode !== false && isset($package_ftp)) {
+			return $package_ftp->create_dir(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')));
+	} elseif ($mode === false)
 	{
 		$test = @opendir(dirname($strPath));
 		if ($test)
 		{
 			closedir($test);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
-	}
-	else
+	} else
 	{
 		@mkdir($strPath, $mode);
 		$test = @opendir($strPath);
@@ -1874,9 +1986,9 @@ 
 		{
 			closedir($test);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 
@@ -1891,39 +2003,46 @@ 
 {
 	global $package_ftp;
 
-	if (!file_exists($destination) || !is_writable($destination))
-		mktree($destination, 0755);
-	if (!is_writable($destination))
-		mktree($destination, 0777);
+	if (!file_exists($destination) || !is_writable($destination)) {
+			mktree($destination, 0755);
+	}
+	if (!is_writable($destination)) {
+			mktree($destination, 0777);
+	}
 
 	$current_dir = opendir($source);
-	if ($current_dir == false)
-		return;
+	if ($current_dir == false) {
+			return;
+	}
 
 	while ($entryname = readdir($current_dir))
 	{
-		if (in_array($entryname, array('.', '..')))
-			continue;
+		if (in_array($entryname, array('.', '..'))) {
+					continue;
+		}
 
-		if (isset($package_ftp))
-			$ftp_file = strtr($destination . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+		if (isset($package_ftp)) {
+					$ftp_file = strtr($destination . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+		}
 
 		if (is_file($source . '/' . $entryname))
 		{
-			if (isset($package_ftp) && !file_exists($destination . '/' . $entryname))
-				$package_ftp->create_file($ftp_file);
-			elseif (!file_exists($destination . '/' . $entryname))
-				@touch($destination . '/' . $entryname);
+			if (isset($package_ftp) && !file_exists($destination . '/' . $entryname)) {
+							$package_ftp->create_file($ftp_file);
+			} elseif (!file_exists($destination . '/' . $entryname)) {
+							@touch($destination . '/' . $entryname);
+			}
 		}
 
 		package_chmod($destination . '/' . $entryname);
 
-		if (is_dir($source . '/' . $entryname))
-			copytree($source . '/' . $entryname, $destination . '/' . $entryname);
-		elseif (file_exists($destination . '/' . $entryname))
-			package_put_contents($destination . '/' . $entryname, package_get_contents($source . '/' . $entryname));
-		else
-			copy($source . '/' . $entryname, $destination . '/' . $entryname);
+		if (is_dir($source . '/' . $entryname)) {
+					copytree($source . '/' . $entryname, $destination . '/' . $entryname);
+		} elseif (file_exists($destination . '/' . $entryname)) {
+					package_put_contents($destination . '/' . $entryname, package_get_contents($source . '/' . $entryname));
+		} else {
+					copy($source . '/' . $entryname, $destination . '/' . $entryname);
+		}
 	}
 
 	closedir($current_dir);
@@ -1941,21 +2060,24 @@ 
 	$data = array();
 
 	$dir = @dir($path . $sub_path);
-	if (!$dir)
-		return array();
+	if (!$dir) {
+			return array();
+	}
 	while ($entry = $dir->read())
 	{
-		if ($entry == '.' || $entry == '..')
-			continue;
+		if ($entry == '.' || $entry == '..') {
+					continue;
+		}
 
-		if (is_dir($path . $sub_path . '/' . $entry))
-			$data = array_merge($data, listtree($path, $sub_path . '/' . $entry));
-		else
-			$data[] = array(
+		if (is_dir($path . $sub_path . '/' . $entry)) {
+					$data = array_merge($data, listtree($path, $sub_path . '/' . $entry));
+		} else {
+					$data[] = array(
 				'filename' => $sub_path == '' ? $entry : $sub_path . '/' . $entry,
 				'size' => filesize($path . $sub_path . '/' . $entry),
 				'skipped' => false,
 			);
+		}
 	}
 	$dir->close();
 
@@ -2010,8 +2132,9 @@ 
 		{
 			// If this filename is relative, if so take a guess at what it should be.
 			$real_filename = $filename;
-			if (strpos($filename, 'Themes') === 0)
-				$real_filename = $boarddir . '/' . $filename;
+			if (strpos($filename, 'Themes') === 0) {
+							$real_filename = $boarddir . '/' . $filename;
+			}
 
 			if (strpos($real_filename, $theme['theme_dir']) === 0)
 			{
@@ -2030,8 +2153,9 @@ 
 		foreach ($theme_paths as $id => $theme)
 		{
 			// Default is getting done anyway, so no need for involvement here.
-			if ($id == 1)
-				continue;
+			if ($id == 1) {
+							continue;
+			}
 
 			// For every template, do we want it? Yea, no, maybe?
 			foreach ($template_changes[1] as $index => $template_file)
@@ -2054,8 +2178,9 @@ 
 		);
 
 		// Sometimes though, we have some additional files for other themes, if we have add them to the mix.
-		if (isset($custom_themes_add[$files_to_change[1]]))
-			$files_to_change += $custom_themes_add[$files_to_change[1]];
+		if (isset($custom_themes_add[$files_to_change[1]])) {
+					$files_to_change += $custom_themes_add[$files_to_change[1]];
+		}
 
 		// Now, loop through all the files we're changing, and, well, change them ;)
 		foreach ($files_to_change as $theme => $working_file)
@@ -2089,11 +2214,13 @@ 
 				continue;
 			}
 			// Okay, we're creating this file then...?
-			elseif (!file_exists($working_file))
-				$working_data = '';
+			elseif (!file_exists($working_file)) {
+							$working_data = '';
+			}
 			// Phew, it exists!  Load 'er up!
-			else
-				$working_data = str_replace("\r", '', package_get_contents($working_file));
+			else {
+							$working_data = str_replace("\r", '', package_get_contents($working_file));
+			}
 
 			$actions[] = array(
 				'type' => 'opened',
@@ -2114,8 +2241,8 @@ 
 
 				// Grab all search items of this operation (in most cases just 1).
 				$searches = $operation->set('search');
-				foreach ($searches as $i => $search)
-					$actual_operation['searches'][] = array(
+				foreach ($searches as $i => $search) {
+									$actual_operation['searches'][] = array(
 						'position' => $search->exists('@position') && in_array(trim($search->fetch('@position')), array('before', 'after', 'replace', 'end')) ? trim($search->fetch('@position')) : 'replace',
 						'is_reg_exp' => $search->exists('@regexp') && trim($search->fetch('@regexp')) === 'true',
 						'loose_whitespace' => $search->exists('@whitespace') && trim($search->fetch('@whitespace')) === 'loose',
@@ -2124,6 +2251,7 @@ 
 						'preg_search' => '',
 						'preg_replace' => '',
 					);
+				}
 
 				// At least one search should be defined.
 				if (empty($actual_operation['searches']))
@@ -2148,30 +2276,32 @@ 
 						// Reverse modification of regular expressions are not allowed.
 						if ($search['is_reg_exp'])
 						{
-							if ($actual_operation['error'] === 'fatal')
-								$actions[] = array(
+							if ($actual_operation['error'] === 'fatal') {
+															$actions[] = array(
 									'type' => 'failure',
 									'filename' => $working_file,
 									'search' => $search['search'],
 									'is_custom' => $theme > 1 ? $theme : 0,
 								);
+							}
 
 							// Continue to the next operation.
 							continue 2;
 						}
 
 						// The replacement is now the search subject...
-						if ($search['position'] === 'replace' || $search['position'] === 'end')
-							$actual_operation['searches'][$i]['search'] = $search['add'];
-						else
+						if ($search['position'] === 'replace' || $search['position'] === 'end') {
+													$actual_operation['searches'][$i]['search'] = $search['add'];
+						} else
 						{
 							// Reversing a before/after modification becomes a replacement.
 							$actual_operation['searches'][$i]['position'] = 'replace';
 
-							if ($search['position'] === 'before')
-								$actual_operation['searches'][$i]['search'] .= $search['add'];
-							elseif ($search['position'] === 'after')
-								$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+							if ($search['position'] === 'before') {
+															$actual_operation['searches'][$i]['search'] .= $search['add'];
+							} elseif ($search['position'] === 'after') {
+															$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+							}
 						}
 
 						// ...and the search subject is now the replacement.
@@ -2199,16 +2329,17 @@ 
 				foreach ($actual_operation['searches'] as $i => $search)
 				{
 					// Not much needed if the search subject is already a regexp.
-					if ($search['is_reg_exp'])
-						$actual_operation['searches'][$i]['preg_search'] = $search['search'];
-					else
+					if ($search['is_reg_exp']) {
+											$actual_operation['searches'][$i]['preg_search'] = $search['search'];
+					} else
 					{
 						// Make the search subject fit into a regular expression.
 						$actual_operation['searches'][$i]['preg_search'] = preg_quote($search['search'], '~');
 
 						// Using 'loose', a random amount of tabs and spaces may be used.
-						if ($search['loose_whitespace'])
-							$actual_operation['searches'][$i]['preg_search'] = preg_replace('~[ \t]+~', '[ \t]+', $actual_operation['searches'][$i]['preg_search']);
+						if ($search['loose_whitespace']) {
+													$actual_operation['searches'][$i]['preg_search'] = preg_replace('~[ \t]+~', '[ \t]+', $actual_operation['searches'][$i]['preg_search']);
+						}
 					}
 
 					// Shuzzup.  This is done so we can safely use a regular expression. ($0 is bad!!)
@@ -2234,8 +2365,7 @@ 
 						if ($undo)
 						{
 							$actual_operation['searches'][$i]['preg_replace'] = '';
-						}
-						else
+						} else
 						{
 							$actual_operation['searches'][$i]['preg_search'] = '(\\n\\?\\>)?$';
 							$actual_operation['searches'][$i]['preg_replace'] .= '$1';
@@ -2282,8 +2412,9 @@ 
 					}
 
 					// Replace it into nothing? That's not an option...unless it's an undoing end.
-					if ($search['add'] === '' && ($search['position'] !== 'end' || !$undo))
-						continue;
+					if ($search['add'] === '' && ($search['position'] !== 'end' || !$undo)) {
+											continue;
+					}
 
 					// Finally, we're doing some replacements.
 					$working_data = preg_replace('~' . $actual_operation['searches'][$i]['preg_search'] . '~s', $actual_operation['searches'][$i]['preg_replace'], $working_data, 1);
@@ -2308,22 +2439,25 @@ 
 
 			package_chmod($working_file);
 
-			if ((file_exists($working_file) && !is_writable($working_file)) || (!file_exists($working_file) && !is_writable(dirname($working_file))))
-				$actions[] = array(
+			if ((file_exists($working_file) && !is_writable($working_file)) || (!file_exists($working_file) && !is_writable(dirname($working_file)))) {
+							$actions[] = array(
 					'type' => 'chmod',
 					'filename' => $working_file
 				);
+			}
 
-			if (basename($working_file) == 'Settings_bak.php')
-				continue;
+			if (basename($working_file) == 'Settings_bak.php') {
+							continue;
+			}
 
 			if (!$testing && !empty($modSettings['package_make_backups']) && file_exists($working_file))
 			{
 				// No, no, not Settings.php!
-				if (basename($working_file) == 'Settings.php')
-					@copy($working_file, dirname($working_file) . '/Settings_bak.php');
-				else
-					@copy($working_file, $working_file . '~');
+				if (basename($working_file) == 'Settings.php') {
+									@copy($working_file, dirname($working_file) . '/Settings_bak.php');
+				} else {
+									@copy($working_file, $working_file . '~');
+				}
 			}
 
 			// Always call this, even if in testing, because it won't really be written in testing mode.
@@ -2390,8 +2524,9 @@ 
 		if ($code_match[1] != 'edit file' && $code_match[1] != 'file')
 		{
 			// It's a step, let's add that to the current steps.
-			if (isset($temp_changes[$step_counter]))
-				$temp_changes[$step_counter]['changes'][] = $code_match[0];
+			if (isset($temp_changes[$step_counter])) {
+							$temp_changes[$step_counter]['changes'][] = $code_match[0];
+			}
 			continue;
 		}
 
@@ -2408,11 +2543,13 @@ 
 		foreach ($theme_paths as $id => $theme)
 		{
 			// If this filename is relative, if so take a guess at what it should be.
-			if (strpos($filename, 'Themes') === 0)
-				$filename = $boarddir . '/' . $filename;
+			if (strpos($filename, 'Themes') === 0) {
+							$filename = $boarddir . '/' . $filename;
+			}
 
-			if (strpos($filename, $theme['theme_dir']) === 0)
-				$template_changes[$id][$counter] = substr($filename, strlen($theme['theme_dir']) + 1);
+			if (strpos($filename, $theme['theme_dir']) === 0) {
+							$template_changes[$id][$counter] = substr($filename, strlen($theme['theme_dir']) + 1);
+			}
 		}
 	}
 
@@ -2427,8 +2564,9 @@ 
 		foreach ($theme_paths as $id => $theme)
 		{
 			// Don't do default, it means nothing to me.
-			if ($id == 1)
-				continue;
+			if ($id == 1) {
+							continue;
+			}
 
 			// Now, for each file do we need to edit it?
 			foreach ($template_changes[1] as $pos => $template_file)
@@ -2464,32 +2602,36 @@ 
 				package_chmod($working_file);
 
 				// Don't even dare.
-				if (basename($working_file) == 'Settings_bak.php')
-					continue;
+				if (basename($working_file) == 'Settings_bak.php') {
+									continue;
+				}
 
-				if (!is_writable($working_file))
-					$actions[] = array(
+				if (!is_writable($working_file)) {
+									$actions[] = array(
 						'type' => 'chmod',
 						'filename' => $working_file
 					);
+				}
 
 				if (!$testing && !empty($modSettings['package_make_backups']) && file_exists($working_file))
 				{
-					if (basename($working_file) == 'Settings.php')
-						@copy($working_file, dirname($working_file) . '/Settings_bak.php');
-					else
-						@copy($working_file, $working_file . '~');
+					if (basename($working_file) == 'Settings.php') {
+											@copy($working_file, dirname($working_file) . '/Settings_bak.php');
+					} else {
+											@copy($working_file, $working_file . '~');
+					}
 				}
 
 				package_put_contents($working_file, $working_data, $testing);
 			}
 
-			if ($working_file !== null)
-				$actions[] = array(
+			if ($working_file !== null) {
+							$actions[] = array(
 					'type' => 'saved',
 					'filename' => $working_file,
 					'is_custom' => $is_custom,
 				);
+			}
 
 			// Is this "now working on" file a theme specific one?
 			$is_custom = isset($theme_id_ref[$counter - 1]) ? $theme_id_ref[$counter - 1] : 0;
@@ -2508,10 +2650,11 @@ 
 			{
 				$places_to_check = array($boarddir, $sourcedir, $settings['default_theme_dir'], $settings['default_theme_dir'] . '/languages');
 
-				foreach ($places_to_check as $place)
-					if (file_exists($place . '/' . $working_file))
+				foreach ($places_to_check as $place) {
+									if (file_exists($place . '/' . $working_file))
 					{
 						$working_file = $place . '/' . $working_file;
+				}
 						break;
 					}
 			}
@@ -2525,8 +2668,7 @@ 
 					'type' => 'opened',
 					'filename' => $working_file
 				);
-			}
-			else
+			} else
 			{
 				$actions[] = array(
 					'type' => 'missing',
@@ -2562,11 +2704,13 @@ 
 			$replace_with = $code_match[2];
 
 			// Add this afterward...
-			if ($code_match[1] == 'add' || $code_match[1] == 'add after')
-				$replace_with = $working_search . "\n" . $replace_with;
+			if ($code_match[1] == 'add' || $code_match[1] == 'add after') {
+							$replace_with = $working_search . "\n" . $replace_with;
+			}
 			// Add this beforehand.
-			elseif ($code_match[1] == 'before' || $code_match[1] == 'add before' || $code_match[1] == 'above' || $code_match[1] == 'add above')
-				$replace_with .= "\n" . $working_search;
+			elseif ($code_match[1] == 'before' || $code_match[1] == 'add before' || $code_match[1] == 'above' || $code_match[1] == 'add above') {
+							$replace_with .= "\n" . $working_search;
+			}
 			// Otherwise.. replace with $replace_with ;).
 		}
 
@@ -2629,29 +2773,32 @@ 
 	{
 		package_chmod($working_file);
 
-		if (!is_writable($working_file))
-			$actions[] = array(
+		if (!is_writable($working_file)) {
+					$actions[] = array(
 				'type' => 'chmod',
 				'filename' => $working_file
 			);
+		}
 
 		if (!$testing && !empty($modSettings['package_make_backups']) && file_exists($working_file))
 		{
-			if (basename($working_file) == 'Settings.php')
-				@copy($working_file, dirname($working_file) . '/Settings_bak.php');
-			else
-				@copy($working_file, $working_file . '~');
+			if (basename($working_file) == 'Settings.php') {
+							@copy($working_file, dirname($working_file) . '/Settings_bak.php');
+			} else {
+							@copy($working_file, $working_file . '~');
+			}
 		}
 
 		package_put_contents($working_file, $working_data, $testing);
 	}
 
-	if ($working_file !== null)
-		$actions[] = array(
+	if ($working_file !== null) {
+			$actions[] = array(
 			'type' => 'saved',
 			'filename' => $working_file,
 			'is_custom' => $is_custom,
 		);
+	}
 
 	$actions[] = array(
 		'type' => 'result',
@@ -2677,17 +2824,19 @@ 
 		$mem_check = setMemoryLimit('128M');
 
 		// Windows doesn't seem to care about the memory_limit.
-		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false)
-			$package_cache = array();
-		else
-			$package_cache = false;
+		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false) {
+					$package_cache = array();
+		} else {
+					$package_cache = false;
+		}
 	}
 
-	if (strpos($filename, 'Packages/') !== false || $package_cache === false || !isset($package_cache[$filename]))
-		return file_get_contents($filename);
-	else
-		return $package_cache[$filename];
-}
+	if (strpos($filename, 'Packages/') !== false || $package_cache === false || !isset($package_cache[$filename])) {
+			return file_get_contents($filename);
+	} else {
+			return $package_cache[$filename];
+	}
+	}
 
 /**
  * Writes data to a file, almost exactly like the file_put_contents() function.
@@ -2710,19 +2859,22 @@ 
 		// Try to increase the memory limit - we don't want to run out of ram!
 		$mem_check = setMemoryLimit('128M');
 
-		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false)
-			$package_cache = array();
-		else
-			$package_cache = false;
+		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false) {
+					$package_cache = array();
+		} else {
+					$package_cache = false;
+		}
 	}
 
-	if (isset($package_ftp))
-		$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+	if (isset($package_ftp)) {
+			$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+	}
 
-	if (!file_exists($filename) && isset($package_ftp))
-		$package_ftp->create_file($ftp_file);
-	elseif (!file_exists($filename))
-		@touch($filename);
+	if (!file_exists($filename) && isset($package_ftp)) {
+			$package_ftp->create_file($ftp_file);
+	} elseif (!file_exists($filename)) {
+			@touch($filename);
+	}
 
 	package_chmod($filename);
 
@@ -2731,22 +2883,23 @@ 
 		$fp = @fopen($filename, in_array(substr($filename, -3), $text_filetypes) ? 'w' : 'wb');
 
 		// We should show an error message or attempt a rollback, no?
-		if (!$fp)
-			return false;
+		if (!$fp) {
+					return false;
+		}
 
 		fwrite($fp, $data);
 		fclose($fp);
-	}
-	elseif (strpos($filename, 'Packages/') !== false || $package_cache === false)
-		return strlen($data);
-	else
+	} elseif (strpos($filename, 'Packages/') !== false || $package_cache === false) {
+			return strlen($data);
+	} else
 	{
 		$package_cache[$filename] = $data;
 
 		// Permission denied, eh?
 		$fp = @fopen($filename, 'r+');
-		if (!$fp)
-			return false;
+		if (!$fp) {
+					return false;
+		}
 		fclose($fp);
 	}
 
@@ -2763,19 +2916,22 @@ 
 	global $package_ftp, $package_cache;
 	static $text_filetypes = array('php', 'txt', '.js', 'css', 'vbs', 'tml', 'htm');
 
-	if (empty($package_cache))
-		return;
+	if (empty($package_cache)) {
+			return;
+	}
 
 	// First, let's check permissions!
 	foreach ($package_cache as $filename => $data)
 	{
-		if (isset($package_ftp))
-			$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		if (isset($package_ftp)) {
+					$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		}
 
-		if (!file_exists($filename) && isset($package_ftp))
-			$package_ftp->create_file($ftp_file);
-		elseif (!file_exists($filename))
-			@touch($filename);
+		if (!file_exists($filename) && isset($package_ftp)) {
+					$package_ftp->create_file($ftp_file);
+		} elseif (!file_exists($filename)) {
+					@touch($filename);
+		}
 
 		$result = package_chmod($filename);
 
@@ -2822,8 +2978,9 @@ 
 {
 	global $package_ftp;
 
-	if (file_exists($filename) && is_writable($filename) && $perm_state == 'writable')
-		return true;
+	if (file_exists($filename) && is_writable($filename) && $perm_state == 'writable') {
+			return true;
+	}
 
 	// Start off checking without FTP.
 	if (!isset($package_ftp) || $package_ftp === false)
@@ -2845,8 +3002,7 @@ 
 
 				// Keep track of the writable status here.
 				$file_permissions = @fileperms($chmod_file);
-			}
-			else
+			} else
 			{
 				// This looks odd, but it's an attempt to work around PHP suExec.
 				if (!file_exists($chmod_file) && $perm_state == 'writable')
@@ -2856,24 +3012,28 @@ 
 					mktree(dirname($chmod_file), 0755);
 					@touch($chmod_file);
 					smf_chmod($chmod_file, 0755);
+				} else {
+									$file_permissions = @fileperms($chmod_file);
 				}
-				else
-					$file_permissions = @fileperms($chmod_file);
 			}
 
 			// This looks odd, but it's another attempt to work around PHP suExec.
-			if ($perm_state != 'writable')
-				smf_chmod($chmod_file, $perm_state == 'execute' ? 0755 : 0644);
-			else
+			if ($perm_state != 'writable') {
+							smf_chmod($chmod_file, $perm_state == 'execute' ? 0755 : 0644);
+			} else
 			{
-				if (!@is_writable($chmod_file))
-					smf_chmod($chmod_file, 0755);
-				if (!@is_writable($chmod_file))
-					smf_chmod($chmod_file, 0777);
-				if (!@is_writable(dirname($chmod_file)))
-					smf_chmod($chmod_file, 0755);
-				if (!@is_writable(dirname($chmod_file)))
-					smf_chmod($chmod_file, 0777);
+				if (!@is_writable($chmod_file)) {
+									smf_chmod($chmod_file, 0755);
+				}
+				if (!@is_writable($chmod_file)) {
+									smf_chmod($chmod_file, 0777);
+				}
+				if (!@is_writable(dirname($chmod_file))) {
+									smf_chmod($chmod_file, 0755);
+				}
+				if (!@is_writable(dirname($chmod_file))) {
+									smf_chmod($chmod_file, 0777);
+				}
 			}
 
 			// The ultimate writable test.
@@ -2882,20 +3042,22 @@ 
 				$fp = is_dir($chmod_file) ? @opendir($chmod_file) : @fopen($chmod_file, 'rb');
 				if (@is_writable($chmod_file) && $fp)
 				{
-					if (!is_dir($chmod_file))
-						fclose($fp);
-					else
-						closedir($fp);
+					if (!is_dir($chmod_file)) {
+											fclose($fp);
+					} else {
+											closedir($fp);
+					}
 
 					// It worked!
-					if ($track_change)
-						$_SESSION['pack_ftp']['original_perms'][$chmod_file] = $file_permissions;
+					if ($track_change) {
+											$_SESSION['pack_ftp']['original_perms'][$chmod_file] = $file_permissions;
+					}
 
 					return true;
 				}
+			} elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$chmod_file])) {
+							unset($_SESSION['pack_ftp']['original_perms'][$chmod_file]);
 			}
-			elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$chmod_file]))
-				unset($_SESSION['pack_ftp']['original_perms'][$chmod_file]);
 		}
 
 		// If we're here we're a failure.
@@ -2914,31 +3076,33 @@ 
 			mktree(dirname($filename), 0755);
 			$package_ftp->create_file($ftp_file);
 			$package_ftp->chmod($ftp_file, 0755);
+		} else {
+					$file_permissions = @fileperms($filename);
 		}
-		else
-			$file_permissions = @fileperms($filename);
 
 		if ($perm_state != 'writable')
 		{
 			$package_ftp->chmod($ftp_file, $perm_state == 'execute' ? 0755 : 0644);
-		}
-		else
+		} else
 		{
-			if (!@is_writable($filename))
-				$package_ftp->chmod($ftp_file, 0777);
-			if (!@is_writable(dirname($filename)))
-				$package_ftp->chmod(dirname($ftp_file), 0777);
+			if (!@is_writable($filename)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
+			if (!@is_writable(dirname($filename))) {
+							$package_ftp->chmod(dirname($ftp_file), 0777);
+			}
 		}
 
 		if (@is_writable($filename))
 		{
-			if ($track_change)
-				$_SESSION['pack_ftp']['original_perms'][$filename] = $file_permissions;
+			if ($track_change) {
+							$_SESSION['pack_ftp']['original_perms'][$filename] = $file_permissions;
+			}
 
 			return true;
+		} elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$filename])) {
+					unset($_SESSION['pack_ftp']['original_perms'][$filename]);
 		}
-		elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$filename]))
-			unset($_SESSION['pack_ftp']['original_perms'][$filename]);
 	}
 
 	// Oh dear, we failed if we get here.
@@ -2956,11 +3120,13 @@ 
 	$n = strlen($pass);
 
 	$salt = session_id();
-	while (strlen($salt) < $n)
-		$salt .= session_id();
+	while (strlen($salt) < $n) {
+			$salt .= session_id();
+	}
 
-	for ($i = 0; $i < $n; $i++)
-		$pass{$i} = chr(ord($pass{$i}) ^ (ord($salt{$i}) - 32));
+	for ($i = 0; $i < $n; $i++) {
+			$pass{$i} = chr(ord($pass{$i}) ^ (ord($salt{$i}) - 32));
+	}
 
 	return $pass;
 }
@@ -2979,8 +3145,9 @@ 
 	$base_files = array('index.php', 'SSI.php', 'agreement.txt', 'cron.php', 'ssi_examples.php', 'ssi_examples.shtml', 'subscriptions.php');
 	foreach ($base_files as $file)
 	{
-		if (file_exists($boarddir . '/' . $file))
-			$files[empty($_REQUEST['use_full_paths']) ? $file : $boarddir . '/' . $file] = $boarddir . '/' . $file;
+		if (file_exists($boarddir . '/' . $file)) {
+					$files[empty($_REQUEST['use_full_paths']) ? $file : $boarddir . '/' . $file] = $boarddir . '/' . $file;
+		}
 	}
 
 	$dirs = array(
@@ -2997,8 +3164,9 @@ 
 			'theme_dir' => 'theme_dir',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$dirs[$row['value']] = empty($_REQUEST['use_full_paths']) ? 'Themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$dirs[$row['value']] = empty($_REQUEST['use_full_paths']) ? 'Themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+	}
 	$smcFunc['db_free_result']($request);
 
 	try
@@ -3013,11 +3181,13 @@ 
 
 			foreach ($iter as $entry => $dir)
 			{
-				if ($dir->isDir())
-					continue;
+				if ($dir->isDir()) {
+									continue;
+				}
 
-				if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~)$~', $entry) != 0)
-					continue;
+				if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~)$~', $entry) != 0) {
+									continue;
+				}
 
 				$files[empty($_REQUEST['use_full_paths']) ? str_replace(realpath($boarddir), '', $entry) : $entry] = $entry;
 			}
@@ -3025,26 +3195,30 @@ 
 		$obj = new ArrayObject($files);
 		$iterator = $obj->getIterator();
 
-		if (!file_exists($packagesdir . '/backups'))
-			mktree($packagesdir . '/backups', 0777);
-		if (!is_writable($packagesdir . '/backups'))
-			package_chmod($packagesdir . '/backups');
+		if (!file_exists($packagesdir . '/backups')) {
+					mktree($packagesdir . '/backups', 0777);
+		}
+		if (!is_writable($packagesdir . '/backups')) {
+					package_chmod($packagesdir . '/backups');
+		}
 		$output_file = $packagesdir . '/backups/' . strftime('%Y-%m-%d_') . preg_replace('~[$\\\\/:<>|?*"\']~', '', $id);
 		$output_ext = '.tar';
 
 		if (file_exists($output_file . $output_ext))
 		{
 			$i = 2;
-			while (file_exists($output_file . '_' . $i . $output_ext))
-				$i++;
+			while (file_exists($output_file . '_' . $i . $output_ext)) {
+							$i++;
+			}
 			$output_file = $output_file . '_' . $i . $output_ext;
+		} else {
+					$output_file .= $output_ext;
 		}
-		else
-			$output_file .= $output_ext;
 
 		@set_time_limit(300);
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 
 		$a = new PharData($output_file);
 		$a->buildFromIterator($iterator);
@@ -3056,8 +3230,7 @@ 
 		 */
 		unset($a);
 		unlink($output_file);
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		log_error($e->getMessage(), 'backup');
 
@@ -3089,32 +3262,35 @@ 
 	preg_match('~^(http|ftp)(s)?://([^/:]+)(:(\d+))?(.+)$~', $url, $match);
 
 	// An FTP url. We should try connecting and RETRieving it...
-	if (empty($match[1]))
-		return false;
-	elseif ($match[1] == 'ftp')
+	if (empty($match[1])) {
+			return false;
+	} elseif ($match[1] == 'ftp')
 	{
 		// Include the file containing the ftp_connection class.
 		require_once($sourcedir . '/Class-Package.php');
 
 		// Establish a connection and attempt to enable passive mode.
 		$ftp = new ftp_connection(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
-		if ($ftp->error !== false || !$ftp->passive())
-			return false;
+		if ($ftp->error !== false || !$ftp->passive()) {
+					return false;
+		}
 
 		// I want that one *points*!
 		fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n");
 
 		// Since passive mode worked (or we would have returned already!) open the connection.
 		$fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $err, $err, 5);
-		if (!$fp)
-			return false;
+		if (!$fp) {
+					return false;
+		}
 
 		// The server should now say something in acknowledgement.
 		$ftp->check_response(150);
 
 		$data = '';
-		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		while (!feof($fp)) {
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// All done, right?  Good.
@@ -3131,22 +3307,25 @@ 
 		$fetch_data->get_url_data($url, $post_data);
 
 		// no errors and a 200 result, then we have a good dataset, well we at least have data ;)
-		if ($fetch_data->result('code') == 200 && !$fetch_data->result('error'))
-			$data = $fetch_data->result('body');
-		else
-			return false;
+		if ($fetch_data->result('code') == 200 && !$fetch_data->result('error')) {
+					$data = $fetch_data->result('body');
+		} else {
+					return false;
+		}
 	}
 	// This is more likely; a standard HTTP URL.
 	elseif (isset($match[1]) && $match[1] == 'http')
 	{
-		if ($keep_alive && $match[3] == $keep_alive_dom)
-			$fp = $keep_alive_fp;
+		if ($keep_alive && $match[3] == $keep_alive_dom) {
+					$fp = $keep_alive_fp;
+		}
 		if (empty($fp))
 		{
 			// Open the socket on the port we want...
 			$fp = @fsockopen(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? ($match[2] ? 443 : 80) : $match[5], $err, $err, 5);
-			if (!$fp)
-				return false;
+			if (!$fp) {
+							return false;
+			}
 		}
 
 		if ($keep_alive)
@@ -3161,20 +3340,21 @@ 
 			fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
 			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 			fwrite($fp, 'User-Agent: PHP/SMF' . "\r\n");
-			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n");
-			else
-				fwrite($fp, 'Connection: close' . "\r\n\r\n");
-		}
-		else
+			if ($keep_alive) {
+							fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n");
+			} else {
+							fwrite($fp, 'Connection: close' . "\r\n\r\n");
+			}
+		} else
 		{
 			fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
 			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 			fwrite($fp, 'User-Agent: PHP/SMF' . "\r\n");
-			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n");
-			else
-				fwrite($fp, 'Connection: close' . "\r\n");
+			if ($keep_alive) {
+							fwrite($fp, 'Connection: Keep-Alive' . "\r\n");
+			} else {
+							fwrite($fp, 'Connection: close' . "\r\n");
+			}
 			fwrite($fp, 'Content-Type: application/x-www-form-urlencoded' . "\r\n");
 			fwrite($fp, 'Content-Length: ' . strlen($post_data) . "\r\n\r\n");
 			fwrite($fp, $post_data);
@@ -3187,30 +3367,33 @@ 
 		{
 			$header = '';
 			$location = '';
-			while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
-				if (strpos($header, 'Location:') !== false)
+			while (!feof($fp) && trim($header = fgets($fp, 4096)) != '') {
+							if (strpos($header, 'Location:') !== false)
 					$location = trim(substr($header, strpos($header, ':') + 1));
+			}
 
-			if (empty($location))
-				return false;
-			else
+			if (empty($location)) {
+							return false;
+			} else
 			{
-				if (!$keep_alive)
-					fclose($fp);
+				if (!$keep_alive) {
+									fclose($fp);
+				}
 				return fetch_web_data($location, $post_data, $keep_alive, $redirection_level + 1);
 			}
 		}
 
 		// Make sure we get a 200 OK.
-		elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0)
-			return false;
+		elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0) {
+					return false;
+		}
 
 		// Skip the headers...
 		while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
 		{
-			if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0)
-				$content_length = $match[1];
-			elseif (preg_match('~connection:\s*close~i', $header) != 0)
+			if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0) {
+							$content_length = $match[1];
+			} elseif (preg_match('~connection:\s*close~i', $header) != 0)
 			{
 				$keep_alive_dom = null;
 				$keep_alive = false;
@@ -3222,19 +3405,20 @@ 
 		$data = '';
 		if (isset($content_length))
 		{
-			while (!feof($fp) && strlen($data) < $content_length)
-				$data .= fread($fp, $content_length - strlen($data));
-		}
-		else
+			while (!feof($fp) && strlen($data) < $content_length) {
+							$data .= fread($fp, $content_length - strlen($data));
+			}
+		} else
 		{
-			while (!feof($fp))
-				$data .= fread($fp, 4096);
+			while (!feof($fp)) {
+							$data .= fread($fp, 4096);
+			}
 		}
 
-		if (!$keep_alive)
-			fclose($fp);
-	}
-	else
+		if (!$keep_alive) {
+					fclose($fp);
+		}
+	} else
 	{
 		// Umm, this shouldn't happen?
 		trigger_error('fetch_web_data(): Bad URL', E_USER_NOTICE);

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/CacheAPI-smf.php

Braces +36 added lines, -26 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -43,8 +44,9 @@ 
 	{
 		$supported = is_writable($this->cachedir);
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -61,11 +63,13 @@ 
 		{
 			// Work around Zend's opcode caching (PHP 5.5+), they would cache older files for a couple of seconds
 			// causing newer files to take effect a while later.
-			if (function_exists('opcache_invalidate'))
-				opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+			if (function_exists('opcache_invalidate')) {
+							opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+			}
 
-			if (function_exists('apc_delete_file'))
-				@apc_delete_file($cachedir . '/data_' . $key . '.php');
+			if (function_exists('apc_delete_file')) {
+							@apc_delete_file($cachedir . '/data_' . $key . '.php');
+			}
 
 			// php will cache file_exists et all, we can't 100% depend on its results so proceed with caution
 			@include($cachedir . '/data_' . $key . '.php');
@@ -89,16 +93,18 @@ 
 
 		// Work around Zend's opcode caching (PHP 5.5+), they would cache older files for a couple of seconds
 		// causing newer files to take effect a while later.
-		if (function_exists('opcache_invalidate'))
-			opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+		if (function_exists('opcache_invalidate')) {
+					opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+		}
 
-		if (function_exists('apc_delete_file'))
-			@apc_delete_file($cachedir . '/data_' . $key . '.php');
+		if (function_exists('apc_delete_file')) {
+					@apc_delete_file($cachedir . '/data_' . $key . '.php');
+		}
 
 		// Otherwise custom cache?
-		if ($value === null)
-			@unlink($cachedir . '/data_' . $key . '.php');
-		else
+		if ($value === null) {
+					@unlink($cachedir . '/data_' . $key . '.php');
+		} else
 		{
 			$cache_data = '<' . '?' . 'php if (!defined(\'SMF\')) die; if (' . (time() + $ttl) . ' < time()) $expired = true; else{$expired = false; $value = \'' . addcslashes($value, '\\\'') . '\';}' . '?' . '>';
 
@@ -109,9 +115,9 @@ 
 			{
 				@unlink($cachedir . '/data_' . $key . '.php');
 				return false;
+			} else {
+							return true;
 			}
-			else
-				return true;
 		}
 	}
 
@@ -123,15 +129,17 @@ 
 		$cachedir = $this->cachedir;
 
 		// No directory = no game.
-		if (!is_dir($cachedir))
-			return;
+		if (!is_dir($cachedir)) {
+					return;
+		}
 
 		// Remove the files in SMF's own disk cache, if any
 		$dh = opendir($cachedir);
 		while ($file = readdir($dh))
 		{
-			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type))
-				@unlink($cachedir . '/' . $file);
+			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type)) {
+							@unlink($cachedir . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -165,8 +173,9 @@ 
 		$config_vars[] = $txt['cache_smf_settings'];
 		$config_vars[] = array('cachedir', $txt['cachedir'], 'file', 'text', 36, 'cache_cachedir');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
@@ -187,10 +196,11 @@ 
 		global $cachedir;
 
 		// If its invalid, use SMF's.
-		if (is_null($dir) || !is_writable($dir))
-			$this->cachedir = $cachedir;
-		else
-			$this->cachedir = $dir;
+		if (is_null($dir) || !is_writable($dir)) {
+					$this->cachedir = $cachedir;
+		} else {
+					$this->cachedir = $dir;
+		}
 	}
 
 	/**

Sources/Reports.php

Braces +199 added lines, -148 removed lines

@@ -21,8 +21,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Handling function for generating reports.
@@ -69,14 +70,15 @@ 
 	);
 
 	$is_first = 0;
-	foreach ($context['report_types'] as $k => $temp)
-		$context['report_types'][$k] = array(
+	foreach ($context['report_types'] as $k => $temp) {
+			$context['report_types'][$k] = array(
 			'id' => $k,
 			'title' => isset($txt['gr_type_' . $k]) ? $txt['gr_type_' . $k] : $k,
 			'description' => isset($txt['gr_type_desc_' . $k]) ? $txt['gr_type_desc_' . $k] : null,
 			'function' => $temp,
 			'is_first' => $is_first++ == 0,
 		);
+	}
 
 	// If they haven't chosen a report type which is valid, send them off to the report type chooser!
 	if (empty($_REQUEST['rt']) || !isset($context['report_types'][$_REQUEST['rt']]))
@@ -102,8 +104,9 @@ 
 		$context['sub_template'] = $_REQUEST['st'];
 
 		// Are we disabling the other layers - print friendly for example?
-		if ($reportTemplates[$_REQUEST['st']]['layers'] !== null)
-			$context['template_layers'] = $reportTemplates[$_REQUEST['st']]['layers'];
+		if ($reportTemplates[$_REQUEST['st']]['layers'] !== null) {
+					$context['template_layers'] = $reportTemplates[$_REQUEST['st']]['layers'];
+		}
 	}
 
 	// Make the page title more descriptive.
@@ -151,8 +154,9 @@ 
 		)
 	);
 	$moderators = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$moderators[$row['id_board']][] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$moderators[$row['id_board']][] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get every moderator gruop.
@@ -164,8 +168,9 @@ 
 		)
 	);
 	$moderator_groups = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$moderator_groups[$row['id_board']][] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$moderator_groups[$row['id_board']][] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get all the possible membergroups!
@@ -176,8 +181,9 @@ 
 		)
 	);
 	$groups = array(-1 => $txt['guest_title'], 0 => $txt['full_member']);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -195,8 +201,9 @@ 
 		'moderator_groups' => $txt['board_moderator_groups'],
 		'groups' => $txt['board_groups'],
 	);
-	if (!empty($modSettings['deny_boards_access']))
-		$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+	if (!empty($modSettings['deny_boards_access'])) {
+			$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+	}
 
 	// Do it in columns, it's just easier.
 	setKeys('cols');
@@ -222,8 +229,9 @@ 
 		newTable($row['name'], '', 'left', 'auto', 'left', 200, 'left');
 
 		$this_boardSettings = $boardSettings;
-		if (empty($row['redirect']))
-			unset($this_boardSettings['redirect']);
+		if (empty($row['redirect'])) {
+					unset($this_boardSettings['redirect']);
+		}
 
 		// First off, add in the side key.
 		addData($this_boardSettings);
@@ -250,10 +258,11 @@ 
 		$allowedGroups = explode(',', $row['member_groups']);
 		foreach ($allowedGroups as $key => $group)
 		{
-			if (isset($groups[$group]))
-				$allowedGroups[$key] = $groups[$group];
-			else
-				unset($allowedGroups[$key]);
+			if (isset($groups[$group])) {
+							$allowedGroups[$key] = $groups[$group];
+			} else {
+							unset($allowedGroups[$key]);
+			}
 		}
 		$boardData['groups'] = implode(', ', $allowedGroups);
 		if (!empty($modSettings['deny_boards_access']))
@@ -261,16 +270,18 @@ 
 			$disallowedGroups = explode(',', $row['deny_member_groups']);
 			foreach ($disallowedGroups as $key => $group)
 			{
-				if (isset($groups[$group]))
-					$disallowedGroups[$key] = $groups[$group];
-				else
-					unset($disallowedGroups[$key]);
+				if (isset($groups[$group])) {
+									$disallowedGroups[$key] = $groups[$group];
+				} else {
+									unset($disallowedGroups[$key]);
+				}
 			}
 			$boardData['disallowed_groups'] = implode(', ', $disallowedGroups);
 		}
 
-		if (empty($row['redirect']))
-			unset ($boardData['redirect']);
+		if (empty($row['redirect'])) {
+					unset ($boardData['redirect']);
+		}
 
 		// Next add the main data.
 		addData($boardData);
@@ -295,27 +306,31 @@ 
 
 	if (isset($_REQUEST['boards']))
 	{
-		if (!is_array($_REQUEST['boards']))
-			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $k => $dummy)
-			$_REQUEST['boards'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['boards'])) {
+					$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
+		}
+		foreach ($_REQUEST['boards'] as $k => $dummy) {
+					$_REQUEST['boards'][$k] = (int) $dummy;
+		}
 
 		$board_clause = 'id_board IN ({array_int:boards})';
+	} else {
+			$board_clause = '1=1';
 	}
-	else
-		$board_clause = '1=1';
 
 	if (isset($_REQUEST['groups']))
 	{
-		if (!is_array($_REQUEST['groups']))
-			$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
-		foreach ($_REQUEST['groups'] as $k => $dummy)
-			$_REQUEST['groups'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['groups'])) {
+					$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+		}
+		foreach ($_REQUEST['groups'] as $k => $dummy) {
+					$_REQUEST['groups'][$k] = (int) $dummy;
+		}
 
 		$group_clause = 'id_group IN ({array_int:groups})';
+	} else {
+			$group_clause = '1=1';
 	}
-	else
-		$group_clause = '1=1';
 
 	// Fetch all the board names.
 	$request = $smcFunc['db_query']('', '
@@ -369,12 +384,14 @@ 
 			'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
 		)
 	);
-	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
-	else
-		$member_groups = array('col' => '');
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$member_groups[$row['id_group']] = $row['group_name'];
+	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
+	} else {
+			$member_groups = array('col' => '');
+	}
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$member_groups[$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that every group is represented - plus in rows!
@@ -411,12 +428,14 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['permission'], $disabled_permissions))
-			continue;
+		if (in_array($row['permission'], $disabled_permissions)) {
+					continue;
+		}
 
-		foreach ($boards as $id => $board)
-			if ($board['profile'] == $row['id_profile'])
+		foreach ($boards as $id => $board) {
+					if ($board['profile'] == $row['id_profile'])
 				$board_permissions[$id][$row['id_group']][$row['permission']] = $row['add_deny'];
+		}
 
 		// Make sure we get every permission.
 		if (!isset($permissions[$row['permission']]))
@@ -454,8 +473,9 @@ 
 			foreach ($member_groups as $id_group => $name)
 			{
 				// Don't overwrite the key column!
-				if ($id_group === 'col')
-					continue;
+				if ($id_group === 'col') {
+									continue;
+				}
 
 				$group_permissions = isset($groups[$id_group]) ? $groups[$id_group] : array();
 
@@ -477,16 +497,18 @@ 
 				}
 
 				// Now actually make the data for the group look right.
-				if (empty($curData[$id_group]))
-					$curData[$id_group] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
-				elseif ($curData[$id_group] == 1)
-					$curData[$id_group] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
-				else
-					$curData[$id_group] = 'x';
+				if (empty($curData[$id_group])) {
+									$curData[$id_group] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+				} elseif ($curData[$id_group] == 1) {
+									$curData[$id_group] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+				} else {
+									$curData[$id_group] = 'x';
+				}
 
 				// Embolden those permissions different from global (makes it a lot easier!)
-				if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM])
-					$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
+				if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM]) {
+									$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
+				}
 			}
 
 			// Now add the data for this permission.
@@ -516,15 +538,17 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (trim($row['member_groups']) == '')
-			$groups = array(1);
-		else
-			$groups = array_merge(array(1), explode(',', $row['member_groups']));
+		if (trim($row['member_groups']) == '') {
+					$groups = array(1);
+		} else {
+					$groups = array_merge(array(1), explode(',', $row['member_groups']));
+		}
 
-		if (trim($row['deny_member_groups']) == '')
-			$denyGroups = array();
-		else
-			$denyGroups = explode(',', $row['deny_member_groups']);
+		if (trim($row['deny_member_groups']) == '') {
+					$denyGroups = array();
+		} else {
+					$denyGroups = explode(',', $row['deny_member_groups']);
+		}
 
 		$boards[$row['id_board']] = array(
 			'id' => $row['id_board'],
@@ -548,8 +572,9 @@ 
 	);
 
 	// Add on the boards!
-	foreach ($boards as $board)
-		$mgSettings['board_' . $board['id']] = $board['name'];
+	foreach ($boards as $board) {
+			$mgSettings['board_' . $board['id']] = $board['name'];
+	}
 
 	// Add all the membergroup settings, plus we'll be adding in columns!
 	setKeys('cols', $mgSettings);
@@ -594,8 +619,9 @@ 
 			'icons' => ''
 		),
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$rows[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$rows[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	foreach ($rows as $row)
@@ -611,8 +637,9 @@ 
 		);
 
 		// Board permissions.
-		foreach ($boards as $board)
-			$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">' . $txt['board_perms_deny'] . '</span>' : 'x');
+		foreach ($boards as $board) {
+					$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">' . $txt['board_perms_deny'] . '</span>' : 'x');
+		}
 
 		addData($group);
 	}
@@ -632,16 +659,18 @@ 
 
 	if (isset($_REQUEST['groups']))
 	{
-		if (!is_array($_REQUEST['groups']))
-			$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
-		foreach ($_REQUEST['groups'] as $k => $dummy)
-			$_REQUEST['groups'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['groups'])) {
+					$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+		}
+		foreach ($_REQUEST['groups'] as $k => $dummy) {
+					$_REQUEST['groups'][$k] = (int) $dummy;
+		}
 		$_REQUEST['groups'] = array_diff($_REQUEST['groups'], array(3));
 
 		$clause = 'id_group IN ({array_int:groups})';
+	} else {
+			$clause = 'id_group != {int:moderator_group}';
 	}
-	else
-		$clause = 'id_group != {int:moderator_group}';
 
 	// Get all the possible membergroups, except admin!
 	$request = $smcFunc['db_query']('', '
@@ -659,12 +688,14 @@ 
 			'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
 		)
 	);
-	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
-	else
-		$groups = array('col' => '');
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = $row['group_name'];
+	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
+	} else {
+			$groups = array('col' => '');
+	}
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that every group is represented!
@@ -688,8 +719,9 @@ 
 		$disabled_permissions[] = 'calendar_edit_own';
 		$disabled_permissions[] = 'calendar_edit_any';
 	}
-	if (empty($modSettings['warning_settings']) || $modSettings['warning_settings'][0] == 0)
-		$disabled_permissions[] = 'issue_warning';
+	if (empty($modSettings['warning_settings']) || $modSettings['warning_settings'][0] == 0) {
+			$disabled_permissions[] = 'issue_warning';
+	}
 
 	call_integration_hook('integrate_reports_groupperm', array(&$disabled_permissions));
 
@@ -710,15 +742,17 @@ 
 	$curData = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['permission'], $disabled_permissions))
-			continue;
+		if (in_array($row['permission'], $disabled_permissions)) {
+					continue;
+		}
 
 		// If this is a new permission flush the last row.
 		if ($row['permission'] != $lastPermission)
 		{
 			// Send the data!
-			if ($lastPermission !== null)
-				addData($curData);
+			if ($lastPermission !== null) {
+							addData($curData);
+			}
 
 			// Add the permission name in the left column.
 			$curData = array('col' => isset($txt['group_perms_name_' . $row['permission']]) ? $txt['group_perms_name_' . $row['permission']] : $row['permission']);
@@ -727,10 +761,11 @@ 
 		}
 
 		// Good stuff - add the permission to the list!
-		if ($row['add_deny'])
-			$curData[$row['id_group']] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
-		else
-			$curData[$row['id_group']] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+		if ($row['add_deny']) {
+					$curData[$row['id_group']] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+		} else {
+					$curData[$row['id_group']] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -760,8 +795,9 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get every moderator.
@@ -793,12 +829,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Either we don't have them as a moderator at all or at least not as a moderator of this board
-		if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']]))
-			$moderators[$row['id_member']][] = $row['id_board'];
+		if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']])) {
+					$moderators[$row['id_member']][] = $row['id_board'];
+		}
 
 		// We don't have them listed as a moderator yet
-		if (!array_key_exists($row['id_member'], $local_mods))
-			$local_mods[$row['id_member']] = $row['id_member'];
+		if (!array_key_exists($row['id_member'], $local_mods)) {
+					$local_mods[$row['id_member']] = $row['id_member'];
+		}
 	}
 
 	// Get a list of global moderators (i.e. members with moderation powers).
@@ -811,8 +849,9 @@ 
 	$allStaff = array_unique($allStaff);
 
 	// This is a bit of a cop out - but we're protecting their forum, really!
-	if (count($allStaff) > 300)
-		fatal_lang_error('report_error_too_many_staff');
+	if (count($allStaff) > 300) {
+			fatal_lang_error('report_error_too_many_staff');
+	}
 
 	// Get all the possible membergroups!
 	$request = $smcFunc['db_query']('', '
@@ -822,8 +861,9 @@ 
 		)
 	);
 	$groups = array(0 => $txt['full_member']);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -864,19 +904,20 @@ 
 		);
 
 		// What do they moderate?
-		if (in_array($row['id_member'], $global_mods))
-			$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
-		elseif (isset($moderators[$row['id_member']]))
+		if (in_array($row['id_member'], $global_mods)) {
+					$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
+		} elseif (isset($moderators[$row['id_member']]))
 		{
 			// Get the names
-			foreach ($moderators[$row['id_member']] as $board)
-				if (isset($boards[$board]))
+			foreach ($moderators[$row['id_member']] as $board) {
+							if (isset($boards[$board]))
 					$staffData['moderates'][] = $boards[$board];
+			}
 
 			$staffData['moderates'] = implode(', ', $staffData['moderates']);
+		} else {
+					$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
 		}
-		else
-			$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
 
 		// Next add the main data.
 		addData($staffData);
@@ -904,8 +945,9 @@ 
 	global $context;
 
 	// Set the table count if needed.
-	if (empty($context['table_count']))
-		$context['table_count'] = 0;
+	if (empty($context['table_count'])) {
+			$context['table_count'] = 0;
+	}
 
 	// Create the table!
 	$context['tables'][$context['table_count']] = array(
@@ -955,16 +997,18 @@ 
 	global $context;
 
 	// No tables? Create one even though we are probably already in a bad state!
-	if (empty($context['table_count']))
-		newTable();
+	if (empty($context['table_count'])) {
+			newTable();
+	}
 
 	// Specific table?
-	if ($custom_table !== null && !isset($context['tables'][$custom_table]))
-		return false;
-	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	if ($custom_table !== null && !isset($context['tables'][$custom_table])) {
+			return false;
+	} elseif ($custom_table !== null) {
+			$table = $custom_table;
+	} else {
+			$table = $context['current_table'];
+	}
 
 	// If we have keys, sanitise the data...
 	if (!empty($context['keys']))
@@ -976,11 +1020,11 @@ 
 				'v' => empty($inc_data[$key]) ? $context['tables'][$table]['default_value'] : $inc_data[$key],
 			);
 			// Special "hack" the adding separators when doing data by column.
-			if (substr($key, 0, 5) == '#sep#')
-				$data[$key]['separator'] = true;
+			if (substr($key, 0, 5) == '#sep#') {
+							$data[$key]['separator'] = true;
+			}
 		}
-	}
-	else
+	} else
 	{
 		$data = $inc_data;
 		foreach ($data as $key => $value)
@@ -988,8 +1032,9 @@ 
 			$data[$key] = array(
 				'v' => $value,
 			);
-			if (substr($key, 0, 5) == '#sep#')
-				$data[$key]['separator'] = true;
+			if (substr($key, 0, 5) == '#sep#') {
+							$data[$key]['separator'] = true;
+			}
 		}
 	}
 
@@ -1002,8 +1047,9 @@ 
 	// Otherwise, tricky!
 	else
 	{
-		foreach ($data as $key => $item)
-			$context['tables'][$table]['data'][$key][] = $item;
+		foreach ($data as $key => $item) {
+					$context['tables'][$table]['data'][$key][] = $item;
+		}
 	}
 }
 
@@ -1020,16 +1066,18 @@ 
 	global $context;
 
 	// No tables - return?
-	if (empty($context['table_count']))
-		return;
+	if (empty($context['table_count'])) {
+			return;
+	}
 
 	// Specific table?
-	if ($custom_table !== null && !isset($context['tables'][$table]))
-		return false;
-	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	if ($custom_table !== null && !isset($context['tables'][$table])) {
+			return false;
+	} elseif ($custom_table !== null) {
+			$table = $custom_table;
+	} else {
+			$table = $context['current_table'];
+	}
 
 	// Plumb in the separator
 	$context['tables'][$table]['data'][] = array(0 => array(
@@ -1050,8 +1098,9 @@ 
 {
 	global $context;
 
-	if (empty($context['tables']))
-		return;
+	if (empty($context['tables'])) {
+			return;
+	}
 
 	// Loop through each table counting up some basic values, to help with the templating.
 	foreach ($context['tables'] as $id => $table)
@@ -1062,12 +1111,13 @@ 
 		$context['tables'][$id]['column_count'] = count($curElement);
 
 		// Work out the rough width - for templates like the print template. Without this we might get funny tables.
-		if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto')
-			$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
-		elseif ($table['width']['normal'] != 'auto')
-			$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
-		else
-			$context['tables'][$id]['max_width'] = 'auto';
+		if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto') {
+					$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
+		} elseif ($table['width']['normal'] != 'auto') {
+					$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
+		} else {
+					$context['tables'][$id]['max_width'] = 'auto';
+		}
 	}
 }
 
@@ -1092,10 +1142,11 @@ 
 	global $context;
 
 	// Do we want to use the keys of the keys as the keys? :P
-	if ($reverse)
-		$context['keys'] = array_flip($keys);
-	else
-		$context['keys'] = $keys;
+	if ($reverse) {
+			$context['keys'] = array_flip($keys);
+	} else {
+			$context['keys'] = $keys;
+	}
 
 	// Rows or columns?
 	$context['key_method'] = $method == 'rows' ? 'rows' : 'cols';

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