elkarte / Elkarte

sources/subs/Members.subs.php

Braces +313 added lines, -122 removed lines

@@ -53,29 +53,39 @@ 
 
 	// If it's not an array, make it so!
 	if (!is_array($users))
-		$users = array($users);
-	else
-		$users = array_unique($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;
+	{
+			return;
+	}
 	elseif (count($users) == 1)
 	{
 		list ($user) = $users;
 
 		if ($user == $user_info['id'])
-			isAllowedTo('profile_remove_own');
-		else
-			isAllowedTo('profile_remove_any');
+		{
+					isAllowedTo('profile_remove_own');
+		}
+		else {
+					isAllowedTo('profile_remove_any');
+		}
 	}
 	else
 	{
 		foreach ($users as $k => $v)
-			$users[$k] = (int) $v;
+		{
+					$users[$k] = (int) $v;
+		}
 
 		// Deleting more than one?  You can't have more than one account...
 		isAllowedTo('profile_remove_any');
@@ -98,26 +108,34 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if ($row['is_admin'])
-			$admins[] = $row['id_member'];
+		{
+					$admins[] = $row['id_member'];
+		}
 		$user_log_details[$row['id_member']] = array($row['id_member'], $row['member_name']);
 		$emails[] = $row['email_address'];
 	}
 	$db->free_result($request);
 
 	if (empty($user_log_details))
-		return;
+	{
+			return;
+	}
 
 	// Make sure they aren't trying to delete administrators if they aren't one.  But don't bother checking if it's just themselves.
 	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]);
+		{
+					unset($user_log_details[$id]);
+		}
 	}
 
 	// No one left?
 	if (empty($users))
-		return;
+	{
+			return;
+	}
 
 	// Log the action - regardless of who is deleting it.
 	$log_changes = array();
@@ -493,9 +511,12 @@ 
 	if (empty($regOptions['auth_method']) || !in_array($regOptions['auth_method'], array('password', 'openid')))
 	{
 		if (!empty($regOptions['openid']))
-			$regOptions['auth_method'] = 'openid';
-		else
-			$regOptions['auth_method'] = 'password';
+		{
+					$regOptions['auth_method'] = 'openid';
+		}
+		else {
+					$regOptions['auth_method'] = 'password';
+		}
 	}
 
 	// Spaces and other odd characters are evil...
@@ -503,7 +524,9 @@ 
 
 	// Valid emails only
 	if (!Data_Validator::is_valid($regOptions, array('email' => 'valid_email|required|max_length[255]'), array('email' => 'trim')))
-		$reg_errors->addError('bad_email');
+	{
+			$reg_errors->addError('bad_email');
+	}
 
 	validateUsername(0, $regOptions['username'], $ErrorContext, !empty($regOptions['check_reserved_name']));
 
@@ -512,15 +535,20 @@ 
 
 	// Does the first password match the second?
 	if ($regOptions['password'] != $regOptions['password_check'] && $regOptions['auth_method'] == 'password')
-		$reg_errors->addError('passwords_dont_match');
+	{
+			$reg_errors->addError('passwords_dont_match');
+	}
 
 	// That's kind of easy to guess...
 	if ($regOptions['password'] == '')
 	{
 		if ($regOptions['auth_method'] == 'password')
-			$reg_errors->addError('no_password');
-		else
-			$regOptions['password'] = sha1(mt_rand());
+		{
+					$reg_errors->addError('no_password');
+		}
+		else {
+					$regOptions['password'] = sha1(mt_rand());
+		}
 	}
 
 	// Now perform hard password validation as required.
@@ -530,13 +558,17 @@ 
 
 		// Password isn't legal?
 		if ($passwordError !== null)
-			$reg_errors->addError('profile_error_password_' . $passwordError);
+		{
+					$reg_errors->addError('profile_error_password_' . $passwordError);
+		}
 	}
 
 	// @todo move to controller
 	// You may not be allowed to register this email.
 	if (!empty($regOptions['check_email_ban']))
-		isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	{
+			isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	}
 
 	// Check if the email address is in use.
 	if (userByEmail($regOptions['email'], $regOptions['username']))
@@ -549,7 +581,9 @@ 
 
 	// If there's any errors left return them at once!
 	if ($reg_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -572,7 +606,9 @@ 
 
 	// Can't change reserved vars.
 	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0)
-		throw new Elk_Exception('no_theme');
+	{
+			throw new Elk_Exception('no_theme');
+	}
 
 	$tokenizer = new Token_Hash();
 
@@ -625,13 +661,18 @@ 
 	}
 	// Maybe it can be activated right away?
 	elseif ($regOptions['require'] == 'nothing')
-		$regOptions['register_vars']['is_activated'] = 1;
+	{
+			$regOptions['register_vars']['is_activated'] = 1;
+	}
 	// Maybe it must be activated by email?
 	elseif ($regOptions['require'] == 'activation')
-		$regOptions['register_vars']['is_activated'] = 0;
+	{
+			$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']))
 	{
@@ -644,19 +685,25 @@ 
 		$unassignableGroups = getUnassignableGroups(allowedTo('admin_forum'));
 
 		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups))
