elkarte / Elkarte

sources/index.php

Braces +3 added lines, -2 removed lines

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

sources/Security.php

Braces +313 added lines, -126 removed lines

@@ -50,31 +50,42 @@ 
 	{
 		// Maybe someone is paranoid or mistakenly misconfigured the param? Give them at least 5 minutes.
 		if ($modSettings['admin_session_lifetime'] < 5)
-			$refreshTime = 5;
+		{
+					$refreshTime = 5;
+		}
 
 		// A whole day should be more than enough..
 		elseif ($modSettings['admin_session_lifetime'] > 14400)
-			$refreshTime = 14400;
+		{
+					$refreshTime = 14400;
+		}
 
 		// We are between our internal min and max. Let's keep the board owner's value.
-		else
-			$refreshTime = $modSettings['admin_session_lifetime'];
+		else {
+					$refreshTime = $modSettings['admin_session_lifetime'];
+		}
 	}
 
 	// If we're using XML give an additional ten minutes grace as an admin can't log on in XML mode.
 	if (isset($_GET['xml']))
-		$refreshTime += 10;
+	{
+			$refreshTime += 10;
+	}
 
 	$refreshTime = $refreshTime * 60;
 
 	// Is the security option off?
 	// @todo remove the exception (means update the db as well)
 	if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')]))
-		return true;
+	{
+			return true;
+	}
 
 	// If their admin or moderator session hasn't expired yet, let it pass, let the admin session trump a moderation one as well
 	if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time()))
-		return true;
+	{
+			return true;
+	}
 
 	require_once(SUBSDIR . '/Auth.subs.php');
 
@@ -88,14 +99,18 @@ 
 		if (isset($_POST[$type . '_hash_pass']) && strlen($_POST[$type . '_hash_pass']) === 64)
 		{
 			if (checkPassword($type, true))
-				return true;
+			{
+							return true;
+			}
 		}
 
 		// Posting the password... check it.
 		if (isset($_POST[$type . '_pass']) && str_replace('*', '', $_POST[$type . '_pass']) !== '')
 		{
 			if (checkPassword($type))
-				return true;
+			{
+							return true;
+			}
 		}
 	}
 
@@ -114,13 +129,19 @@ 
 
 	// Better be sure to remember the real referer
 	if (empty($_SESSION['request_referer']))
-		$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+	{
+			$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+	}
 	elseif (empty($_POST))
-		unset($_SESSION['request_referer']);
+	{
+			unset($_SESSION['request_referer']);
+	}
 
 	// Need to type in a password for that, man.
 	if (!isset($_GET['xml']))
-		adminLogin($type);
+	{
+			adminLogin($type);
+	}
 
 	return 'session_verify_fail';
 }
@@ -178,7 +199,9 @@ 
 
 	// Luckily, this person isn't a guest.
 	if (isset($user_info['is_guest']) && !$user_info['is_guest'])
-		return true;
+	{
+			return true;
+	}
 
 	// People always worry when they see people doing things they aren't actually doing...
 	$_GET['action'] = '';
@@ -188,11 +211,15 @@ 
 
 	// Just die.
 	if (isset($_REQUEST['xml']) || !$is_fatal)
-		obExit(false);
+	{
+			obExit(false);
+	}
 
 	// Attempt to detect if they came from dlattach.
 	if (ELK != 'SSI' && empty($context['theme_loaded']))
-		loadTheme();
+	{
+			loadTheme();
+	}
 
 	// Never redirect to an attachment
 	if (validLoginUrl($_SERVER['REQUEST_URL']))
@@ -210,7 +237,9 @@ 
 		redirectexit('action=login');
 	}
 	elseif (isset($_GET['api']))
-		return false;
+	{
+			return false;
+	}
 	else
 	{
 		loadTemplate('Login');
@@ -251,7 +280,9 @@ 
 
 	// You cannot be banned if you are an admin - doesn't help if you log out.
 	if ($user_info['is_admin'])
-		return;
+	{
+			return;
+	}
 
 	// Only check the ban every so often. (to reduce load.)
 	if ($forceCheck || !isset($_SESSION['ban']) || empty($modSettings['banLastUpdated']) || ($_SESSION['ban']['last_checked'] < $modSettings['banLastUpdated']) || $_SESSION['ban']['id_member'] != $user_info['id'] || $_SESSION['ban']['ip'] != $user_info['ip'] || $_SESSION['ban']['ip2'] != $user_info['ip2'] || (isset($user_info['email'], $_SESSION['ban']['email']) && $_SESSION['ban']['email'] != $user_info['email']))
@@ -273,7 +304,9 @@ 
 		foreach (array('ip', 'ip2') as $ip_number)
 		{
 			if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip'])
-				continue;
+			{
+							continue;
+			}
 			$ban_query[] = constructBanQueryIP($user_info[$ip_number]);
 
 			// IP was valid, maybe there's also a hostname...
@@ -329,10 +362,14 @@ 
 							$_SESSION['ban'][$restriction]['reason'] = $row['reason'];
 							$_SESSION['ban'][$restriction]['ids'][] = $row['id_ban'];
 							if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time'])))
-								$_SESSION['ban']['expire_time'] = $row['expire_time'];
+							{
+															$_SESSION['ban']['expire_time'] = $row['expire_time'];
+							}
 
 							if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email']))
-								$flag_is_activated = true;
+							{
+															$flag_is_activated = true;
+							}
 						}
 					}
 				}
@@ -341,7 +378,9 @@ 
 
 		// Mark the cannot_access and cannot_post bans as being 'hit'.
 		if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login']))