-			$regOptions['register_vars']['id_group'] = 0;
+		{
+					$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)
+	{
+			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)
+	{
+			foreach ($regOptions['theme_vars'] as $var => $value)
 			$theme_vars[$var] = $value;
+	}
 
 	// Right, now let's prepare for insertion.
 	$knownInts = array(
@@ -678,11 +725,17 @@ 
 	{
 		$type = 'string';
 		if (in_array($var, $knownInts))
-			$type = 'int';
+		{
+					$type = 'int';
+		}
 		elseif (in_array($var, $knownFloats))
-			$type = 'float';
+		{
+					$type = 'float';
+		}
 		elseif ($var == 'birthdate')
-			$type = 'date';
+		{
+					$type = 'date';
+		}
 
 		$column_names[$var] = $type;
 		$values[$var] = $val;
@@ -699,9 +752,12 @@ 
 
 	// 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)
-		updateMemberStats($memberID, $regOptions['register_vars']['real_name']);
-	else
-		updateMemberStats();
+	{
+			updateMemberStats($memberID, $regOptions['register_vars']['real_name']);
+	}
+	else {
+			updateMemberStats();
+	}
 
 	// @todo there's got to be a method that does this
 	// Theme variables too?
@@ -709,7 +765,9 @@ 
 	{
 		$inserts = array();
 		foreach ($theme_vars as $var => $val)
-			$inserts[] = array($memberID, $var, $val);
+		{
+					$inserts[] = array($memberID, $var, $val);
+		}
 		$db->insert('insert',
 			'{db_prefix}themes',
 			array('id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
@@ -740,9 +798,13 @@ 
 	if ($regOptions['interface'] == 'admin')
 	{
 		if ($regOptions['require'] == 'activation')
-			$email_message = 'admin_register_activate';
+		{
+					$email_message = 'admin_register_activate';
+		}
 		elseif (!empty($regOptions['send_welcome_email']))
-			$email_message = 'admin_register_immediate';
+		{
+					$email_message = 'admin_register_immediate';
+		}
 
 		if (isset($email_message))
 		{
@@ -855,38 +917,51 @@ 
 		foreach ($reservedNames as $reserved)
 		{
 			if ($reserved == '')
-				continue;
+			{
+							continue;
+			}
 
 			// The admin might've used entities too, level the playing field.
 			$reservedCheck = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'replaceEntities__callback', $reserved);
 
 			// Case sensitive name?
 			if (empty($modSettings['reserveCase']))
-				$reservedCheck = Util::strtolower($reservedCheck);
+			{
+							$reservedCheck = Util::strtolower($reservedCheck);
+			}
 
 			// If it's not just entire word, check for it in there somewhere...
 			if ($checkMe == $reservedCheck || (Util::strpos($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord'])))
-				if ($fatal)
+			{
+							if ($fatal)
 					throw new Elk_Exception('username_reserved', 'password', array($reserved));
-				else
-					return true;
+			}
+				else {
+									return true;
+				}
 		}
 
 		$censor_name = $name;
 		if (censor($censor_name) != $name)
-			if ($fatal)
+		{
+					if ($fatal)
 				throw new Elk_Exception('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)
+	{
+			if (strpos($checkName, $char) !== false)
 			if ($fatal)
 				throw new Elk_Exception('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('_' => '\\_', '%' => '\\%'));
@@ -972,7 +1047,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		{
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$db->free_result($request);
 	}
 
@@ -981,18 +1058,23 @@ 
 	{
 		// First get the profile of the given board.
 		if (isset($board_info['id']) && $board_info['id'] == $board_id)
-			$profile_id = $board_info['profile'];
+		{
+					$profile_id = $board_info['profile'];
+		}
 		elseif ($board_id !== 0)
 		{
 			require_once(SUBSDIR . '/Boards.subs.php');
 			$board_data = fetchBoardsInfo(array('boards' => $board_id), array('selects' => 'permissions'));
 
 			if (empty($board_data))
-				throw new Elk_Exception('no_board');
+			{
+							throw new Elk_Exception('no_board');
+			}
 			$profile_id = $board_data[$board_id]['id_profile'];
 		}
-		else
-			$profile_id = 1;
+		else {
+					$profile_id = 1;
+		}
 
 		$request = $db->query('', '
 			SELECT bp.id_group, bp.add_deny
@@ -1005,7 +1087,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		{
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$db->free_result($request);
 	}
 
@@ -1117,9 +1201,13 @@ 
 
 	$query_parts = array();
 	if (!empty($email))
-		$query_parts[] = 'poster_email = {string:email_address}';
+	{
+			$query_parts[] = 'poster_email = {string:email_address}';
+	}
 	if (!empty($membername))
-		$query_parts[] = 'poster_name = {string:member_name}';
+	{
+			$query_parts[] = 'poster_name = {string:member_name}';
+	}
 	$query = implode(' AND ', $query_parts);
 
 	// Finally, update the posts themselves!
@@ -1182,7 +1270,9 @@ 
 
 	// If we want duplicates pass the members array off.
 	if ($get_duplicates)
-		populateDuplicateMembers($members);
+	{
+			populateDuplicateMembers($members);
+	}
 
 	return $members;
 }
@@ -1202,7 +1292,9 @@ 
 
 	// We know how many members there are in total.
 	if (empty($where) || $where == '1=1')
-		$num_members = $modSettings['totalMembers'];
+	{
+			$num_members = $modSettings['totalMembers'];
+	}
 
 	// The database knows the amount when there are extra conditions.
 	else
@@ -1240,15 +1332,21 @@ 
 
 		// Store the IPs.
 		if (!empty($member['member_ip']))
-			$ips[] = $member['member_ip'];
+		{
+					$ips[] = $member['member_ip'];
+		}
 		if (!empty($member['member_ip2']))
-			$ips[] = $member['member_ip2'];
+		{
+					$ips[] = $member['member_ip2'];
+		}
 	}
 
 	$ips = array_unique($ips);
 
 	if (empty($ips))
-		return false;
+	{
+			return false;
+	}
 
 	// Fetch all members with this IP address, we'll filter out the current ones in a sec.
 	$potential_dupes = membersByIP($ips, 'exact', true);
@@ -1269,9 +1367,13 @@ 
 		);
 
 		if (in_array($row['member_ip'], $ips))
-			$duplicate_members[$row['member_ip']][] = $member_context;
+		{
+					$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;
+		{
+					$duplicate_members[$row['member_ip2']][] = $member_context;
+		}
 	}
 
 	// Also try to get a list of messages using these ips.
@@ -1294,7 +1396,9 @@ 
 	{
 		// 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;
+		{
+					continue;
+		}
 		$had_ips[$row['poster_ip']][] = $row['id_member'];
 
 		$duplicate_members[$row['poster_ip']][] = array(
@@ -1314,9 +1418,13 @@ 
 		foreach ($members as $key => $member)
 		{
 			if (isset($duplicate_members[$member['member_ip']]))
-				$members[$key]['duplicate_members'] = $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']]);
+			{
+							$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']);
@@ -1352,10 +1460,14 @@ 
 	foreach (array($ip1, $ip2) as $id => $ip)
 	{
 		if ($ip === false)
-			continue;
+		{
+					continue;
+		}
 
 		if ($match === 'exact')
-			$ip_params['ips'] = array_merge($ip_params['ips'], (array) $ip);
+		{
+					$ip_params['ips'] = array_merge($ip_params['ips'], (array) $ip);
+		}
 		else
 		{
 			$ip = (array) $ip;
@@ -1372,15 +1484,19 @@ 
 	{
 		$where = 'member_ip IN ({array_string:ips})';
 		if ($ip2 !== false)
-			$where .= '
+		{
+					$where .= '
 			OR member_ip2 IN ({array_string:ips})';
+		}
 	}
 	else
 	{
 		$where = 'member_ip ' . implode(' OR member_ip', $ip_query);
 		if ($ip2 !== false)
-			$where .= '
+		{
+					$where .= '
 			OR member_ip2 ' . implode(' OR member_ip', $ip_query);
+		}
 	}
 
 	return $db->fetchQuery('
@@ -1451,13 +1567,17 @@ 
 	if ($details)
 	{
 		while ($row = $db->fetch_assoc($request))
-			$members[$row['id_member']] = $row;
+		{
+					$members[$row['id_member']] = $row;
+		}
 	}
 	// Or just a int[] of found member id's
 	else
 	{
 		while ($row = $db->fetch_assoc($request))
-			$members[] = $row['id_member'];
+		{
+					$members[] = $row['id_member'];
+		}
 	}
 	$db->free_result($request);
 
@@ -1538,9 +1658,12 @@ 
 				foreach ($query_conditions as $condition => $query_condition)
 				{
 					if ($query_condition == 'member_names')
-						$query_parts[$condition === 'or' ? 'or' : 'and'][] = $allowed_conditions[$query_condition]($query_params);
-					else
-						$query_parts[$condition === 'or' ? 'or' : 'and'][] = isset($allowed_conditions[$query_condition]) ? $allowed_conditions[$query_condition] : $query_condition;
+					{
+											$query_parts[$condition === 'or' ? 'or' : 'and'][] = $allowed_conditions[$query_condition]($query_params);
+					}
+					else {
+											$query_parts[$condition === 'or' ? 'or' : 'and'][] = isset($allowed_conditions[$query_condition]) ? $allowed_conditions[$query_condition] : $query_condition;
+					}
 				}
 			}
 			elseif ($query_conditions == 'member_names')
@@ -1554,7 +1677,9 @@ 
 		}
 
 		if (!empty($query_parts['or']))
-			$query_parts['and'][] = implode("\n\t\t\tOR ", $query_parts['or']);
+		{
+					$query_parts['and'][] = implode("\n\t\t\tOR ", $query_parts['or']);
+		}
 
 		$query_where = implode("\n\t\t\tAND ", $query_parts['and']);
 	}
@@ -1562,17 +1687,23 @@ 
 	elseif (isset($allowed_conditions[$query]))
 	{
 		if ($query == 'member_names')
-			$query_where = $allowed_conditions[$query]($query_params);
-		else
-			$query_where = $allowed_conditions[$query];
+		{
+					$query_where = $allowed_conditions[$query]($query_params);
+		}
+		else {
+					$query_where = $allowed_conditions[$query];
+		}
 	}
 	// Something else, be careful ;)
-	else
-		$query_where = $query;
+	else {
+			$query_where = $query;
+	}
 
 	// Lazy loading, our favorite
 	if (empty($query_where))
-		return false;
+	{
+			return false;
+	}
 
 	// Only want active members
 	if ($only_active)
@@ -1613,7 +1744,9 @@ 
 
 	$admins = array();
 	while ($row = $db->fetch_assoc($request))
-		$admins[$row['id_member']] = array($row['real_name'], $row['lngfile']);
+	{
+			$admins[$row['id_member']] = array($row['real_name'], $row['lngfile']);
+	}
 	$db->free_result($request);
 
 	return $admins;
@@ -1663,7 +1796,9 @@ 
 	$members = array();
 
 	if (empty($member_ids))
-		return false;
+	{
+			return false;
+	}
 
 	if (!is_array($member_ids))
 	{
@@ -1703,12 +1838,17 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (empty($row['lngfile']))
-			$row['lngfile'] = $language;
+		{
+					$row['lngfile'] = $language;
+		}
 
 		if (!empty($single))
-			$members = $row;
-		else
-			$members[$row['id_member']] = $row;
+		{
+					$members = $row;
+		}
+		else {
+					$members[$row['id_member']] = $row;
+		}
 	}
 	$db->free_result($request);
 
@@ -1738,7 +1878,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$inactive_members[$row['is_activated']] = $row['total_members'];
+	{
+			$inactive_members[$row['is_activated']] = $row['total_members'];
+	}
 	$db->free_result($request);
 
 	return $inactive_members;
@@ -1769,7 +1911,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		return false;
+	{
+			return false;
+	}
 	$member = $db->fetch_assoc($request);
 	$db->free_result($request);
 
@@ -1873,16 +2017,22 @@ 
 
 	$query_cond = array();
 	foreach ($conditions as $key => $dummy)
-		if (isset($available_conditions[$key]))
+	{
+			if (isset($available_conditions[$key]))
 			$query_cond[] = $available_conditions[$key];
+	}
 
 	if (isset($conditions['group_list']))
-		$conditions['additional_group_list'] = implode(', additional_groups) != 0 OR FIND_IN_SET(', $conditions['group_list']);
+	{
+			$conditions['additional_group_list'] = implode(', additional_groups) != 0 OR FIND_IN_SET(', $conditions['group_list']);
+	}
 
 	$data = array();
 
 	if (!isset($conditions['order_by']))
-		$conditions['order_by'] = 'lngfile';
+	{
+			$conditions['order_by'] = 'lngfile';
+	}
 
 	$limit = (isset($conditions['limit'])) ? '
 		LIMIT {int:limit}' : '';
@@ -1899,7 +2049,9 @@ 
 	$data['member_count'] = $db->num_rows($request);
 
 	if ($data['member_count'] == 0)
-		return $data;
+	{
+			return $data;
+	}
 
 	// Fill the info array.
 	while ($row = $db->fetch_assoc($request))
@@ -1951,7 +2103,9 @@ 
 		if (isset($available_conditions[$key]))
 		{
 			if ($key === 'time_before')
-				$query = true;
+			{
+							$query = true;
+			}
 			$query_cond[] = $available_conditions[$key];
 		}
 	}
@@ -1961,7 +2115,9 @@ 
 		$data = retrieveMemberData($conditions);
 		$members_id = array();
 		foreach ($data['member_info'] as $member)
-			$members_id[] = $member['username'];
+		{
+					$members_id[] = $member['username'];
+		}
 	}
 	else
 	{
@@ -1981,7 +2137,9 @@ 
 
 	// Let the integration know that they've been activated!
 	foreach ($members_id as $member_id)
-		call_integration_hook('integrate_activate', array($member_id, $conditions['activated_status'], $conditions['is_activated']));
+	{
+			call_integration_hook('integrate_activate', array($member_id, $conditions['activated_status'], $conditions['is_activated']));
+	}
 
 	return $conditions['is_activated'];
 }
@@ -2232,16 +2390,22 @@ 
 				$row['additional_groups'] = $group_changes[$row['id_member']]['add'];
 				$row['primary_group'] = $group_changes[$row['id_member']]['primary'];
 			}
-			else
-				$row['additional_groups'] = explode(',', $row['additional_groups']);
+			else {
+							$row['additional_groups'] = explode(',', $row['additional_groups']);
+			}
 				// Don't have it already?
 			if ($row['primary_group'] == $row['id_group'] || in_array($row['id_group'], $row['additional_groups']))
-				continue;
+			{
+							continue;
+			}
 				// Should it become their primary?
 			if ($row['primary_group'] == 0 && $row['hidden'] == 0)
-				$row['primary_group'] = $row['id_group'];
-			else
-				$row['additional_groups'][] = $row['id_group'];
+			{
+							$row['primary_group'] = $row['id_group'];
+			}
+			else {
+							$row['additional_groups'][] = $row['id_group'];
+			}
 
 			// Add them to the group master list.
 			$group_changes[$row['id_member']] = array(
@@ -2252,7 +2416,8 @@ 
 
 		// Add required information to email them.
 		if ($row['notify_types'] != 4)
-			$email_details[] = array(
+		{
+					$email_details[] = array(
 				'rid' => $row['id_request'],
 				'member_id' => $row['id_member'],
 				'member_name' => $row['member_name'],
@@ -2261,6 +2426,7 @@ 
 				'email' => $row['email_address'],
 				'language' => $row['lngfile'],
 			);
+		}
 	}
 	$db->free_result($request);
 
@@ -2300,17 +2466,24 @@ 
 
 	// 0 = all members
 	if ($receive_from == 0)
-		return true;
+	{
+			return true;
+	}
 	// 1 = all except ignore
 	elseif ($receive_from == 1)
-		return !(!empty($ignore_list) && in_array($user_info['id'], $ignore_list));
+	{
+			return !(!empty($ignore_list) && in_array($user_info['id'], $ignore_list));
+	}
 	// 2 = buddies and admin
 	elseif ($receive_from == 2)
-		return ($user_info['is_admin'] || (!empty($buddy_list) && in_array($user_info['id'], $buddy_list)));
+	{
+			return ($user_info['is_admin'] || (!empty($buddy_list) && in_array($user_info['id'], $buddy_list)));
+	}
 	// 3 = admin only
-	else
-		return (bool) $user_info['is_admin'];
-}
+	else {
+			return (bool) $user_info['is_admin'];
+	}
+	}
 
 /**
  * This function updates the latest member, the total membercount, and the
@@ -2458,7 +2631,9 @@ 
 		$parameters['members'] = $members;
 	}
 	elseif ($members === null)
-		$condition = '1=1';
+	{
+			$condition = '1=1';
+	}
 	else
 	{
 		$condition = 'id_member = {int:member}';
@@ -2501,7 +2676,9 @@ 
 		{
 			// Fetch a list of member_names if necessary
 			if ((!is_array($members) && $members === $user_info['id']) || (is_array($members) && count($members) == 1 && in_array($user_info['id'], $members)))
-				$member_names = array($user_info['username']);
+			{
+							$member_names = array($user_info['username']);
+			}
 			else
 			{
 				$member_names = $db->fetchQueryCallback('
@@ -2517,8 +2694,10 @@ 
 			}
 
 			if (!empty($member_names))
-				foreach ($vars_to_integrate as $var)
+			{
+							foreach ($vars_to_integrate as $var)
 					call_integration_hook('integrate_change_member_data', array($member_names, &$var, &$data[$var], &$knownInts, &$knownFloats));
+			}
 		}
 	}
 
@@ -2528,11 +2707,17 @@ 
 		$type = 'string';
 
 		if (in_array($var, $knownInts))
-			$type = 'int';
+		{
+					$type = 'int';
+		}
 		elseif (in_array($var, $knownFloats))
-			$type = 'float';
+		{
+					$type = 'float';
+		}
 		elseif ($var == 'birthdate')
-			$type = 'date';
+		{
+					$type = 'date';
+		}
 
 		// Doing an increment?
 		if ($type == 'int' && ($val === '+' || $val === '-'))
@@ -2547,7 +2732,9 @@ 
 			if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match))
 			{
 				if ($match[1] != '+ ')
-					$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				{
+									$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+				}
 				$type = 'raw';
 			}
 		}
@@ -2572,7 +2759,9 @@ 
 	if ($cache->levelHigherThan(1) && !empty($members))
 	{
 		if (!is_array($members))
-			$members = array($members);
+		{
+					$members = array($members);
+		}
 
 		foreach ($members as $member)
 		{
@@ -2611,7 +2800,9 @@ 
 	);
 	$ips = array();
 	while ($row = $db->fetch_assoc($request))
-		$ips[$row['member_ip']][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	{
+			$ips[$row['member_ip']][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	}
 	$db->free_result($request);
 
 	ksort($ips);

Spacing +5 added lines, -5 removed lines

@@ -430,7 +430,7 @@ 
 			'pm_ignore_list' => implode(', pm_ignore_list) != 0 OR FIND_IN_SET(', $users),
 			'buddy_list' => implode(', buddy_list) != 0 OR FIND_IN_SET(', $users),
 		),
-		function ($row) use ($users)
+		function($row) use ($users)
 		{
 			updateMemberData($row['id_member'], array(
 				'pm_ignore_list' => implode(',', array_diff(explode(',', $row['pm_ignore_list']), $users)),
@@ -1054,7 +1054,7 @@ 
 			'member_group_allowed_implode' => implode(', mem.additional_groups) != 0 OR FIND_IN_SET(', $member_groups['allowed']),
 			'member_group_denied_implode' => implode(', mem.additional_groups) != 0 OR FIND_IN_SET(', $member_groups['denied']),
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_member'];
 		}
@@ -1509,7 +1509,7 @@ 
 {
 	$allowed_conditions = array(
 		'member_ids'   => 'id_member IN ({array_int:member_ids})',
-		'member_names' => function (&$members)
+		'member_names' => function(&$members)
 		{
 			$mem_query = array();
 
@@ -1811,7 +1811,7 @@ 
 			'activation_status' => array(1, 12),
 			'limit' => Util::strlen($search) <= 2 ? 100 : 200,
 		),
-		function ($row)
+		function($row)
 		{
 			$row['real_name'] = strtr($row['real_name'], array('&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;'));
 
@@ -2509,7 +2509,7 @@ 
 					FROM {db_prefix}members
 					WHERE ' . $condition,
 					$parameters,
-					function ($row)
+					function($row)
 					{
 						return $row['member_name'];
 					}

sources/subs/Attachments.subs.php

Braces +320 added lines, -126 removed lines

@@ -30,11 +30,17 @@ 
 	// Not pretty, but since we don't want folders created for every post.
 	// It'll do unless a better solution can be found.
 	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
-		$doit = true;
+	{
+			$doit = true;
+	}
 	elseif (empty($modSettings['automanage_attachments']))
-		return;
+	{
+			return;
+	}
 	elseif (!isset($_FILES))
-		return;
+	{
+			return;
+	}
 	elseif (isset($_FILES['attachment']))
 	{
 		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
@@ -48,7 +54,9 @@ 
 	}
 
 	if (!isset($doit))
-		return;
+	{
+			return;
+	}
 
 	// Get our date and random numbers for the directory choices
 	$year = date('Y');
@@ -61,21 +69,30 @@ 
 	if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments']))
 	{
 		if (!is_array($modSettings['attachment_basedirectories']))
-			$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+		{
+					$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+		}
 
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 	}
-	else
-		$base_dir = 0;
+	else {
+			$base_dir = 0;
+	}
 
 	if ($modSettings['automanage_attachments'] == 1)
 	{
 		if (!isset($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = array();
+		{
+					$modSettings['last_attachments_directory'] = array();
+		}
 		if (!is_array($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
+		{
+					$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
+		}
 		if (!isset($modSettings['last_attachments_directory'][$base_dir]))
-			$modSettings['last_attachments_directory'][$base_dir] = 0;
+		{
+					$modSettings['last_attachments_directory'][$base_dir] = 0;
+		}
 	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : BOARDDIR);
@@ -106,12 +123,18 @@ 
 	}
 
 	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+	{
+			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+	}
 
 	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir))
-		$outputCreation = automanage_attachments_create_directory($updir);
+	{
+			$outputCreation = automanage_attachments_create_directory($updir);
+	}
 	elseif (in_array($updir, $modSettings['attachmentUploadDir']))
-		$outputCreation = true;
+	{
+			$outputCreation = true;
+	}
 
 	if ($outputCreation)
 	{
@@ -153,7 +176,9 @@ 
 
 		$directory = !empty($tree) ? attachments_init_dir($tree, $count) : false;
 		if ($directory === false)
-			return false;
+		{
+					return false;
+		}
 	}
 
 	$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
@@ -194,7 +219,9 @@ 
 
 	// Everything seems fine...let's create the .htaccess
 	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
-		secureDirectory($updir, true);
+	{
+			secureDirectory($updir, true);
+	}
 
 	$sep = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? '\/' : DIRECTORY_SEPARATOR;
 	$updir = rtrim($updir, $sep);
@@ -231,7 +258,9 @@ 
 	global $modSettings;
 
 	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1))
-		return;
+	{
+			return;
+	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : BOARDDIR);
 
@@ -245,12 +274,15 @@ 
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 		$base_dir = !empty($modSettings['automanage_attachments']) ? $base_dir : 0;
 	}
-	else
-		$base_dir = 0;
+	else {
+			$base_dir = 0;
+	}
 
 	// Get the last attachment directory for that base directory
 	if (empty($modSettings['last_attachments_directory'][$base_dir]))
-		$modSettings['last_attachments_directory'][$base_dir] = 0;
+	{
+			$modSettings['last_attachments_directory'][$base_dir] = 0;
+	}
 
 	// And increment it.
 	$modSettings['last_attachments_directory'][$base_dir]++;
@@ -269,9 +301,10 @@ 
 
 		return true;
 	}
-	else
-		return false;
-}
+	else {
+			return false;
+	}
+	}
 
 /**
  * Finds the current directory tree for the supplied base directory
@@ -290,11 +323,15 @@ 
 			* while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR)
 	*/
 	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
-		$tree = preg_split('#[\\\/]#', $directory);
+	{
+			$tree = preg_split('#[\\\/]#', $directory);
+	}
 	else
 	{
 		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
-			return false;
+		{
+					return false;
+		}
 
 		$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 	}
@@ -324,9 +361,12 @@ 
 		// ...even if, I should check this in the admin page...isn't it?
 		// ...NHAAA Let's leave space for users' complains! :P
 		if (preg_match('/^[a-z]:$/i', $tree[0]))
-			$directory = array_shift($tree);
-		else
-			return false;
+		{
+					$directory = array_shift($tree);
+		}
+		else {
+					return false;
+		}
 
 		$count--;
 	}
@@ -356,7 +396,9 @@ 
 
 	// Make sure we're uploading to the right place.
 	if (!empty($modSettings['automanage_attachments']))
-		automanage_attachments_check_directory();
+	{
+			automanage_attachments_check_directory();
+	}
 
 	if (!is_array($modSettings['attachmentUploadDir']))
 	{
@@ -371,7 +413,9 @@ 
 
 	// Is the attachments folder actually there?
 	if (!empty($context['dir_creation_error']))
-		$initial_error = $context['dir_creation_error'];
+	{
+			$initial_error = $context['dir_creation_error'];
+	}
 	elseif (!is_dir($context['attach_dir']))
 	{
 		$initial_error = 'attach_folder_warning';
@@ -382,7 +426,9 @@ 
 	{
 		// If this isn't a new post, check the current attachments.
 		if (!empty($id_msg))
-			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = attachmentsSizeForMessage($id_msg);
+		{
+					list ($context['attachments']['quantity'], $context['attachments']['total_size']) = attachmentsSizeForMessage($id_msg);
+		}
 		else
 		{
 			$context['attachments']['quantity'] = 0;
@@ -416,7 +462,9 @@ 
 			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 			{
 				if (strpos($attachID, 'post_tmp_' . $user_info['id'] . '_') !== false)
-					@unlink($attachment['tmp_name']);
+				{
+									@unlink($attachment['tmp_name']);
+				}
 			}
 
 			$attach_errors->activate()->addError('temp_attachments_flushed');
@@ -425,25 +473,33 @@ 
 	}
 
 	if (!isset($_FILES['attachment']['name']))
-		$_FILES['attachment']['tmp_name'] = array();
+	{
+			$_FILES['attachment']['tmp_name'] = array();
+	}
 
 	if (!isset($_SESSION['temp_attachments']))
-		$_SESSION['temp_attachments'] = array();
+	{
+			$_SESSION['temp_attachments'] = array();
+	}
 
 	// Remember where we are at. If it's anywhere at all.
 	if (!$ignore_temp)
-		$_SESSION['temp_attachments']['post'] = array(
+	{
+			$_SESSION['temp_attachments']['post'] = array(
 			'msg' => !empty($id_msg) ? $id_msg : 0,
 			'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0,
 			'topic' => !empty($topic) ? $topic : 0,
 			'board' => !empty($board) ? $board : 0,
 		);
+	}
 
 	// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 	foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 	{
 		if ($_FILES['attachment']['name'][$n] == '')
-			continue;
+		{
+					continue;
+		}
 
 		// If we have an initial error, lets just display it.
 		if (!empty($initial_error) && $added_initial_error === false)
@@ -464,7 +520,9 @@ 
 			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 			{
 				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				{
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			$_FILES['attachment']['tmp_name'] = array();
@@ -493,12 +551,16 @@ 
 
 			// Move the file to the attachments folder with a temp name for now.
 			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-				@chmod($destName, 0644);
+			{
+							@chmod($destName, 0644);
+			}
 			else
 			{
 				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
 				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				{
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 		}
 		// Upload error(s) were detected, flag the error, remove the file
@@ -511,12 +573,16 @@ 
 			);
 
 			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-				unlink($_FILES['attachment']['tmp_name'][$n]);
+			{
+							unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 		}
 
 		// If there were no errors to this point, we apply some additional checks
 		if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-			attachmentChecks($attachID);
+		{
+					attachmentChecks($attachID);
+		}
 
 		// Want to correct for phonetographer photos?
 		if (!empty($modSettings['attachment_autorotate']) && empty($_SESSION['temp_attachments'][$attachID]['errors']) && substr($_SESSION['temp_attachments'][$attachID]['type'], 0, 5) === 'image')
@@ -548,8 +614,9 @@ 
 						unset($_SESSION['temp_attachments'][$attachID]);
 					}
 				}
-				else
-					$attach_errors->addError(array($error[0], $error[1]));
+				else {
+									$attach_errors->addError(array($error[0], $error[1]));
+				}
 			}
 		}
 	}
@@ -589,8 +656,9 @@ 
 				return true;
 			}
 			// Nope can't delete it if we can't find it
-			else
-				return 'attachment_not_found';
+			else {
+							return 'attachment_not_found';
+			}
 		}
 	}
 
@@ -642,18 +710,25 @@ 
 
 	// Permissions: only temporary attachments
 	if (substr($id_attach, 0, 8) !== 'post_tmp')
-		throw new \Exception('no_access');
+	{
+			throw new \Exception('no_access');
+	}
 
 	// Permissions: only author is allowed.
 	$pieces = explode('_', substr($id_attach, 9));
 
 	if (!isset($pieces[0]) || $pieces[0] != $user_info['id'])
-		throw new \Exception('no_access');
+	{
+			throw new \Exception('no_access');
+	}
 
 	if (is_array($modSettings['attachmentUploadDir']))
-		$dirs = $modSettings['attachmentUploadDir'];
-	else
-		$dirs = unserialize($modSettings['attachmentUploadDir']);
+	{
+			$dirs = $modSettings['attachmentUploadDir'];
+	}
+	else {
+			$dirs = unserialize($modSettings['attachmentUploadDir']);
+	}
 
 	$attach_dir = $dirs[$modSettings['currentAttachmentUploadDir']];
 
@@ -687,21 +762,30 @@ 
 	{
 		// The file exceeds the max_filesize directive in php.ini
 		if ($_FILES['attachment']['error'][$attachID] == 1)
-			$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		{
+					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		}
 		// The uploaded file exceeds the MAX_FILE_SIZE directive in the HTML form.
 		elseif ($_FILES['attachment']['error'][$attachID] == 2)
-			$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		{
+					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+		}
 		// Missing or a full a temp directory on the server
 		elseif ($_FILES['attachment']['error'][$attachID] == 6)
-			Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_6'], 'critical');
+		{
+					Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_6'], 'critical');
+		}
 		// One of many errors such as (3)partially uploaded, (4)empty file,
-		else
-			Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$attachID]]);
+		else {
+					Errors::instance()->log_error($_FILES['attachment']['name'][$attachID] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$attachID]]);
+		}
 
 		// If we did not set an user error (3,4,6,7,8) to show then give them a generic one as there is
 		// no need to provide back specifics of a server error, those are logged
 		if (empty($errors))
-			$errors[] = 'attach_php_error';
+		{
+					$errors[] = 'attach_php_error';
+		}
 	}
 
 	return $errors;
@@ -731,17 +815,27 @@ 
 
 	// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
 	if (empty($_SESSION['temp_attachments'][$attachID]))
-		$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	{
+			$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	}
 	elseif (empty($attachID))
-		$error = '$attachID';
+	{
+			$error = '$attachID';
+	}
 	elseif (empty($context['attachments']))
-		$error = '$context[\'attachments\']';
+	{
+			$error = '$context[\'attachments\']';
+	}
 	elseif (empty($context['attach_dir']))
-		$error = '$context[\'attach_dir\']';
+	{
+			$error = '$context[\'attach_dir\']';
+	}
 
 	// Let's get their attention.
 	if (!empty($error))
-		throw new Elk_Exception('attach_check_nag', 'debug', array($error));
+	{
+			throw new Elk_Exception('attach_check_nag', 'debug', array($error));
+	}
 
 	// Just in case this slipped by the first checks, we stop it here and now
 	if ($_SESSION['temp_attachments'][$attachID]['size'] == 0)
@@ -859,41 +953,55 @@ 
 				else
 				{
 					if (isset($context['dir_creation_error']))
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
-					else
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					{
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
+					}
+					else {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					}
 				}
 			}
-			else
-				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+			else {
+							$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+			}
 		}
 	}
 
 	// Is the file too big?
 	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	{
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	}
 
 	// Check the total upload size for this post...
 	$context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size'];
 	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	{
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	}
 
 	// Have we reached the maximum number of files we are allowed?
 	$context['attachments']['quantity']++;
 
 	// Set a max limit if none exists
 	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50)
-		$modSettings['attachmentNumPerPostLimit'] = 50;
+	{
+			$modSettings['attachmentNumPerPostLimit'] = 50;
+	}
 
 	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit'])
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	{
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	}
 
 	// File extension check
 	if (!empty($modSettings['attachmentCheckExtensions']))
 	{
 		$allowed = explode(',', strtolower($modSettings['attachmentExtensions']));
 		foreach ($allowed as $k => $dummy)
-			$allowed[$k] = trim($dummy);
+		{
+					$allowed[$k] = trim($dummy);
+		}
 
 		if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed))
 		{
@@ -906,9 +1014,13 @@ 
 	if (!empty($_SESSION['temp_attachments'][$attachID]['errors']))
 	{
 		if (isset($context['dir_size']))
-			$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		{
+					$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		}
 		if (isset($context['dir_files']))
-			$context['dir_files']--;
+		{
+					$context['dir_files']--;
+		}
 
 		$context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
 		$context['attachments']['quantity']--;
@@ -970,14 +1082,18 @@ 
 
 	// Get the hash if no hash has been given yet.
 	if (empty($attachmentOptions['file_hash']))
-		$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], 0, null, true);
+	{
+			$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], 0, null, true);
+	}
 
 	// Assuming no-one set the extension let's take a look at it.
 	if (empty($attachmentOptions['fileext']))
 	{
 		$attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : '');
 		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name'])
-			$attachmentOptions['fileext'] = '';
+		{
+					$attachmentOptions['fileext'] = '';
+		}
 	}
 
 	$db->insert('',
@@ -998,7 +1114,9 @@ 
 
 	// @todo Add an error here maybe?
 	if (empty($attachmentOptions['id']))
-		return false;
+	{
+			return false;
+	}
 
 	// Now that we have the attach id, let's rename this and finish up.
 	$attachmentOptions['destination'] = getAttachmentFilename(basename($attachmentOptions['name']), $attachmentOptions['id'], $attachmentOptions['id_folder'], false, $attachmentOptions['file_hash']);
@@ -1006,7 +1124,8 @@ 
 
 	// If it's not approved then add to the approval queue.
 	if (!$attachmentOptions['approved'])
-		$db->insert('',
+	{
+			$db->insert('',
 			'{db_prefix}approval_queue',
 			array(
 				'id_attach' => 'int', 'id_msg' => 'int',
@@ -1016,9 +1135,12 @@ 
 			),
 			array()
 		);
+	}
 
 	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height'])))
-		return true;
+	{
+			return true;
+	}
 
 	// Like thumbnails, do we?
 	if (!empty($modSettings['attachmentThumbWidth']) && !empty($modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > $modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > $modSettings['attachmentThumbHeight']))
@@ -1123,7 +1245,9 @@ 
 	// Use our cache when possible
 	$cache = array();
 	if (Cache::instance()->getVar($cache, 'getAvatar_id-' . $id_attach))
-		$avatarData = $cache;
+	{
+			$avatarData = $cache;
+	}
 	else
 	{
 		$request = $db->query('', '
@@ -1139,7 +1263,9 @@ 
 		);
 		$avatarData = array();
 		if ($db->num_rows($request) != 0)
-			$avatarData = $db->fetch_row($request);
+		{
+					$avatarData = $db->fetch_row($request);
+		}
 		$db->free_result($request);
 
 		Cache::instance()->put('getAvatar_id-' . $id_attach, $avatarData, 900);
@@ -1365,7 +1491,9 @@ 
 
 	// Just making sure there is a non-zero member.
 	if (empty($memID))
-		return false;
+	{
+			return false;
+	}
 
 	require_once(SUBSDIR . '/Graphics.subs.php');
 	require_once(SUBSDIR . '/ManageAttachments.subs.php');
@@ -1441,8 +1569,9 @@ 
 			);
 			return true;
 		}
-		else
-			return false;
+		else {
+					return false;
+		}
 	}
 	else
 	{
@@ -1481,7 +1610,9 @@ 
 	// Can we pull this from the cache... please please?
 	$temp = array();
 	if (Cache::instance()->getVar($temp, 'url_image_size-' . md5($url), 240))
-		return $temp;
+	{
+			return $temp;
+	}
 
 	$t = microtime(true);
 
@@ -1490,9 +1621,13 @@ 
 
 	// Can't figure it out, just try the image size.
 	if ($url == '' || $url == 'http://' || $url == 'https://')
-		return false;
+	{
+			return false;
+	}
 	elseif (!isset($match[1]))
-		$size = elk_getimagesize($url, false);
+	{
+			$size = elk_getimagesize($url, false);
+	}
 	else
 	{
 		// Try to connect to the server... give it half a second.
@@ -1533,11 +1668,15 @@ 
 
 	// If we didn't get it, we failed.
 	if (!isset($size))
-		$size = false;
+	{
+			$size = false;
+	}
 
 	// If this took a long time, we may never have to do it again, but then again we might...
 	if (microtime(true) - $t > 0.8)
-		Cache::instance()->put('url_image_size-' . md5($url), $size, 240);
+	{
+			Cache::instance()->put('url_image_size-' . md5($url), $size, 240);
+	}
 
 	// Didn't work.
 	return $size;
@@ -1561,7 +1700,9 @@ 
 
 	// Make sure this thing exists and it is unserialized
 	if (empty($modSettings['attachmentUploadDir']))
-		$attachmentDir = BOARDDIR . '/attachments';
+	{
+			$attachmentDir = BOARDDIR . '/attachments';
+	}
 	elseif (!empty($modSettings['currentAttachmentUploadDir']) && !is_array($modSettings['attachmentUploadDir']) && (@unserialize($modSettings['attachmentUploadDir']) !== false))
 	{
 		// @todo this is here to prevent the package manager to die when complete the installation of the patch (the new Util class has not yet been loaded so we need the normal one)
@@ -1574,8 +1715,9 @@ 
 			$attachmentDir = unserialize($modSettings['attachmentUploadDir']);
 		}
 	}
-	else
-		$attachmentDir = $modSettings['attachmentUploadDir'];
+	else {
+			$attachmentDir = $modSettings['attachmentUploadDir'];
+	}
 
 	return is_array($attachmentDir) ? $attachmentDir[$modSettings['currentAttachmentUploadDir']] : $attachmentDir;
 }
@@ -1628,10 +1770,13 @@ 
 
 	// Little utility function for the endless $id_folder computation for avatars.
 	if (!empty($modSettings['custom_avatar_enabled']))
-		return 1;
-	else
-		return getAttachmentPathID();
-}
+	{
+			return 1;
+	}
+	else {
+			return getAttachmentPathID();
+	}
+	}
 
 /**
  * Get all attachments associated with a set of posts.
@@ -1670,12 +1815,16 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!$row['approved'] && !$includeUnapproved && (empty($filter) || !call_user_func($filter, $row, $all_posters)))
-			continue;
+		{
+					continue;
+		}
 
 		$temp[$row['id_attach']] = $row;
 
 		if (!isset($attachments[$row['id_msg']]))
-			$attachments[$row['id_msg']] = array();
+		{
+					$attachments[$row['id_msg']] = array();
+		}
 	}
 	$db->free_result($request);
 
@@ -1683,7 +1832,9 @@ 
 	ksort($temp);
 
 	foreach ($temp as $row)
-		$attachments[$row['id_msg']][] = $row;
+	{
+			$attachments[$row['id_msg']][] = $row;
+	}
 
 	return $attachments;
 }
@@ -1732,17 +1883,24 @@ 
 	$files = array();
 
 	if (!$dir)
-		return array();
+	{
+			return array();
+	}
 
 	while ($line = $dir->read())
 	{
 		if (in_array($line, array('.', '..', 'blank.png', 'index.php')))
-			continue;
+		{
+					continue;
+		}
 
 		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line))
-			$dirs[] = $line;
-		else
-			$files[] = $line;
+		{
+					$dirs[] = $line;
+		}
+		else {
+					$files[] = $line;
+		}
 	}
 	$dir->close();
 
@@ -1764,13 +1922,15 @@ 
 	{
 		$tmp = getServerStoredAvatars($directory . (!empty($directory) ? '/' : '') . $line, $level + 1);
 		if (!empty($tmp))
-			$result[] = array(
+		{
+					$result[] = array(
 				'filename' => htmlspecialchars($line, ENT_COMPAT, 'UTF-8'),
 				'checked' => strpos($context['member']['avatar']['server_pic'], $line . '/') !== false,
 				'name' => '[' . htmlspecialchars(str_replace('_', ' ', $line), ENT_COMPAT, 'UTF-8') . ']',
 				'is_dir' => true,
 				'files' => $tmp
 		);
+		}
 		unset($tmp);
 	}
 
@@ -1781,7 +1941,9 @@ 
 
 		// Make sure it is an image.
 		if (getValidMimeImageType($extension) === '')
-			continue;
+		{
+					continue;
+		}
 
 		$result[] = array(
 			'filename' => htmlspecialchars($line, ENT_COMPAT, 'UTF-8'),
@@ -1790,7 +1952,9 @@ 
 			'is_dir' => false
 		);
 		if ($level == 1)
-			$context['avatar_list'][] = $directory . '/' . $line;
+		{
+					$context['avatar_list'][] = $directory . '/' . $line;
+		}
 	}
 
 	return $result;
@@ -1960,10 +2124,14 @@ 
 
 			// If something is unapproved we'll note it so we can sort them.
 			if (!$attachment['approved'])
-				$have_unapproved = true;
+			{
+							$have_unapproved = true;
+			}
 
 			if (!$attachmentData[$i]['is_image'])
-				continue;
+			{
+							continue;
+			}
 
 			$attachmentData[$i]['real_width'] = $attachment['width'];
 			$attachmentData[$i]['width'] = $attachment['width'];
@@ -1977,9 +2145,11 @@ 
 				if (empty($attachment['id_thumb'])
 					|| $attachment['thumb_width'] > $modSettings['attachmentThumbWidth']
 					|| $attachment['thumb_height'] > $modSettings['attachmentThumbHeight'])
-					//|| ($attachment['thumb_width'] < $modSettings['attachmentThumbWidth'] && $attachment['thumb_height'] < $modSettings['attachmentThumbHeight']))
+				{
+									//|| ($attachment['thumb_width'] < $modSettings['attachmentThumbWidth'] && $attachment['thumb_height'] < $modSettings['attachmentThumbHeight']))
 				{
 					$filename = getAttachmentFilename($attachment['filename'], $attachment['id_attach'], $attachment['id_folder'], false, $attachment['file_hash']);
+				}
 					$attachment = array_merge($attachment, updateAttachmentThumbnail($filename, $attachment['id_attach'], $id_msg, $attachment['id_thumb'], $attachment['filename']));
 				}
 
@@ -2022,19 +2192,26 @@ 
 				// If the image is too large to show inline, make it a popup.
 				// @todo this needs to be removed or depreciated
 				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height'])))
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
-				else
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				{
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
+				}
+				else {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				}
 			}
 
 			if (!$attachmentData[$i]['thumbnail']['has_thumb'])
-				$attachmentData[$i]['downloads']++;
+			{
+							$attachmentData[$i]['downloads']++;
+			}
 		}
 	}
 
 	// Do we need to instigate a sort?
 	if ($have_unapproved)
-		usort($attachmentData, 'approved_attach_sort');
+	{
+			usort($attachmentData, 'approved_attach_sort');
+	}
 
 	return $attachmentData;
 }
@@ -2050,7 +2227,9 @@ 
 function approved_attach_sort($a, $b)
 {
 	if ($a['is_approved'] == $b['is_approved'])
-		return 0;
+	{
+			return 0;
+	}
 
 	return $a['is_approved'] > $b['is_approved'] ? -1 : 1;
 }
@@ -2096,24 +2275,34 @@ 
 	$clean_name = preg_replace('~\.[\.]+~', '.', $clean_name);
 
 	if (empty($attachment_id) || ($new && empty($modSettings['attachmentEncryptFilenames'])))
-		return $clean_name;
+	{
+			return $clean_name;
+	}
 	elseif ($new)
-		return $enc_name;
+	{
+			return $enc_name;
+	}
 
 	// Are we using multiple directories?
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
 		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		{
+					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		}
 		$path = $modSettings['attachmentUploadDir'][$dir];
 	}
-	else
-		$path = $modSettings['attachmentUploadDir'];
+	else {
+			$path = $modSettings['attachmentUploadDir'];
+	}
 
 	if (file_exists($path . '/' . $enc_name))
-		$filename = $path . '/' . $enc_name;
-	else
-		$filename = $path . '/' . $clean_name;
+	{
+			$filename = $path . '/' . $enc_name;
+	}
+	else {
+			$filename = $path . '/' . $clean_name;
+	}
 
 	return $filename;
 }
@@ -2164,7 +2353,9 @@ 
 
 	// Just make up a nice hash...
 	if ($new)
-		return hash('sha1', hash('md5', $filename . time()) . mt_rand());
+	{
+			return hash('sha1', hash('md5', $filename . time()) . mt_rand());
+	}
 
 	// In case of files from the old system, do a legacy call.
 	if (empty($file_hash))
@@ -2176,11 +2367,14 @@ 
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
 		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		{
+					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		}
 		$path = isset($modSettings['attachmentUploadDir'][$dir]) ? $modSettings['attachmentUploadDir'][$dir] : $modSettings['basedirectory_for_attachments'];
 	}
-	else
-		$path = $modSettings['attachmentUploadDir'];
+	else {
+			$path = $modSettings['attachmentUploadDir'];
+	}
 
 	return $path . '/' . $attachment_id . '_' . $file_hash . '.elk';
 }

sources/subs/Post.subs.php

Braces +171 added lines, -61 removed lines

@@ -82,7 +82,9 @@ 
 
 	// We need to know if the topic is approved. If we're told that's great - if not find out.
 	if (!$modSettings['postmod_active'])
-		$topicOptions['is_approved'] = true;
+	{
+			$topicOptions['is_approved'] = true;
+	}
 	elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
 	{
 		require_once(SUBSDIR . '/Topic.subs.php');
@@ -175,7 +177,9 @@ 
 
 	// Something went wrong creating the message...
 	if (empty($msgOptions['id']))
-		return false;
+	{
+			return false;
+	}
 
 	// What if we want to export new posts out to a CMS?
 	call_integration_hook('integrate_create_post', array($msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters));
@@ -269,21 +273,28 @@ 
 		);
 
 		if ($msgOptions['approved'])
-			$topics_columns = array(
+		{
+					$topics_columns = array(
 				'id_member_updated = {int:poster_id}',
 				'id_last_msg = {int:id_msg}',
 				'num_replies = num_replies + {int:counter_increment}',
 			);
-		else
-			$topics_columns = array(
+		}
+		else {
+					$topics_columns = array(
 				'unapproved_posts = unapproved_posts + {int:counter_increment}',
 			);
+		}
 
 		if ($topicOptions['lock_mode'] !== null)
-			$topics_columns[] = 'locked = {int:locked}';
+		{
+					$topics_columns[] = 'locked = {int:locked}';
+		}
 
 		if ($topicOptions['sticky_mode'] !== null)
-			$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		{
+					$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
 
 		call_integration_hook('integrate_before_modify_topic', array(&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions));
 
@@ -314,7 +325,8 @@ 
 
 	// Increase the number of posts and topics on the board.
 	if ($msgOptions['approved'])
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
 			WHERE id_board = {int:id_board}',
@@ -322,6 +334,7 @@ 
 				'id_board' => $topicOptions['board'],
 			)
 		);
+	}
 	else
 	{
 		$db->query('', '
@@ -378,14 +391,18 @@ 
 	$search = new \ElkArte\Search\Search;
 	$searchAPI = $search->findSearchAPI();
 	if (is_callable(array($searchAPI, 'postCreated')))
-		$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	{
+			$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	// Increase the post counter for the user that created the post.
 	if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved'])
 	{
 		// Are you the one that happened to create this post?
 		if ($user_info['id'] == $posterOptions['id'])
-			$user_info['posts']++;
+		{
+					$user_info['posts']++;
+		}
 
 		require_once(SUBSDIR . '/Members.subs.php');
 		updateMemberData($posterOptions['id'], array('posts' => '+'));
@@ -396,7 +413,9 @@ 
 
 	// Better safe than sorry.
 	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']]))
-		$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	{
+			$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	}
 
 	// Update all the stats so everyone knows about this new topic and message.
 	require_once(SUBSDIR . '/Messages.subs.php');
@@ -404,7 +423,9 @@ 
 
 	// Update the last message on the board assuming it's approved AND the topic is.
 	if ($msgOptions['approved'])
-		updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	{
+			updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	}
 
 	// Alright, done now... we can abort now, I guess... at least this much is done.
 	ignore_user_abort($previous_ignore_user_abort);
@@ -435,13 +456,21 @@ 
 	// This is longer than it has to be, but makes it so we only set/change what we have to.
 	$messages_columns = array();
 	if (isset($posterOptions['name']))
-		$messages_columns['poster_name'] = $posterOptions['name'];
+	{
+			$messages_columns['poster_name'] = $posterOptions['name'];
+	}
 	if (isset($posterOptions['email']))
-		$messages_columns['poster_email'] = $posterOptions['email'];
+	{
+			$messages_columns['poster_email'] = $posterOptions['email'];
+	}
 	if (isset($msgOptions['icon']))
-		$messages_columns['icon'] = $msgOptions['icon'];
+	{
+			$messages_columns['icon'] = $msgOptions['icon'];
+	}
 	if (isset($msgOptions['subject']))
-		$messages_columns['subject'] = $msgOptions['subject'];
+	{
+			$messages_columns['subject'] = $msgOptions['subject'];
+	}
 	if (isset($msgOptions['body']))
 	{
 		$messages_columns['body'] = $msgOptions['body'];
@@ -461,7 +490,9 @@ 
 		$messages_columns['id_msg_modified'] = $modSettings['maxMsgID'];
 	}
 	if (isset($msgOptions['smileys_enabled']))
-		$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	{
+			$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	}
 
 	// Which columns need to be ints?
 	$messageInts = array('modified_time', 'id_msg_modified', 'smileys_enabled');
@@ -479,7 +510,9 @@ 
 
 	// Nothing to do?
 	if (empty($messages_columns))
-		return true;
+	{
+			return true;
+	}
 
 	// Change the post.
 	$db->query('', '
@@ -492,15 +525,23 @@ 
 	$attributes = array();
 	// Lock and or sticky the post.
 	if ($topicOptions['sticky_mode'] !== null)
-		$attributes['is_sticky'] = $topicOptions['sticky_mode'];
+	{
+			$attributes['is_sticky'] = $topicOptions['sticky_mode'];
+	}
 	if ($topicOptions['lock_mode'] !== null)
-		$attributes['locked'] = $topicOptions['lock_mode'];
+	{
+			$attributes['locked'] = $topicOptions['lock_mode'];
+	}
 	if ($topicOptions['poll'] !== null)
-		$attributes['id_poll'] = $topicOptions['poll'];
+	{
+			$attributes['id_poll'] = $topicOptions['poll'];
+	}
 
 	// If anything to do, do it.
 	if (!empty($attributes))
-		setTopicAttribute($topicOptions['id'], $attributes);
+	{
+			setTopicAttribute($topicOptions['id'], $attributes);
+	}
 
 	// Mark the edited post as read.
 	if (!empty($topicOptions['mark_as_read']) && !$user_info['is_guest'])
@@ -531,7 +572,9 @@ 
 	$search = new \ElkArte\Search\Search;
 	$searchAPI = $search->findSearchAPI();
 	if (is_callable(array($searchAPI, 'postModified')))
-		$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	{
+			$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	if (isset($msgOptions['subject']))
 	{
@@ -555,7 +598,9 @@ 
 
 	// Finally, if we are setting the approved state we need to do much more work :(
 	if ($modSettings['postmod_active'] && isset($msgOptions['approved']))
-		approvePosts($msgOptions['id'], $msgOptions['approved']);
+	{
+			approvePosts($msgOptions['id'], $msgOptions['approved']);
+	}
 
 	return true;
 }
@@ -575,10 +620,14 @@ 
 	$db = database();
 
 	if (!is_array($msgs))
-		$msgs = array($msgs);
+	{
+			$msgs = array($msgs);
+	}
 
 	if (empty($msgs))
-		return false;
+	{
+			return false;
+	}
 
 	// May as well start at the beginning, working out *what* we need to change.
 	$request = $db->query('', '
@@ -611,19 +660,23 @@ 
 
 		// Ensure our change array exists already.
 		if (!isset($topic_changes[$row['id_topic']]))
-			$topic_changes[$row['id_topic']] = array(
+		{
+					$topic_changes[$row['id_topic']] = array(
 				'id_last_msg' => $row['id_last_msg'],
 				'approved' => $row['topic_approved'],
 				'replies' => 0,
 				'unapproved_posts' => 0,
 			);
+		}
 		if (!isset($board_changes[$row['id_board']]))
-			$board_changes[$row['id_board']] = array(
+		{
+					$board_changes[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0,
 			);
+		}
 
 		// If it's the first message then the topic state changes!
 		if ($row['id_msg'] == $row['id_first_msg'])
@@ -651,7 +704,8 @@ 
 
 			// This will be a post... but don't notify unless it's not followed by approved ones.
 			if ($row['id_msg'] > $row['id_last_msg'])
-				$notification_posts[$row['id_topic']][] = array(
+			{
+							$notification_posts[$row['id_topic']][] = array(
 					'id' => $row['id_msg'],
 					'body' => $row['body'],
 					'subject' => $row['subject'],
@@ -659,15 +713,20 @@ 
 					'topic' => $row['id_topic'],
 					'signature' => $row['signature'],
 				);
+			}
 		}
 
 		// If this is being approved and id_msg is higher than the current id_last_msg then it changes.
 		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg'])
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		{
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		}
 		// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
 		elseif (!$approve)
-			// Default to the first message and then we'll override in a bit ;)
+		{
+					// Default to the first message and then we'll override in a bit ;)
 			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
+		}
 
 		$topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1;
@@ -675,12 +734,16 @@ 
 
 		// Post count for the user?
 		if ($row['id_member'] && empty($row['count_posts']))
-			$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		{
+					$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		}
 	}
 	$db->free_result($request);
 
 	if (empty($msgs))
-		return;
+	{
+			return;
+	}
 
 	// Now we have the differences make the changes, first the easy one.
 	$db->query('', '
@@ -708,13 +771,16 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		{
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		}
 		$db->free_result($request);
 	}
 
 	// ... next the topics...
 	foreach ($topic_changes as $id => $changes)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}topics
 			SET
 				approved = {int:approved},
@@ -730,10 +796,12 @@ 
 				'id_topic' => $id,
 			)
 		);
+	}
 
 	// ... finally the boards...
 	foreach ($board_changes as $id => $changes)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}boards
 			SET
 				num_posts = num_posts + {int:num_posts},
@@ -749,6 +817,7 @@ 
 				'id_board' => $id,
 			)
 		);
+	}
 
 	// Finally, least importantly, notifications!
 	if ($approve)
@@ -756,10 +825,14 @@ 
 		require_once(SUBSDIR . '/Notification.subs.php');
 
 		if (!empty($notification_topics))
-			sendBoardNotifications($notification_topics);
+		{
+					sendBoardNotifications($notification_topics);
+		}
 
 		if (!empty($notification_posts))
-			sendApprovalNotifications($notification_posts);
+		{
+					sendApprovalNotifications($notification_posts);
+		}
 
 		$db->query('', '
 			DELETE FROM {db_prefix}approval_queue
@@ -776,7 +849,9 @@ 
 	{
 		$msgInserts = array();
 		foreach ($msgs as $msg)
-			$msgInserts[] = array($msg);
+		{
+					$msgInserts[] = array($msg);
+		}
 
 		$db->insert('ignore',
 			'{db_prefix}approval_queue',
@@ -800,7 +875,9 @@ 
 	{
 		require_once(SUBSDIR . '/Members.subs.php');
 		foreach ($member_post_changes as $id_member => $count_change)
-			updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+		{
+					updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+		}
 	}
 
 	return true;
@@ -827,10 +904,14 @@ 
 
 	// Please - let's be sane.
 	if (empty($setboards))
-		return false;
+	{
+			return false;
+	}
 
 	if (!is_array($setboards))
-		$setboards = array($setboards);
+	{
+			$setboards = array($setboards);
+	}
 
 	$lastMsg = array();
 
@@ -850,14 +931,18 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$lastMsg[$row['id_board']] = $row['id_msg'];
+		{
+					$lastMsg[$row['id_board']] = $row['id_msg'];
+		}
 		$db->free_result($request);
 	}
 	else
 	{
 		// Just to note - there should only be one board passed if we are doing this.
 		foreach ($setboards as $id_board)
-			$lastMsg[$id_board] = $id_msg;
+		{
+					$lastMsg[$id_board] = $id_msg;
+		}
 	}
 
 	$parent_boards = array();
@@ -875,9 +960,12 @@ 
 		}
 
 		if (!empty($board) && $id_board == $board)
-			$parents = $board_info['parent_boards'];
-		else
-			$parents = getBoardParents($id_board);
+		{
+					$parents = $board_info['parent_boards'];
+		}
+		else {
+					$parents = getBoardParents($id_board);
+		}
 
 		// Ignore any parents on the top child level.
 		foreach ($parents as $id => $parent)
@@ -886,9 +974,13 @@ 
 			{
 				// If we're already doing this one as a board, is this a higher last modified?
 				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id])
-					$lastModified[$id] = $lastModified[$id_board];
+				{
+									$lastModified[$id] = $lastModified[$id_board];
+				}
 				elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board]))
-					$parent_boards[$id] = $lastModified[$id_board];
+				{
+									$parent_boards[$id] = $lastModified[$id_board];
+				}
 			}
 		}
 	}
@@ -902,22 +994,28 @@ 
 	foreach ($parent_boards as $id => $msg)
 	{
 		if (!isset($parent_updates[$msg]))
-			$parent_updates[$msg] = array($id);
-		else
-			$parent_updates[$msg][] = $id;
+		{
+					$parent_updates[$msg] = array($id);
+		}
+		else {
+					$parent_updates[$msg][] = $id;
+		}
 	}
 
 	foreach ($lastMsg as $id => $msg)
 	{
 		if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		{
+					$board_updates[$msg . '-' . $lastModified[$id]] = array(
 				'id' => $msg,
 				'updated' => $lastModified[$id],
 				'boards' => array($id)
 			);
+		}
 
-		else
-			$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		else {
+					$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		}
 	}
 
 	// Now commit the changes!
@@ -980,7 +1078,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		return array();
+	{
+			return array();
+	}
 	$row = $db->fetch_assoc($request);
 	$db->free_result($request);
 
@@ -1044,14 +1144,18 @@ 
 
 			// The message they were trying to edit was most likely deleted.
 			if ($message === false)
-				return false;
+			{
+							return false;
+			}
 
 			$errors = checkMessagePermissions($message['message']);
 
 			prepareMessageContext($message);
 
 			if (!empty($errors))
-				$message['errors'] = $errors;
+			{
+							$message['errors'] = $errors;
+			}
 
 			return $message;
 		// Posting a quoted reply?
@@ -1074,14 +1178,18 @@ 
 				)
 			);
 			if ($db->num_rows($request) == 0)
-				throw new Elk_Exception('quoted_post_deleted', false);
+			{
+							throw new Elk_Exception('quoted_post_deleted', false);
+			}
 			list ($form_subject, $mname, $mdate, $form_message) = $db->fetch_row($request);
 			$db->free_result($request);
 
 			// Add 'Re: ' to the front of the quoted subject.
 			$response_prefix = response_prefix();
 			if (trim($response_prefix) != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
-				$form_subject = $response_prefix . $form_subject;
+			{
+							$form_subject = $response_prefix . $form_subject;
+			}
 
 			// Censor the message and subject.
 			$form_message = censor($form_message);
@@ -1102,7 +1210,9 @@ 
 			// Add 'Re: ' to the front of the subject.
 			$response_prefix = response_prefix();
 			if (trim($response_prefix) != '' && $form_subject != '' && Util::strpos($form_subject, trim($response_prefix)) !== 0)
-				$form_subject = $response_prefix . $form_subject;
+			{
+							$form_subject = $response_prefix . $form_subject;
+			}
 
 			// Censor the subject.
 			$form_subject = censor($form_subject);

sources/subs/UnZip.class.php

Braces +93 added lines, -35 removed lines

@@ -140,7 +140,9 @@ 
 
 		// This function sorta needs gzinflate!
 		if (!function_exists('gzinflate'))
-			throw new Elk_Exception('package_no_zlib', 'critical');
+		{
+					throw new Elk_Exception('package_no_zlib', 'critical');
+		}
 
 		// Make sure we have this loaded.
 		loadLanguage('Packages');
@@ -151,7 +153,9 @@ 
 		// The destination needs exist and be writable or we are doomed
 		umask(0);
 		if ($this->destination !== null && !file_exists($this->destination) && !$this->single_file)
-			mktree($this->destination, 0777);
+		{
+					mktree($this->destination, 0777);
+		}
 	}
 
 	/**
@@ -163,7 +167,9 @@ 
 	{
 		// Make sure we have a zip file
 		if ($this->check_valid_zip() === false)
-			return false;
+		{
+					return false;
+		}
 
 		// The overall zip information for this archive
 		$this->_read_endof_cdr();
@@ -173,23 +179,32 @@ 
 
 		// Load the file list from the central directory record
 		if ($this->_load_file_headers() === false)
-			return false;
+		{
+					return false;
+		}
 
 		// The file records in the CDR point to the files location in the archive
 		$this->_process_files();
 
 		// Looking for a single file and this is it
 		if ($this->_found && $this->single_file)
-			return $this->_crc_check ? $this->_found : false;
+		{
+					return $this->_crc_check ? $this->_found : false;
+		}
 
 		// Wanted many files then we need to clean up
 		if ($this->destination !== null && !$this->single_file)
-			package_flush_cache();
+		{
+					package_flush_cache();
+		}
 
 		if ($this->single_file)
-			return false;
-		else
-			return $this->return;
+		{
+					return false;
+		}
+		else {
+					return $this->return;
+		}
 	}
 
 	/**
@@ -201,7 +216,9 @@ 
 	{
 		// No signature?
 		if (strlen($this->data) < 10)
-			return false;
+		{
+					return false;
+		}
 
 		// Look for an end of central directory signature 0x06054b50
 		$check = explode("\x50\x4b\x05\x06", $this->data);
@@ -280,7 +297,9 @@ 
 			// Extract all file standard length information for this record, its the 42 bytes following the signature
 			$temp = unpack('vversion/vversion_needed/vgeneral_purpose/vcompress_method/vfile_time/vfile_date/Vcrc/Vcompressed_size/Vsize/vfilename_length/vextra_field_length/vcomment_length/vdisk_number_start/vinternal_attributes/vexternal_attributes1/vexternal_attributes2/Vrelative_offset', substr($this->_data_cdr, $pointer + 4, 42));
 			if ($temp === false)
-				return false;
+			{
+							return false;
+			}
 
 			// Extract the variable length data, filename, etc
 			$pointer = $pointer + 46;
@@ -298,7 +317,9 @@ 
 
 		// Sections and count from the signature must match or the zip file is bad
 		if ($i !== $this->_zip_info['files'])
-			return false;
+		{
+					return false;
+		}
 	}
 
 	/**
@@ -323,10 +344,13 @@ 
 
 			// Validate we are at a local file header '\x50\x4b\x03\x04'
 			if (substr($this->_file_info['data'], 0, 4) === "\x50\x4b\x03\x04")
-				$this->_read_local_header();
+			{
+							$this->_read_local_header();
+			}
 			// Something is probably wrong with the archive, like the 70's
-			else
-				continue;
+			else {
+							continue;
+			}
 
 			// Check if the gp flag requires us to make any adjustments
 			$this->_check_general_purpose_flag();
@@ -335,12 +359,17 @@ 
 			if (!empty($this->_file_info['compress_method']) || ($this->_file_info['compressed_size'] != $this->_file_info['size']))
 			{
 				if ($this->_file_info['compress_method'] == 8)
-					$this->_file_info['data'] = @gzinflate($this->_file_info['compress_data'], $this->_file_info['size']);
+				{
+									$this->_file_info['data'] = @gzinflate($this->_file_info['compress_data'], $this->_file_info['size']);
+				}
 				elseif ($this->_file_info['compress_method'] == 12 && function_exists('bzdecompress'))
-					$this->_file_info['data'] = bzdecompress($this->_file_info['compress_data']);
+				{
+									$this->_file_info['data'] = bzdecompress($this->_file_info['compress_data']);
+				}
+			}
+			else {
+							$this->_file_info['data'] = $this->_file_info['compress_data'];
 			}
-			else
-				$this->_file_info['data'] = $this->_file_info['compress_data'];
 
 			// Okay!  We can write this file, looks good from here...
 			if ($this->_write_this && $this->destination !== null)
@@ -348,10 +377,14 @@ 
 				$this->_write_this_file();
 
 				if ($this->_skip)
-					continue;
+				{
+									continue;
+				}
 
 				if ($this->_found)
-					return;
+				{
+									return;
+				}
 			}
 
 			// Not a directory, add it to our results
@@ -411,10 +444,14 @@ 
 	{
 		// If this is a file, and it doesn't exist.... happy days!
 		if (substr($this->_filename, -1) !== '/' && !file_exists($this->destination . '/' . $this->_filename))
-			$this->_write_this = true;
+		{
+					$this->_write_this = true;
+		}
 		// If the file exists, we may not want to overwrite it.
 		elseif (substr($this->_filename, -1) !== '/')
-			$this->_write_this = $this->overwrite;
+		{
+					$this->_write_this = $this->overwrite;
+		}
 		// This is a directory, so we're gonna want to create it. (probably...)
 		elseif ($this->destination !== null && !$this->single_file)
 		{
@@ -422,11 +459,14 @@ 
 			$this->_filename = strtr($this->_filename, array('../' => '', '/..' => ''));
 
 			if (!file_exists($this->destination . '/' . $this->_filename))
-				mktree($this->destination . '/' . $this->_filename, 0777);
+			{
+							mktree($this->destination . '/' . $this->_filename, 0777);
+			}
 			$this->_write_this = false;
 		}
-		else
-			$this->_write_this = false;
+		else {
+					$this->_write_this = false;
+		}
 	}
 
 	/**
@@ -442,26 +482,40 @@ 
 
 		// A directory may need to be created
 		if ((strpos($this->_filename, '/') !== false && !$this->single_file) || (!$this->single_file && !is_dir($this->_file_info['dir'])))
-			mktree($this->_file_info['dir'], 0777);
+		{
+					mktree($this->_file_info['dir'], 0777);
+		}
 
 		// If we're looking for a **specific file**, and this is it... ka-bam, baby.
 		if ($this->single_file && ($this->destination === $this->_filename || $this->destination === '*/' . basename($this->_filename)))