-			log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array()));
+		{
+					log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array()));
+		}
 
 		// If for whatever reason the is_activated flag seems wrong, do a little work to clear it up.
 		if ($user_info['id'] && (($user_settings['is_activated'] >= 10 && !$flag_is_activated)
@@ -357,7 +396,9 @@ 
 	{
 		$bans = explode(',', $_COOKIE[$cookiename . '_']);
 		foreach ($bans as $key => $value)
-			$bans[$key] = (int) $value;
+		{
+					$bans[$key] = (int) $value;
+		}
 
 		$db->fetchQueryCallback('
 			SELECT bi.id_ban, bg.reason
@@ -478,8 +519,10 @@ 
 
 	// Fix up the banning permissions.
 	if (isset($user_info['permissions']))
-		banPermissions();
-}
+	{
+			banPermissions();
+	}
+	}
 
 /**
  * Fix permissions according to ban status.
@@ -498,7 +541,9 @@ 
 
 	// Somehow they got here, at least take away all permissions...
 	if (isset($_SESSION['ban']['cannot_access']))
-		$user_info['permissions'] = array();
+	{
+			$user_info['permissions'] = array();
+	}
 	// Okay, well, you can watch, but don't touch a thing.
 	elseif (isset($_SESSION['ban']['cannot_post']) || (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $user_info['warning']))
 	{
@@ -543,9 +588,12 @@ 
 		foreach ($permission_change as $old => $new)
 		{
 			if (!in_array($old, $user_info['permissions']))
-				unset($permission_change[$old]);
-			else
-				$user_info['permissions'][] = $new;
+			{
+							unset($permission_change[$old]);
+			}
+			else {
+							$user_info['permissions'][] = $new;
+			}
 		}
 		$user_info['permissions'] = array_diff($user_info['permissions'], array_keys($permission_change));
 	}
@@ -553,7 +601,9 @@ 
 	// @todo Find a better place to call this? Needs to be after permissions loaded!
 	// Finally, some bits we cache in the session because it saves queries.
 	if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id'])
-		$user_info['mod_cache'] = $_SESSION['mc'];
+	{
+			$user_info['mod_cache'] = $_SESSION['mc'];
+	}
 	else
 	{
 		require_once(SUBSDIR . '/Auth.subs.php');
@@ -574,9 +624,10 @@ 
 		require_once(SUBSDIR . '/Moderation.subs.php');
 		recountOpenReports(true, allowedTo('admin_forum'));
 	}
-	else
-		$context['open_mod_reports'] = 0;
-}
+	else {
+			$context['open_mod_reports'] = 0;
+	}
+	}
 
 /**
  * Log a ban in the database.
@@ -598,7 +649,9 @@ 
 
 	// Don't log web accelerators, it's very confusing...
 	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-		return;
+	{
+			return;
+	}
 
 	$db->insert('',
 		'{db_prefix}log_banned',
@@ -609,7 +662,8 @@ 
 
 	// One extra point for these bans.
 	if (!empty($ban_ids))
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}ban_items
 			SET hits = hits + 1
 			WHERE id_ban IN ({array_int:ban_ids})',
@@ -617,7 +671,8 @@ 
 				'ban_ids' => $ban_ids,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Checks if a given email address might be banned.
@@ -642,7 +697,9 @@ 
 
 	// Can't ban an empty email
 	if (empty($email) || trim($email) == '')
-		return;
+	{
+			return;
+	}
 
 	// Let's start with the bans based on your IP/hostname/memberID...
 	$ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : array();
@@ -724,14 +781,18 @@ 
 	{
 		$check = isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null);
 		if ($check !== $_SESSION['session_value'])
-			$error = 'session_timeout';
+		{
+					$error = 'session_timeout';
+		}
 	}
 	// How about $_GET['sesc']?
 	elseif ($type === 'get')
 	{
 		$check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : null);
 		if ($check !== $_SESSION['session_value'])
-			$error = 'session_verify_fail';
+		{
+					$error = 'session_verify_fail';
+		}
 	}
 	// Or can it be in either?
 	elseif ($type == 'request')
@@ -739,30 +800,40 @@ 
 		$check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : (isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null)));
 
 		if ($check !== $_SESSION['session_value'])
-			$error = 'session_verify_fail';
+		{
+					$error = 'session_verify_fail';
+		}
 	}
 
 	// Verify that they aren't changing user agents on us - that could be bad.
 	if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $req->user_agent()) && empty($modSettings['disableCheckUA']))
-		$error = 'session_verify_fail';
+	{
+			$error = 'session_verify_fail';
+	}
 
 	// Make sure a page with session check requirement is not being prefetched.
 	stop_prefetching();
 
 	// Check the referring site - it should be the same server at least!
 	if (isset($_SESSION['request_referer']))
-		$referrer_url = $_SESSION['request_referer'];
-	else
-		$referrer_url = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+	{
+			$referrer_url = $_SESSION['request_referer'];
+	}
+	else {
+			$referrer_url = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+	}
 
 	$referrer = @parse_url($referrer_url);
 
 	if (!empty($referrer['host']))
 	{
 		if (strpos($_SERVER['HTTP_HOST'], ':') !== false)
-			$real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':'));
-		else
-			$real_host = $_SERVER['HTTP_HOST'];
+		{
+					$real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':'));
+		}
+		else {
+					$real_host = $_SERVER['HTTP_HOST'];
+		}
 
 		$parsed_url = parse_url($boardurl);
 
@@ -770,13 +841,19 @@ 
 		if (!empty($modSettings['globalCookies']))
 		{
 			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-				$parsed_url['host'] = $parts[1];
+			{
+							$parsed_url['host'] = $parts[1];
+			}
 
 			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1)
-				$referrer['host'] = $parts[1];
+			{
+							$referrer['host'] = $parts[1];
+			}
 
 			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1)
-				$real_host = $parts[1];
+			{
+							$real_host = $parts[1];
+			}
 		}
 
 		// Okay: referrer must either match parsed_url or real_host.
@@ -798,7 +875,9 @@ 
 
 	// Everything is ok, return an empty string.
 	if (!isset($error))
-		return '';
+	{
+			return '';
+	}
 	// A session error occurred, show the error.
 	elseif ($is_fatal)
 	{
@@ -808,12 +887,14 @@ 
 			header('HTTP/1.1 403 Forbidden - Session timeout');
 			die;
 		}
-		else
-			throw new Elk_Exception($error, isset($log_error) ? 'user' : false, isset($sprintf) ? $sprintf : array());
+		else {
+					throw new Elk_Exception($error, isset($log_error) ? 'user' : false, isset($sprintf) ? $sprintf : array());
+		}
 	}
 	// A session error occurred, return the error to the calling function.
-	else
-		return $error;
+	else {
+			return $error;
+	}
 
 	// We really should never fall through here, for very important reasons.  Let's make sure.
 	trigger_error('Hacking attempt...', E_USER_ERROR);
@@ -887,12 +968,15 @@ 
 
 			return $return;
 		}
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 	if (!isset($_SESSION['token'][$token_index]))
-		return false;
+	{
+			return false;
+	}
 
 	// We need the user agent and client IP
 	$req = request();
@@ -921,7 +1005,9 @@ 
 		createToken($action, $type);
 
 		if ($fatal)
-			throw new Elk_Exception('token_verify_fail', false);
+		{
+					throw new Elk_Exception('token_verify_fail', false);
+		}
 	}
 	// You don't get a new token
 	else
@@ -951,18 +1037,25 @@ 
 {
 	// We appreciate cleaning up after yourselves.
 	if (!isset($_SESSION['token']))
-		return;
+	{
+			return;
+	}
 
 	// Clean up tokens, trying to give enough time still.
 	foreach ($_SESSION['token'] as $key => $data)
 	{
 		if (!empty($suffix))
-			$force = $complete || strpos($key, $suffix);
-		else
-			$force = $complete;
+		{
+					$force = $complete || strpos($key, $suffix);
+		}
+		else {
+					$force = $complete;
+		}
 
 		if ($data[2] + 10800 < time() || $force)
-			unset($_SESSION['token'][$key]);
+		{
+					unset($_SESSION['token'][$key]);
+		}
 	}
 }
 
@@ -988,7 +1081,9 @@ 
 	global $context;
 
 	if (!isset($_SESSION['forms']))
-		$_SESSION['forms'] = array();
+	{
+			$_SESSION['forms'] = array();
+	}
 
 	// Register a form number and store it in the session stack. (use this on the page that has the form.)
 	if ($action == 'register')
@@ -996,13 +1091,17 @@ 
 		$tokenizer = new Token_Hash();
 		$context['form_sequence_number'] = '';
 		while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms']))
-			$context['form_sequence_number'] = $tokenizer->generate_hash();
+		{
+					$context['form_sequence_number'] = $tokenizer->generate_hash();
+		}
 	}
 	// Check whether the submitted number can be found in the session.
 	elseif ($action == 'check')
 	{
 		if (!isset($_REQUEST['seqnum']))
-			return true;
+		{
+					return true;
+		}
 		elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms']))
 		{
 			// Mark this one as used
@@ -1010,16 +1109,23 @@ 
 			return true;
 		}
 		elseif ($is_fatal)
-			throw new Elk_Exception('error_form_already_submitted', false);
-		else
-			return false;
+		{
+					throw new Elk_Exception('error_form_already_submitted', false);
+		}
+		else {
+					return false;
+		}
 	}
 	// Don't check, just free the stack number.
 	elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms']))
-		$_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum']));
+	{
+			$_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum']));
+	}
 	elseif ($action != 'free')
-		trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING);
-}
+	{
+			trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING);
+	}
+	}
 
 /**
  * This function checks whether the user is allowed to do permission. (ie. post_new.)
@@ -1042,35 +1148,49 @@ 
 
 	// You're always allowed to do nothing. (unless you're a working man, MR. LAZY :P!)
 	if (empty($permission))
-		return true;
+	{
+			return true;
+	}
 
 	// You're never allowed to do something if your data hasn't been loaded yet!
 	if (empty($user_info) || !isset($user_info['permissions']))
-		return false;
+	{
+			return false;
+	}
 
 	// Administrators are supermen :P.
 	if ($user_info['is_admin'])
-		return true;
+	{
+			return true;
+	}
 
 	// Make sure permission is a valid array
 	if (!is_array($permission))
-		$permission = array($permission);
+	{
+			$permission = array($permission);
+	}
 
 	// Are we checking the _current_ board, or some other boards?
 	if ($boards === null)
 	{
 		if (empty($user_info['permissions']))
-			return false;
+		{
+					return false;
+		}
 
 		// Check if they can do it, you aren't allowed, by default.
 		return count(array_intersect($permission, $user_info['permissions'])) !== 0 ? true : false;
 	}
 
 	if (!is_array($boards))
-		$boards = array($boards);
+	{
+			$boards = array($boards);
+	}
 
 	if (empty($user_info['groups']))
-		return false;
+	{
+			return false;
+	}
 
 	$request = $db->query('', '
 		SELECT MIN(bp.add_deny) AS add_deny
@@ -1093,11 +1213,15 @@ 
 
 	// Make sure they can do it on all of the boards.
 	if ($db->num_rows($request) != count($boards))
-		return false;
+	{
+			return false;
+	}
 
 	$result = true;
 	while ($row = $db->fetch_assoc($request))
-		$result &= !empty($row['add_deny']);
+	{
+			$result &= !empty($row['add_deny']);
+	}
 	$db->free_result($request);
 
 	// If the query returned 1, they can do it... otherwise, they can't.
@@ -1163,8 +1287,10 @@ 
 	// If you're doing something on behalf of some "heavy" permissions, validate your session.
 	// (take out the heavy permissions, and if you can't do anything but those, you need a validated session.)
 	if (!allowedTo(array_diff($permission, $heavy_permissions), $boards))
-		validateSession();
-}
+	{
+			validateSession();
+	}
+	}
 
 /**
  * Return the boards a user has a certain (board) permission on. (array(0) if all.)
@@ -1188,7 +1314,9 @@ 
 
 	// Arrays are nice, most of the time.
 	if (!is_array($permissions))
-		$permissions = array($permissions);
+	{
+			$permissions = array($permissions);
+	}
 
 	/*
 	 * Set $simple to true to use this function in compatibility mode
@@ -1201,12 +1329,16 @@ 
 	if ($user_info['is_admin'])
 	{
 		if ($simple)
-			return array(0);
+		{
+					return array(0);
+		}
 		else
 		{
 			$boards = array();
 			foreach ($permissions as $permission)
-				$boards[$permission] = array(0);
+			{
+							$boards[$permission] = array(0);
+			}
 
 			return $boards;
 		}
@@ -1238,29 +1370,39 @@ 
 		if ($simple)
 		{
 			if (empty($row['add_deny']))
-				$deny_boards[] = $row['id_board'];
-			else
-				$boards[] = $row['id_board'];
+			{
+							$deny_boards[] = $row['id_board'];
+			}
+			else {
+							$boards[] = $row['id_board'];
+			}
 		}
 		else
 		{
 			if (empty($row['add_deny']))
-				$deny_boards[$row['permission']][] = $row['id_board'];
-			else
-				$boards[$row['permission']][] = $row['id_board'];
+			{
+							$deny_boards[$row['permission']][] = $row['id_board'];
+			}
+			else {
+							$boards[$row['permission']][] = $row['id_board'];
+			}
 		}
 	}
 	$db->free_result($request);
 
 	if ($simple)
-		$boards = array_unique(array_values(array_diff($boards, $deny_boards)));
+	{
+			$boards = array_unique(array_values(array_diff($boards, $deny_boards)));
+	}
 	else
 	{
 		foreach ($permissions as $permission)
 		{
 			// Never had it to start with
 			if (empty($boards[$permission]))
-				$boards[$permission] = array();
+			{
+							$boards[$permission] = array();
+			}
 			else
 			{
 				// Or it may have been removed
@@ -1304,16 +1446,25 @@ 
 	// Otherwise: no_through_forum. (don't show it but allow emailing the member)
 
 	if ($user_info['is_guest'] || isset($_SESSION['ban']['cannot_post']))
-		return 'no';
+	{
+			return 'no';
+	}
 	elseif ((!$user_info['is_guest'] && $user_info['id'] == $userProfile_id && !$userProfile_hideEmail))
-		return 'yes_permission_override';
+	{
+			return 'yes_permission_override';
+	}
 	elseif (allowedTo('moderate_forum'))
-		return 'yes_permission_override';
+	{
+			return 'yes_permission_override';
+	}
 	elseif ($userProfile_hideEmail)
-		return 'no';
-	else
-		return 'no_through_forum';
-}
+	{
+			return 'no';
+	}
+	else {
+			return 'no_through_forum';
+	}
+	}
 
 /**
  * This function attempts to protect from carrying out specific actions repeatedly.
@@ -1352,9 +1503,12 @@ 
 
 	// Moderators are free...
 	if (!allowedTo('moderate_board'))
-		$timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime'];
-	else
-		$timeLimit = 2;
+	{
+			$timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime'];
+	}
+	else {
+			$timeLimit = 2;
+	}
 
 	// Delete old entries...
 	$db->query('', '
@@ -1383,8 +1537,9 @@ 
 		{
 			throw new Elk_Exception($error_type . '_WaitTime_broken', false, array($timeLimit));
 		}
-		else
-			return $timeLimit;
+		else {
+					return $timeLimit;
+		}
 	}
 
 	// They haven't posted within the limit.
@@ -1403,10 +1558,14 @@ 
 function secureDirectory($path, $allow_localhost = false, $files = '*')
 {
 	if (empty($path))
-		return 'empty_path';
+	{
+			return 'empty_path';
+	}
 
 	if (!is_writable($path))
-		return 'path_not_writable';
+	{
+			return 'path_not_writable';
+	}
 
 	$directoryname = basename($path);
 
@@ -1419,7 +1578,9 @@ 
 RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml';
 
 	if (file_exists($path . '/.htaccess'))
-		$errors[] = 'htaccess_exists';
+	{
+			$errors[] = 'htaccess_exists';
+	}
 	else
 	{
 		$fh = @fopen($path . '/.htaccess', 'w');
@@ -1434,7 +1595,9 @@ 
 	}
 
 	if (file_exists($path . '/index.php'))
-		$errors[] = 'index-php_exists';
+	{
+			$errors[] = 'index-php_exists';
+	}
 	else
 	{
 		$fh = @fopen($path . '/index.php', 'w');
@@ -1462,10 +1625,13 @@ 
 	}
 
 	if (!empty($errors))
-		return $errors;
-	else
-		return true;
-}
+	{
+			return $errors;
+	}
+	else {
+			return true;
+	}
+	}
 
 /**
  * Helper function that puts together a ban query for a given ip
@@ -1496,16 +1662,19 @@ 
 	}
 	// Check if we have a valid IPv4 address.
 	elseif (preg_match('/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $fullip, $ip_parts) == 1)
-		$ban_query = '((' . $ip_parts[1] . ' BETWEEN bi.ip_low1 AND bi.ip_high1)
+	{
+			$ban_query = '((' . $ip_parts[1] . ' BETWEEN bi.ip_low1 AND bi.ip_high1)
 			AND (' . $ip_parts[2] . ' BETWEEN bi.ip_low2 AND bi.ip_high2)
 			AND (' . $ip_parts[3] . ' BETWEEN bi.ip_low3 AND bi.ip_high3)
 			AND (' . $ip_parts[4] . ' BETWEEN bi.ip_low4 AND bi.ip_high4))';
+	}
 	// We use '255.255.255.255' for 'unknown' since it's not valid anyway.
-	else
-		$ban_query = '(bi.ip_low1 = 255 AND bi.ip_high1 = 255
+	else {
+			$ban_query = '(bi.ip_low1 = 255 AND bi.ip_high1 = 255
 			AND bi.ip_low2 = 255 AND bi.ip_high2 = 255
 			AND bi.ip_low3 = 255 AND bi.ip_high3 = 255
 			AND bi.ip_low4 = 255 AND bi.ip_high4 = 255)';
+	}
 
 	return $ban_query;
 }
@@ -1533,11 +1702,17 @@ 
 		if (!$user_info['is_guest'])
 		{
 			if (!empty($user_info['is_moderator']) || !empty($user_info['is_admin']))
-				$bb_run = false;
+			{
+							$bb_run = false;
+			}
 			elseif (!empty($modSettings['badbehavior_postcount_wl']) && $modSettings['badbehavior_postcount_wl'] < 0)
-				$bb_run = false;
+			{
+							$bb_run = false;
+			}
 			elseif (!empty($modSettings['badbehavior_postcount_wl']) && $modSettings['badbehavior_postcount_wl'] > 0 && ($user_info['posts'] > $modSettings['badbehavior_postcount_wl']))
-				$bb_run = false;
+			{
+							$bb_run = false;
+			}
 		}
 
 		// Put on the sanitary gloves, its time for a patdown !
@@ -1574,7 +1749,9 @@ 
 	setLoginCookie(-3600, 0);
 
 	if (isset($_SESSION['login_' . $cookiename]))
-		unset($_SESSION['login_' . $cookiename]);
+	{
+			unset($_SESSION['login_' . $cookiename]);
+	}
 
 	// We need a member!
 	if (!$id_member)
@@ -1592,7 +1769,9 @@ 
 
 	// Right, have we got a flood value?
 	if ($password_flood_value !== false)
-		@list ($time_stamp, $number_tries) = explode('|', $password_flood_value);
+	{
+			@list ($time_stamp, $number_tries) = explode('|', $password_flood_value);
+	}
 
 	// Timestamp invalid or non-existent?
 	if (empty($number_tries) || $time_stamp < (time() - 10))
@@ -1606,7 +1785,9 @@ 
 
 	// Broken the law?
 	if ($number_tries > 5)
-		throw new Elk_Exception('login_threshold_brute_fail', 'critical');
+	{
+			throw new Elk_Exception('login_threshold_brute_fail', 'critical');
+	}
 
 	// Otherwise set the members data. If they correct on their first attempt then we actually clear it, otherwise we set it!
 	require_once(SUBSDIR . '/Members.subs.php');
@@ -1625,13 +1806,19 @@ 
 	$option = 'SAMEORIGIN';
 
 	if (is_null($override) && !empty($modSettings['frame_security']))
-		$option = $modSettings['frame_security'];
+	{
+			$option = $modSettings['frame_security'];
+	}
 	elseif (in_array($override, array('SAMEORIGIN', 'DENY')))
-		$option = $override;
+	{
+			$option = $override;
+	}
 
 	// Don't bother setting the header if we have disabled it.
 	if ($option == 'DISABLE')
-		return;
+	{
+			return;
+	}
 
 	// Finally set it.
 	header('X-Frame-Options: ' . $option);

Spacing +2 added lines, -2 removed lines

@@ -319,7 +319,7 @@ 
 				WHERE
 					(' . implode(' OR ', $ban_query) . ')',
 				$ban_query_vars,
-				function ($row) use($user_info, $restrictions, &$flag_is_activated)
+				function($row) use($user_info, $restrictions, &$flag_is_activated)
 				{
 					// Store every type of ban that applies to you in your session.
 					foreach ($restrictions as $restriction)
@@ -372,7 +372,7 @@ 
 				'ban_list' => $bans,
 				'current_time' => time(),
 			),
-			function ($row)
+			function($row)
 			{
 				$_SESSION['ban']['cannot_access']['ids'][] = $row['id_ban'];
 				$_SESSION['ban']['cannot_access']['reason'] = $row['reason'];

sources/Request.php

Braces +102 added lines, -41 removed lines

@@ -179,14 +179,19 @@ 
 			// Just in case we have a legacy IPv4 address.
 			// @ TODO: Convert to IPv6.
 			if (filter_var($this->_client_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false)
-				$this->_client_ip = 'unknown';
+			{
+							$this->_client_ip = 'unknown';
+			}
+		}
+		else {
+					$this->_client_ip = $_SERVER['REMOTE_ADDR'];
 		}
-		else
-			$this->_client_ip = $_SERVER['REMOTE_ADDR'];
 
 		// Final check
 		if ($this->_client_ip == 'unknown')
-			$this->_client_ip = '';
+		{
+					$this->_client_ip = '';
+		}
 	}
 
 	/**
@@ -204,18 +209,24 @@ 
 			if (strtok($_SERVER['HTTP_X_FORWARDED_FOR'], '.') != strtok($_SERVER['HTTP_CLIENT_IP'], '.')
 					&& '.' . strtok($_SERVER['HTTP_X_FORWARDED_FOR'], '.') == strrchr($_SERVER['HTTP_CLIENT_IP'], '.')
 					&& (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown)~', $_SERVER['HTTP_X_FORWARDED_FOR']) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown)~', $this->_client_ip) != 0))
-				$this->_ban_ip = implode('.', array_reverse(explode('.', $_SERVER['HTTP_CLIENT_IP'])));
-			else
-				$this->_ban_ip = $_SERVER['HTTP_CLIENT_IP'];
+			{
+							$this->_ban_ip = implode('.', array_reverse(explode('.', $_SERVER['HTTP_CLIENT_IP'])));
+			}
+			else {
+							$this->_ban_ip = $_SERVER['HTTP_CLIENT_IP'];
+			}
 		}
 
 		if (!empty($_SERVER['HTTP_CLIENT_IP']) && (preg_match('~^' . $this->_local_ip_pattern . '~', $_SERVER['HTTP_CLIENT_IP']) == 0 || preg_match('~^' . $this->_local_ip_pattern . '~', $this->_client_ip) != 0))
 		{
 			// Since they are in different blocks, it's probably reversed.
 			if (strtok($this->_client_ip, '.') != strtok($_SERVER['HTTP_CLIENT_IP'], '.'))
-				$this->_ban_ip = implode('.', array_reverse(explode('.', $_SERVER['HTTP_CLIENT_IP'])));
-			else
-				$this->_ban_ip = $_SERVER['HTTP_CLIENT_IP'];
+			{
+							$this->_ban_ip = implode('.', array_reverse(explode('.', $_SERVER['HTTP_CLIENT_IP'])));
+			}
+			else {
+							$this->_ban_ip = $_SERVER['HTTP_CLIENT_IP'];
+			}
 		}
 		elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
 		{
@@ -229,7 +240,9 @@ 
 				{
 					// Make sure it's in a valid range...
 					if (preg_match('~^' . $this->_local_ip_pattern . '~', $ip) != 0 && preg_match('~^' . $this->_local_ip_pattern . '~', $this->_client_ip) == 0)
-						continue;
+					{
+											continue;
+					}
 
 					// Otherwise, we've got an IP!
 					$this->_ban_ip = trim($ip);
@@ -238,12 +251,16 @@ 
 			}
 			// Otherwise just use the only one.
 			elseif (preg_match('~^' . $this->_local_ip_pattern . '~', $_SERVER['HTTP_X_FORWARDED_FOR']) == 0 || preg_match('~^' . $this->_local_ip_pattern . '~', $this->_client_ip) != 0)
-				$this->_ban_ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+			{
+							$this->_ban_ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+			}
 		}
 
 		// Some final checking.
 		if (filter_var($this->_ban_ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false && !isValidIPv6($this->_ban_ip))
-			$this->_ban_ip = '';
+		{
+					$this->_ban_ip = '';
+		}
 	}
 
 	/**
@@ -264,14 +281,20 @@ 
 
 		// There should be a $_REQUEST['start'], some at least.  If you need to default to other than 0, use $_GET['start'].
 		if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647)
-			$_REQUEST['start'] = 0;
+		{
+					$_REQUEST['start'] = 0;
+		}
 
 		// The action needs to be a string, too.
 		if (isset($_REQUEST['action']))
-			$_REQUEST['action'] = (string) $_REQUEST['action'];
+		{
+					$_REQUEST['action'] = (string) $_REQUEST['action'];
+		}
 
 		if (isset($_GET['action']))
-			$_GET['action'] = (string) $_GET['action'];
+		{
+					$_GET['action'] = (string) $_GET['action'];
+		}
 
 		$this->_xml = (isset($_SERVER['X_REQUESTED_WITH']) && $_SERVER['X_REQUESTED_WITH'] == 'XMLHttpRequest') || isset($_REQUEST['xml']);
 	}
@@ -290,10 +313,14 @@ 
 
 			// If we have ?board=3/10, that's... board=3, start=10! (old, compatible links.)
 			if (strpos($_REQUEST['board'], '/') !== false)
-				list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']);
+			{
+							list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']);
+			}
 			// Or perhaps we have... ?board=1.0...
 			elseif (strpos($_REQUEST['board'], '.') !== false)
-				list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']);
+			{
+							list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']);
+			}
 
 			// $board and $_REQUEST['start'] are always numbers.
 			$board = (int) $_REQUEST['board'];
@@ -303,8 +330,9 @@ 
 			$_GET['board'] = $board;
 		}
 		// None? We still need *something*, and it'd better be a number
-		else
-			$board = 0;
+		else {
+					$board = 0;
+		}
 
 		return $board;
 	}
@@ -318,7 +346,9 @@ 
 	{
 		// Look for threadid, old YaBB SE links have those. Just read it as a topic.
 		if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic']))
-			$_REQUEST['topic'] = $_REQUEST['threadid'];
+		{
+					$_REQUEST['topic'] = $_REQUEST['threadid'];
+		}
 
 		if (isset($_REQUEST['topic']))
 		{
@@ -327,10 +357,14 @@ 
 
 			// It might come as ?topic=1/15, from an old, SMF beta style link
 			if (strpos($_REQUEST['topic'], '/') !== false)
-				list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']);
+			{
+							list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']);
+			}
 			// Or it might come as ?topic=1.15.
 			elseif (strpos($_REQUEST['topic'], '.') !== false)
-				list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']);
+			{
+							list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']);
+			}
 
 			// $topic and $_REQUEST['start'] are numbers, numbers I say.
 			$topic = (int) $_REQUEST['topic'];
@@ -342,8 +376,9 @@ 
 			$_GET['topic'] = $topic;
 		}
 		// No topic? Well, set something, and that something is 0.
-		else
-			$topic = 0;
+		else {
+					$topic = 0;
+		}
 
 		return $topic;
 	}
@@ -389,11 +424,16 @@ 
 
 		// Make sure we know the URL of the current request.
 		if (empty($_SERVER['REQUEST_URI']))
-			$_SERVER['REQUEST_URL'] = $this->_scripturl . (!empty($this->_server_query_string) ? '?' . $this->_server_query_string : '');
+		{
+					$_SERVER['REQUEST_URL'] = $this->_scripturl . (!empty($this->_server_query_string) ? '?' . $this->_server_query_string : '');
+		}
 		elseif (preg_match('~^([^/]+//[^/]+)~', $this->_scripturl, $match) == 1)
-			$_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI'];
-		else
-			$_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI'];
+		{
+					$_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI'];
+		}
+		else {
+					$_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI'];
+		}
 	}
 
 	/**
@@ -420,7 +460,9 @@ 
 
 		// Get the correct query string.  It may be in an environment variable...
 		if (!isset($_SERVER['QUERY_STRING']))
-			$_SERVER['QUERY_STRING'] = getenv('QUERY_STRING');
+		{
+					$_SERVER['QUERY_STRING'] = getenv('QUERY_STRING');
+		}
 
 		// It seems that sticking a URL after the query string is mighty common, well, it's evil - don't.
 		if (strpos($_SERVER['QUERY_STRING'], 'http') === 0)
@@ -443,20 +485,26 @@ 
 	private function _checkNumericKeys()
 	{
 		if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
-			throw new Elk_Exception('Invalid request variable.', false);
+		{
+					throw new Elk_Exception('Invalid request variable.', false);
+		}
 
 		// Same goes for numeric keys.
 		foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key)
 		{
 			if (is_numeric($key))
-				throw new Elk_Exception('Numeric request keys are invalid.', false);
+			{
+							throw new Elk_Exception('Numeric request keys are invalid.', false);
+			}
 		}
 
 		// Numeric keys in cookies are less of a problem. Just unset those.
 		foreach ($_COOKIE as $key => $value)
 		{
 			if (is_numeric($key))
-				unset($_COOKIE[$key]);
+			{
+							unset($_COOKIE[$key]);
+			}
 		}
 	}
 
@@ -471,11 +519,15 @@ 
 		{
 			// Reject magic_quotes_sybase='on'.
 			if (ini_get('magic_quotes_sybase') || strtolower(ini_get('magic_quotes_sybase')) == 'on')
-				throw new Elk_Exception('magic_quotes_sybase=on was detected: your host is using an unsecure PHP configuration, deprecated and removed in current versions. Please upgrade PHP.', false);
+			{
+							throw new Elk_Exception('magic_quotes_sybase=on was detected: your host is using an unsecure PHP configuration, deprecated and removed in current versions. Please upgrade PHP.', false);
+			}
 
 			// Reject magic_quotes_gpc='on'.
 			if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() != 0)
-				throw new Elk_Exception('magic_quotes_gpc=on was detected: your host is using an unsecure PHP configuration, deprecated and removed in current versions. Please upgrade PHP.', false);
+			{
+							throw new Elk_Exception('magic_quotes_gpc=on was detected: your host is using an unsecure PHP configuration, deprecated and removed in current versions. Please upgrade PHP.', false);
+			}
 		}
 	}
 
@@ -496,7 +548,9 @@ 
 
 			// Some german webmailers need a decoded string, so let's decode the string for sa=activate and action=reminder
 			if (strpos($this->_server_query_string, 'activate') !== false || strpos($this->_server_query_string, 'reminder') !== false)
-				$this->_server_query_string = urldecode($this->_server_query_string);
+			{
+							$this->_server_query_string = urldecode($this->_server_query_string);
+			}
 
 			// Replace ';' with '&' and '&something&' with '&something=&'.  (this is done for compatibility...)
 			parse_str(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr($this->_server_query_string, array(';?' => '&', ';' => '&', '%00' => '', "\0" => ''))), $_GET);
@@ -518,7 +572,9 @@ 
 					{
 						list ($key, $val) = array_pad(explode('=', $temp[$i], 2), 2, '');
 						if (!isset($_GET[$key]))
-							$_GET[$key] = $val;
+						{
+													$_GET[$key] = $val;
+						}
 					}
 				}
 
@@ -542,9 +598,12 @@ 
 		{
 			// Remove the .html, assuming there is one.
 			if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) === '.htm')
-				$request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.'));
-			else
-				$request = $_SERVER['REQUEST_URI'];
+			{
+							$request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.'));
+			}
+			else {
+							$request = $_SERVER['REQUEST_URI'];
+			}
 
 			// Replace 'index.php/a,b,c/d/e,f' with 'a=b,c&d=&e=f' and parse it into $_GET.
 			if (strpos($request, basename($this->_scripturl) . '/') !== false)
@@ -563,7 +622,9 @@ 
 	public static function instance()
 	{
 		if (self::$_req === null)
-			self::$_req = new Request();
+		{
+					self::$_req = new Request();
+		}
 
 		return self::$_req;
 	}

sources/CurlFetchWebdata.class.php

Braces +30 added lines, -14 removed lines

@@ -129,9 +129,13 @@ 
 	{
 		// POSTing some data perhaps?
 		if (!empty($post_data) && is_array($post_data))
-			$this->_post_data = $this->_buildPostData($post_data);
+		{
+					$this->_post_data = $this->_buildPostData($post_data);
+		}
 		elseif (!empty($post_data))
-			$this->_post_data = trim($post_data);
+		{
+					$this->_post_data = trim($post_data);
+		}
 
 		// Set the options and get it
 		$this->_setOptions();
@@ -154,9 +158,12 @@ 
 	{
 		// We do have a url I hope
 		if ($url == '')
-			return false;
-		else
-			$this->_options[CURLOPT_URL] = $url;
+		{
+					return false;
+		}
+		else {
+					$this->_options[CURLOPT_URL] = $url;
+		}
 
 		// If we have not already been redirected, set it up so we can
 		if (!$redirect)
@@ -242,9 +249,12 @@ 
 
 		// Just return a specified area or the entire result?
 		if ($area == '')
-			return $this->_response[$max_result];
-		else
-			return isset($this->_response[$max_result][$area]) ? $this->_response[$max_result][$area] : $this->_response[$max_result];
+		{
+					return $this->_response[$max_result];
+		}
+		else {
+					return isset($this->_response[$max_result][$area]) ? $this->_response[$max_result][$area] : $this->_response[$max_result];
+		}
 	}
 
 	/**
@@ -260,7 +270,9 @@ 
 	public function result_raw($response_number = '')
 	{
 		if (!is_numeric($response_number))
-			return $this->_response;
+		{
+					return $this->_response;
+		}
 		else
 		{
 			$response_number = min($response_number, count($this->_response) - 1);
@@ -292,8 +304,9 @@ 
 
 			return implode('&', $postvars);
 		}
-		else
-			return $post_data;
+		else {
+					return $post_data;
+		}
 	}
 
 	/**
@@ -318,8 +331,9 @@ 
 			$vals = array_merge($this->default_options, $this->_user_options);
 			$this->_options = array_combine($keys, $vals);
 		}
-		else
-			$this->_options = $this->default_options;
+		else {
+					$this->_options = $this->default_options;
+		}
 
 		// POST data options, here we don't allow any override
 		if (!empty($this->_post_data))
@@ -363,7 +377,9 @@ 
 
 		// Set proper headers only
 		if (isset($temp[0]) && isset($temp[1]))
-			$this->_headers[strtolower($temp[0])] = trim($temp[1]);
+		{
+					$this->_headers[strtolower($temp[0])] = trim($temp[1]);
+		}
 
 		// Return the length of what was *passed* unless you want a Failed writing header error ;)
 		return strlen($header);

sources/Autoloader.class.php

Braces +3 added lines, -1 removed lines

@@ -338,7 +338,9 @@
 				$this->_file_name = $this->_surname;
 
 				if (!empty($this->_current_namespace))
-						$this->_file_name = $this->_current_namespace . '/' . $this->_file_name;
+				{
+										$this->_file_name = $this->_current_namespace . '/' . $this->_file_name;
+				}
 
 				// validate the file since it can vary
 				if (stream_resolve_include_path($this->_file_name . '.class.php'))

sources/SiteDispatcher.class.php

Braces +18 added lines, -8 removed lines

@@ -271,12 +271,17 @@ 
 
 			// If the method is coded in, use it
 			if (!empty($this->actionArray[$this->action][1]))
-				$this->_function_name = $this->actionArray[$this->action][1];
+			{
+							$this->_function_name = $this->actionArray[$this->action][1];
+			}
 			// Otherwise fall back to naming patterns
 			elseif (!empty($this->subAction) && preg_match('~^\w+$~', $this->subAction))
-				$this->_function_name = 'action_' . $this->subAction;
-			else
-				$this->_function_name = 'action_index';
+			{
+							$this->_function_name = 'action_' . $this->subAction;
+			}
+			else {
+							$this->_function_name = 'action_index';
+			}
 		}
 		// Fall back to naming patterns.
 		// addons can use any of them, and it should Just Work (tm).
@@ -286,9 +291,12 @@ 
 			// sa=upload => action_upload()
 			$this->_controller_name = ucfirst($this->action) . '_Controller';
 			if (isset($this->subAction) && preg_match('~^\w+$~', $this->subAction) && empty($this->area))
-				$this->_function_name = 'action_' . $this->subAction;
-			else
-				$this->_function_name = 'action_index';
+			{
+							$this->_function_name = 'action_' . $this->subAction;
+			}
+			else {
+							$this->_function_name = 'action_index';
+			}
 		}
 
 		// The file and function weren't found yet?
@@ -305,7 +313,9 @@ 
 		}
 
 		if (isset($_REQUEST['api']))
-			$this->_function_name .= '_api';
+		{
+					$this->_function_name .= '_api';
+		}
 
 		// 3, 2, ... and go
 		if (class_exists($this->_controller_name))

sources/modules/Drafts/DraftsPostModule.class.php

Braces +30 added lines, -10 removed lines

@@ -74,10 +74,14 @@ 
 			self::$_autosave_enabled = !empty($modSettings['drafts_autosave_enabled']);
 
 			if (!empty($modSettings['drafts_autosave_frequency']))
-				self::$_autosave_frequency = (int) $modSettings['drafts_autosave_frequency'] * 1000;
+			{
+							self::$_autosave_frequency = (int) $modSettings['drafts_autosave_frequency'] * 1000;
+			}
 
 			if (!empty($modSettings['draft_subject_length']))
-				self::$_subject_length = (int) $modSettings['draft_subject_length'];
+			{
+							self::$_subject_length = (int) $modSettings['draft_subject_length'];
+			}
 
 			self::$_drafts_save = allowedTo('post_draft');
 
@@ -142,9 +146,13 @@ 
 			if (!empty($context['drafts_autosave']) && !empty($options['drafts_autosave_enabled']))
 			{
 				if (!isset($editorOptions['plugin_addons']))
-					$editorOptions['plugin_addons'] = array();
+				{
+									$editorOptions['plugin_addons'] = array();
+				}
 				if (!isset($editorOptions['plugin_options']))
-					$editorOptions['plugin_options'] = array();
+				{
+									$editorOptions['plugin_options'] = array();
+				}
 
 				// @todo remove
 				$context['drafts_autosave_frequency'] = self::$_autosave_frequency;
@@ -167,7 +175,9 @@ 
 			$context['shortcuts_text'] = $txt['shortcuts_drafts'];
 
 			if (!isset($editorOptions['buttons']))
-				$editorOptions['buttons'] = array();
+			{
+							$editorOptions['buttons'] = array();
+			}
 
 			$editorOptions['buttons'][] = array(
 				'name' => 'save_draft',
@@ -176,7 +186,9 @@ 
 			);
 
 			if (!empty($context['drafts']))
-				$template_layers->add('load_drafts', 100);
+			{
+							$template_layers->add('load_drafts', 100);
+			}
 		}
 	}
 
@@ -188,7 +200,9 @@ 
 	{
 		// Drafts enabled and needed?
 		if (isset($_POST['save_draft']) || isset($_POST['id_draft']))
-			require_once(SUBSDIR . '/Drafts.subs.php');
+		{
+					require_once(SUBSDIR . '/Drafts.subs.php');
+		}
 	}
 
 	/**
@@ -254,7 +268,9 @@ 
 
 		// If we had a draft for this, its time to remove it since it was just posted
 		if (!empty($_POST['id_draft']))
-			deleteDrafts($_POST['id_draft'], $user_info['id']);
+		{
+					deleteDrafts($_POST['id_draft'], $user_info['id']);
+		}
 	}
 
 	/**
@@ -278,7 +294,9 @@ 
 
 		// Need a member
 		if (empty($member_id))
-			return false;
+		{
+					return false;
+		}
 
 		// We haz drafts
 		loadLanguage('Drafts');
@@ -286,7 +304,9 @@ 
 
 		// has a specific draft has been selected?  Load it up if there is not already a message already in the editor
 		if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-			$this->_loading_draft = loadDraft((int) $_REQUEST['id_draft'], 0, true, true);
+		{
+					$this->_loading_draft = loadDraft((int) $_REQUEST['id_draft'], 0, true, true);
+		}
 
 		// load all the drafts for this user that meet the criteria
 		$order = 'poster_time DESC';

sources/modules/Drafts/DraftsDisplayModule.class.php

Braces +18 added lines, -7 removed lines

@@ -46,14 +46,17 @@ 
 			self::$_autosave_enabled = !empty($modSettings['drafts_autosave_enabled']);
 
 			if (!empty($modSettings['drafts_autosave_frequency']))
-				self::$_autosave_frequency = (int) $modSettings['drafts_autosave_frequency'] * 1000;
+			{
+							self::$_autosave_frequency = (int) $modSettings['drafts_autosave_frequency'] * 1000;
+			}
 
 			return array(
 				array('prepare_context', array('Drafts_Display_Module', 'prepare_context'), array('use_quick_reply', 'editorOptions', 'board')),
 			);
 		}
-		else
-			return array();
+		else {
+					return array();
+		}
 	}
 
 	/**
@@ -89,9 +92,13 @@ 
 				if (!empty($options['use_editor_quick_reply']))
 				{
 					if (!isset($editorOptions['plugin_addons']))
-						$editorOptions['plugin_addons'] = array();
+					{
+											$editorOptions['plugin_addons'] = array();
+					}
 					if (!isset($editorOptions['plugin_options']))
-						$editorOptions['plugin_options'] = array();
+					{
+											$editorOptions['plugin_options'] = array();
+					}
 
 					// @todo remove
 					$context['drafts_autosave_frequency'] = self::$_autosave_frequency;
@@ -112,9 +119,13 @@ 
 					$context['shortcuts_text'] = $txt['shortcuts_drafts'];
 
 					if (!isset($editorOptions['buttons']))
-						$editorOptions['buttons'] = array();
+					{
+											$editorOptions['buttons'] = array();
+					}
 					if (!isset($editorOptions['hidden_fields']))
-						$editorOptions['hidden_fields'] = array();
+					{
+											$editorOptions['hidden_fields'] = array();
+					}
 
 					$editorOptions['buttons'][] = array(
 						'name' => 'save_draft',

sources/modules/Drafts/DraftsProfileModule.class.php

Braces +6 added lines, -3 removed lines

@@ -36,8 +36,9 @@ 
 				array('pre_load', array('Drafts_Profile_Module', 'pre_load'), array('post_errors')),
 			);
 		}
-		else
-			return array();
+		else {
+					return array();
+		}
 	}
 
 	/**
@@ -70,6 +71,8 @@ 
 	public function pre_load($post_errors)
 	{
 		if (empty($post_errors))
-			loadLanguage('Drafts');
+		{
+					loadLanguage('Drafts');
+		}
 	}
 }
\ No newline at end of file