-			$this->_found = $this->_file_info['data'];
+		{
+					$this->_found = $this->_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 ($this->single_file)
-			$this->_skip = true;
+		{
+					$this->_skip = true;
+		}
 		// Don't really want this file?
 		elseif ($this->files_to_extract !== null && !in_array($this->_filename, $this->files_to_extract))
-			$this->_skip = true;
+		{
+					$this->_skip = true;
+		}
 
 		// Write it out then
 		if ($this->_skip === true)
-			return;
+		{
+					return;
+		}
 		elseif (!empty($this->_found))
-			$this->_check_crc();
+		{
+					$this->_check_crc();
+		}
 		elseif ($this->_skip === false && $this->_found === false && $this->_check_crc())
-			package_put_contents($this->destination . '/' . $this->_filename, $this->_file_info['data']);
+		{
+					package_put_contents($this->destination . '/' . $this->_filename, $this->_file_info['data']);
+		}
 	}
 
 	/**
@@ -487,7 +541,9 @@ 
 	{
 		// If bit 1 is set the file is encrypted so empty it instead of writing out gibberish
 		if ($this->_file_info['general_purpose'] & 0x0001)
-			$this->_file_info['data'] = '';
+		{
+					$this->_file_info['data'] = '';
+		}
 
 		// See if bit 3 is set
 		if ($this->_file_info['general_purpose'] & 0x0008)
@@ -497,7 +553,9 @@ 
 
 			// The spec allows for an optional header in the general purpose record
 			if (substr($general_purpose, 0, 4) === "\x50\x4b\x07\x08")
-				$general_purpose = substr($general_purpose, 4);
+			{
+							$general_purpose = substr($general_purpose, 4);
+			}
 
 			// These values should be what's in the CDR record per spec
 			$general_purpose_data = unpack('Vcrc/Vcompressed_size/Vsize', $general_purpose);

sources/subs/ManageSearch.subs.php

Braces +27 added lines, -10 removed lines

@@ -131,7 +131,9 @@ 
 
 	// Set up to output a file to the users browser
 	while (ob_get_level() > 0)
-		@ob_end_clean();
+	{
+			@ob_end_clean();
+	}
 
 	header('Content-Encoding: none');
 	header('Pragma: no-cache');
@@ -349,11 +351,15 @@ 
 
 		// Temporarily switch back to not using a search index.
 		if (!empty($modSettings['search_index']) && $modSettings['search_index'] === 'custom')
-			updateSettings(array('search_index' => ''));
+		{
+					updateSettings(array('search_index' => ''));
+		}
 
 		// Don't let simultaneous processes be updating the search index.
 		if (!empty($modSettings['search_custom_index_config']))
-			updateSettings(array('search_custom_index_config' => ''));
+		{
+					updateSettings(array('search_custom_index_config' => ''));
+		}
 	}
 
 	$num_messages = array(
@@ -370,7 +376,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+	{
+			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+	}
 
 	// Done with indexing the messages, on to the next step
 	if (empty($num_messages['todo']))
@@ -411,7 +419,9 @@ 
 
 				$number_processed++;
 				foreach (text2words($row['body'], $index_settings['bytes_per_word'], true) as $id_word)
-					$inserts[] = array($id_word, $row['id_msg']);
+				{
+									$inserts[] = array($id_word, $row['id_msg']);
+				}
 			}
 			$num_messages['done'] += $number_processed;
 			$num_messages['todo'] -= $number_processed;
@@ -420,12 +430,14 @@ 
 			$start += $forced_break ? $number_processed : $messages_per_batch;
 
 			if (!empty($inserts))
-				$db->insert('ignore',
+			{
+							$db->insert('ignore',
 					'{db_prefix}log_search_words',
 					array('id_word' => 'int', 'id_msg' => 'int'),
 					$inserts,
 					array('id_word', 'id_msg')
 				);
+			}
 
 			// Done then set up for the next step, set up for the next loop.
 			if ($num_messages['todo'] === 0)
@@ -434,8 +446,9 @@ 
 				$start = 0;
 				break;
 			}
-			else
-				updateSettings(array('search_custom_index_resume' => serialize(array_merge($index_settings, array('resume_at' => $start)))));
+			else {
+							updateSettings(array('search_custom_index_resume' => serialize(array_merge($index_settings, array('resume_at' => $start)))));
+			}
 		}
 
 		// Since there are still steps to go, 80% is the maximum here.
@@ -478,19 +491,23 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$stop_words[] = $row['id_word'];
+		{
+					$stop_words[] = $row['id_word'];
+		}
 		$db->free_result($request);
 
 		updateSettings(array('search_stopwords' => implode(',', $stop_words)));
 
 		if (!empty($stop_words))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}log_search_words
 				WHERE id_word in ({array_int:stop_words})',
 				array(
 					'stop_words' => $stop_words,
 				)
 			);
+		}
 
 		$start += $column_definition['step_size'];
 		if ($start > $column_definition['max_size'])

sources/subs/Calendar.subs.php

Braces +150 added lines, -59 removed lines

@@ -65,9 +65,12 @@ 
 	while ($row = $db->fetch_assoc($result))
 	{
 		if ($year_low != $year_high)
-			$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
-		else
-			$age_year = $year_low;
+		{
+					$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
+		}
+		else {
+					$age_year = $year_low;
+		}
 
 		$bday[$age_year . substr($row['birthdate'], 4)][] = array(
 			'id' => $row['id_member'],
@@ -80,7 +83,9 @@ 
 
 	// Set is_last, so the themes know when to stop placing separators.
 	foreach ($bday as $mday => $array)
-		$bday[$mday][count($array) - 1]['is_last'] = true;
+	{
+			$bday[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	return $bday;
 }
@@ -137,7 +142,9 @@ 
 	{
 		// If the attached topic is not approved then for the moment pretend it doesn't exist
 		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved'])
-			continue;
+		{
+					continue;
+		}
 
 		// Force a censor of the title - as often these are used by others.
 		$row['title'] = censor($row['title'], $use_permissions ? false : true);
@@ -153,12 +160,15 @@ 
 			// Attempt to avoid DST problems.
 			// @todo Resolve this properly at some point.
 			if (Util::strftime('%Y-%m-%d', $date) == $lastDate)
-				$date += 3601;
+			{
+							$date += 3601;
+			}
 			$lastDate = Util::strftime('%Y-%m-%d', $date);
 
 			// If we're using permissions (calendar pages?) then just ouput normal contextual style information.
 			if ($use_permissions)
-				$events[Util::strftime('%Y-%m-%d', $date)][] = array(
+			{
+							$events[Util::strftime('%Y-%m-%d', $date)][] = array(
 					'id' => $row['id_event'],
 					'title' => $row['title'],
 					'start_date' => $row['start_date'],
@@ -173,9 +183,10 @@ 
 					'can_export' => !empty($modSettings['cal_export']) ? true : false,
 					'export_href' => $scripturl . '?action=calendar;sa=ical;eventid=' . $row['id_event'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				);
+			}
 			// Otherwise, this is going to be cached and the VIEWER'S permissions should apply... just put together some info.
-			else
-				$events[Util::strftime('%Y-%m-%d', $date)][] = array(
+			else {
+							$events[Util::strftime('%Y-%m-%d', $date)][] = array(
 					'id' => $row['id_event'],
 					'title' => $row['title'],
 					'start_date' => $row['start_date'],
@@ -192,6 +203,7 @@ 
 					'poster' => $row['id_member'],
 					'allowed_groups' => explode(',', $row['member_groups']),
 				);
+			}
 		}
 	}
 	$db->free_result($result);
@@ -200,7 +212,9 @@ 
 	if ($use_permissions)
 	{
 		foreach ($events as $mday => $array)
-			$events[$mday][count($array) - 1]['is_last'] = true;
+		{
+					$events[$mday][count($array) - 1]['is_last'] = true;
+		}
 	}
 
 	return $events;
@@ -220,10 +234,13 @@ 
 
 	// Get the lowest and highest dates for "all years".
 	if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
+	{
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
 			OR event_date BETWEEN {date:all_year_jan} AND {date:all_year_high}';
-	else
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	}
+	else {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	}
 
 	// Find some holidays... ;).
 	$result = $db->query('', '
@@ -244,9 +261,12 @@ 
 	while ($row = $db->fetch_assoc($result))
 	{
 		if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-			$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
-		else
-			$event_year = substr($low_date, 0, 4);
+		{
+					$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
+		}
+		else {
+					$event_year = substr($low_date, 0, 4);
+		}
 
 		$holidays[$event_year . substr($row['event_date'], 4)][] = $row['title'];
 	}
@@ -277,9 +297,13 @@ 
 
 	// No board?  No topic?!?
 	if (empty($board))
-		throw new Elk_Exception('missing_board_id', false);
+	{
+			throw new Elk_Exception('missing_board_id', false);
+	}
 	if (empty($topic))
-		throw new Elk_Exception('missing_topic_id', false);
+	{
+			throw new Elk_Exception('missing_topic_id', false);
+	}
 
 	// Administrator, Moderator, or owner.  Period.
 	if (!allowedTo('admin_forum') && !allowedTo('moderate_board'))
@@ -290,11 +314,14 @@ 
 		{
 			// Not the owner of the topic.
 			if ($row['id_member_started'] != $user_info['id'])
-				throw new Elk_Exception('not_your_topic', 'user');
+			{
+							throw new Elk_Exception('not_your_topic', 'user');
+			}
 		}
 		// Topic/Board doesn't exist.....
-		else
-			throw new Elk_Exception('calendar_no_topic', 'general');
+		else {
+					throw new Elk_Exception('calendar_no_topic', 'general');
+		}
 	}
 }
 
@@ -379,13 +406,17 @@ 
 	{
 		$nShift -= $calendarOptions['start_day'];
 		if ($nShift < 0)
-			$nShift = 7 + $nShift;
+		{
+					$nShift = 7 + $nShift;
+		}
 	}
 
 	// Number of rows required to fit the month.
 	$nRows = floor(($month_info['last_day']['day_of_month'] + $nShift) / 7);
 	if (($month_info['last_day']['day_of_month'] + $nShift) % 7)
-		$nRows++;
+	{
+			$nRows++;
+	}
 
 	// Fetch the arrays for birthdays, posted events, and holidays.
 	$bday = $calendarOptions['show_birthdays'] ? getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
@@ -399,7 +430,9 @@ 
 		$calendarGrid['week_days'][] = $count;
 		$count++;
 		if ($count == 7)
-			$count = 0;
+		{
+					$count = 0;
+		}
 	}
 
 	// An adjustment value to apply to all calculated week numbers.
@@ -410,7 +443,9 @@ 
 		// a Sunday, then there is a partial week at the start of the year
 		// that needs to be accounted for.
 		if ($calendarOptions['start_day'] === 0)
-			$nWeekAdjust = $month_info['first_day_of_year'] === 0 ? 0 : 1;
+		{
+					$nWeekAdjust = $month_info['first_day_of_year'] === 0 ? 0 : 1;
+		}
 		// If we are viewing the weeks, with a starting date other than Sunday,
 		// then things get complicated! Basically, as PHP is calculating the
 		// weeks with a Sunday starting date, we need to take this into account
@@ -418,18 +453,22 @@ 
 		// year is above or below our starting date. Note that we offset by
 		// two, as some of this will get undone quite quickly by the statement
 		// below.
-		else
-			$nWeekAdjust = $calendarOptions['start_day'] > $month_info['first_day_of_year'] && $month_info['first_day_of_year'] !== 0 ? 2 : 1;
+		else {
+					$nWeekAdjust = $calendarOptions['start_day'] > $month_info['first_day_of_year'] && $month_info['first_day_of_year'] !== 0 ? 2 : 1;
+		}
 
 		// If our week starts on a day greater than the day the month starts
 		// on, then our week numbers will be one too high. So we need to
 		// reduce it by one - all these thoughts of offsets makes my head
 		// hurt...
 		if ($month_info['first_day']['day_of_week'] < $calendarOptions['start_day'] || $month_info['first_day_of_year'] > 4)
-			$nWeekAdjust--;
+		{
+					$nWeekAdjust--;
+		}
+	}
+	else {
+			$nWeekAdjust = 0;
 	}
-	else
-		$nWeekAdjust = 0;
 
 	// Iterate through each week.
 	$calendarGrid['weeks'] = array();
@@ -443,7 +482,9 @@ 
 
 		// Handle the dreaded "week 53", it can happen, but only once in a blue moon ;)
 		if ($calendarGrid['weeks'][$nRow]['number'] == 53 && $nShift != 4 && $month_info['first_day_of_next_year'] < 4)
-			$calendarGrid['weeks'][$nRow]['number'] = 1;
+		{
+					$calendarGrid['weeks'][$nRow]['number'] = 1;
+		}
 
 		// And figure out all the days.
 		for ($nCol = 0; $nCol < 7; $nCol++)
@@ -451,7 +492,9 @@ 
 			$nDay = ($nRow * 7) + $nCol - $nShift + 1;
 
 			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month'])
-				$nDay = 0;
+			{
+							$nDay = 0;
+			}
 
 			$date = sprintf('%04d-%02d-%02d', $year, $month, $nDay);
 
@@ -499,7 +542,9 @@ 
 		// Here we offset accordingly to get things to the real start of a week.
 		$date_diff = $day_of_week - $calendarOptions['start_day'];
 		if ($date_diff < 0)
-			$date_diff += 7;
+		{
+					$date_diff += 7;
+		}
 		$new_timestamp = mktime(0, 0, 0, $month, $day, $year) - $date_diff * 86400;
 		$day = (int) Util::strftime('%d', $new_timestamp);
 		$month = (int) Util::strftime('%m', $new_timestamp);
@@ -545,15 +590,20 @@ 
 
 		// All this is as getCalendarGrid.
 		if ($calendarOptions['start_day'] === 0)
-			$nWeekAdjust = $first_day_of_year === 0 && $first_day_of_year > 3 ? 0 : 1;
-		else
-			$nWeekAdjust = $calendarOptions['start_day'] > $first_day_of_year && $first_day_of_year !== 0 ? 2 : 1;
+		{
+					$nWeekAdjust = $first_day_of_year === 0 && $first_day_of_year > 3 ? 0 : 1;
+		}
+		else {
+					$nWeekAdjust = $calendarOptions['start_day'] > $first_day_of_year && $first_day_of_year !== 0 ? 2 : 1;
+		}
 
 		$calendarGrid['week_number'] = (int) Util::strftime('%U', mktime(0, 0, 0, $month, $day, $year)) + $nWeekAdjust;
 
 		// If this crosses a year boundary and includes january it should be week one.
 		if ((int) Util::strftime('%Y', $curTimestamp + 518400) != $year && $calendarGrid['week_number'] > 53 && $first_day_of_next_year < 5)
-			$calendarGrid['week_number'] = 1;
+		{
+					$calendarGrid['week_number'] = 1;
+		}
 	}
 
 	// This holds all the main data - there is at least one month!
@@ -668,7 +718,9 @@ 
 	for ($i = $now; $i < $now + $days_for_index; $i += 86400)
 	{
 		if (isset($cached_data['holidays'][Util::strftime('%Y-%m-%d', $i)]))
-			$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][Util::strftime('%Y-%m-%d', $i)]);
+		{
+					$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][Util::strftime('%Y-%m-%d', $i)]);
+		}
 	}
 
 	// Happy Birthday, guys and gals!
@@ -678,7 +730,9 @@ 
 		if (isset($cached_data['birthdays'][$loop_date]))
 		{
 			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy)
-				$cached_data['birthdays'][Util::strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			{
+							$cached_data['birthdays'][Util::strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			}
 			$return_data['calendar_birthdays'] = array_merge($return_data['calendar_birthdays'], $cached_data['birthdays'][$loop_date]);
 		}
 	}
@@ -691,7 +745,9 @@ 
 
 		// No events today? Check the next day.
 		if (empty($cached_data['events'][$loop_date]))
-			continue;
+		{
+					continue;
+		}
 
 		// Loop through all events to add a few last-minute values.
 		foreach ($cached_data['events'][$loop_date] as $ev => $event)
@@ -705,8 +761,9 @@ 
 				unset($cached_data['events'][$loop_date][$ev]);
 				continue;
 			}
-			else
-				$duplicates[$this_event['topic'] . $this_event['title']] = true;
+			else {
+							$duplicates[$this_event['topic'] . $this_event['title']] = true;
+			}
 
 			// Might be set to true afterwards, depending on the permissions.
 			$this_event['can_edit'] = false;
@@ -715,14 +772,20 @@ 
 		}
 
 		if (!empty($cached_data['events'][$loop_date]))
-			$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		{
+					$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		}
 	}
 
 	// Mark the last item so that a list separator can be used in the template.
 	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++)
-		$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
+	{
+			$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
+	}
 	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++)
-		$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	{
+			$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	}
 
 	return array(
 		'data' => $return_data,
@@ -781,7 +844,9 @@ 
 
 	// No results, return false.
 	if ($db->num_rows($request) === 0)
-		return false;
+	{
+			return false;
+	}
 
 	// Grab the results and return.
 	list ($poster) = $db->fetch_row($request);
@@ -818,11 +883,15 @@ 
 	$month = '';
 	$day = '';
 	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3)
-		trigger_error('insertEvent(): invalid start date format given', E_USER_ERROR);
+	{
+			trigger_error('insertEvent(): invalid start date format given', E_USER_ERROR);
+	}
 
 	// Set the end date (if not yet given)
 	if (!isset($eventOptions['end_date']))
-		$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	{
+			$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	}
 
 	// If no topic and board are given, they are not linked to a topic.
 	$eventOptions['id_board'] = isset($eventOptions['id_board']) ? (int) $eventOptions['id_board'] : 0;
@@ -878,14 +947,18 @@ 
 	$month = '';
 	$day = '';
 	if (($num_results = sscanf($eventOptions['start_date'], '%d-%d-%d', $year, $month, $day)) !== 3)
-		trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	{
+			trigger_error('modifyEvent(): invalid start date format given', E_USER_ERROR);
+	}
 
 	// Default span to 0 days.
 	$eventOptions['span'] = isset($eventOptions['span']) ? (int) $eventOptions['span'] : 0;
 
 	// Set the end date to the start date + span (if the end date wasn't already given).
 	if (!isset($eventOptions['end_date']))
-		$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	{
+			$eventOptions['end_date'] = Util::strftime('%Y-%m-%d', mktime(0, 0, 0, $month, $day, $year) + $eventOptions['span'] * 86400);
+	}
 
 	$event_columns = array(
 		'start_date' => 'start_date = {date:start_date}',
@@ -901,11 +974,15 @@ 
 
 	$to_update = array();
 	foreach ($event_columns as $key => $value)
-		if (isset($eventOptions[$key]))
+	{
+			if (isset($eventOptions[$key]))
 			$to_update[] = $value;
+	}
 
 	if (empty($to_update))
-		return;
+	{
+			return;
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}calendar
@@ -979,13 +1056,17 @@ 
 
 	// If nothing returned, we are in poo, poo.
 	if ($db->num_rows($request) === 0)
-		return false;
+	{
+			return false;
+	}
 
 	$row = $db->fetch_assoc($request);
 	$db->free_result($request);
 
 	if ($calendar_only)
-		$return_value = $row;
+	{
+			$return_value = $row;
+	}
 	else
 	{
 		$return_value = array(
@@ -1094,7 +1175,9 @@ 
 	$db = database();
 
 	if (!is_array($holiday_ids))
-		$holiday_ids = array($holiday_ids);
+	{
+			$holiday_ids = array($holiday_ids);
+	}
 
 	$db->query('', '
 		DELETE FROM {db_prefix}calendar_holidays
@@ -1185,13 +1268,15 @@ 
 			)
 		);
 	while ($row = $db->fetch_assoc($request))
-		$holiday = array(
+	{
+			$holiday = array(
 			'id' => $row['id_holiday'],
 			'day' => $row['day'],
 			'month' => $row['month'],
 			'year' => $row['year'] <= 4 ? 0 : $row['year'],
 			'title' => $row['title']
 		);
+	}
 	$db->free_result($request);
 
 	return $holiday;
@@ -1219,7 +1304,9 @@ 
 	foreach ($title as $id => $line)
 	{
 		if ($id != 0)
-			$title[$id] = ' ' . $title[$id];
+		{
+					$title[$id] = ' ' . $title[$id];
+		}
 		$title[$id] .= "\n";
 	}
 
@@ -1248,11 +1335,15 @@ 
 
 	// more than one day
 	if ($event['span'] > 1)
-		$filecontents .= 'DTEND;VALUE=DATE:' . $dateend . "\n";
+	{
+			$filecontents .= 'DTEND;VALUE=DATE:' . $dateend . "\n";
+	}
 
 	// event has changed? advance the sequence for this UID
 	if ($event['sequence'] > 0)
-		$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	{
+			$filecontents .= 'SEQUENCE:' . $event['sequence'] . "\n";
+	}
 
 	$filecontents .= 'SUMMARY:' . implode('', $title);
 	$filecontents .= 'UID:' . $event['eventid'] . '@' . str_replace(' ', '-', $mbname) . "\n";

sources/subs/SearchEngines.subs.php

Braces +86 added lines, -33 removed lines

@@ -28,7 +28,9 @@ 
 	$db = database();
 
 	if (isset($_SESSION['id_robot']))
-		unset($_SESSION['id_robot']);
+	{
+			unset($_SESSION['id_robot']);
+	}
 
 	$_SESSION['robot_check'] = time();
 
@@ -45,7 +47,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$spider_data[] = $row;
+		{
+					$spider_data[] = $row;
+		}
 		$db->free_result($request);
 
 		// Save it in the cache
@@ -53,23 +57,30 @@ 
 	}
 
 	if (empty($spider_data))
-		return false;
+	{
+			return false;
+	}
 
 	// We need the user agent
 	$req = request();
 
 	// Always attempt IPv6 first.
 	if (strpos($_SERVER['REMOTE_ADDR'], ':') !== false)
-		$ip_parts = convertIPv6toInts($_SERVER['REMOTE_ADDR']);
+	{
+			$ip_parts = convertIPv6toInts($_SERVER['REMOTE_ADDR']);
+	}
 	// Then xxx.xxx.xxx.xxx next
-	else
-		preg_match('/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $_SERVER['REMOTE_ADDR'], $ip_parts);
+	else {
+			preg_match('/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $_SERVER['REMOTE_ADDR'], $ip_parts);
+	}
 
 	foreach ($spider_data as $spider)
 	{
 		// User agent is easy.
 		if (!empty($spider['user_agent']) && strpos(strtolower($req->user_agent()), strtolower($spider['user_agent'])) !== false)
-			$_SESSION['id_robot'] = $spider['id_spider'];
+		{
+					$_SESSION['id_robot'] = $spider['id_spider'];
+		}
 		// IP stuff is harder.
 		elseif (!empty($ip_parts))
 		{
@@ -82,21 +93,29 @@ 
 					foreach ($ip as $key => $value)
 					{
 						if ($value['low'] > $ip_parts[$key + 1] || $value['high'] < $ip_parts[$key + 1])
-							break;
+						{
+													break;
+						}
 						elseif (($key == 7 && strpos($_SERVER['REMOTE_ADDR'], ':') !== false) || ($key == 3 && strpos($_SERVER['REMOTE_ADDR'], ':') === false))
-							$_SESSION['id_robot'] = $spider['id_spider'];
+						{
+													$_SESSION['id_robot'] = $spider['id_spider'];
+						}
 					}
 				}
 			}
 		}
 
 		if (isset($_SESSION['id_robot']))
-			break;
+		{
+					break;
+		}
 	}
 
 	// If this is low server tracking then log the spider here as opposed to the main logging function.
 	if (!empty($modSettings['spider_mode']) && $modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot']))
-		logSpider();
+	{
+			logSpider();
+	}
 
 	return !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 }
@@ -113,7 +132,9 @@ 
 	$db = database();
 
 	if (empty($modSettings['spider_mode']) || empty($_SESSION['id_robot']))
-		return;
+	{
+			return;
+	}
 
 	// Attempt to update today's entry.
 	if ($modSettings['spider_mode'] == 1)
@@ -152,13 +173,17 @@ 
 		{
 			$url = $_GET;
 			if (isset($context['session_var']))
-				unset($url['sesc'], $url[$context['session_var']]);
-			else
-				unset($url['sesc']);
+			{
+							unset($url['sesc'], $url[$context['session_var']]);
+			}
+			else {
+							unset($url['sesc']);
+			}
 			$url = serialize($url);
 		}
-		else
-			$url = '';
+		else {
+					$url = '';
+		}
 
 		$db->insert('insert',
 			'{db_prefix}log_spider_hits',
@@ -189,11 +214,15 @@ 
 	);
 	$spider_hits = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_hits[] = $row;
+	{
+			$spider_hits[] = $row;
+	}
 	$db->free_result($request);
 
 	if (empty($spider_hits))
-		return;
+	{
+			return;
+	}
 
 	// Attempt to update the master data.
 	$stat_inserts = array();
@@ -214,17 +243,21 @@ 
 			)
 		);
 		if ($db->affected_rows() == 0)
-			$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		{
+					$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+		}
 	}
 
 	// New stats?
 	if (!empty($stat_inserts))
-		$db->insert('ignore',
+	{
+			$db->insert('ignore',
 			'{db_prefix}log_spider_stats',
 			array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'),
 			$stat_inserts,
 			array('stat_date', 'id_spider')
 		);
+	}
 
 	// All processed.
 	$db->query('', '
@@ -255,7 +288,9 @@ 
 	);
 	$spiders = array();
 	while ($row = $db->fetch_assoc($request))
-		$spiders[$row['id_spider']] = $row['spider_name'];
+	{
+			$spiders[$row['id_spider']] = $row['spider_name'];
+	}
 	$db->free_result($request);
 
 	updateSettings(array('spider_name_cache' => serialize($spiders)));
@@ -306,7 +341,9 @@ 
 	);
 	$spiders = array();
 	while ($row = $db->fetch_assoc($request))
-		$spiders[$row['id_spider']] = $row;
+	{
+			$spiders[$row['id_spider']] = $row;
+	}
 	$db->free_result($request);
 
 	return $spiders;
@@ -386,7 +423,9 @@ 
 	);
 	$spider_logs = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_logs[] = $row;
+	{
+			$spider_logs[] = $row;
+	}
 	$db->free_result($request);
 
 	return $spider_logs;
@@ -440,7 +479,9 @@ 
 	);
 	$spider_stats = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_stats[] = $row;
+	{
+			$spider_stats[] = $row;
+	}
 	$db->free_result($request);
 
 	return $spider_stats;
@@ -564,7 +605,9 @@ 
 
 	$spider_last_seen = array();
 	while ($row = $db->fetch_assoc($request))
-		$spider_last_seen[$row['id_spider']] = $row['last_seen_time'];
+	{
+			$spider_last_seen[$row['id_spider']] = $row['last_seen_time'];
+	}
 	$db->free_result($request);
 
 	return $spider_last_seen;
@@ -600,13 +643,20 @@ 
 	// Prepare the dates for the drop down.
 	$date_choices = array();
 	for ($y = $min_year; $y <= $max_year; $y++)
-		for ($m = 1; $m <= 12; $m++)
+	{
+			for ($m = 1;
+	}
+	$m <= 12; $m++)
 		{
 			// This doesn't count?
 			if ($y == $min_year && $m < $min_month)
-				continue;
+			{
+							continue;
+			}
 			if ($y == $max_year && $m > $max_month)
-				break;
+			{
+							break;
+			}
 
 			$date_choices[$y . $m] = $txt['months_short'][$m] . ' ' . $y;
 		}
@@ -629,7 +679,8 @@ 
 
 	// New spider, insert
 	if (empty($id))
-		$db->insert('insert',
+	{
+			$db->insert('insert',
 			'{db_prefix}spiders',
 			array(
 				'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string',
@@ -639,9 +690,10 @@ 
 			),
 			array('id_spider')
 		);
+	}
 	// Existing spider update
-	else
-		$db->query('', '
+	else {
+			$db->query('', '
 			UPDATE {db_prefix}spiders
 			SET spider_name = {string:spider_name}, user_agent = {string:spider_agent},
 				ip_info = {string:ip_info}
@@ -653,4 +705,5 @@ 
 				'ip_info' => $info_ip,
 			)
 		);
-}
\ No newline at end of file
+	}
+	}
\ No newline at end of file

sources/subs/Profile.subs.php

Braces +524 added lines, -199 removed lines

@@ -31,17 +31,24 @@ 
 
 	// If we already know who we're dealing with
 	if (isset($memID) && !$reload_id)
-		return $memID;
+	{
+			return $memID;
+	}
 
 	// Did we get the user by name...
 	if (isset($_REQUEST['user']))
-		$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	{
+			$memberResult = loadMemberData($_REQUEST['user'], true, 'profile');
+	}
 	// ... or by id_member?
 	elseif (!empty($_REQUEST['u']))
-		$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	{
+			$memberResult = loadMemberData((int) $_REQUEST['u'], false, 'profile');
+	}
 	// If it was just ?action=profile, edit your own profile.
-	else
-		$memberResult = loadMemberData($user_info['id'], false, 'profile');
+	else {
+			$memberResult = loadMemberData($user_info['id'], false, 'profile');
+	}
 
 	// Check if loadMemberData() has returned a valid result.
 	if (!is_array($memberResult))
@@ -50,9 +57,12 @@ 
 		is_not_guest('', $fatal);
 
 		if ($fatal)
-			throw new Elk_Exception('not_a_user', false);
-		else
-			return false;
+		{
+					throw new Elk_Exception('not_a_user', false);
+		}
+		else {
+					return false;
+		}
 	}
 
 	// If all went well, we have a valid member ID!
@@ -72,15 +82,19 @@ 
 	global $profile_fields, $context, $cur_profile, $txt;
 
 	if (!empty($hook))
-		call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	{
+			call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	}
 
 	// Make sure we have this!
 	loadProfileFields(true);
 
 	// First check for any linked sets.
 	foreach ($profile_fields as $key => $field)
-		if (isset($field['link_with']) && in_array($field['link_with'], $fields))
+	{
+			if (isset($field['link_with']) && in_array($field['link_with'], $fields))
 			$fields[] = $key;
+	}
 
 	// Some default bits.
 	$context['profile_prehtml'] = '';
@@ -98,17 +112,23 @@ 
 
 			// Does it have a preload and does that preload succeed?
 			if (isset($cur_field['preload']) && !$cur_field['preload']())
-				continue;
+			{
+							continue;
+			}
 
 			// If this is anything but complex we need to do more cleaning!
 			if ($cur_field['type'] !== 'callback' && $cur_field['type'] !== 'hidden')
 			{
 				if (!isset($cur_field['label']))
-					$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				{
+									$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				}
 
 				// Everything has a value!
 				if (!isset($cur_field['value']))
-					$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				{
+									$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				}
 
 				// Any input attributes?
 				$cur_field['input_attr'] = !empty($cur_field['input_attr']) ? implode(',', $cur_field['input_attr']) : '';
@@ -116,21 +136,33 @@ 
 
 			// Was there an error with this field on posting?
 			if (isset($context['post_errors'][$field]))
-				$cur_field['is_error'] = true;
+			{
+							$cur_field['is_error'] = true;
+			}
 
 			// Any javascript stuff?
 			if (!empty($cur_field['js_submit']))
-				$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+			{
+							$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+			}
 			if (!empty($cur_field['js']))
-				addInlineJavascript($cur_field['js']);
+			{
+							addInlineJavascript($cur_field['js']);
+			}
 			if (!empty($cur_field['js_load']))
-				loadJavascriptFile($cur_field['js_load']);
+			{
+							loadJavascriptFile($cur_field['js_load']);
+			}
 
 			// Any template stuff?
 			if (!empty($cur_field['prehtml']))
-				$context['profile_prehtml'] .= $cur_field['prehtml'];
+			{
+							$context['profile_prehtml'] .= $cur_field['prehtml'];
+			}
 			if (!empty($cur_field['posthtml']))
-				$context['profile_posthtml'] .= $cur_field['posthtml'];
+			{
+							$context['profile_posthtml'] .= $cur_field['posthtml'];
+			}
 
 			// Finally put it into context?
 			if ($cur_field['type'] !== 'hidden')
@@ -171,15 +203,22 @@ 
 	{
 		// If it's the owner they can see two types of private fields, regardless.
 		if ($memID == $user_info['id'])
-			$where .= $area === 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
-		else
-			$where .= $area === 'summary' ? ' AND private < 2' : ' AND private = 0';
+		{
+					$where .= $area === 'summary' ? ' AND private < 3' : ' AND (private = 0 OR private = 2)';
+		}
+		else {
+					$where .= $area === 'summary' ? ' AND private < 2' : ' AND private = 0';
+		}
 	}
 
 	if ($area === 'register')
-		$where .= ' AND show_reg != 0';
+	{
+			$where .= ' AND show_reg != 0';
+	}
 	elseif ($area !== 'summary')
-		$where .= ' AND show_profile = {string:area}';
+	{
+			$where .= ' AND show_profile = {string:area}';
+	}
 
 	// Load all the relevant fields - and data.
 	// The fully-qualified name for rows is here because it's a reserved word in Mariadb 10.2.4+ and quoting would be different for MySQL/Mariadb and PSQL
@@ -274,10 +313,14 @@ 
 
 		// Parse BBCode
 		if ($row['bbc'])
-			$output_html = $bbc_parser->parseCustomFields($output_html);
+		{
+					$output_html = $bbc_parser->parseCustomFields($output_html);
+		}
 		// Allow for newlines at least
 		elseif ($row['field_type'] === 'textarea')
-			$output_html = strtr($output_html, array("\n" => '<br />'));
+		{
+					$output_html = strtr($output_html, array("\n" => '<br />'));
+		}
 
 		// Enclosing the user input within some other text?
 		if (!empty($row['enclose']) && !empty($output_html))
@@ -333,7 +376,9 @@ 
 
 	// Don't load this twice!
 	if (!empty($profile_fields) && !$force_reload)
-		return;
+	{
+			return;
+	}
 
 	/**
 	 * This horrific array defines all the profile fields in the whole world!
@@ -414,12 +459,16 @@ 
 				{
 					// Set to blank?
 					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1)
-						$value = '0001-01-01';
-					else
-						$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					{
+											$value = '0001-01-01';
+					}
+					else {
+											$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					}
+				}
+				else {
+									$value = '0001-01-01';
 				}
-				else
-					$value = '0001-01-01';
 
 				$profile_vars['birthdate'] = $value;
 				$cur_profile['birthdate'] = $value;
@@ -463,9 +512,12 @@ 
 				}
 				// As long as it doesn't equal "N/A"...
 				elseif ($value != $txt['not_applicable'] && $value != strtotime(Util::strftime('%Y-%m-%d', $cur_profile['date_registered'] + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600)))
-					$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
-				else
-					$value = $cur_profile['date_registered'];
+				{
+									$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+				}
+				else {
+									$value = $cur_profile['date_registered'];
+				}
 
 				return true;
 			},
@@ -480,7 +532,9 @@ 
 				global $context, $old_profile, $profile_vars, $modSettings;
 
 				if (strtolower($value) == strtolower($old_profile['email_address']))
-					return false;
+				{
+									return false;
+				}
 
 				$isValid = profileValidateEmail($value, $context['id_member']);
 
@@ -595,7 +649,9 @@ 
 				if (isset($context['profile_languages'][$value]))
 				{
 					if ($context['user']['is_owner'] && empty($context['password_auth_failed']))
-						$_SESSION['language'] = $value;
+					{
+											$_SESSION['language'] = $value;
+					}
 					return true;
 				}
 				else
@@ -641,14 +697,18 @@ 
 
 						// No errors we can proceed normally
 						if (!$errors->hasErrors())
-							updateMemberData($context['id_member'], array('member_name' => $value));
+						{
+													updateMemberData($context['id_member'], array('member_name' => $value));
+						}
 						else
 						{
 							// If there are "important" errors and you are not an admin: log the first error
 							// Otherwise grab all of them and do not log anything
 							$error_severity = $errors->hasErrors(1) && !$user_info['is_admin'] ? 1 : null;
 							foreach ($errors->prepareErrors($error_severity) as $error)
-								throw new Elk_Exception($error, $error_severity === null ? false : 'general');
+							{
+															throw new Elk_Exception($error, $error_severity === null ? false : 'general');
+							}
 						}
 					}
 				}
@@ -670,11 +730,15 @@ 
 
 				// If we didn't try it then ignore it!
 				if ($value == '')
-					return false;
+				{
+									return false;
+				}
 
 				// Do the two entries for the password even match?
 				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2'])
-					return 'bad_new_password';
+				{
+									return 'bad_new_password';
+				}
 
 				// Let's get the validation function into play...
 				require_once(SUBSDIR . '/Auth.subs.php');
@@ -682,7 +746,9 @@ 
 
 				// Were there errors?
 				if ($passwordErrors !== null)
-					return 'password_' . $passwordErrors;
+				{
+									return 'password_' . $passwordErrors;
+				}
 
 				// Set up the new password variable... ready for storage.
 				require_once(SUBSDIR . '/Auth.subs.php');
@@ -771,9 +837,12 @@ 
 			'permission' => 'moderate_forum',
 			'input_validate' => function (&$value) {
 				if (!is_numeric($value))
-					return 'digits_only';
-				else
-					$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				{
+									return 'digits_only';
+				}
+				else {
+									$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				}
 				return true;
 			},
 		),
@@ -791,14 +860,20 @@ 
 				$value = trim(preg_replace('~[\s]~u', ' ', $value));
 
 				if (trim($value) == '')
-					return 'no_name';
+				{
+									return 'no_name';
+				}
 				elseif (Util::strlen($value) > 60)
-					return 'name_too_long';
+				{
+									return 'name_too_long';
+				}
 				elseif ($cur_profile['real_name'] != $value)
 				{
 					require_once(SUBSDIR . '/Members.subs.php');
 					if (isReservedName($value, $context['id_member']))
-						return 'name_taken';
+					{
+											return 'name_taken';
+					}
 				}
 				return true;
 			},
@@ -877,7 +952,9 @@ 
 					);
 
 					if ($context['smiley_sets'][$i]['selected'])
-						$context['member']['smiley_set']['name'] = $set_names[$i];
+					{
+											$context['member']['smiley_set']['name'] = $set_names[$i];
+					}
 				}
 				return true;
 			},
@@ -886,7 +963,9 @@ 
 
 				$smiley_sets = explode(',', $modSettings['smiley_sets_known']);
 				if (!in_array($value, $smiley_sets) && $value !== 'none')
-					$value = '';
+				{
+									$value = '';
+				}
 				return true;
 			},
 		),
@@ -904,7 +983,9 @@ 
 				// Can they disable censoring?
 				$context['allow_no_censored'] = false;
 				if ($user_info['is_admin'] || $context['user']['is_owner'])
-					$context['allow_no_censored'] = allowedTo('disable_censor');
+				{
+									$context['allow_no_censored'] = allowedTo('disable_censor');
+				}
 
 				return true;
 			},
@@ -947,7 +1028,9 @@ 
 				$value = (float) strtr($value, ',', '.');
 
 				if ($value < -23.5 || $value > 23.5)
-					return 'bad_offset';
+				{
+									return 'bad_offset';
+				}
 
 				return true;
 			},
@@ -962,7 +1045,9 @@ 
 			'enabled' => !empty($modSettings['titlesEnable']),
 			'input_validate' => function (&$value) {
 				if (Util::strlen($value) > 50)
-					return 'user_title_too_long';
+				{
+									return 'user_title_too_long';
+				}
 
 				return true;
 			},
@@ -986,7 +1071,9 @@ 
 
 				$value = addProtocol($value, array('http://', 'https://', 'ftp://', 'ftps://'));
 				if (strlen($value) < 8)
-					$value = '';
+				{
+									$value = '';
+				}
 				return true;
 			},
 			'link_with' => 'website',
@@ -1005,15 +1092,21 @@ 
 	{
 		// Do we have permission to do this?
 		if (isset($field['permission']) && !allowedTo(($context['user']['is_owner'] ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !allowedTo($field['permission']))
-			unset($profile_fields[$key]);
+		{
+					unset($profile_fields[$key]);
+		}
 
 		// Is it enabled?
 		if (isset($field['enabled']) && !$field['enabled'])
-			unset($profile_fields[$key]);
+		{
+					unset($profile_fields[$key]);
+		}
 
 		// Is it specifically disabled?
 		if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields)))
-			unset($profile_fields[$key]);
+		{
+					unset($profile_fields[$key]);
+		}
 	}
 }
 
@@ -1029,7 +1122,9 @@ 
 	global $profile_fields, $profile_vars, $context, $old_profile, $post_errors, $cur_profile;
 
 	if (!empty($hook))
-		call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	{
+			call_integration_hook('integrate_' . $hook . '_profile_fields', array(&$fields));
+	}
 
 	// Load them up.
 	loadProfileFields();
@@ -1041,7 +1136,9 @@ 
 	// - by default just to reload their settings
 	$context['profile_execute_on_save'] = array();
 	if ($context['user']['is_owner'])
-		$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	{
+			$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	}
 
 	// Assume we log nothing.
 	$context['log_changes'] = array();
@@ -1057,7 +1154,9 @@ 
 		$field = $profile_fields[$key];
 
 		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key === 'signature'))
-			continue;
+		{
+					continue;
+		}
 
 		// What gets updated?
 		$db_key = isset($field['save_key']) ? $field['save_key'] : $key;
@@ -1088,11 +1187,17 @@ 
 
 		// Finally, clean up certain types.
 		if ($field['cast_type'] === 'int')
-			$_POST[$key] = (int) $_POST[$key];
+		{
+					$_POST[$key] = (int) $_POST[$key];
+		}
 		elseif ($field['cast_type'] === 'float')
-			$_POST[$key] = (float) $_POST[$key];
+		{
+					$_POST[$key] = (float) $_POST[$key];
+		}
 		elseif ($field['cast_type'] === 'check')
-			$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		{
+					$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		}
 
 		// If we got here we're doing OK.
 		if ($field['type'] !== 'hidden' && (!isset($old_profile[$key]) || $_POST[$key] != $old_profile[$key]))
@@ -1105,10 +1210,12 @@ 
 
 			// Are we logging it?
 			if (!empty($field['log_change']) && isset($old_profile[$key]))
-				$context['log_changes'][$key] = array(
+			{
+							$context['log_changes'][$key] = array(
 					'previous' => $old_profile[$key],
 					'new' => $_POST[$key],
 				);
+			}
 		}
 
 		// Logging group changes are a bit different...
@@ -1142,9 +1249,12 @@ 
 					foreach ($groups as $id => $group)
 					{
 						if (isset($context['member_groups'][$group]))
-							$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
-						else
-							unset($additional_groups[$type][$id]);
+						{
+													$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
+						}
+						else {
+													unset($additional_groups[$type][$id]);
+						}
 					}
 					$additional_groups[$type] = implode(', ', $additional_groups[$type]);
 				}
@@ -1156,15 +1266,20 @@ 
 
 	// @todo Temporary
 	if ($context['user']['is_owner'])
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$changeOther = allowedTo('profile_extra_any');
+	{
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	}
+	else {
+			$changeOther = allowedTo('profile_extra_any');
+	}
 
 	if ($changeOther && empty($post_errors))
 	{
 		makeThemeChanges($context['id_member'], isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
 		if (!empty($_REQUEST['sa']))
-			makeCustomFieldChanges($context['id_member'], $_REQUEST['sa'], false);
+		{
+					makeCustomFieldChanges($context['id_member'], $_REQUEST['sa'], false);
+		}
 	}
 
 	// Free memory!
@@ -1185,9 +1300,12 @@ 
 	$check = array();
 	$check['email'] = strtr($email, array('&#039;' => '\''));
 	if (Data_Validator::is_valid($check, array('email' => 'valid_email|required'), array('email' => 'trim')))
-		$email = $check['email'];
-	else
-		return empty($check['email']) ? 'no_email' : 'bad_email';
+	{
+			$email = $check['email'];
+	}
+	else {
+			return empty($check['email']) ? 'no_email' : 'bad_email';
+	}
 
 	// Email addresses should be and stay unique.
 	$request = $db->query('', '
@@ -1223,9 +1341,12 @@ 
 
 	// Permissions...
 	if ($context['user']['is_owner'])
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$changeOther = allowedTo('profile_extra_any');
+	{
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	}
+	else {
+			$changeOther = allowedTo('profile_extra_any');
+	}
 
 	// Arrays of all the changes - makes things easier.
 	$profile_bools = array(
@@ -1249,7 +1370,9 @@ 
 	call_integration_hook('integrate_save_profile_changes', array(&$profile_bools, &$profile_ints, &$profile_floats, &$profile_strings));
 
 	if (isset($_POST['sa']) && $_POST['sa'] === 'ignoreboards' && empty($_POST['ignore_brd']))
-		$_POST['ignore_brd'] = array();
+	{
+			$_POST['ignore_brd'] = array();
+	}
 
 	// Whatever it is set to is a dirty filthy thing.  Kinda like our minds.
 	unset($_POST['ignore_boards']);
@@ -1257,15 +1380,20 @@ 
 	if (isset($_POST['ignore_brd']))
 	{
 		if (!is_array($_POST['ignore_brd']))
-			$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		{
+					$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		}
 
 		foreach ($_POST['ignore_brd'] as $k => $d)
 		{
 			$d = (int) $d;
 			if ($d != 0)
-				$_POST['ignore_brd'][$k] = $d;
-			else
-				unset($_POST['ignore_brd'][$k]);
+			{
+							$_POST['ignore_brd'][$k] = $d;
+			}
+			else {
+							unset($_POST['ignore_brd'][$k]);
+			}
 		}
 		$_POST['ignore_boards'] = implode(',', $_POST['ignore_brd']);
 		unset($_POST['ignore_brd']);
@@ -1277,20 +1405,30 @@ 
 		makeThemeChanges($memID, isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
 		makeNotificationChanges($memID);
 		if (!empty($_REQUEST['sa']))
-			makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		{
+					makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		}
 
 		foreach ($profile_bools as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = empty($_POST[$var]) ? '0' : '1';
+		}
 		foreach ($profile_ints as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var] != '' ? (int) $_POST[$var] : '';
+		}
 		foreach ($profile_floats as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = (float) $_POST[$var];
+		}
 		foreach ($profile_strings as $var)
-			if (isset($_POST[$var]))
+		{
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var];
+		}
 	}
 }
 
@@ -1329,7 +1467,9 @@ 
 
 	// Can't change reserved vars.
 	if ((isset($_POST['options']) && count(array_intersect(array_keys($_POST['options']), $reservedVars)) != 0) || (isset($_POST['default_options']) && count(array_intersect(array_keys($_POST['default_options']), $reservedVars)) != 0))
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 
 	// Don't allow any overriding of custom fields with default or non-default options.
 	$request = $db->query('', '
@@ -1342,7 +1482,9 @@ 
 	);
 	$custom_fields = array();
 	while ($row = $db->fetch_assoc($request))
-		$custom_fields[] = $row['col_name'];
+	{
+			$custom_fields[] = $row['col_name'];
+	}
 	$db->free_result($request);
 
 	// These are the theme changes...
@@ -1352,14 +1494,20 @@ 
 		foreach ($_POST['options'] as $opt => $val)
 		{
 			if (in_array($opt, $custom_fields))
-				continue;
+			{
+							continue;
+			}
 
 			// These need to be controlled.
 			if ($opt === 'topics_per_page' || $opt === 'messages_per_page')
-				$val = max(0, min($val, 50));
+			{
+							$val = max(0, min($val, 50));
+			}
 			// We don't set this per theme anymore.
 			elseif ($opt === 'allow_no_censored')
-				continue;
+			{
+							continue;
+			}
 
 			$themeSetArray[] = array($id_theme, $memID, $opt, is_array($val) ? implode(',', $val) : $val);
 		}
@@ -1371,14 +1519,20 @@ 
 		foreach ($_POST['default_options'] as $opt => $val)
 		{
 			if (in_array($opt, $custom_fields))
-				continue;
+			{
+							continue;
+			}
 
 			// These need to be controlled.
 			if ($opt === 'topics_per_page' || $opt === 'messages_per_page')
-				$val = max(0, min($val, 50));
+			{
+							$val = max(0, min($val, 50));
+			}
 			// Only let admins and owners change the censor.
 			elseif ($opt === 'allow_no_censored' && !$user_info['is_admin'] && !$context['user']['is_owner'])
-				continue;
+			{
+							continue;
+			}
 
 			$themeSetArray[] = array(1, $memID, $opt, is_array($val) ? implode(',', $val) : $val);
 			$erase_options[] = $opt;
@@ -1390,14 +1544,20 @@ 
 	{
 		require_once(SUBSDIR . '/Themes.subs.php');
 		if (!empty($themeSetArray))
-			updateThemeOptions($themeSetArray);
+		{
+					updateThemeOptions($themeSetArray);
+		}
 
 		if (!empty($erase_options))
-			removeThemeOptions('custom', $memID, $erase_options);
+		{
+					removeThemeOptions('custom', $memID, $erase_options);
+		}
 
 		$themes = explode(',', $modSettings['knownThemes']);
 		foreach ($themes as $t)
-			Cache::instance()->remove('theme_settings-' . $t . ':' . $memID);
+		{
+					Cache::instance()->remove('theme_settings-' . $t . ':' . $memID);
+		}
 	}
 }
 
@@ -1419,8 +1579,9 @@ 
 			{
 				$to_save[$mention] = (int) $_POST['notify'][$mention]['method'];
 			}
-			else
-				$to_save[$mention] = 0;
+			else {
+							$to_save[$mention] = 0;
+			}
 		}
 		saveUserNotificationsPreferences($memID, $to_save);
 	}
@@ -1429,11 +1590,15 @@ 
 	if (isset($_POST['edit_notify_boards']))
 	{
 		if (!isset($_POST['notify_boards']))
-			$_POST['notify_boards'] = array();
+		{
+					$_POST['notify_boards'] = array();
+		}
 
 		// Make sure only integers are added/deleted.
 		foreach ($_POST['notify_boards'] as $index => $id)
-			$_POST['notify_boards'][$index] = (int) $id;
+		{
+					$_POST['notify_boards'][$index] = (int) $id;
+		}
 
 		// id_board = 0 is reserved for topic notifications only
 		$notification_wanted = array_diff($_POST['notify_boards'], array(0));
@@ -1451,13 +1616,16 @@ 
 		);
 		$notification_current = array();
 		while ($row = $db->fetch_assoc($request))
-			$notification_current[] = $row['id_board'];
+		{
+					$notification_current[] = $row['id_board'];
+		}
 		$db->free_result($request);
 
 		// And remove what they no longer want
 		$notification_deletes = array_diff($notification_current, $notification_wanted);
 		if (!empty($notification_deletes))
-			$db->query('', '
+		{
+					$db->query('', '
 				DELETE FROM {db_prefix}log_notify
 				WHERE id_board IN ({array_int:board_list})
 					AND id_member = {int:selected_member}',
@@ -1466,19 +1634,24 @@ 
 					'selected_member' => $memID,
 				)
 			);
+		}
 
 		// Now add in what they do want
 		$notification_inserts = array();
 		foreach ($notification_wanted as $id)
-			$notification_inserts[] = array($memID, $id);
+		{
+					$notification_inserts[] = array($memID, $id);
+		}
 
 		if (!empty($notification_inserts))
-			$db->insert('ignore',
+		{
+					$db->insert('ignore',
 				'{db_prefix}log_notify',
 				array('id_member' => 'int', 'id_board' => 'int'),
 				$notification_inserts,
 				array('id_member', 'id_board')
 			);
+		}
 	}
 
 	// We are editing topic notifications......
@@ -1486,7 +1659,9 @@ 
 	{
 		$edit_notify_topics = array();
 		foreach ($_POST['notify_topics'] as $index => $id)
-			$edit_notify_topics[$index] = (int) $id;
+		{
+					$edit_notify_topics[$index] = (int) $id;
+		}
 
 		// Make sure there are no zeros left.
 		$edit_notify_topics = array_diff($edit_notify_topics, array(0));
@@ -1517,7 +1692,9 @@ 
 	$db = database();
 
 	if ($sanitize && isset($_POST['customfield']))
-		$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	{
+			$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	}
 
 	$where = $area === 'register' ? 'show_reg != 0' : 'show_profile = {string:area}';
 
@@ -1543,11 +1720,15 @@ 
 			- The area isn't registration, and if it is that the field is not supposed to be shown there.
 		*/
 		if ($row['private'] != 0 && !allowedTo('admin_forum') && ($memID != $user_info['id'] || $row['private'] != 2) && ($area !== 'register' || $row['show_reg'] == 0))
-			continue;
+		{
+					continue;
+		}
 
 		// Validate the user data.
 		if ($row['field_type'] === 'check')
-			$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
+		{
+					$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
+		}
 		elseif (in_array($row['field_type'], array('radio', 'select')))
 		{
 			$value = $row['default_value'];
@@ -1584,7 +1765,9 @@ 
 			}
 
 			if ($row['mask'] === 'number')
-				$value = (int) $value;
+			{
+							$value = (int) $value;
+			}
 		}
 
 		// Did it change or has it been set?
@@ -1628,7 +1811,9 @@ 
 		);
 
 		if (!empty($log_changes) && !empty($modSettings['modlog_enabled']))
-			logActions($log_changes);
+		{
+					logActions($log_changes);
+		}
 	}
 }
 
@@ -1648,18 +1833,26 @@ 
 {
 	// Is it too long?
 	if ($field['field_length'] && $field['field_length'] < Util::strlen($value))
-		return 'custom_field_too_long';
+	{
+			return 'custom_field_too_long';
+	}
 
 	// Any masks to apply?
 	if ($field['field_type'] === 'text' && !empty($field['mask']) && $field['mask'] !== 'none')
 	{
 		// @todo We never error on this - just ignore it at the moment...
 		if ($field['mask'] === 'email' && !isValidEmail($value))
-			return 'custom_field_invalid_email';
+		{
+					return 'custom_field_invalid_email';
+		}
 		elseif ($field['mask'] === 'number' && preg_match('~[^\d]~', $value))
-			return 'custom_field_not_number';
+		{
+					return 'custom_field_not_number';
+		}
 		elseif (substr($field['mask'], 0, 5) === 'regex' && trim($value) !== '' && preg_match(substr($field['mask'], 5), $value) === 0)
-			return 'custom_field_inproper_format';
+		{
+					return 'custom_field_inproper_format';
+		}
 	}
 
 	return true;
@@ -1676,7 +1869,9 @@ 
 
 	// Shouldn't happen but just in case.
 	if (empty($profile_vars['email_address']))
-		return;
+	{
+			return;
+	}
 
 	$replacements = array(
 		'ACTIVATIONLINK' => $scripturl . '?action=register;sa=activate;u=' . $context['id_member'] . ';code=' . $old_profile['validation_code'],
@@ -1695,7 +1890,9 @@ 
 	$_SESSION['login_' . $cookiename] = serialize(array(0, '', 0));
 
 	if (isset($_COOKIE[$cookiename]))
-		$_COOKIE[$cookiename] = '';
+	{
+			$_COOKIE[$cookiename] = '';
+	}
 
 	loadUserSettings();
 
@@ -1743,16 +1940,24 @@ 
 	// Warning message for signature image limits?
 	$context['signature_warning'] = '';
 	if ($context['signature_limits']['max_image_width'] && $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
+	{
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
+	}
 	elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	{
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	}
 
 	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && function_exists('pspell_new');
 	if ($context['show_spellchecking'])
-		loadJavascriptFile('spellcheck.js', array('defer' => true));
+	{
+			loadJavascriptFile('spellcheck.js', array('defer' => true));
+	}
 
 	if (empty($context['do_preview']))
-		$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br />', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
+	{
+			$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br />', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
+	}
 	else
 	{
 		$signature = !empty($_POST['signature']) ? $_POST['signature'] : '';
@@ -1765,7 +1970,9 @@ 
 
 		$context['post_errors'][] = 'signature_not_yet_saved';
 		if ($validation !== true && $validation !== false)
-			$context['post_errors'][] = $validation;
+		{
+					$context['post_errors'][] = $validation;
+		}
 
 		$context['member']['signature'] = censor($context['member']['signature']);
 		$context['member']['current_signature'] = $context['member']['signature'];
@@ -1794,9 +2001,12 @@ 
 
 	// @todo Temporary
 	if ($context['user']['is_owner'])
-		$allowedChange = allowedTo('profile_set_avatar') && allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$allowedChange = allowedTo('profile_set_avatar') && allowedTo('profile_extra_any');
+	{
+			$allowedChange = allowedTo('profile_set_avatar') && allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	}
+	else {
+			$allowedChange = allowedTo('profile_set_avatar') && allowedTo('profile_extra_any');
+	}
 
 	// Default context.
 	$context['member']['avatar'] += array(
@@ -1820,29 +2030,36 @@ 
 		$context['member']['avatar']['href'] = empty($cur_profile['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $cur_profile['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $cur_profile['filename'];
 	}
 	elseif ($valid_protocol && $context['member']['avatar']['allow_external'])
-		$context['member']['avatar'] += array(
+	{
+			$context['member']['avatar'] += array(
 			'choice' => 'external',
 			'server_pic' => 'blank.png',
 			'external' => $cur_profile['avatar']
 		);
+	}
 	elseif ($cur_profile['avatar'] === 'gravatar' && $context['member']['avatar']['allow_gravatar'])
-		$context['member']['avatar'] += array(
+	{
+			$context['member']['avatar'] += array(
 			'choice' => 'gravatar',
 			'server_pic' => 'blank.png',
 			'external' => 'https://'
 		);
+	}
 	elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored'])
-		$context['member']['avatar'] += array(
+	{
+			$context['member']['avatar'] += array(
 			'choice' => 'server_stored',
 			'server_pic' => $cur_profile['avatar'] == '' ? 'blank.png' : $cur_profile['avatar'],
 			'external' => $schema
 		);
-	else
-		$context['member']['avatar'] += array(
+	}
+	else {
+			$context['member']['avatar'] += array(
 			'choice' => 'none',
 			'server_pic' => 'blank.png',
 			'external' => $schema
 		);
+	}
 
 	// Get a list of all the avatars.
 	if ($context['member']['avatar']['allow_server_stored'])
@@ -1881,7 +2098,9 @@ 
 	{
 		// Registered member was already taken care before
 		if ($id_group == 0)
-			continue;
+		{
+					continue;
+		}
 
 		$context['member_groups'][$id_group]['is_primary'] = $cur_profile['id_group'] == $id_group;
 		$context['member_groups'][$id_group]['is_additional'] = in_array($id_group, $curGroups);
@@ -1908,7 +2127,9 @@ 
 
 	// Setup our languages.
 	foreach ($languages as $lang)
-		$context['profile_languages'][$lang['filename']] = $lang['name'];
+	{
+			$context['profile_languages'][$lang['filename']] = $lang['name'];
+	}
 
 	ksort($context['profile_languages']);
 
@@ -1982,7 +2203,9 @@ 
 
 		$smiley_count = substr_count(strtolower($smiley_parsed), '<img') - substr_count(strtolower($unparsed_signature), '<img');
 		if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0)
-			return 'signature_allow_smileys';
+		{
+					return 'signature_allow_smileys';
+		}
 		elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
 		{
 			$txt['profile_error_signature_max_smileys'] = sprintf($txt['profile_error_signature_max_smileys'], $sig_limits[4]);
@@ -2008,13 +2231,21 @@ 
 
 				// Attempt to allow all sizes of abuse, so to speak.
 				if ($matches[2][$ind] === 'px' && $size > $sig_limits[7])
-					$limit_broke = $sig_limits[7] . 'px';
+				{
+									$limit_broke = $sig_limits[7] . 'px';
+				}
 				elseif ($matches[2][$ind] === 'pt' && $size > ($sig_limits[7] * 0.75))
-					$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+				{
+									$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+				}
 				elseif ($matches[2][$ind] === 'em' && $size > ((float) $sig_limits[7] / 14))
-					$limit_broke = ((float) $sig_limits[7] / 14) . 'em';
+				{
+									$limit_broke = ((float) $sig_limits[7] / 14) . 'em';
+				}
 				elseif ($matches[2][$ind] !== 'px' && $matches[2][$ind] !== 'pt' && $matches[2][$ind] !== 'em' && $sig_limits[7] < 18)
-					$limit_broke = 'large';
+				{
+									$limit_broke = 'large';
+				}
 
 				if ($limit_broke)
 				{
@@ -2061,7 +2292,9 @@ 
 
 					// Does it have predefined restraints? Width first.
 					if ($matches[6][$key])
-						$matches[2][$key] = $matches[6][$key];
+					{
+											$matches[2][$key] = $matches[6][$key];
+					}
 
 					if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 					{
@@ -2069,17 +2302,23 @@ 
 						$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
 					}
 					elseif ($matches[2][$key])
-						$width = $matches[2][$key];
+					{
+											$width = $matches[2][$key];
+					}
 
 					// ... and height.
 					if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 					{
 						$height = $sig_limits[6];
 						if ($width != -1)
-							$width = $width * ($height / $matches[4][$key]);
+						{
+													$width = $width * ($height / $matches[4][$key]);
+						}
 					}
 					elseif ($matches[4][$key])
-						$height = $matches[4][$key];
+					{
+											$height = $matches[4][$key];
+					}
 
 					// If the dimensions are still not fixed - we need to check the actual image.
 					if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -2100,21 +2339,29 @@ 
 							{
 								$height = $sig_limits[6];
 								if ($width == -1)
-									$width = $sizes[0];
+								{
+																	$width = $sizes[0];
+								}
 								$width = $width * ($height / $sizes[1]);
 							}
 							elseif ($width != -1)
-								$height = $sizes[1];
+							{
+															$height = $sizes[1];
+							}
 						}
 					}
 
 					// Did we come up with some changes? If so remake the string.
 					if ($width != -1 || $height != -1)
-						$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					{
+											$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					}
 				}
 
 				if (!empty($replaces))
-					$value = str_replace(array_keys($replaces), array_values($replaces), $value);
+				{
+									$value = str_replace(array_keys($replaces), array_values($replaces), $value);
+				}
 			}
 		}
 
@@ -2166,7 +2413,9 @@ 
 
 	$memID = $context['id_member'];
 	if (empty($memID) && !empty($context['password_auth_failed']))
-		return false;
+	{
+			return false;
+	}
 
 	// We need to know where we're going to be putting it..
 	require_once(SUBSDIR . '/Attachments.subs.php');
@@ -2181,7 +2430,9 @@ 
 	{
 		loadLanguage('Post');
 		if (!is_writable($uploadDir))
-			throw new Elk_Exception('attachments_no_write', 'critical');
+		{
+					throw new Elk_Exception('attachments_no_write', 'critical');
+		}
 
 		require_once(SUBSDIR . '/Package.subs.php');
 
@@ -2248,10 +2499,14 @@ 
 		$profile_vars['avatar'] = str_replace(' ', '%20', preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $_POST['userpicpersonal']));
 
 		if (preg_match('~^https?:///?$~i', $profile_vars['avatar']) === 1)
-			$profile_vars['avatar'] = '';
+		{
+					$profile_vars['avatar'] = '';
+		}
 		// Trying to make us do something we'll regret?
 		elseif ((!$valid_http && !$valid_https) || ($valid_http && detectServer()->supportsSSL()))
-			return 'bad_avatar';
+		{
+					return 'bad_avatar';
+		}
 		// Should we check dimensions?
 		elseif (!empty($modSettings['avatar_max_height']) || !empty($modSettings['avatar_max_width']))
 		{
@@ -2262,7 +2517,9 @@ 
 			{
 				// Houston, we have a problem. The avatar is too large!!
 				if ($modSettings['avatar_action_too_large'] === 'option_refuse')
-					return 'bad_avatar';
+				{
+									return 'bad_avatar';
+				}
 				elseif ($modSettings['avatar_action_too_large'] === 'option_download_and_resize')
 				{
 					// @todo remove this if appropriate
@@ -2274,8 +2531,9 @@ 
 						$cur_profile['filename'] = $modSettings['new_avatar_data']['filename'];
 						$cur_profile['attachment_type'] = $modSettings['new_avatar_data']['type'];
 					}
-					else
-						return 'bad_avatar';
+					else {
+											return 'bad_avatar';
+					}
 				}
 			}
 		}
@@ -2406,7 +2664,9 @@ 
 				);
 
 				if (!empty($modSettings['attachment_webp_enable']))
-					$extensions['18'] = 'webp';
+				{
+									$extensions['18'] = 'webp';
+				}
 
 				$extension = isset($extensions[$sizes[2]]) ? $extensions[$sizes[2]] : 'jpg';
 				$mime_type = 'image/' . ($extension === 'jpg' ? 'jpeg' : $extension);
@@ -2450,14 +2710,18 @@ 
 
 			// Delete any temporary file.
 			if (file_exists($_FILES['attachment']['tmp_name']))
-				@unlink($_FILES['attachment']['tmp_name']);
+			{
+							@unlink($_FILES['attachment']['tmp_name']);
+			}
 		}
 		// Selected the upload avatar option and had one already uploaded before or didn't upload one.
-		else
+		else {
+					$profile_vars['avatar'] = '';
+		}
+	}
+	else {
 			$profile_vars['avatar'] = '';
 	}
-	else
-		$profile_vars['avatar'] = '';
 
 	// Setup the profile variables so it shows things right on display!
 	$cur_profile['avatar'] = $profile_vars['avatar'];
@@ -2492,7 +2756,9 @@ 
 		);
 		$protected_groups = array(1);
 		while ($row = $db->fetch_assoc($request))
-			$protected_groups[] = $row['id_group'];
+		{
+					$protected_groups[] = $row['id_group'];
+		}
 		$db->free_result($request);
 
 		$protected_groups = array_unique($protected_groups);
@@ -2500,10 +2766,13 @@ 
 
 	// The account page allows the change of your id_group - but not to a protected group!
 	if (empty($protected_groups) || count(array_intersect(array((int) $value, $old_profile['id_group']), $protected_groups)) == 0)
-		$value = (int) $value;
+	{
+			$value = (int) $value;
+	}
 	// ... otherwise it's the old group sir.
-	else
-		$value = $old_profile['id_group'];
+	else {
+			$value = $old_profile['id_group'];
+	}
 
 	// Find the additional membergroups (if any)
 	if (isset($_POST['additional_groups']) && is_array($_POST['additional_groups']))
@@ -2513,7 +2782,9 @@ 
 		{
 			$group_id = (int) $group_id;
 			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups)))
-				$additional_groups[] = $group_id;
+			{
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		// Put the protected groups back in there if you don't have permission to take them away.
@@ -2521,7 +2792,9 @@ 
 		foreach ($old_additional_groups as $group_id)
 		{
 			if (!empty($protected_groups) && in_array($group_id, $protected_groups))
-				$additional_groups[] = $group_id;
+			{
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		if (implode(',', $additional_groups) !== $old_profile['additional_groups'])
@@ -2554,7 +2827,9 @@ 
 			$db->free_result($request);
 
 			if (empty($another))
-				throw new Elk_Exception('at_least_one_admin', 'critical');
+			{
+							throw new Elk_Exception('at_least_one_admin', 'critical');
+			}
 		}
 	}
 
@@ -2562,9 +2837,12 @@ 
 	if ($value != $old_profile['id_group'] || isset($profile_vars['additional_groups']))
 	{
 		if ($context['user']['is_owner'])
-			$_SESSION['mc']['time'] = 0;
-		else
-			updateSettings(array('settings_updated' => time()));
+		{
+					$_SESSION['mc']['time'] = 0;
+		}
+		else {
+					updateSettings(array('settings_updated' => time()));
+		}
 	}
 
 	return true;
@@ -2665,7 +2943,9 @@ 
 	$db = database();
 
 	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
+	{
+			$exclude_boards = array($modSettings['recycle_board']);
+	}
 
 	// Retrieve some attachments.
 	$request = $db->query('', '
@@ -2702,9 +2982,12 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!$row['approved'])
-			$row['filename'] = str_replace(array('{attachment_link}', '{txt_awaiting}'), array('<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>', $txt['awaiting_approval']), $settings['attachments_awaiting_approval']);
-		else
-			$row['filename'] = '<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>';
+		{
+					$row['filename'] = str_replace(array('{attachment_link}', '{txt_awaiting}'), array('<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>', $txt['awaiting_approval']), $settings['attachments_awaiting_approval']);
+		}
+		else {
+					$row['filename'] = '<a href="' . $scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $row['filename'] . '</a>';
+		}
 
 		$attachments[] = array(
 			'id' => $row['id_attach'],
@@ -2806,7 +3089,9 @@ 
 	);
 	$topics = array();
 	while ($row = $db->fetch_assoc($request))
-		$topics[] = $row['id_topic'];
+	{
+			$topics[] = $row['id_topic'];
+	}
 	$db->free_result($request);
 
 	// Any topics found?
@@ -2826,7 +3111,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$topicsInfo[] = $row;
+		{
+					$topicsInfo[] = $row;
+		}
 		$db->free_result($request);
 	}
 
@@ -3058,14 +3345,19 @@ 
 
 		// Did we get what we wanted, if so stop looking
 		if ($db->num_rows($request) === $count || empty($range_limit))
-			break;
-		else
-			$range_limit = '';
+		{
+					break;
+		}
+		else {
+					$range_limit = '';
+		}
 	}
 
 	// Place them in the post array
 	while ($row = $db->fetch_assoc($request))
-		$user_posts[] = $row;
+	{
+			$user_posts[] = $row;
+	}
 	$db->free_result($request);
 
 	return $user_posts;
@@ -3123,14 +3415,19 @@ 
 
 		// Did we get what we wanted, if so stop looking
 		if ($db->num_rows($request) === $count || empty($range_limit))
-			break;
-		else
-			$range_limit = '';
+		{
+					break;
+		}
+		else {
+					$range_limit = '';
+		}
 	}
 
 	// Place them in the topic array
 	while ($row = $db->fetch_assoc($request))
-		$user_topics[] = $row;
+	{
+			$user_topics[] = $row;
+	}
 	$db->free_result($request);
 
 	return $user_topics;
@@ -3165,13 +3462,18 @@ 
 	{
 		// We don't know about this permission, it doesn't exist :P.
 		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		{
+					continue;
+		}
 
 		// Permissions that end with _own or _any consist of two parts.
 		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		{
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		}
+		else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Add this permission if it doesn't exist yet.
 		if (!isset($general_permission[$row['permission']]))
@@ -3238,17 +3540,23 @@ 
 	{
 		// We don't know about this permission, it doesn't exist :P.
 		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		{
+					continue;
+		}
 
 		// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
 		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		{
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		}
+		else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Create the structure for this permission.
 		if (!isset($board_permission[$row['permission']]))
-			$board_permission[$row['permission']] = array(
+		{
+					$board_permission[$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -3258,6 +3566,7 @@ 
 				'is_denied' => false,
 				'is_global' => empty($board),
 			);
+		}
 
 		$board_permission[$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][$row['id_group']] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
 		$board_permission[$row['permission']]['is_denied'] |= empty($row['add_deny']);
@@ -3319,7 +3628,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$ips[] = $row['poster_ip'];
+	{
+			$ips[] = $row['poster_ip'];
+	}
 
 	$db->free_result($request);
 
@@ -3337,7 +3648,9 @@ 
 	$error_ips = array();
 
 	while ($row = $db->fetch_assoc($request))
-		$error_ips[] = $row['ip'];
+	{
+			$error_ips[] = $row['ip'];
+	}
 
 	$db->free_result($request);
 
@@ -3373,7 +3686,9 @@ 
 	);
 
 	while ($row = $db->fetch_assoc($request))
-		$message_members[] = $row['id_member'];
+	{
+			$message_members[] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	// And then get the member ID's belong to other users
@@ -3388,7 +3703,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$message_members[] = $row['id_member'];
+	{
+			$message_members[] = $row['id_member'];
+	}
 	$db->free_result($request);
 
 	// Once the IDs are all combined, let's clean them up
@@ -3418,7 +3735,9 @@ 
 	global $modSettings, $context;
 
 	if (empty($modSettings['enabled_mentions']))
-		return array();
+	{
+			return array();
+	}
 
 	require_once(SUBSDIR . '/Notification.subs.php');
 	Elk_Autoloader::instance()->register(SUBSDIR . '/MentionType', '\\ElkArte\\sources\\subs\\MentionType');
@@ -3438,14 +3757,20 @@ 
 		{
 			$notif[$key] = array('id' => $val, 'enabled' => $user_preferences[$member_id][$type] === $key);
 			if ($user_preferences[$member_id][$type] > 0)
-				$type_on = true;
+			{
+							$type_on = true;
+			}
 
 			if (!$push_enabled && $val === 'notification' && $user_preferences[$member_id][$type] === $key)
-				$push_enabled = true;
+			{
+							$push_enabled = true;
+			}
 		}
 
 		if (!empty($notif))
-			$mention_types[$type] = array('data' => $notif, 'enabled' => $type_on);
+		{
+					$mention_types[$type] = array('data' => $notif, 'enabled' => $type_on);
+		}
 	}
 
 	// If they enabled notifications alert, then lets ask for browser permission to show them

Spacing +27 added lines, -27 removed lines

@@ -394,7 +394,7 @@ 
 			'type' => 'callback',
 			'callback_func' => 'birthdate',
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $cur_profile, $context;
 
 				// Split up the birth date....
@@ -407,7 +407,7 @@ 
 
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $profile_vars, $cur_profile;
 
 				if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0)
@@ -430,7 +430,7 @@ 
 		'birthdate' => array(
 			'type' => 'hidden',
 			'permission' => 'profile_extra',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile;
 
 				// @todo Should we check for this year and tell them they made a mistake :P? (based on coppa at least?)
@@ -452,7 +452,7 @@ 
 			'label' => $txt['date_registered'],
 			'log_change' => true,
 			'permission' => 'moderate_forum',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $txt, $user_info, $modSettings, $cur_profile;
 
 				// Bad date!  Go try again - please?
@@ -476,7 +476,7 @@ 
 			'subtext' => $txt['valid_email'],
 			'log_change' => true,
 			'permission' => 'profile_identity',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $old_profile, $profile_vars, $modSettings;
 
 				if (strtolower($value) == strtolower($old_profile['email_address']))
@@ -503,7 +503,7 @@ 
 			'value' => empty($cur_profile['hide_email']) ? true : false,
 			'label' => $txt['allow_user_email'],
 			'permission' => 'profile_identity',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				$value = $value == 0 ? 1 : 0;
 
 				return true;
@@ -523,7 +523,7 @@ 
 			'callback_func' => 'theme_pick',
 			'permission' => 'profile_extra',
 			'enabled' => empty($settings['disable_user_variant']) || !empty($modSettings['theme_allow']) || allowedTo('admin_forum'),
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile, $txt;
 
 				$db = database();
@@ -547,7 +547,7 @@ 
 				);
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				$value = (int) $value;
 				return true;
 			},
@@ -557,7 +557,7 @@ 
 			'callback_func' => 'karma_modify',
 			'permission' => 'admin_forum',
 			// Set karma_bad too!
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $profile_vars, $cur_profile;
 
 				$value = (int) $value;
@@ -568,7 +568,7 @@ 
 				}
 				return true;
 			},
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile;
 
 				$context['member']['karma']['good'] = $cur_profile['karma_good'];
@@ -586,7 +586,7 @@ 
 			'preload' => 'profileLoadLanguages',
 			'enabled' => !empty($modSettings['userLanguage']),
 			'value' => empty($cur_profile['lngfile']) ? $language : $cur_profile['lngfile'],
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $cur_profile;
 
 				// Load the languages.
@@ -613,7 +613,7 @@ 
 			'log_change' => true,
 			'permission' => 'profile_identity',
 			'prehtml' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? '<div class="warningbox">' . $txt['username_warning'] . '</div>' : '',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $user_info, $cur_profile;
 
 				if (allowedTo('admin_forum'))
@@ -665,7 +665,7 @@ 
 			'permission' => 'profile_identity',
 			'save_key' => 'passwd',
 			// Note this will only work if passwrd2 also exists!
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $user_info, $cur_profile;
 
 				// If we didn't try it then ignore it!
@@ -727,7 +727,7 @@ 
 			),
 			'subtext' => $txt['receive_from_description'],
 			'value' => empty($cur_profile['receive_from']) ? 0 : $cur_profile['receive_from'],
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile, $profile_vars;
 
 				// Simple validate and apply the two "sub settings"
@@ -744,7 +744,7 @@ 
 			'callback_func' => 'pm_settings',
 			'permission' => 'pm_read',
 			'save_key' => 'pm_prefs',
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile;
 
 				$context['display_mode'] = $cur_profile['pm_prefs'] & 3;
@@ -752,7 +752,7 @@ 
 
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile, $profile_vars;
 
 				// Simple validate and apply the two "sub settings"
@@ -769,7 +769,7 @@ 
 			'log_change' => true,
 			'size' => 7,
 			'permission' => 'moderate_forum',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				if (!is_numeric($value))
 					return 'digits_only';
 				else
@@ -785,7 +785,7 @@ 
 			'input_attr' => array('maxlength="60"'),
 			'permission' => 'profile_identity',
 			'enabled' => !empty($modSettings['allow_editDisplayName']) || allowedTo('moderate_forum'),
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $context, $cur_profile;
 
 				$value = trim(preg_replace('~[\s]~u', ' ', $value));
@@ -818,7 +818,7 @@ 
 			'postinput' => '<span class="smalltext" style="margin-left: 4ex;">[<a href="' . $scripturl . '?action=quickhelp;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);">' . $txt['secret_why_blank'] . '</a>]</span>',
 			'value' => '',
 			'permission' => 'profile_identity',
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $cur_profile;
 
 				if (empty($value))
@@ -862,7 +862,7 @@ 
 			'callback_func' => 'smiley_pick',
 			'enabled' => !empty($modSettings['smiley_sets_enable']),
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $modSettings, $context, $txt, $cur_profile;
 
 				$context['member']['smiley_set']['id'] = empty($cur_profile['smiley_set']) ? '' : $cur_profile['smiley_set'];
@@ -881,7 +881,7 @@ 
 				}
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				global $modSettings;
 
 				$smiley_sets = explode(',', $modSettings['smiley_sets_known']);
@@ -896,7 +896,7 @@ 
 			'callback_func' => 'theme_settings',
 			'permission' => 'profile_extra',
 			'is_dummy' => true,
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $user_info;
 
 				loadLanguage('Settings');
@@ -913,7 +913,7 @@ 
 			'type' => 'callback',
 			'callback_func' => 'timeformat_modify',
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $user_info, $txt, $cur_profile, $modSettings;
 
 				$context['easy_timeformats'] = array(
@@ -936,13 +936,13 @@ 
 			'type' => 'callback',
 			'callback_func' => 'timeoffset_modify',
 			'permission' => 'profile_extra',
-			'preload' => function () {
+			'preload' => function() {
 				global $context, $cur_profile;
 
 				$context['member']['time_offset'] = $cur_profile['time_offset'];
 				return true;
 			},
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				// Validate the time_offset...
 				$value = (float) strtr($value, ',', '.');
 
@@ -960,7 +960,7 @@ 
 			'size' => 50,
 			'permission' => 'profile_title',
 			'enabled' => !empty($modSettings['titlesEnable']),
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 				if (Util::strlen($value) > 50)
 					return 'user_title_too_long';
 
@@ -982,7 +982,7 @@ 
 			'size' => 50,
 			'permission' => 'profile_extra',
 			// Fix the URL...
-			'input_validate' => function (&$value) {
+			'input_validate' => function(&$value) {
 
 				$value = addProtocol($value, array('http://', 'https://', 'ftp://', 'ftps://'));
 				if (strlen($value) < 8)

sources/subs/CalendarEvent.class.php

Braces +60 added lines, -21 removed lines

@@ -69,9 +69,13 @@ 
 		{
 			// Make sure it's turned on and not some fool trying to trick it.
 			if (empty($this->_settings['cal_allowspan']))
-				throw new Elk_Exception('no_span', false);
+			{
+							throw new Elk_Exception('no_span', false);
+			}
 			if ($event['span'] < 1 || $event['span'] > $this->_settings['cal_maxspan'])
-				throw new Elk_Exception('invalid_days_numb', false);
+			{
+							throw new Elk_Exception('invalid_days_numb', false);
+			}
 		}
 
 
@@ -80,34 +84,54 @@ 
 		{
 			// No month?  No year?
 			if (!isset($event['month']))
-				throw new Elk_Exception('event_month_missing', false);
+			{
+							throw new Elk_Exception('event_month_missing', false);
+			}
 			if (!isset($event['year']))
-				throw new Elk_Exception('event_year_missing', false);
+			{
+							throw new Elk_Exception('event_year_missing', false);
+			}
 
 			// Check the month and year...
 			if ($event['month'] < 1 || $event['month'] > 12)
-				throw new Elk_Exception('invalid_month', false);
+			{
+							throw new Elk_Exception('invalid_month', false);
+			}
 			if ($event['year'] < $this->_settings['cal_minyear'] || $event['year'] > (int) date('Y') + $this->_settings['cal_limityear'])
-				throw new Elk_Exception('invalid_year', false);
+			{
+							throw new Elk_Exception('invalid_year', false);
+			}
 
 			// No day?
 			if (!isset($event['day']))
-				throw new Elk_Exception('event_day_missing', false);
+			{
+							throw new Elk_Exception('event_day_missing', false);
+			}
 
 			if (!isset($event['evtitle']) && !isset($event['subject']))
-				throw new Elk_Exception('event_title_missing', false);
+			{
+							throw new Elk_Exception('event_title_missing', false);
+			}
 			elseif (!isset($event['evtitle']))
-				$event['evtitle'] = $event['subject'];
+			{
+							$event['evtitle'] = $event['subject'];
+			}
 
 			// Bad day?
 			if (!checkdate($event['month'], $event['day'], $event['year']))
-				throw new Elk_Exception('invalid_date', false);
+			{
+							throw new Elk_Exception('invalid_date', false);
+			}
 
 			// No title?
 			if (Util::htmltrim($event['evtitle']) === '')
-				throw new Elk_Exception('no_event_title', false);
+			{
+							throw new Elk_Exception('no_event_title', false);
+			}
 			if (Util::strlen($event['evtitle']) > 100)
-				$event['evtitle'] = Util::substr($event['evtitle'], 0, 100);
+			{
+							$event['evtitle'] = Util::substr($event['evtitle'], 0, 100);
+			}
 			$event['evtitle'] = str_replace(';', '', $event['evtitle']);
 		}
 
@@ -153,19 +177,28 @@ 
 	{
 		// There could be already a topic you are not allowed to modify
 		if (!allowedTo('post_new') && empty($this->_settings['disableNoPostingCalendarEdits']))
-			$eventProperties = getEventProperties($this->_event_id, true);
+		{
+					$eventProperties = getEventProperties($this->_event_id, true);
+		}
 
 		$id_board = isset($eventProperties['id_board']) ? $eventProperties['id_board'] : (isset($options['id_board']) ? $options['board'] : 0);
 		$id_topic = isset($eventProperties['id_topic']) ? $eventProperties['id_topic'] : (isset($options['id_topic']) ? $options['topic'] : 0);
 
 		if (empty($this->_settings['cal_allowspan']))
-			$span = 0;
+		{
+					$span = 0;
+		}
 		elseif (empty($options['span']) || $options['span'] == 1)
-			$span = 0;
+		{
+					$span = 0;
+		}
 		elseif (empty($this->_settings['cal_maxspan']) || $options['span'] > $this->_settings['cal_maxspan'])
-			$span = 0;
-		else
-			$span = min((int) $this->_settings['cal_maxspan'], (int) $options['span'] - 1);
+		{
+					$span = 0;
+		}
+		else {
+					$span = min((int) $this->_settings['cal_maxspan'], (int) $options['span'] - 1);
+		}
 
 		$eventOptions = array(
 			'title' => Util::substr($options['evtitle'], 0, 100),
@@ -217,7 +250,9 @@ 
 			$event = getEventProperties($this->_event_id);
 
 			if ($event === false)
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// If it has a board, then they should be editing it within the topic.
 			if (!empty($event['topic']['id']) && !empty($event['topic']['first_msg']))
@@ -229,9 +264,13 @@ 
 
 			// Make sure the user is allowed to edit this event.
 			if ($event['member'] != $member_id)
-				isAllowedTo('calendar_edit_any');
+			{
+							isAllowedTo('calendar_edit_any');
+			}
 			elseif (!allowedTo('calendar_edit_any'))
-				isAllowedTo('calendar_edit_own');
+			{
+							isAllowedTo('calendar_edit_own');
+			}
 		}
 
 		return $event;