elkarte / Elkarte

sources/subs/Bans.subs.php

Braces +218 added lines, -86 removed lines

@@ -59,15 +59,20 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (!is_array($suggestions))
-		return false;
+	{
+			return false;
+	}
 
 	// What triggers are we adding (like ip, host, email, etc)
 	foreach ($suggestions['ban_suggestions'] as $key => $value)
 	{
 		if (is_array($value))
-			$triggers[$key] = $value;
-		else
-			$triggers[$value] = !empty($suggestions[$value]) ? $suggestions[$value] : '';
+		{
+					$triggers[$key] = $value;
+		}
+		else {
+					$triggers[$value] = !empty($suggestions[$value]) ? $suggestions[$value] : '';
+		}
 	}
 
 	// Make sure the triggers for this ban are valid
@@ -77,17 +82,23 @@ 
 	if (!empty($ban_triggers['ban_triggers']) && !$ban_errors->hasErrors())
 	{
 		if (empty($trigger_id))
-			addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
-		else
-			updateTriggers($trigger_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		{
+					addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
+		}
+		else {
+					updateTriggers($trigger_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		}
 	}
 
 	// No errors, then return the ban triggers
 	if ($ban_errors->hasErrors())
-		return $triggers;
-	else
-		return false;
-}
+	{
+			return $triggers;
+	}
+	else {
+			return false;
+	}
+	}
 
 /**
  * This function removes a batch of triggers based on ids
@@ -107,13 +118,19 @@ 
 	$db = database();
 
 	if ($group_id !== false)
-		$group_id = (int) $group_id;
+	{
+			$group_id = (int) $group_id;
+	}
 
 	if (empty($group_id) && empty($items_ids))
-		return false;
+	{
+			return false;
+	}
 
 	if (!is_array($items_ids))
-		$items_ids = array($items_ids);
+	{
+			$items_ids = array($items_ids);
+	}
 
 	// Log the ban removals so others know
 	$log_info = banLogItems(banDetails($items_ids, $group_id));
@@ -163,12 +180,16 @@ 
 	$db = database();
 
 	if (!is_array($group_ids))
-		$group_ids = array($group_ids);
+	{
+			$group_ids = array($group_ids);
+	}
 
 	$group_ids = array_unique($group_ids);
 
 	if (empty($group_ids))
-		return false;
+	{
+			return false;
+	}
 
 	$db->query('', '
 		DELETE FROM {db_prefix}ban_groups
@@ -199,21 +220,27 @@ 
 
 	// No specific id's passed, we truncate the entire table
 	if (empty($ids))
-		$db->query('truncate_table', '
+	{
+			$db->query('truncate_table', '
 			TRUNCATE {db_prefix}log_banned',
 			array(
 			)
 		);
+	}
 	else
 	{
 		if (!is_array($ids))
-			$ids = array($ids);
+		{
+					$ids = array($ids);
+		}
 
 		// Can only remove it once
 		$ids = array_unique($ids);
 
 		if (empty($ids))
-			return false;
+		{
+					return false;
+		}
 
 		// Remove this grouping
 		$db->query('', '
@@ -240,7 +267,9 @@ 
 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 	if (empty($triggers))
-		$ban_errors->addError('ban_empty_triggers');
+	{
+			$ban_errors->addError('ban_empty_triggers');
+	}
 
 	$ban_triggers = array();
 	$log_info = array();
@@ -251,7 +280,9 @@ 
 		if (!empty($value))
 		{
 			if ($key == 'member')
-				continue;
+			{
+							continue;
+			}
 
 			if ($key == 'main_ip')
 			{
@@ -262,13 +293,16 @@ 
 				{
 					$ban_triggers['main_ip'] = $ban_trigger;
 				}
-				else
-					$ban_errors->addError($ban_trigger['error']);
+				else {
+									$ban_errors->addError($ban_trigger['error']);
+				}
 			}
 			elseif ($key == 'hostname')
 			{
 				if (preg_match('/[^\w.\-*]/', $value) == 1)
-					$ban_errors->addError('invalid_hostname');
+				{
+									$ban_errors->addError('invalid_hostname');
+				}
 				else
 				{
 					// Replace the * wildcard by a MySQL wildcard %.
@@ -280,7 +314,9 @@ 
 			elseif ($key == 'email')
 			{
 				if (preg_match('/[^\w.\-\+*@]/', $value) == 1)
-					$ban_errors->addError('invalid_email');
+				{
+									$ban_errors->addError('invalid_email');
+				}
 
 				// Check the user is not banning an admin.
 				$request = $db->query('', '
@@ -295,7 +331,9 @@ 
 					)
 				);
 				if ($db->num_rows($request) != 0)
-					$ban_errors->addError('no_ban_admin');
+				{
+									$ban_errors->addError('no_ban_admin');
+				}
 				$db->free_result($request);
 
 				$value = substr(strtolower(str_replace('*', '%', $value)), 0, 255);
@@ -317,7 +355,9 @@ 
 					)
 				);
 				if ($db->num_rows($request) == 0)
-					$ban_errors->addError('invalid_username');
+				{
+									$ban_errors->addError('invalid_username');
+				}
 				list ($value, $isAdmin) = $db->fetch_row($request);
 				$db->free_result($request);
 
@@ -326,8 +366,9 @@ 
 					unset($value);
 					$ban_errors->addError('no_ban_admin');
 				}
-				else
-					$ban_triggers['user']['id_member'] = $value;
+				else {
+									$ban_triggers['user']['id_member'] = $value;
+				}
 			}
 			elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
 			{
@@ -336,7 +377,9 @@ 
 
 				// Don't add the main IP again.
 				if (isset($triggers['main_ip']))
-					$values = array_diff($values, array($triggers['main_ip']));
+				{
+									$values = array_diff($values, array($triggers['main_ip']));
+				}
 
 				unset($value);
 				foreach ($values as $val)
@@ -354,18 +397,22 @@ 
 							'bantype' => 'ip_range',
 						);
 					}
-					else
-						$ban_errors->addError($ban_trigger['error']);
+					else {
+											$ban_errors->addError($ban_trigger['error']);
+					}
 				}
 			}
-			else
-				$ban_errors->addError('no_bantype_selected');
+			else {
+							$ban_errors->addError('no_bantype_selected');
+			}
 
 			if (isset($value) && !is_array($value))
-				$log_info[] = array(
+			{
+							$log_info[] = array(
 					'value' => $value,
 					'bantype' => $key,
 				);
+			}
 		}
 	}
 
@@ -388,7 +435,9 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($group_id))
-		$ban_errors->addError('ban_not_found');
+	{
+			$ban_errors->addError('ban_not_found');
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -442,17 +491,24 @@ 
 	{
 		// Exceptions, exceptions, exceptions...always exceptions... :P
 		if (in_array($key, array('ips_in_messages', 'ips_in_errors')))
-			foreach ($trigger as $real_trigger)
+		{
+					foreach ($trigger as $real_trigger)
 				$insertTriggers[] = array_merge($values, $real_trigger);
-		else
-			$insertTriggers[] = array_merge($values, $trigger);
+		}
+		else {
+					$insertTriggers[] = array_merge($values, $trigger);
+		}
 	}
 
 	if (empty($insertTriggers))
-		$ban_errors->addError('ban_no_triggers');
+	{
+			$ban_errors->addError('ban_no_triggers');
+	}
 
 	if ($ban_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	$db->insert('ignore',
 		'{db_prefix}ban_items',
@@ -482,15 +538,23 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($ban_item))
-		$ban_errors->addError('ban_ban_item_empty');
+	{
+			$ban_errors->addError('ban_ban_item_empty');
+	}
 	if (empty($group_id))
-		$ban_errors->addError('ban_not_found');
+	{
+			$ban_errors->addError('ban_not_found');
+	}
 	if (empty($trigger))
-		$ban_errors->addError('ban_no_triggers');
+	{
+			$ban_errors->addError('ban_no_triggers');
+	}
 
 	// Any errors then we are not updating it
 	if ($ban_errors->hasErrors())
-		return;
+	{
+			return;
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -554,7 +618,9 @@ 
 function logTriggersUpdates($logs, $new = true)
 {
 	if (empty($logs))
-		return;
+	{
+			return;
+	}
 
 	$log_name_map = array(
 		'main_ip' => 'ip_range',
@@ -566,12 +632,14 @@ 
 
 	// Log the addition of the ban entries into the moderation log.
 	foreach ($logs as $log)
-		logAction('ban', array(
+	{
+			logAction('ban', array(
 			$log_name_map[$log['bantype']] => $log['value'],
 			'new' => empty($new) ? 0 : ($new === true ? 1 : -1),
 			'type' => $log['bantype'],
 		));
-}
+	}
+	}
 
 /**
  * Updates an existing ban group
@@ -590,13 +658,19 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($ban_info['name']))
-		$ban_errors->addError('ban_name_empty');
+	{
+			$ban_errors->addError('ban_name_empty');
+	}
 
 	if (empty($ban_info['id']))
-		$ban_errors->addError('ban_id_empty');
+	{
+			$ban_errors->addError('ban_id_empty');
+	}
 
 	if ($ban_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	// No problems found, so lets add this to the ban list
 	$request = $db->query('', '
@@ -611,7 +685,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		return insertBanGroup($ban_info);
+	{
+			return insertBanGroup($ban_info);
+	}
 	$db->free_result($request);
 
 	$db->query('', '
@@ -661,13 +737,19 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($ban_info['name']))
-		$ban_errors->addError('ban_name_empty');
+	{
+			$ban_errors->addError('ban_name_empty');
+	}
 
 	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$ban_errors->addError('ban_unknown_restriction_type');
+	{
+			$ban_errors->addError('ban_unknown_restriction_type');
+	}
 
 	if ($ban_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	// Check whether a ban with this name already exists.
 	$request = $db->query('', '
@@ -705,7 +787,9 @@ 
 	$ban_info['id'] = $db->insert_id('{db_prefix}ban_groups', 'id_ban_group');
 
 	if (empty($ban_info['id']))
-		$ban_errors->addError('impossible_insert_new_bangroup');
+	{
+			$ban_errors->addError('impossible_insert_new_bangroup');
+	}
 
 	return $ban_info['id'];
 }
@@ -730,16 +814,23 @@ 
 	if (!empty($high[4]) || !empty($high[5]) || !empty($high[6]) || !empty($high[7]))
 	{
 		if (count($low) != 8 || count($high) != 8)
-			return '';
+		{
+					return '';
+		}
 
 		for ($i = 0; $i < 8; $i++)
 		{
 			if ($low[$i] == $high[$i])
-				$ip[$i] = dechex($low[$i]);
+			{
+							$ip[$i] = dechex($low[$i]);
+			}
 			elseif ($low[$i] == '0' && $high[$i] == '255')
-				$ip[$i] = '*';
-			else
-				$ip[$i] = dechex($low[$i]) . '-' . dechex($high[$i]);
+			{
+							$ip[$i] = '*';
+			}
+			else {
+							$ip[$i] = dechex($low[$i]) . '-' . dechex($high[$i]);
+			}
 		}
 
 		return implode(':', $ip);
@@ -748,21 +839,30 @@ 
 	// Legacy IPv4 stuff.
 	// (count($low) != 4 || count($high) != 4) would not work because $low and $high always contain 8 elements!
 	if ((count($low) != 4 || count($high) != 4) && (count($low) != 8 || count($high) != 8))
-			return '';
+	{
+				return '';
+	}
 
 	for ($i = 0; $i < 4; $i++)
 	{
 		if ($low[$i] == $high[$i])
-			$ip[$i] = $low[$i];
+		{
+					$ip[$i] = $low[$i];
+		}
 		elseif ($low[$i] == '0' && $high[$i] == '255')
-			$ip[$i] = '*';
-		else
-			$ip[$i] = $low[$i] . '-' . $high[$i];
+		{
+					$ip[$i] = '*';
+		}
+		else {
+					$ip[$i] = $low[$i] . '-' . $high[$i];
+		}
 	}
 
 	// Pretending is fun... the IP can't be this, so use it for 'unknown'.
 	if ($ip == array(255, 255, 255, 255))
-		return 'unknown';
+	{
+			return 'unknown';
+	}
 
 	return implode('.', $ip);
 }
@@ -788,7 +888,8 @@ 
 	$db = database();
 
 	if (count($ip_array) == 4 || count($ip_array) == 8)
-		$values = array(
+	{
+			$values = array(
 			'ip_low1' => $ip_array[0]['low'],
 			'ip_high1' => $ip_array[0]['high'],
 			'ip_low2' => $ip_array[1]['low'],
@@ -806,8 +907,10 @@ 
 			'ip_low8' => $ip_array[7]['low'],
 			'ip_high8' => $ip_array[7]['high'],
 		);
-	else
-		$values = array('error' => 'invalid_ip');
+	}
+	else {
+			$values = array('error' => 'invalid_ip');
+	}
 
 	$request = $db->query('', '
 		SELECT bg.id_ban_group, bg.name
@@ -861,10 +964,14 @@ 
 	$return = validateIPBan($ip_array, $fullip);
 
 	if (empty($return['error']))
-		return $return;
+	{
+			return $return;
+	}
 
 	if ($return['error'] === 'ban_trigger_already_exists')
-		throw new Elk_Exception($return['error'][0], false, $return['error'][1]);
+	{
+			throw new Elk_Exception($return['error'][0], false, $return['error'][1]);
+	}
 
 	return false;
 }
@@ -904,14 +1011,19 @@ 
 		function ($row) use (&$memberIDs, &$memberEmails, &$memberEmailWild)
 		{
 			if ($row['id_member'])
-				$memberIDs[$row['id_member']] = $row['id_member'];
+			{
+							$memberIDs[$row['id_member']] = $row['id_member'];
+			}
 			if ($row['email_address'])
 			{
 				// Does it have a wildcard - if so we can't do a IN on it.
 				if (strpos($row['email_address'], '%') !== false)
-					$memberEmailWild[$row['email_address']] = $row['email_address'];
-				else
-					$memberEmails[$row['email_address']] = $row['email_address'];
+				{
+									$memberEmailWild[$row['email_address']] = $row['email_address'];
+				}
+				else {
+									$memberEmails[$row['email_address']] = $row['email_address'];
+				}
 			}
 		}
 	);
@@ -997,7 +1109,9 @@ 
 	{
 		require_once(SUBSDIR . '/Members.subs.php');
 		foreach ($updates as $newStatus => $members)
-			updateMemberData($members, array('is_activated' => $newStatus));
+		{
+					updateMemberData($members, array('is_activated' => $newStatus));
+		}
 	}
 
 	// Update the latest member and our total members as banning may change them.
@@ -1020,7 +1134,8 @@ 
 
 	$result = getBasicMemberData($id, array('moderation' => true));
 	if (!empty($result))
-		$suggestions = array(
+	{
+			$suggestions = array(
 			'member' => array(
 				'id' => $result['id_member'],
 				'name' => $result['real_name'],
@@ -1028,6 +1143,7 @@ 
 			'main_ip' => $result['member_ip'],
 			'email' => $result['email_address'],
 		);
+	}
 
 	return $suggestions;
 }
@@ -1128,12 +1244,16 @@ 
 			// Work out what restrictions we actually have.
 			$ban_restrictions = array();
 			foreach (array('access', 'register', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
+			{
+							if ($row['cannot_' . $type])
 					$ban_restrictions[] = $txt['ban_type_' . $type];
+			}
 
 			// No actual ban in place?
 			if (empty($ban_restrictions))
-				continue;
+			{
+							continue;
+			}
 
 			// Prepare the link for context.
 			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
@@ -1296,7 +1416,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		throw new Elk_Exception('ban_not_found', false);
+	{
+			throw new Elk_Exception('ban_not_found', false);
+	}
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!isset($context['ban']))
@@ -1446,7 +1568,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$message_ips[] = $row['poster_ip'];
+	{
+			$message_ips[] = $row['poster_ip'];
+	}
 	$db->free_result($request);
 
 	return $message_ips;
@@ -1475,7 +1599,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$error_ips[] = $row['ip'];
+	{
+			$error_ips[] = $row['ip'];
+	}
 	$db->free_result($request);
 
 	return $error_ips;
@@ -1499,8 +1625,10 @@ 
 
 	$return = array();
 	foreach ($search_list as $key => $callable)
-		if (is_callable($callable))
+	{
+			if (is_callable($callable))
 			$return[$key] = call_user_func($callable, $member_id);
+	}
 
 	return $return;
 }
@@ -1517,7 +1645,9 @@ 
 	$db = database();
 
 	if (!is_array($ban_ids))
-		$ban_ids = array($ban_ids);
+	{
+			$ban_ids = array($ban_ids);
+	}
 
 	$request = $db->query('', '
 		SELECT
@@ -1536,7 +1666,9 @@ 
 	);
 	$details = array();
 	while ($row = $db->fetch_assoc($request))
-		$details[$row['id_ban']] = $row;
+	{
+			$details[$row['id_ban']] = $row;
+	}
 	$db->free_result($request);
 
 	return $details;

Spacing +3 added lines, -3 removed lines

@@ -901,7 +901,7 @@ 
 			'current_time' => time(),
 			'blank_string' => '',
 		),
-		function ($row) use (&$memberIDs, &$memberEmails, &$memberEmailWild)
+		function($row) use (&$memberIDs, &$memberEmails, &$memberEmailWild)
 		{
 			if ($row['id_member'])
 				$memberIDs[$row['id_member']] = $row['id_member'];
@@ -946,7 +946,7 @@ 
 			FROM {db_prefix}members AS mem
 			WHERE ' . implode(' OR ', $queryPart),
 			$queryValues,
-			function ($row) use (&$allMembers, &$updates, &$newMembers)
+			function($row) use (&$allMembers, &$updates, &$newMembers)
 			{
 				if (!in_array($row['id_member'], $allMembers))
 				{
@@ -982,7 +982,7 @@ 
 			'current_time' => time(),
 			'ban_flag' => 10,
 		),
-		function ($row) use (&$allMembers, &$updates)
+		function($row) use (&$allMembers, &$updates)
 		{
 			// Don't do this twice!
 			if (!in_array($row['id_member'], $allMembers))

sources/subs/Menu.subs.php

Braces +93 added lines, -34 removed lines

@@ -80,24 +80,32 @@ 
 
 	// Allow extend *any* menu with a single hook
 	if (!empty($menuOptions['hook']))
-		call_integration_hook('integrate_' . $menuOptions['hook'] . '_areas', array(&$menuData, &$menuOptions));
+	{
+			call_integration_hook('integrate_' . $menuOptions['hook'] . '_areas', array(&$menuData, &$menuOptions));
+	}
 
 	// What is the general action of this menu (i.e. $scripturl?action=XXXX.
 	$menu_context['current_action'] = isset($menuOptions['action']) ? $menuOptions['action'] : $context['current_action'];
 
 	// What is the current area selected?
 	if (isset($menuOptions['current_area']) || isset($_req->query->area))
-		$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_req->query->area;
+	{
+			$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_req->query->area;
+	}
 
 	// Build a list of additional parameters that should go in the URL.
 	$menu_context['extra_parameters'] = '';
 	if (!empty($menuOptions['extra_url_parameters']))
-		foreach ($menuOptions['extra_url_parameters'] as $key => $value)
+	{
+			foreach ($menuOptions['extra_url_parameters'] as $key => $value)
 			$menu_context['extra_parameters'] .= ';' . $key . '=' . $value;
+	}
 
 	// Only include the session ID in the URL if it's strictly necessary.
 	if (empty($menuOptions['disable_url_session_check']))
-		$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	{
+			$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	$include_data = array();
 	// This is necessary only in profile (at least for the core), but we do it always because it's easier
@@ -108,7 +116,9 @@ 
 	{
 		// Is this enabled?
 		if ((isset($section['enabled']) && $section['enabled'] == false))
-			continue;
+		{
+					continue;
+		}
 		// Has permission check?
 		if (isset($section['permission']))
 		{
@@ -116,10 +126,14 @@ 
 			if (is_array($section['permission']) && isset($section['permission']['own'], $section['permission']['any']))
 			{
 				if (empty($section['permission'][$permission_set]) || !allowedTo($section['permission'][$permission_set]))
-					continue;
+				{
+									continue;
+				}
 			}
 			elseif (!allowedTo($section['permission']))
-				continue;
+			{
+							continue;
+			}
 		}
 
 		// Now we cycle through the sections to pick the right area.
@@ -135,10 +149,14 @@ 
 					if (is_array($area['permission']) && isset($area['permission']['own'], $area['permission']['any']))
 					{
 						if (empty($area['permission'][$permission_set]) || !allowedTo($area['permission'][$permission_set]))
-							continue;
+						{
+													continue;
+						}
 					}
 					elseif (!allowedTo($area['permission']))
-						continue;
+					{
+											continue;
+					}
 				}
 
 				// Add it to the context... if it has some form of name!
@@ -146,7 +164,9 @@ 
 				{
 					// We may want to include a file, let's find out the path
 					if (!empty($area['file']))
-							$area['file'] = (!empty($area['dir']) ? $area['dir'] : (!empty($menuOptions['default_include_dir']) ? $menuOptions['default_include_dir'] : CONTROLLERDIR)) . '/' . $area['file'];
+					{
+												$area['file'] = (!empty($area['dir']) ? $area['dir'] : (!empty($menuOptions['default_include_dir']) ? $menuOptions['default_include_dir'] : CONTROLLERDIR)) . '/' . $area['file'];
+					}
 
 					// If we haven't got an area then the first valid one is our choice.
 					if (!isset($menu_context['current_area']))
@@ -162,27 +182,36 @@ 
 						if (!isset($menu_context['sections'][$section_id]))
 						{
 							if (isset($menuOptions['counters'], $section['counter']) && !empty($menuOptions['counters'][$section['counter']]))
-								$section['title'] .= sprintf($settings['menu_numeric_notice'][0], $menuOptions['counters'][$section['counter']]);
+							{
+															$section['title'] .= sprintf($settings['menu_numeric_notice'][0], $menuOptions['counters'][$section['counter']]);
+							}
 
 							$menu_context['sections'][$section_id]['title'] = $section['title'];
 						}
 
 						$menu_context['sections'][$section_id]['areas'][$area_id] = array('label' => isset($area['label']) ? $area['label'] : $txt[$area_id]);
 						if (isset($menuOptions['counters'], $area['counter']) && !empty($menuOptions['counters'][$area['counter']]))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['label'] .= sprintf($settings['menu_numeric_notice'][1], $menuOptions['counters'][$area['counter']]);
+						{
+													$menu_context['sections'][$section_id]['areas'][$area_id]['label'] .= sprintf($settings['menu_numeric_notice'][1], $menuOptions['counters'][$area['counter']]);
+						}
 
 						// We'll need the ID as well...
 						$menu_context['sections'][$section_id]['id'] = $section_id;
 
 						// Does it have a custom URL?
 						if (isset($area['custom_url']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						{
+													$menu_context['sections'][$section_id]['areas'][$area_id]['url'] = $area['custom_url'];
+						}
 
 						// Does this area have its own icon?
 						if (isset($area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img ' . (isset($area['class']) ? 'class="' . $area['class'] . '" ' : 'style="background: none"') . ' src="' . $context['menu_image_path'] . '/' . $area['icon'] . '" alt="" />&nbsp;&nbsp;';
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '';
+						{
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img ' . (isset($area['class']) ? 'class="' . $area['class'] . '" ' : 'style="background: none"') . ' src="' . $context['menu_image_path'] . '/' . $area['icon'] . '" alt="" />&nbsp;&nbsp;';
+						}
+						else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '';
+						}
 
 						// Did it have subsections?
 						if (!empty($area['subsections']))
@@ -194,41 +223,56 @@ 
 								if ((empty($sub[1]) || allowedTo($sub[1])) && (!isset($sub['enabled']) || !empty($sub['enabled'])))
 								{
 									if ($first_sa === null)
-										$first_sa = $sa;
+									{
+																			$first_sa = $sa;
+									}
 
 									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa] = array('label' => $sub[0]);
 									if (isset($menuOptions['counters'], $sub['counter']) && !empty($menuOptions['counters'][$sub['counter']]))
-										$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['label'] .= sprintf($settings['menu_numeric_notice'][2], $menuOptions['counters'][$sub['counter']]);
+									{
+																			$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['label'] .= sprintf($settings['menu_numeric_notice'][2], $menuOptions['counters'][$sub['counter']]);
+									}
 
 									// Custom URL?
 									if (isset($sub['url']))
-										$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									{
+																			$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									}
 
 									// A bit complicated - but is this set?
 									if ($menu_context['current_area'] == $area_id)
 									{
 										// Save which is the first...
 										if (empty($first_sa))
-											$first_sa = $sa;
+										{
+																					$first_sa = $sa;
+										}
 
 										// Is this the current subsection?
 										if (isset($_req->query->sa) && $_req->query->sa == $sa)
-											$menu_context['current_subsection'] = $sa;
+										{
+																					$menu_context['current_subsection'] = $sa;
+										}
 
 										elseif (isset($sub['active']) && isset($_req->query->sa) && in_array($_req->query->sa, $sub['active']))
-											$menu_context['current_subsection'] = $sa;
+										{
+																					$menu_context['current_subsection'] = $sa;
+										}
 
 										// Otherwise is it the default?
 										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2]))
-											$menu_context['current_subsection'] = $sa;
+										{
+																					$menu_context['current_subsection'] = $sa;
+										}
 									}
 
 									// Let's assume this is the last, for now.
 									$last_sa = $sa;
 								}
 								// Mark it as disabled...
-								else
-									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								else {
+																	$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['disabled'] = true;
+								}
 							}
 
 							// Set which one is first, last and selected in the group.
@@ -238,7 +282,9 @@ 
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $first_sa : $last_sa]['is_last'] = true;
 
 								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection']))
-									$menu_context['current_subsection'] = $first_sa;
+								{
+																	$menu_context['current_subsection'] = $first_sa;
+								}
 							}
 						}
 					}
@@ -284,14 +330,18 @@ 
 		$menu_context['sections'][$menu_context['current_section']]['selected'] = true;
 		$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['selected'] = true;
 		if (!empty($menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]))
-			$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		{
+					$menu_context['sections'][$menu_context['current_section']]['areas'][$menu_context['current_area']]['subsections'][$context['current_subaction']]['selected'] = true;
+		}
 
 		foreach ($menu_context['sections'] as $section_id => $section)
-			foreach ($section['areas'] as $area_id => $area)
+		{
+					foreach ($section['areas'] as $area_id => $area)
 			{
 				if (!isset($menu_context['sections'][$section_id]['url']))
 				{
 					$menu_context['sections'][$section_id]['url'] = isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $area_id;
+		}
 					break;
 				}
 			}
@@ -299,7 +349,9 @@ 
 
 	// If we didn't find the area we were looking for go to a default one.
 	if (isset($backup_area) && empty($found_section))
-		$menu_context['current_area'] = $backup_area;
+	{
+			$menu_context['current_area'] = $backup_area;
+	}
 
 	// If still no data then return - nothing to show!
 	if (empty($menu_context['sections']))
@@ -307,7 +359,9 @@ 
 		// Never happened!
 		$context['max_menu_id']--;
 		if ($context['max_menu_id'] == 0)
-			unset($context['max_menu_id']);
+		{
+					unset($context['max_menu_id']);
+		}
 
 		return false;
 	}
@@ -318,8 +372,9 @@ 
 		$menuOptions['menu_type'] = '_' . (empty($options['use_sidebar_menu']) ? 'dropdown' : 'sidebar');
 		$menu_context['can_toggle_drop_down'] = !$user_info['is_guest'] && isset($settings['theme_version']) && $settings['theme_version'] >= 2.0;
 	}
-	else
-		$menu_context['can_toggle_drop_down'] = !empty($menuOptions['can_toggle_drop_down']);
+	else {
+			$menu_context['can_toggle_drop_down'] = !empty($menuOptions['can_toggle_drop_down']);
+	}
 
 	// Almost there - load the template and add to the template layers.
 	loadTemplate(isset($menuOptions['template_name']) ? $menuOptions['template_name'] : 'GenericMenu');
@@ -328,7 +383,9 @@ 
 
 	// Check we had something - for sanity sake.
 	if (empty($include_data))
-		return false;
+	{
+			return false;
+	}
 
 	// Finally - return information on the selected item.
 	$include_data += array(
@@ -353,7 +410,9 @@ 
 
 	$menu_name = $menu_id == 'last' && isset($context['max_menu_id']) && isset($context['menu_data_' . $context['max_menu_id']]) ? 'menu_data_' . $context['max_menu_id'] : 'menu_data_' . $menu_id;
 	if (!isset($context[$menu_name]))
-		return false;
+	{
+			return false;
+	}
 
 	Template_Layers::instance()->remove($context[$menu_name]['layer_name']);
 

sources/subs/Memberlist.subs.php

Braces +24 added lines, -9 removed lines

@@ -65,15 +65,18 @@ 
 		{
 			// Build the sort queries.
 			if ($row['field_type'] != 'check')
-				$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
+			{
+							$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
 					'down' => 'LENGTH(cfd' . $curField . '.value) > 0 ASC, COALESCE(cfd' . $curField . '.value, 1=1) DESC, cfd' . $curField . '.value DESC',
 					'up' => 'LENGTH(cfd' . $curField . '.value) > 0 DESC, COALESCE(cfd' . $curField . '.value, 1=1) ASC, cfd' . $curField . '.value ASC'
 				);
-			else
-				$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
+			}
+			else {
+							$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
 					'down' => 'cfd' . $curField . '.value DESC',
 					'up' => 'cfd' . $curField . '.value ASC'
 				);
+			}
 
 			// Build the join and parameters for the sort query
 			$context['custom_profile_fields']['join'] = 'LEFT JOIN {db_prefix}custom_fields_data AS cfd' . $curField . ' ON (cfd' . $curField . '.variable = {string:cfd' . $curField . '} AND cfd' . $curField . '.id_member = mem.id_member)';
@@ -291,11 +294,13 @@ 
 	);
 	$context['custom_search_fields'] = array();
 	while ($row = $db->fetch_assoc($request))
-		$context['custom_search_fields'][$row['col_name']] = array(
+	{
+			$context['custom_search_fields'][$row['col_name']] = array(
 			'colname' => $row['col_name'],
 			'name' => $row['field_name'],
 			'desc' => $row['field_desc'],
 		);
+	}
 	$db->free_result($request);
 }
 
@@ -323,11 +328,15 @@ 
 
 	// Avoid division by zero...
 	if ($most_posts == 0)
-		$most_posts = 1;
+	{
+			$most_posts = 1;
+	}
 
 	$members = array();
 	while ($row = $db->fetch_assoc($request))
-		$members[] = $row['id_member'];
+	{
+			$members[] = $row['id_member'];
+	}
 
 	// Load all the members for display.
 	loadMemberData($members);
@@ -338,7 +347,9 @@ 
 	foreach ($members as $member)
 	{
 		if (!loadMemberContext($member, true))
-			continue;
+		{
+					continue;
+		}
 
 		$context['members'][$member] = $memberContext[$member];
 		$context['members'][$member]['post_percent'] = round(($context['members'][$member]['real_posts'] * 100) / $most_posts);
@@ -388,9 +399,13 @@ 
 
 				// Anything else to make it look "nice"
 				if ($column['bbc'])
-					$context['members'][$member]['options'][$curField] = strip_tags($bbc_parser->parseCustomFields($context['members'][$member]['options'][$curField]));
+				{
+									$context['members'][$member]['options'][$curField] = strip_tags($bbc_parser->parseCustomFields($context['members'][$member]['options'][$curField]));
+				}
 				elseif ($column['type'] === 'check')
-					$context['members'][$member]['options'][$curField] = $context['members'][$member]['options'][$curField] == 0 ? $txt['no'] : $txt['yes'];
+				{
+									$context['members'][$member]['options'][$curField] = $context['members'][$member]['options'][$curField] == 0 ? $txt['no'] : $txt['yes'];
+				}
 			}
 		}
 	}

sources/subs/Language.subs.php

Braces +76 added lines, -31 removed lines

@@ -74,9 +74,12 @@ 
 	// Put them back.
 	$settings['actual_theme_dir'] = $backup_actual_theme_dir;
 	if (!empty($backup_base_theme_dir))
-		$settings['base_theme_dir'] = $backup_base_theme_dir;
-	else
-		unset($settings['base_theme_dir']);
+	{
+			$settings['base_theme_dir'] = $backup_base_theme_dir;
+	}
+	else {
+			unset($settings['base_theme_dir']);
+	}
 
 	// Get the language files and data...
 	foreach ($all_languages as $lang)
@@ -106,12 +109,18 @@ 
 	{
 		// Default?
 		if (empty($row['lngfile']) || !isset($languages[$row['lngfile']]))
-			$row['lngfile'] = $language;
+		{
+					$row['lngfile'] = $language;
+		}
 
 		if (!isset($languages[$row['lngfile']]) && isset($languages['english']))
-			$languages['english']['count'] += $row['num_users'];
+		{
+					$languages['english']['count'] += $row['num_users'];
+		}
 		elseif (isset($languages[$row['lngfile']]))
-			$languages[$row['lngfile']]['count'] += $row['num_users'];
+		{
+					$languages[$row['lngfile']]['count'] += $row['num_users'];
+		}
 	}
 	$db->free_result($request);
 
@@ -149,7 +158,9 @@ 
 
 				// If we're now escaped don't add this string.
 				if ($is_escape)
-					continue;
+				{
+									continue;
+				}
 			}
 			// Special case - parsed string with line break etc?
 			elseif (($string[$i] == 'n' || $string[$i] == 't') && $in_string == 2 && $is_escape)
@@ -167,10 +178,13 @@ 
 				{
 					// Is it the end of a single quote string?
 					if ($in_string == 1)
-						$in_string = 0;
+					{
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 1;
+					else {
+											$in_string = 1;
+					}
 
 					// Don't actually include this character!
 					continue;
@@ -184,10 +198,13 @@ 
 				{
 					// Is it the end of a double quote string?
 					if ($in_string == 2)
-						$in_string = 0;
+					{
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 2;
+					else {
+											$in_string = 2;
+					}
 
 					// Don't actually include this character!
 					continue;
@@ -195,7 +212,9 @@ 
 			}
 			// A join/space outside of a string is simply removed.
 			elseif ($in_string == 0 && (empty($string[$i]) || $string[$i] == '.'))
-				continue;
+			{
+							continue;
+			}
 			// Start of a variable?
 			elseif ($in_string == 0 && $string[$i] == '$')
 			{
@@ -261,9 +280,13 @@ 
 				if (!empty($matches[1]))
 				{
 					if ($in_string == 1)
-						$new_string .= '\' . ';
+					{
+											$new_string .= '\' . ';
+					}
 					elseif ($new_string)
-						$new_string .= ' . ';
+					{
+											$new_string .= ' . ';
+					}
 
 					$new_string .= $matches[1];
 					$i += strlen($matches[1]) + 3;
@@ -277,7 +300,9 @@ 
 			{
 				// Probably HTML?
 				if ($string[$i + 1] != ' ')
-					$in_html = true;
+				{
+									$in_html = true;
+				}
 				// Assume we need an entity...
 				else
 				{
@@ -290,7 +315,9 @@ 
 			{
 				// Will it be HTML?
 				if ($in_html)
-					$in_html = false;
+				{
+									$in_html = false;
+				}
 				// Otherwise we need an entity...
 				else
 				{
@@ -300,7 +327,9 @@ 
 			}
 			// Is it a slash? If so escape it...
 			if ($string[$i] == '\\')
-				$new_string .= '\\';
+			{
+							$new_string .= '\\';
+			}
 			// The infamous double quote?
 			elseif ($string[$i] == '"')
 			{
@@ -324,9 +353,13 @@ 
 
 		// If we ended as a string then close it off.
 		if ($in_string == 1)
-			$new_string .= '\'';
+		{
+					$new_string .= '\'';
+		}
 		elseif ($in_string == 2)
-			$new_string .= '"';
+		{
+					$new_string .= '"';
+		}
 	}
 
 	return $new_string;
@@ -353,9 +386,13 @@ 
 
 	// Check that the site responded and that the language exists.
 	if (!$language_list->exists('languages'))
-		$context['langfile_error'] = 'no_response';
+	{
+			$context['langfile_error'] = 'no_response';
+	}
 	elseif (!$language_list->exists('languages/language'))
-		$context['langfile_error'] = 'no_files';
+	{
+			$context['langfile_error'] = 'no_files';
+	}
 	else
 	{
 		$language_list = $language_list->path('languages[0]');
@@ -365,7 +402,9 @@ 
 		{
 			// Were we searching?
 			if (!empty($context['elk_search_term']) && strpos($file->fetch('name'), Util::strtolower($context['elk_search_term'])) === false)
-				continue;
+			{
+							continue;
+			}
 
 			$languages[] = array(
 				'id' => $file->fetch('id'),
@@ -377,9 +416,12 @@ 
 			);
 		}
 		if (empty($languages))
-			$context['langfile_error'] = 'no_files';
-		else
-			return $languages;
+		{
+					$context['langfile_error'] = 'no_files';
+		}
+		else {
+					return $languages;
+		}
 	}
 }
 
@@ -413,7 +455,10 @@ 
 	$db->free_result($request);
 
 	if (!empty($pid))
-		return array($pid, $file_name);
-	else
-		return false;
-}
+	{
+			return array($pid, $file_name);
+	}
+	else {
+			return false;
+	}
+	}

sources/subs/DataValidator.class.php

Braces +219 added lines, -82 removed lines

@@ -174,13 +174,18 @@ 
 	{
 		// If its not an array, make it one
 		if (!is_array($rules))
-			$rules = array($rules);
+		{
+					$rules = array($rules);
+		}
 
 		// Set the validation rules
 		if (!empty($rules))
-			$this->_validation_rules = $rules;
-		else
-			return $this->_validation_rules;
+		{
+					$this->_validation_rules = $rules;
+		}
+		else {
+					return $this->_validation_rules;
+		}
 	}
 
 	/**
@@ -193,15 +198,20 @@ 
 	{
 		// If its not an array, make it one
 		if (!is_array($rules))
-			$rules = array($rules);
+		{
+					$rules = array($rules);
+		}
 
 		// Set the sanitation rules
 		$this->_strict = $strict;
 
 		if (!empty($rules))
-			$this->_sanitation_rules = $rules;
-		else
-			return $this->_sanitation_rules;
+		{
+					$this->_sanitation_rules = $rules;
+		}
+		else {
+					return $this->_sanitation_rules;
+		}
 	}
 
 	/**
@@ -211,9 +221,12 @@ 
 	public function text_replacements($replacements = array())
 	{
 		if (!empty($replacements))
-			$this->_replacements = $replacements;
-		else
-			return $this->_replacements;
+		{
+					$this->_replacements = $replacements;
+		}
+		else {
+					return $this->_replacements;
+		}
 	}
 
 	/**
@@ -225,9 +238,12 @@ 
 	public function input_processing($datatype = array())
 	{
 		if (!empty($datatype))
-			$this->_datatype = $datatype;
-		else
-			return $this->_datatype;
+		{
+					$this->_datatype = $datatype;
+		}
+		else {
+					return $this->_datatype;
+		}
 	}
 
 	/**
@@ -239,11 +255,15 @@ 
 	{
 		// If its an object, convert it to an array
 		if (is_object($input))
-			$input = (array) $input;
+		{
+					$input = (array) $input;
+		}
 
 		// @todo this won't work, $input[$field] will be undefined
 		if (!is_array($input))
-			$input[$input] = array($input);
+		{
+					$input[$input] = array($input);
+		}
 
 		// Clean em
 		$this->_data = $this->_sanitize($input, $this->_sanitation_rules);
@@ -265,10 +285,13 @@ 
 	{
 		// Return the array
 		if ($raw === true)
-			return $this->_validation_errors;
+		{
+					return $this->_validation_errors;
+		}
 		// Otherwise return the formatted text string(s)
-		else
-			return $this->_get_error_messages($raw);
+		else {
+					return $this->_get_error_messages($raw);
+		}
 	}
 
 	/**
@@ -278,7 +301,9 @@ 
 	public function validation_data($key = null)
 	{
 		if ($key === null)
-			return $this->_data;
+		{
+					return $this->_data;
+		}
 
 		return isset($this->_data[$key]) ? $this->_data[$key] : null;
 	}
@@ -299,7 +324,9 @@ 
 		{
 			// Special processing required on this field like csv or array?
 			if (isset($this->_datatype[$field]) && in_array($this->_datatype[$field], array('csv', 'array')))
-				$this->_validate_recursive($input, $field, $rules);
+			{
+							$this->_validate_recursive($input, $field, $rules);
+			}
 			else
 			{
 				// Get rules for this field
@@ -326,20 +353,27 @@ 
 
 					// Defined method to use?
 					if (is_callable(array($this, $validation_method)))
-						$result = $this->{$validation_method}($field, $input, $validation_parameters);
+					{
+											$result = $this->{$validation_method}($field, $input, $validation_parameters);
+					}
 					// Maybe even a custom function set up like a defined one, addons can do this.
 					elseif (is_callable($validation_function) && strpos($validation_function, 'validate_') === 0 && isset($input[$field]))
-						$result = call_user_func_array($validation_function, array_merge((array) $field, (array) $input[$field], $validation_parameters_function));
-					else
-						$result = array(
+					{
+											$result = call_user_func_array($validation_function, array_merge((array) $field, (array) $input[$field], $validation_parameters_function));
+					}
+					else {
+											$result = array(
 							'field' => $validation_method,
 							'input' => isset($input[$field]) ? $input[$field] : null,
 							'function' => '_validate_invalid_function',
 							'param' => $validation_parameters
 						);
+					}
 
 					if (is_array($result))
-						$this->_validation_errors[] = $result;
+					{
+											$this->_validation_errors[] = $result;
+					}
 				}
 			}
 		}
@@ -360,7 +394,9 @@ 
 	private function _validate_recursive($input, $field, $rules)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		// Start a new instance of the validator to work on this sub data (csv/array)
 		$sub_validator = new Data_Validator();
@@ -427,14 +463,18 @@ 
 			if (!array_key_exists($field, $input))
 			{
 				if ($this->_strict)
-					unset($input[$field]);
+				{
+									unset($input[$field]);
+				}
 
 				continue;
 			}
 
 			// Is this a special processing field like csv or array?
 			if (isset($this->_datatype[$field]) && in_array($this->_datatype[$field], array('csv', 'array')))
-				$input[$field] = $this->_sanitize_recursive($input, $field, $rules);
+			{
+							$input[$field] = $this->_sanitize_recursive($input, $field, $rules);
+			}
 			else
 			{
 				// Rules for which we do have data
@@ -461,10 +501,14 @@ 
 
 					// Defined method to use?
 					if (is_callable(array($this, $sanitation_method)))
-						$input[$field] = $this->{$sanitation_method}($input[$field], $sanitation_parameters);
+					{
+											$input[$field] = $this->{$sanitation_method}($input[$field], $sanitation_parameters);
+					}
 					// One of our static methods or even a built in php function like strtoupper, intval, etc?
 					elseif (is_callable($sanitation_function))
-						$input[$field] = call_user_func_array($sanitation_function, array_merge((array) $input[$field], $sanitation_parameters_function));
+					{
+											$input[$field] = call_user_func_array($sanitation_function, array_merge((array) $input[$field], $sanitation_parameters_function));
+					}
 					// Or even a language construct?
 					elseif (in_array($sanitation_function, array('empty', 'array', 'isset')))
 					{
@@ -557,14 +601,18 @@ 
 		global $txt;
 
 		if (empty($this->_validation_errors))
-			return false;
+		{
+					return false;
+		}
 
 		loadLanguage('Validation');
 		$result = array();
 
 		// Just want specific errors then it must be an array
 		if (!empty($keys) && !is_array($keys))
-			$keys = array($keys);
+		{
+					$keys = array($keys);
+		}
 
 		foreach ($this->_validation_errors as $error)
 		{
@@ -573,22 +621,30 @@ 
 
 			// Just want specific field errors returned?
 			if (!empty($keys) && is_array($keys) && !in_array($error['field'], $keys))
-				continue;
+			{
+							continue;
+			}
 
 			// Set the error message for this validation failure
 			if (isset($error['error']))
-				$result[] = sprintf($txt[$error['error']], $field, $error['error_msg']);
+			{
+							$result[] = sprintf($txt[$error['error']], $field, $error['error_msg']);
+			}
 			// Use our error text based on the function name itself
 			elseif (isset($txt[$error['function']]))
 			{
 				if (!empty($error['param']))
-					$result[] = sprintf($txt[$error['function']], $field, $error['param']);
-				else
-					$result[] = sprintf($txt[$error['function']], $field, $error['input']);
+				{
+									$result[] = sprintf($txt[$error['function']], $field, $error['param']);
+				}
+				else {
+									$result[] = sprintf($txt[$error['function']], $field, $error['input']);
+				}
 			}
 			// can't find the function text, so set a generic one
-			else
-				$result[] = sprintf($txt['_validate_generic'], $field);
+			else {
+							$result[] = sprintf($txt['_validate_generic'], $field);
+			}
 		}
 
 		return empty($result) ? false : $result;
@@ -610,7 +666,9 @@ 
 		$value = trim(strtolower($input[$field]));
 
 		if (in_array($value, $validation_parameters))
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -636,7 +694,9 @@ 
 		$value = trim(strtolower($input[$field]));
 
 		if (!in_array($value, $validation_parameters))
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -669,15 +729,21 @@ 
 		// Lower bound ?
 		$passmin = true;
 		if (isset($validation_parameters[0]))
-			$passmin = $value >= $validation_parameters[0];
+		{
+					$passmin = $value >= $validation_parameters[0];
+		}
 
 		// Upper bound ?
 		$passmax = true;
 		if (isset($validation_parameters[1]))
-			$passmax = $value <= $validation_parameters[1];
+		{
+					$passmax = $value <= $validation_parameters[1];
+		}
 
 		if ($passmax && $passmin)
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -705,12 +771,14 @@ 
 		foreach ($validation_parameters as $dummy => $check)
 		{
 			if (strpos($value, $check) !== false)
-				return array(
+			{
+							return array(
 					'field' => $field,
 					'input' => $input[$field],
 					'function' => __FUNCTION__,
 					'param' => implode(',', $validation_parameters)
 				);
+			}
 		}
 
 		return;
@@ -728,7 +796,9 @@ 
 	protected function _validate_required($field, $input, $validation_parameters = null)
 	{
 		if (isset($input[$field]) && trim($input[$field]) !== '')
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -750,16 +820,23 @@ 
 	protected function _validate_valid_email($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		// Quick check, no @ in the email
 		if (strrpos($input[$field], '@') === false)
-			$valid = false;
-		else
-			$valid = filter_var($input[$field], FILTER_VALIDATE_EMAIL) !== false;
+		{
+					$valid = false;
+		}
+		else {
+					$valid = filter_var($input[$field], FILTER_VALIDATE_EMAIL) !== false;
+		}
 
 		if ($valid)
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -781,10 +858,14 @@ 
 	protected function _validate_max_length($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (Util::strlen($input[$field]) <= (int) $validation_parameters)
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -806,10 +887,14 @@ 
 	protected function _validate_min_length($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (Util::strlen($input[$field]) >= (int) $validation_parameters)
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -831,10 +916,14 @@ 
 	protected function _validate_length($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (Util::strlen($input[$field]) == (int) $validation_parameters)
-			return;
+		{
+					return;
+		}
 
 		return array(
 			'field' => $field,
@@ -856,7 +945,9 @@ 
 	protected function _validate_alpha($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		// A character with the Unicode property of letter (any kind of letter from any language)
 		if (!preg_match('~^(\p{L})+$~iu', $input[$field]))
@@ -883,7 +974,9 @@ 
 	protected function _validate_alpha_numeric($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		// A character with the Unicode property of letter or number (any kind of letter or numeric 0-9 from any language)
 		if (!preg_match('~^([-_\p{L}\p{Nd}])+$~iu', $input[$field]))
@@ -909,7 +1002,9 @@ 
 	protected function _validate_alpha_dash($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (!preg_match('~^([-_\p{L}])+$~iu', $input[$field]))
 		{
@@ -934,7 +1029,9 @@ 
 	protected function _validate_isarray($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (!is_array($input[$field]))
 		{
@@ -959,7 +1056,9 @@ 
 	protected function _validate_numeric($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (!is_numeric($input[$field]))
 		{
@@ -984,7 +1083,9 @@ 
 	protected function _validate_integer($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		$filter = filter_var($input[$field], FILTER_VALIDATE_INT);
 
@@ -1016,7 +1117,9 @@ 
 	protected function _validate_boolean($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		$filter = filter_var($input[$field], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
 
@@ -1057,7 +1160,9 @@ 
 	protected function _validate_float($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (filter_var($input[$field], FILTER_VALIDATE_FLOAT) === false)
 		{
@@ -1082,7 +1187,9 @@ 
 	protected function _validate_valid_url($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (!preg_match('`^(https{0,1}?:(//([a-z0-9\-._~%]+)(:[0-9]+)?(/[a-z0-9\-._~%!$&\'()*+,;=:@]+)*/?))(\?[a-z0-9\-._~%!$&\'()*+,;=:@/?]*)?(\#[a-z0-9\-._~%!$&\'()*+,;=:@/?]*)?$`', $input[$field], $matches))
 		{
@@ -1107,7 +1214,9 @@ 
 	protected function _validate_valid_ipv6($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (filter_var($input[$field], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false)
 		{
@@ -1132,7 +1241,9 @@ 
 	protected function _validate_valid_ip($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		if (filter_var($input[$field], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false)
 		{
@@ -1160,7 +1271,9 @@ 
 	protected function _validate_php_syntax($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		// Check the depth.
 		$level = 0;
@@ -1168,13 +1281,19 @@ 
 		foreach ($tokens as $token)
 		{
 			if ($token === '{' || (isset($token[1]) && $token[1] === '${'))
-				$level++;
+			{
+							$level++;
+			}
 			elseif ($token === '}')
-				$level--;
+			{
+							$level--;
+			}
 		}
 
 		if (!empty($level))
-			$result = false;
+		{
+					$result = false;
+		}
 		else
 		{
 			// Check the validity of the syntax.
@@ -1223,31 +1342,45 @@ 
 	protected function _validate_valid_color($field, $input, $validation_parameters = null)
 	{
 		if (!isset($input[$field]))
-			return;
+		{
+					return;
+		}
 
 		// A color can be a name: there are 140 valid, but a similar list is too long, so let's just use the basic 17
 		if (in_array(strtolower($input[$field]), array('aqua', 'black', 'blue', 'fuchsia', 'gray', 'green', 'lime', 'maroon', 'navy', 'olive', 'orange', 'purple', 'red', 'silver', 'teal', 'white', 'yellow')))
-			return true;
+		{
+					return true;
+		}
 
 		// An hex code
 		if (preg_match('~^#([a-f0-9]{3}|[a-f0-9]{6})$~i', $input[$field]) === 1)
-			return true;
+		{
+					return true;
+		}
 
 		// RGB
 		if (preg_match('~^rgb\(\d{1,3},\d{1,3},\d{1,3}\)$~i', str_replace(' ', '', $input[$field])) === 1)
-			return true;
+		{
+					return true;
+		}
 
 		// RGBA
 		if (preg_match('~^rgba\(\d{1,3},\d{1,3},\d{1,3},(0|0\.\d+|1(\.0*)|\.\d+)\)$~i', str_replace(' ', '', $input[$field])) === 1)
-			return true;
+		{
+					return true;
+		}
 
 		// HSL
 		if (preg_match('~^hsl\(\d{1,3},\d{1,3}%,\d{1,3}%\)$~i', str_replace(' ', '', $input[$field])) === 1)
-			return true;
+		{
+					return true;
+		}
 
 		// HSLA
 		if (preg_match('~^hsla\(\d{1,3},\d{1,3}%,\d{1,3}%,(0|0\.\d+|1(\.0*)|\.\d+)\)$~i', str_replace(' ', '', $input[$field])) === 1)
-			return true;
+		{
+					return true;
+		}
 
 		return array(
 			'field' => $field,
@@ -1270,7 +1403,9 @@ 
 	protected function _sanitation_gmail_normalize($input)
 	{
 		if (!isset($input))
-			return;
+		{
+					return;
+		}
 
 		$at_index = strrpos($input, '@');
 
@@ -1302,7 +1437,9 @@ 
 	protected function _sanitation_cleanhtml($input)
 	{
 		if (!isset($input))
-			return;
+		{
+					return;
+		}
 
 		return Util::htmlspecialchars($input);
 	}

sources/subs/Messages.subs.php

Braces +89 added lines, -36 removed lines

@@ -35,7 +35,9 @@ 
 	$db = database();
 
 	if (empty($id_msg))
-		return false;
+	{
+			return false;
+	}
 
 	$request = $db->query('', '
 		SELECT
@@ -59,19 +61,25 @@ 
 	);
 	// The message they were trying to edit was most likely deleted.
 	if ($db->num_rows($request) == 0)
-		return false;
+	{
+			return false;
+	}
 	$row = $db->fetch_assoc($request);
 
 	$attachment_stuff = array($row);
 	while ($row2 = $db->fetch_assoc($request))
-		$attachment_stuff[] = $row2;
+	{
+			$attachment_stuff[] = $row2;
+	}
 	$db->free_result($request);
 
 	$temp = array();
 	foreach ($attachment_stuff as $attachment)
 	{
 		if ($attachment['filesize'] >= 0 && !empty($modSettings['attachmentEnable']))
-			$temp[$attachment['id_attach']] = $attachment;
+		{
+					$temp[$attachment['id_attach']] = $attachment;
+		}
 
 	}
 	ksort($temp);
@@ -98,7 +106,9 @@ 
 	$db = database();
 
 	if (empty($id_msg))
-		return false;
+	{
+			return false;
+	}
 
 	$request = $db->query('', '
 		SELECT
@@ -136,7 +146,9 @@ 
 	global $user_info;
 
 	if (empty($id_msg))
-		return false;
+	{
+			return false;
+	}
 
 	$db = database();
 
@@ -186,19 +198,29 @@ 
 	{
 		// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
 		if ($message['approved'] && !empty($modSettings['edit_disable_time']) && $message['poster_time'] + ($modSettings['edit_disable_time'] + 5) * 60 < time())
-			throw new Elk_Exception('modify_post_time_passed', false);
+		{
+					throw new Elk_Exception('modify_post_time_passed', false);
+		}
 		elseif ($message['id_member_poster'] == $user_info['id'] && !allowedTo('modify_own'))
-			isAllowedTo('modify_replies');
-		else
-			isAllowedTo('modify_own');
+		{
+					isAllowedTo('modify_replies');
+		}
+		else {
+					isAllowedTo('modify_own');
+		}
 	}
 	elseif ($message['id_member_poster'] == $user_info['id'] && !allowedTo('modify_any'))
-		isAllowedTo('modify_replies');
-	else
-		isAllowedTo('modify_any');
+	{
+			isAllowedTo('modify_replies');
+	}
+	else {
+			isAllowedTo('modify_any');
+	}
 
 	if ($context['can_announce'] && !empty($message['id_action']))
-		return array('topic_already_announced');
+	{
+			return array('topic_already_announced');
+	}
 
 	return false;
 }
@@ -239,8 +261,10 @@ 
 
 	// Show an "approve" box if the user can approve it, and the message isn't approved.
 	if (!$message['message']['approved'] && !$context['show_approval'])
-		$context['show_approval'] = allowedTo('approve_posts');
-}
+	{
+			$context['show_approval'] = allowedTo('approve_posts');
+	}
+	}
 
 /**
  * This function removes all the messages of a certain user that are *not*
@@ -316,9 +340,12 @@ 
 				'msg' => $msg_id,
 		));
 		if ($db->num_rows($request) != 1)
-			$topic = false;
-		else
-			list ($topic) = $db->fetch_row($request);
+		{
+					$topic = false;
+		}
+		else {
+					list ($topic) = $db->fetch_row($request);
+		}
 		$db->free_result($request);
 
 		return $topic;
@@ -353,7 +380,9 @@ 
 
 	// Do we even have a message to speak of?
 	if (empty($message_info))
-		return false;
+	{
+			return false;
+	}
 
 	// Check for approval status?
 	if ($check_approval)
@@ -467,7 +496,9 @@ 
 	);
 	$msg = array();
 	while ($row = $db->fetch_assoc($result))
-		$msg[] = $row['id_msg'];
+	{
+			$msg[] = $row['id_msg'];
+	}
 	$db->free_result($result);
 
 	return $msg;
@@ -503,11 +534,15 @@ 
 	);
 
 	if ($db->num_rows($request) != 0)
-		list ($id_report, $ignore_all) = $db->fetch_row($request);
+	{
+			list ($id_report, $ignore_all) = $db->fetch_row($request);
+	}
 	$db->free_result($request);
 
 	if (!empty($ignore_all))
-		return false;
+	{
+			return false;
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
 	if (!empty($id_report))
@@ -526,7 +561,9 @@ 
 	else
 	{
 		if (empty($message['real_name']))
-			$message['real_name'] = $message['poster_name'];
+		{
+					$message['real_name'] = $message['poster_name'];
+		}
 
 		$db->insert('',
 			'{db_prefix}log_reported',
@@ -650,21 +687,27 @@ 
 		$single = true;
 		$msg_parameters['message_list'] = array($msg_parameters['message_list']);
 	}
-	else
-		$single = false;
+	else {
+			$single = false;
+	}
 
 	$request = loadMessageRequest($msg_selects, $msg_tables, $msg_parameters, $optional);
 
 	$return = array();
 	while ($row = $db->fetch_assoc($request))
-		$return[] = $row;
+	{
+			$return[] = $row;
+	}
 	$db->free_result($request);
 
 	if ($single)
-		return $return[0];
-	else
-		return $return;
-}
+	{
+			return $return[0];
+	}
+	else {
+			return $return;
+	}
+	}
 
 /**
  * Checks, which messages can be removed from a certain member.
@@ -698,7 +741,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-			continue;
+		{
+					continue;
+		}
 		$messages_list[$row['id_msg']] = array($row['subject'], $row['id_member']);
 	}
 
@@ -732,7 +777,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$return[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected'] = $row['num_messages'];
+	{
+			$return[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected'] = $row['num_messages'];
+	}
 	$db->free_result($request);
 
 	return $return;
@@ -781,7 +828,9 @@ 
 	$db = database();
 
 	if ($increment === true && $max_msg_id !== null)
-		updateSettings(array('totalMessages' => true, 'maxMsgID' => $max_msg_id), true);
+	{
+			updateSettings(array('totalMessages' => true, 'maxMsgID' => $max_msg_id), true);
+	}
 	else
 	{
 		// SUM and MAX on a smaller table is better for InnoDB tables.
@@ -834,14 +883,18 @@ 
 
 		$inserts = array();
 		foreach ($subject_words as $word)
-			$inserts[] = array($word, $id_topic);
+		{
+					$inserts[] = array($word, $id_topic);
+		}
 
 		if (!empty($inserts))
-			$db->insert('ignore',
+		{
+					$db->insert('ignore',
 				'{db_prefix}log_search_subjects',
 				array('word' => 'string', 'id_topic' => 'int'),
 				$inserts,
 				array('word', 'id_topic')
 			);
+		}
 	}
 }

sources/subs/Moderation.subs.php

Braces +87 added lines, -33 removed lines

@@ -95,7 +95,9 @@ 
 	$db = database();
 
 	if ($approve_query === null)
-		return array('posts' => 0, 'topics' => 0);
+	{
+			return array('posts' => 0, 'topics' => 0);
+	}
 
 	// Any unapproved posts?
 	$request = $db->query('', '
@@ -145,7 +147,9 @@ 
 	$db = database();
 
 	if ($approve_query === null)
-		return 0;
+	{
+			return 0;
+	}
 
 	$request = $db->query('', '
 		SELECT COUNT(*)
@@ -207,7 +211,9 @@ 
 	global $user_info;
 
 	if (empty($reports_id))
-		return 0;
+	{
+			return 0;
+	}
 
 	$db = database();
 
@@ -258,17 +264,24 @@ 
 
 	// Work out the query
 	if ($approve_boards == array(0))
-		$approve_query = '';
+	{
+			$approve_query = '';
+	}
 	elseif (!empty($approve_boards))
-		$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
-	else
-		$approve_query = ' AND 1=0';
+	{
+			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	}
+	else {
+			$approve_query = ' AND 1=0';
+	}
 
 	// Set up the cache key for this permissions level
 	$cache_key = md5($user_info['query_see_board'] . $approve_query . $user_info['mod_cache']['bq'] . $user_info['mod_cache']['gq'] . $user_info['mod_cache']['mq'] . (int) allowedTo('approve_emails') . '_' . (int) allowedTo('moderate_forum'));
 
 	if (isset($menu_errors[$cache_key]))
-		return $menu_errors[$cache_key];
+	{
+			return $menu_errors[$cache_key];
+	}
 
 	// If its been cached, guess what, that's right use it!
 	$temp = Cache::instance()->get('num_menu_errors', 900);
@@ -320,11 +333,15 @@ 
 
 		// Email failures that require attention
 		if (!empty($modSettings['maillist_enabled']) && allowedTo('approve_emails'))
-			$menu_errors[$cache_key]['emailmod'] = recountFailedEmails($approve_query);
+		{
+					$menu_errors[$cache_key]['emailmod'] = recountFailedEmails($approve_query);
+		}
 
 		// Group requests
 		if (!empty($user_info['mod_cache']) && $user_info['mod_cache']['gq'] != '0=1')
-			$menu_errors[$cache_key]['groupreq'] = count(groupRequests());
+		{
+					$menu_errors[$cache_key]['groupreq'] = count(groupRequests());
+		}
 
 		// Member requests
 		if (allowedTo('moderate_forum') && ((!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 2) || !empty($modSettings['approveAccountDeletion'])))
@@ -337,7 +354,9 @@ 
 			foreach ($activation_numbers as $activation_type => $total_members)
 			{
 				if (in_array($activation_type, array(3, 4, 5)))
-					$awaiting_activation += $total_members;
+				{
+									$awaiting_activation += $total_members;
+				}
 			}
 			$menu_errors[$cache_key]['memberreq'] = $awaiting_activation;
 		}
@@ -354,8 +373,9 @@ 
 		// Store it away for a while, not like this should change that often
 		Cache::instance()->put('num_menu_errors', $menu_errors, 900);
 	}
-	else
-		$menu_errors = $temp === null ? array() : $temp;
+	else {
+			$menu_errors = $temp === null ? array() : $temp;
+	}
 
 	return $menu_errors[$cache_key];
 }
@@ -445,7 +465,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		logAction('delete_warn_template', array('template' => $row['recipient_name']));
+	{
+			logAction('delete_warn_template', array('template' => $row['recipient_name']));
+	}
 	$db->free_result($request);
 
 	// Do the deletes.
@@ -748,9 +770,12 @@ 
 
 	// So did we find anything?
 	if (!$db->num_rows($request))
-		$row = false;
-	else
-		$row = $db->fetch_assoc($request);
+	{
+			$row = false;
+	}
+	else {
+			$row = $db->fetch_assoc($request);
+	}
 
 	$db->free_result($request);
 
@@ -794,7 +819,9 @@ 
 
 	$reports = array();
 	while ($row = $db->fetch_assoc($request))
-		$reports[$row['id_report']] = $row;
+	{
+			$reports[$row['id_report']] = $row;
+	}
 	$db->free_result($request);
 
 	return $reports;
@@ -824,7 +851,9 @@ 
 
 	$comments = array();
 	while ($row = $db->fetch_assoc($request))
-		$comments[$row['id_report']][] = $row;
+	{
+			$comments[$row['id_report']][] = $row;
+	}
 
 	$db->free_result($request);
 
@@ -855,7 +884,9 @@ 
 
 	$comments = array();
 	while ($row = $db->fetch_assoc($request))
-		$comments[] = $row;
+	{
+			$comments[] = $row;
+	}
 
 	$db->free_result($request);
 
@@ -881,7 +912,9 @@ 
 	);
 	$msgs = array();
 	while ($row = $db->fetch_row($request))
-		$msgs[] = $row[0];
+	{
+			$msgs[] = $row[0];
+	}
 	$db->free_result($request);
 
 	if (!empty($msgs))
@@ -902,7 +935,9 @@ 
 	);
 	$attaches = array();
 	while ($row = $db->fetch_row($request))
-		$attaches[] = $row[0];
+	{
+			$attaches[] = $row[0];
+	}
 	$db->free_result($request);
 
 	if (!empty($attaches))
@@ -998,7 +1033,9 @@ 
 		);
 		$latest_posts = array();
 		while ($row = $db->fetch_assoc($request))
-			$latest_posts[$row['id_member']] = $row['last_post_id'];
+		{
+					$latest_posts[$row['id_member']] = $row['last_post_id'];
+		}
 
 		if (!empty($latest_posts))
 		{
@@ -1152,7 +1189,9 @@ 
 
 	// Make sure they can even moderate someone!
 	if ($user_info['mod_cache']['gq'] == '0=1')
-		return array();
+	{
+			return array();
+	}
 
 	// What requests are outstanding?
 	$request = $db->query('', '
@@ -1215,7 +1254,9 @@ 
 			)
 		);
 		while ($row = $db->fetch_assoc($request))
-			$watched_users[] = $row;
+		{
+					$watched_users[] = $row;
+		}
 		$db->free_result($request);
 
 		Cache::instance()->put('recent_user_watches', $watched_users, 240);
@@ -1410,11 +1451,15 @@ 
 		);
 		$moderator_notes = array();
 		while ($row = $db->fetch_assoc($request))
-			$moderator_notes[] = $row;
+		{
+					$moderator_notes[] = $row;
+		}
 		$db->free_result($request);
 
 		if ($offset == 0)
-			Cache::instance()->put('moderator_notes', $moderator_notes, 240);
+		{
+					Cache::instance()->put('moderator_notes', $moderator_notes, 240);
+		}
 	}
 
 	return $moderator_notes;
@@ -1439,7 +1484,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		return array();
+	{
+			return array();
+	}
 	list ($notice_body, $notice_subject) = $db->fetch_row($request);
 	$db->free_result($request);
 
@@ -1532,15 +1579,22 @@ 
 	{
 		// Can delete is complicated, let's solve it first... is it their own post?
 		if ($row['id_member'] == $user_info['id'] && ($boards_allowed['delete_own_boards'] == array(0) || in_array($row['id_board'], $boards_allowed['delete_own_boards'])))
-			$can_delete = true;
+		{
+					$can_delete = true;
+		}
 		// Is it a reply to their own topic?
 		elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($boards_allowed['delete_own_replies'] == array(0) || in_array($row['id_board'], $boards_allowed['delete_own_replies'])))
-			$can_delete = true;
+		{
+					$can_delete = true;
+		}
 		// Someone else's?
 		elseif ($row['id_member'] != $user_info['id'] && ($boards_allowed['delete_any_boards'] == array(0) || in_array($row['id_board'], $boards_allowed['delete_any_boards'])))
-			$can_delete = true;
-		else
-			$can_delete = false;
+		{
+					$can_delete = true;
+		}
+		else {
+					$can_delete = false;
+		}
 
 		$unapproved_items[] = array(
 			'id' => $row['id_msg'],

sources/subs/Charset.subs.php

Braces +3 added lines, -1 removed lines

@@ -570,7 +570,8 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (@unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1)
-			$db->query('', '
+		{
+					$db->query('', '
 				UPDATE {db_prefix}log_actions
 				SET extra = {string:extra}
 				WHERE id_action = {int:current_action}',
@@ -579,6 +580,7 @@ 
 					'extra' => $matches[1] . strlen($matches[3]) . ':"' . $matches[3] . '"' . $matches[4],
 				)
 			);
+		}
 	}
 	$db->free_result($request);
 

Spacing +506 added lines, -506 removed lines

@@ -25,259 +25,259 @@
 function utf8_strtolower($string)
 {
 	static $case_folding = array(
-		'A' => 'a',		'B' => 'b',		'C' => 'c',		'D' => 'd',
-		'E' => 'e',		'F' => 'f',		'G' => 'g',		'H' => 'h',
-		'I' => 'i',		'J' => 'j',		'K' => 'k',		'L' => 'l',
-		'M' => 'm',		'N' => 'n',		'O' => 'o',		'P' => 'p',
-		'Q' => 'q',		'R' => 'r',		'S' => 's',		'T' => 't',
-		'U' => 'u',		'V' => 'v',		'W' => 'w',		'X' => 'x',
-		'Y' => 'y',		'Z' => 'z',		'µ' => 'μ',		'À' => 'à',
-		'Á' => 'á',		'Â' => 'â',		'Ã' => 'ã',		'Ä' => 'ä',
-		'Å' => 'å',		'Æ' => 'æ',		'Ç' => 'ç',		'È' => 'è',
-		'É' => 'é',		'Ê' => 'ê',		'Ë' => 'ë',		'Ì' => 'ì',
-		'Í' => 'í',		'Î' => 'î',		'Ï' => 'ï',		'Ð' => 'ð',
-		'Ñ' => 'ñ',		'Ò' => 'ò',		'Ó' => 'ó',		'Ô' => 'ô',
-		'Õ' => 'õ',		'Ö' => 'ö',		'Ø' => 'ø',		'Ù' => 'ù',
-		'Ú' => 'ú',		'Û' => 'û',		'Ü' => 'ü',		'Ý' => 'ý',
-		'Þ' => 'þ',		'ß' => 'ss',	'Ā' => 'ā',		'Ă' => 'ă',
-		'Ą' => 'ą',		'Ć' => 'ć',		'Ĉ' => 'ĉ',		'Ċ' => 'ċ',
-		'Č' => 'č',		'Ď' => 'ď',		'Đ' => 'đ',		'Ē' => 'ē',
-		'Ĕ' => 'ĕ',		'Ė' => 'ė',		'Ę' => 'ę',		'Ě' => 'ě',
-		'Ĝ' => 'ĝ',		'Ğ' => 'ğ',		'Ġ' => 'ġ',		'Ģ' => 'ģ',
-		'Ĥ' => 'ĥ',		'Ħ' => 'ħ',		'Ĩ' => 'ĩ',		'Ī' => 'ī',
-		'Ĭ' => 'ĭ',		'Į' => 'į',		'İ' => 'i̇',		'IJ' => 'ij',
-		'Ĵ' => 'ĵ',		'Ķ' => 'ķ',		'Ĺ' => 'ĺ',		'Ļ' => 'ļ',
-		'Ľ' => 'ľ',		'Ŀ' => 'ŀ',		'Ł' => 'ł',		'Ń' => 'ń',
-		'Ņ' => 'ņ',		'Ň' => 'ň',		'ʼn' => 'ʼn',	'Ŋ' => 'ŋ',
-		'Ō' => 'ō',		'Ŏ' => 'ŏ',		'Ő' => 'ő',		'Œ' => 'œ',
-		'Ŕ' => 'ŕ',		'Ŗ' => 'ŗ',		'Ř' => 'ř',		'Ś' => 'ś',
-		'Ŝ' => 'ŝ',		'Ş' => 'ş',		'Š' => 'š',		'Ţ' => 'ţ',
-		'Ť' => 'ť',		'Ŧ' => 'ŧ',		'Ũ' => 'ũ',		'Ū' => 'ū',
-		'Ŭ' => 'ŭ',		'Ů' => 'ů',		'Ű' => 'ű',		'Ų' => 'ų',
-		'Ŵ' => 'ŵ',		'Ŷ' => 'ŷ',		'Ÿ' => 'ÿ',		'Ź' => 'ź',
-		'Ż' => 'ż',		'Ž' => 'ž',		'ſ' => 's',		'Ɓ' => 'ɓ',
-		'Ƃ' => 'ƃ',		'Ƅ' => 'ƅ',		'Ɔ' => 'ɔ',		'Ƈ' => 'ƈ',
-		'Ɖ' => 'ɖ',		'Ɗ' => 'ɗ',		'Ƌ' => 'ƌ',		'Ǝ' => 'ǝ',
-		'Ə' => 'ə',		'Ɛ' => 'ɛ',		'Ƒ' => 'ƒ',		'Ɠ' => 'ɠ',
-		'Ɣ' => 'ɣ',		'Ɩ' => 'ɩ',		'Ɨ' => 'ɨ',		'Ƙ' => 'ƙ',
-		'Ɯ' => 'ɯ',		'Ɲ' => 'ɲ',		'Ɵ' => 'ɵ',		'Ơ' => 'ơ',
-		'Ƣ' => 'ƣ',		'Ƥ' => 'ƥ',		'Ʀ' => 'ʀ',		'Ƨ' => 'ƨ',
-		'Ʃ' => 'ʃ',		'Ƭ' => 'ƭ',		'Ʈ' => 'ʈ',		'Ư' => 'ư',
-		'Ʊ' => 'ʊ',		'Ʋ' => 'ʋ',		'Ƴ' => 'ƴ',		'Ƶ' => 'ƶ',
-		'Ʒ' => 'ʒ',		'Ƹ' => 'ƹ',		'Ƽ' => 'ƽ',		'DŽ' => 'dž',
-		'Dž' => 'dž',		'LJ' => 'lj',		'Lj' => 'lj',		'NJ' => 'nj',
-		'Nj' => 'nj',		'Ǎ' => 'ǎ',		'Ǐ' => 'ǐ',		'Ǒ' => 'ǒ',
-		'Ǔ' => 'ǔ',		'Ǖ' => 'ǖ',		'Ǘ' => 'ǘ',		'Ǚ' => 'ǚ',
-		'Ǜ' => 'ǜ',		'Ǟ' => 'ǟ',		'Ǡ' => 'ǡ',		'Ǣ' => 'ǣ',
-		'Ǥ' => 'ǥ',		'Ǧ' => 'ǧ',		'Ǩ' => 'ǩ',		'Ǫ' => 'ǫ',
-		'Ǭ' => 'ǭ',		'Ǯ' => 'ǯ',		'ǰ' => 'ǰ',		'DZ' => 'dz',
-		'Dz' => 'dz',		'Ǵ' => 'ǵ',		'Ƕ' => 'ƕ',		'Ƿ' => 'ƿ',
-		'Ǹ' => 'ǹ',		'Ǻ' => 'ǻ',		'Ǽ' => 'ǽ',		'Ǿ' => 'ǿ',
-		'Ȁ' => 'ȁ',		'Ȃ' => 'ȃ',		'Ȅ' => 'ȅ',		'Ȇ' => 'ȇ',
-		'Ȉ' => 'ȉ',		'Ȋ' => 'ȋ',		'Ȍ' => 'ȍ',		'Ȏ' => 'ȏ',
-		'Ȑ' => 'ȑ',		'Ȓ' => 'ȓ',		'Ȕ' => 'ȕ',		'Ȗ' => 'ȗ',
-		'Ș' => 'ș',		'Ț' => 'ț',		'Ȝ' => 'ȝ',		'Ȟ' => 'ȟ',
-		'Ƞ' => 'ƞ',		'Ȣ' => 'ȣ',		'Ȥ' => 'ȥ',		'Ȧ' => 'ȧ',
-		'Ȩ' => 'ȩ',		'Ȫ' => 'ȫ',		'Ȭ' => 'ȭ',		'Ȯ' => 'ȯ',
-		'Ȱ' => 'ȱ',		'Ȳ' => 'ȳ',		'Ⱥ' => 'ⱥ',		'Ȼ' => 'ȼ',
-		'Ƚ' => 'ƚ',		'Ⱦ' => 'ⱦ',		'Ɂ' => 'ɂ',		'Ƀ' => 'ƀ',
-		'Ʉ' => 'ʉ',		'Ʌ' => 'ʌ',		'Ɇ' => 'ɇ',		'Ɉ' => 'ɉ',
-		'Ɋ' => 'ɋ',		'Ɍ' => 'ɍ',		'Ɏ' => 'ɏ',		'ͅ' => 'ι',
-		'Ά' => 'ά',		'Έ' => 'έ',		'Ή' => 'ή',		'Ί' => 'ί',
-		'Ό' => 'ό',		'Ύ' => 'ύ',		'Ώ' => 'ώ',		'ΐ' => 'ΐ',
-		'Α' => 'α',		'Β' => 'β',		'Γ' => 'γ',		'Δ' => 'δ',
-		'Ε' => 'ε',		'Ζ' => 'ζ',		'Η' => 'η',		'Θ' => 'θ',
-		'Ι' => 'ι',		'Κ' => 'κ',		'Λ' => 'λ',		'Μ' => 'μ',
-		'Ν' => 'ν',		'Ξ' => 'ξ',		'Ο' => 'ο',		'Π' => 'π',
-		'Ρ' => 'ρ',		'Σ' => 'σ',		'Τ' => 'τ',		'Υ' => 'υ',
-		'Φ' => 'φ',		'Χ' => 'χ',		'Ψ' => 'ψ',		'Ω' => 'ω',
-		'Ϊ' => 'ϊ',		'Ϋ' => 'ϋ',		'ΰ' => 'ΰ',		'ς' => 'σ',
-		'ϐ' => 'β',		'ϑ' => 'θ',		'ϕ' => 'φ',		'ϖ' => 'π',
-		'Ϙ' => 'ϙ',		'Ϛ' => 'ϛ',		'Ϝ' => 'ϝ',		'Ϟ' => 'ϟ',
-		'Ϡ' => 'ϡ',		'Ϣ' => 'ϣ',		'Ϥ' => 'ϥ',		'Ϧ' => 'ϧ',
-		'Ϩ' => 'ϩ',		'Ϫ' => 'ϫ',		'Ϭ' => 'ϭ',		'Ϯ' => 'ϯ',
-		'ϰ' => 'κ',		'ϱ' => 'ρ',		'ϴ' => 'θ',		'ϵ' => 'ε',
-		'Ϸ' => 'ϸ',		'Ϲ' => 'ϲ',		'Ϻ' => 'ϻ',		'Ͻ' => 'ͻ',
-		'Ͼ' => 'ͼ',		'Ͽ' => 'ͽ',		'Ѐ' => 'ѐ',		'Ё' => 'ё',
-		'Ђ' => 'ђ',		'Ѓ' => 'ѓ',		'Є' => 'є',		'Ѕ' => 'ѕ',
-		'І' => 'і',		'Ї' => 'ї',		'Ј' => 'ј',		'Љ' => 'љ',
-		'Њ' => 'њ',		'Ћ' => 'ћ',		'Ќ' => 'ќ',		'Ѝ' => 'ѝ',
-		'Ў' => 'ў',		'Џ' => 'џ',		'А' => 'а',		'Б' => 'б',
-		'В' => 'в',		'Г' => 'г',		'Д' => 'д',		'Е' => 'е',
-		'Ж' => 'ж',		'З' => 'з',		'И' => 'и',		'Й' => 'й',
-		'К' => 'к',		'Л' => 'л',		'М' => 'м',		'Н' => 'н',
-		'О' => 'о',		'П' => 'п',		'Р' => 'р',		'С' => 'с',
-		'Т' => 'т',		'У' => 'у',		'Ф' => 'ф',		'Х' => 'х',
-		'Ц' => 'ц',		'Ч' => 'ч',		'Ш' => 'ш',		'Щ' => 'щ',
-		'Ъ' => 'ъ',		'Ы' => 'ы',		'Ь' => 'ь',		'Э' => 'э',
-		'Ю' => 'ю',		'Я' => 'я',		'Ѡ' => 'ѡ',		'Ѣ' => 'ѣ',
-		'Ѥ' => 'ѥ',		'Ѧ' => 'ѧ',		'Ѩ' => 'ѩ',		'Ѫ' => 'ѫ',
-		'Ѭ' => 'ѭ',		'Ѯ' => 'ѯ',		'Ѱ' => 'ѱ',		'Ѳ' => 'ѳ',
-		'Ѵ' => 'ѵ',		'Ѷ' => 'ѷ',		'Ѹ' => 'ѹ',		'Ѻ' => 'ѻ',
-		'Ѽ' => 'ѽ',		'Ѿ' => 'ѿ',		'Ҁ' => 'ҁ',		'Ҋ' => 'ҋ',
-		'Ҍ' => 'ҍ',		'Ҏ' => 'ҏ',		'Ґ' => 'ґ',		'Ғ' => 'ғ',
-		'Ҕ' => 'ҕ',		'Җ' => 'җ',		'Ҙ' => 'ҙ',		'Қ' => 'қ',
-		'Ҝ' => 'ҝ',		'Ҟ' => 'ҟ',		'Ҡ' => 'ҡ',		'Ң' => 'ң',
-		'Ҥ' => 'ҥ',		'Ҧ' => 'ҧ',		'Ҩ' => 'ҩ',		'Ҫ' => 'ҫ',
-		'Ҭ' => 'ҭ',		'Ү' => 'ү',		'Ұ' => 'ұ',		'Ҳ' => 'ҳ',
-		'Ҵ' => 'ҵ',		'Ҷ' => 'ҷ',		'Ҹ' => 'ҹ',		'Һ' => 'һ',
-		'Ҽ' => 'ҽ',		'Ҿ' => 'ҿ',		'Ӏ' => 'ӏ',		'Ӂ' => 'ӂ',
-		'Ӄ' => 'ӄ',		'Ӆ' => 'ӆ',		'Ӈ' => 'ӈ',		'Ӊ' => 'ӊ',
-		'Ӌ' => 'ӌ',		'Ӎ' => 'ӎ',		'Ӑ' => 'ӑ',		'Ӓ' => 'ӓ',
-		'Ӕ' => 'ӕ',		'Ӗ' => 'ӗ',		'Ә' => 'ә',		'Ӛ' => 'ӛ',
-		'Ӝ' => 'ӝ',		'Ӟ' => 'ӟ',		'Ӡ' => 'ӡ',		'Ӣ' => 'ӣ',
-		'Ӥ' => 'ӥ',		'Ӧ' => 'ӧ',		'Ө' => 'ө',		'Ӫ' => 'ӫ',
-		'Ӭ' => 'ӭ',		'Ӯ' => 'ӯ',		'Ӱ' => 'ӱ',		'Ӳ' => 'ӳ',
-		'Ӵ' => 'ӵ',		'Ӷ' => 'ӷ',		'Ӹ' => 'ӹ',		'Ӻ' => 'ӻ',
-		'Ӽ' => 'ӽ',		'Ӿ' => 'ӿ',		'Ԁ' => 'ԁ',		'Ԃ' => 'ԃ',
-		'Ԅ' => 'ԅ',		'Ԇ' => 'ԇ',		'Ԉ' => 'ԉ',		'Ԋ' => 'ԋ',
-		'Ԍ' => 'ԍ',		'Ԏ' => 'ԏ',		'Ԑ' => 'ԑ',		'Ԓ' => 'ԓ',
-		'Ա' => 'ա',		'Բ' => 'բ',		'Գ' => 'գ',		'Դ' => 'դ',
-		'Ե' => 'ե',		'Զ' => 'զ',		'Է' => 'է',		'Ը' => 'ը',
-		'Թ' => 'թ',		'Ժ' => 'ժ',		'Ի' => 'ի',		'Լ' => 'լ',
-		'Խ' => 'խ',		'Ծ' => 'ծ',		'Կ' => 'կ',		'Հ' => 'հ',
-		'Ձ' => 'ձ',		'Ղ' => 'ղ',		'Ճ' => 'ճ',		'Մ' => 'մ',
-		'Յ' => 'յ',		'Ն' => 'ն',		'Շ' => 'շ',		'Ո' => 'ո',
-		'Չ' => 'չ',		'Պ' => 'պ',		'Ջ' => 'ջ',		'Ռ' => 'ռ',
-		'Ս' => 'ս',		'Վ' => 'վ',		'Տ' => 'տ',		'Ր' => 'ր',
-		'Ց' => 'ց',		'Ւ' => 'ւ',		'Փ' => 'փ',		'Ք' => 'ք',
-		'Օ' => 'օ',		'Ֆ' => 'ֆ',		'և' => 'եւ',	'Ⴀ' => 'ⴀ',
-		'Ⴁ' => 'ⴁ',		'Ⴂ' => 'ⴂ',		'Ⴃ' => 'ⴃ',		'Ⴄ' => 'ⴄ',
-		'Ⴅ' => 'ⴅ',		'Ⴆ' => 'ⴆ',		'Ⴇ' => 'ⴇ',		'Ⴈ' => 'ⴈ',
-		'Ⴉ' => 'ⴉ',		'Ⴊ' => 'ⴊ',		'Ⴋ' => 'ⴋ',		'Ⴌ' => 'ⴌ',
-		'Ⴍ' => 'ⴍ',		'Ⴎ' => 'ⴎ',		'Ⴏ' => 'ⴏ',		'Ⴐ' => 'ⴐ',
-		'Ⴑ' => 'ⴑ',		'Ⴒ' => 'ⴒ',		'Ⴓ' => 'ⴓ',		'Ⴔ' => 'ⴔ',
-		'Ⴕ' => 'ⴕ',		'Ⴖ' => 'ⴖ',		'Ⴗ' => 'ⴗ',		'Ⴘ' => 'ⴘ',
-		'Ⴙ' => 'ⴙ',		'Ⴚ' => 'ⴚ',		'Ⴛ' => 'ⴛ',		'Ⴜ' => 'ⴜ',
-		'Ⴝ' => 'ⴝ',		'Ⴞ' => 'ⴞ',		'Ⴟ' => 'ⴟ',		'Ⴠ' => 'ⴠ',
-		'Ⴡ' => 'ⴡ',		'Ⴢ' => 'ⴢ',		'Ⴣ' => 'ⴣ',		'Ⴤ' => 'ⴤ',
-		'Ⴥ' => 'ⴥ',		'Ḁ' => 'ḁ',		'Ḃ' => 'ḃ',		'Ḅ' => 'ḅ',
-		'Ḇ' => 'ḇ',		'Ḉ' => 'ḉ',		'Ḋ' => 'ḋ',		'Ḍ' => 'ḍ',
-		'Ḏ' => 'ḏ',		'Ḑ' => 'ḑ',		'Ḓ' => 'ḓ',		'Ḕ' => 'ḕ',
-		'Ḗ' => 'ḗ',		'Ḙ' => 'ḙ',		'Ḛ' => 'ḛ',		'Ḝ' => 'ḝ',
-		'Ḟ' => 'ḟ',		'Ḡ' => 'ḡ',		'Ḣ' => 'ḣ',		'Ḥ' => 'ḥ',
-		'Ḧ' => 'ḧ',		'Ḩ' => 'ḩ',		'Ḫ' => 'ḫ',		'Ḭ' => 'ḭ',
-		'Ḯ' => 'ḯ',		'Ḱ' => 'ḱ',		'Ḳ' => 'ḳ',		'Ḵ' => 'ḵ',
-		'Ḷ' => 'ḷ',		'Ḹ' => 'ḹ',		'Ḻ' => 'ḻ',		'Ḽ' => 'ḽ',
-		'Ḿ' => 'ḿ',		'Ṁ' => 'ṁ',		'Ṃ' => 'ṃ',		'Ṅ' => 'ṅ',
-		'Ṇ' => 'ṇ',		'Ṉ' => 'ṉ',		'Ṋ' => 'ṋ',		'Ṍ' => 'ṍ',
-		'Ṏ' => 'ṏ',		'Ṑ' => 'ṑ',		'Ṓ' => 'ṓ',		'Ṕ' => 'ṕ',
-		'Ṗ' => 'ṗ',		'Ṙ' => 'ṙ',		'Ṛ' => 'ṛ',		'Ṝ' => 'ṝ',
-		'Ṟ' => 'ṟ',		'Ṡ' => 'ṡ',		'Ṣ' => 'ṣ',		'Ṥ' => 'ṥ',
-		'Ṧ' => 'ṧ',		'Ṩ' => 'ṩ',		'Ṫ' => 'ṫ',		'Ṭ' => 'ṭ',
-		'Ṯ' => 'ṯ',		'Ṱ' => 'ṱ',		'Ṳ' => 'ṳ',		'Ṵ' => 'ṵ',
-		'Ṷ' => 'ṷ',		'Ṹ' => 'ṹ',		'Ṻ' => 'ṻ',		'Ṽ' => 'ṽ',
-		'Ṿ' => 'ṿ',		'Ẁ' => 'ẁ',		'Ẃ' => 'ẃ',		'Ẅ' => 'ẅ',
-		'Ẇ' => 'ẇ',		'Ẉ' => 'ẉ',		'Ẋ' => 'ẋ',		'Ẍ' => 'ẍ',
-		'Ẏ' => 'ẏ',		'Ẑ' => 'ẑ',		'Ẓ' => 'ẓ',		'Ẕ' => 'ẕ',
-		'ẖ' => 'ẖ',		'ẗ' => 'ẗ',		'ẘ' => 'ẘ',		'ẙ' => 'ẙ',
-		'ẚ' => 'aʾ',	'ẛ' => 'ṡ',		'Ạ' => 'ạ',		'Ả' => 'ả',
-		'Ấ' => 'ấ',		'Ầ' => 'ầ',		'Ẩ' => 'ẩ',		'Ẫ' => 'ẫ',
-		'Ậ' => 'ậ',		'Ắ' => 'ắ',		'Ằ' => 'ằ',		'Ẳ' => 'ẳ',
-		'Ẵ' => 'ẵ',		'Ặ' => 'ặ',		'Ẹ' => 'ẹ',		'Ẻ' => 'ẻ',
-		'Ẽ' => 'ẽ',		'Ế' => 'ế',		'Ề' => 'ề',		'Ể' => 'ể',
-		'Ễ' => 'ễ',		'Ệ' => 'ệ',		'Ỉ' => 'ỉ',		'Ị' => 'ị',
-		'Ọ' => 'ọ',		'Ỏ' => 'ỏ',		'Ố' => 'ố',		'Ồ' => 'ồ',
-		'Ổ' => 'ổ',		'Ỗ' => 'ỗ',		'Ộ' => 'ộ',		'Ớ' => 'ớ',
-		'Ờ' => 'ờ',		'Ở' => 'ở',		'Ỡ' => 'ỡ',		'Ợ' => 'ợ',
-		'Ụ' => 'ụ',		'Ủ' => 'ủ',		'Ứ' => 'ứ',		'Ừ' => 'ừ',
-		'Ử' => 'ử',		'Ữ' => 'ữ',		'Ự' => 'ự',		'Ỳ' => 'ỳ',
-		'Ỵ' => 'ỵ',		'Ỷ' => 'ỷ',		'Ỹ' => 'ỹ',		'Ἀ' => 'ἀ',
-		'Ἁ' => 'ἁ',		'Ἂ' => 'ἂ',		'Ἃ' => 'ἃ',		'Ἄ' => 'ἄ',
-		'Ἅ' => 'ἅ',		'Ἆ' => 'ἆ',		'Ἇ' => 'ἇ',		'Ἐ' => 'ἐ',
-		'Ἑ' => 'ἑ',		'Ἒ' => 'ἒ',		'Ἓ' => 'ἓ',		'Ἔ' => 'ἔ',
-		'Ἕ' => 'ἕ',		'Ἠ' => 'ἠ',		'Ἡ' => 'ἡ',		'Ἢ' => 'ἢ',
-		'Ἣ' => 'ἣ',		'Ἤ' => 'ἤ',		'Ἥ' => 'ἥ',		'Ἦ' => 'ἦ',
-		'Ἧ' => 'ἧ',		'Ἰ' => 'ἰ',		'Ἱ' => 'ἱ',		'Ἲ' => 'ἲ',
-		'Ἳ' => 'ἳ',		'Ἴ' => 'ἴ',		'Ἵ' => 'ἵ',		'Ἶ' => 'ἶ',
-		'Ἷ' => 'ἷ',		'Ὀ' => 'ὀ',		'Ὁ' => 'ὁ',		'Ὂ' => 'ὂ',
-		'Ὃ' => 'ὃ',		'Ὄ' => 'ὄ',		'Ὅ' => 'ὅ',		'ὐ' => 'ὐ',
-		'ὒ' => 'ὒ',		'ὔ' => 'ὔ',		'ὖ' => 'ὖ',	'Ὑ' => 'ὑ',
-		'Ὓ' => 'ὓ',		'Ὕ' => 'ὕ',		'Ὗ' => 'ὗ',		'Ὠ' => 'ὠ',
-		'Ὡ' => 'ὡ',		'Ὢ' => 'ὢ',		'Ὣ' => 'ὣ',		'Ὤ' => 'ὤ',
-		'Ὥ' => 'ὥ',		'Ὦ' => 'ὦ',		'Ὧ' => 'ὧ',		'ᾀ' => 'ἀι',
-		'ᾁ' => 'ἁι',	'ᾂ' => 'ἂι',	'ᾃ' => 'ἃι',	'ᾄ' => 'ἄι',
-		'ᾅ' => 'ἅι',	'ᾆ' => 'ἆι',	'ᾇ' => 'ἇι',	'ᾈ' => 'ᾀ',
-		'ᾉ' => 'ᾁ',		'ᾊ' => 'ᾂ',		'ᾋ' => 'ᾃ',		'ᾌ' => 'ᾄ',
-		'ᾍ' => 'ᾅ',		'ᾎ' => 'ᾆ',		'ᾏ' => 'ᾇ',		'ᾐ' => 'ἠι',
-		'ᾑ' => 'ἡι',	'ᾒ' => 'ἢι',	'ᾓ' => 'ἣι',	'ᾔ' => 'ἤι',
-		'ᾕ' => 'ἥι',	'ᾖ' => 'ἦι',	'ᾗ' => 'ἧι',	'ᾘ' => 'ᾐ',
-		'ᾙ' => 'ᾑ',		'ᾚ' => 'ᾒ',		'ᾛ' => 'ᾓ',		'ᾜ' => 'ᾔ',
-		'ᾝ' => 'ᾕ',		'ᾞ' => 'ᾖ',		'ᾟ' => 'ᾗ',		'ᾠ' => 'ὠι',
-		'ᾡ' => 'ὡι',	'ᾢ' => 'ὢι',	'ᾣ' => 'ὣι',	'ᾤ' => 'ὤι',
-		'ᾥ' => 'ὥι',	'ᾦ' => 'ὦι',	'ᾧ' => 'ὧι',	'ᾨ' => 'ᾠ',
-		'ᾩ' => 'ᾡ',		'ᾪ' => 'ᾢ',		'ᾫ' => 'ᾣ',		'ᾬ' => 'ᾤ',
-		'ᾭ' => 'ᾥ',		'ᾮ' => 'ᾦ',		'ᾯ' => 'ᾧ',		'ᾲ' => 'ὰι',
-		'ᾳ' => 'αι',	'ᾴ' => 'άι',	'ᾶ' => 'ᾶ',	'ᾷ' => 'ᾶι',
-		'Ᾰ' => 'ᾰ',		'Ᾱ' => 'ᾱ',		'Ὰ' => 'ὰ',		'Ά' => 'ά',
-		'ᾼ' => 'ᾳ',		'ι' => 'ι',		'ῂ' => 'ὴι',	'ῃ' => 'ηι',
-		'ῄ' => 'ήι',	'ῆ' => 'ῆ',	'ῇ' => 'ῆι',	'Ὲ' => 'ὲ',
-		'Έ' => 'έ',		'Ὴ' => 'ὴ',		'Ή' => 'ή',		'ῌ' => 'ῃ',
-		'ῒ' => 'ῒ',		'ΐ' => 'ΐ',		'ῖ' => 'ῖ',	'ῗ' => 'ῗ',
-		'Ῐ' => 'ῐ',		'Ῑ' => 'ῑ',		'Ὶ' => 'ὶ',		'Ί' => 'ί',
-		'ῢ' => 'ῢ',		'ΰ' => 'ΰ',		'ῤ' => 'ῤ',		'ῦ' => 'ῦ',
-		'ῧ' => 'ῧ',	'Ῠ' => 'ῠ',		'Ῡ' => 'ῡ',		'Ὺ' => 'ὺ',
-		'Ύ' => 'ύ',		'Ῥ' => 'ῥ',		'ῲ' => 'ὼι',	'ῳ' => 'ωι',
-		'ῴ' => 'ώι',	'ῶ' => 'ῶ',	'ῷ' => 'ῶι',	'Ὸ' => 'ὸ',
-		'Ό' => 'ό',		'Ὼ' => 'ὼ',		'Ώ' => 'ώ',		'ῼ' => 'ῳ',
-		'Ω' => 'ω',		'K' => 'k',		'Å' => 'å',		'Ⅎ' => 'ⅎ',
-		'Ⅰ' => 'ⅰ',		'Ⅱ' => 'ⅱ',		'Ⅲ' => 'ⅲ',		'Ⅳ' => 'ⅳ',
-		'Ⅴ' => 'ⅴ',		'Ⅵ' => 'ⅵ',		'Ⅶ' => 'ⅶ',		'Ⅷ' => 'ⅷ',
-		'Ⅸ' => 'ⅸ',		'Ⅹ' => 'ⅹ',		'Ⅺ' => 'ⅺ',		'Ⅻ' => 'ⅻ',
-		'Ⅼ' => 'ⅼ',		'Ⅽ' => 'ⅽ',		'Ⅾ' => 'ⅾ',		'Ⅿ' => 'ⅿ',
-		'Ↄ' => 'ↄ',		'Ⓐ' => 'ⓐ',		'Ⓑ' => 'ⓑ',		'Ⓒ' => 'ⓒ',
-		'Ⓓ' => 'ⓓ',		'Ⓔ' => 'ⓔ',		'Ⓕ' => 'ⓕ',		'Ⓖ' => 'ⓖ',
-		'Ⓗ' => 'ⓗ',		'Ⓘ' => 'ⓘ',		'Ⓙ' => 'ⓙ',		'Ⓚ' => 'ⓚ',
-		'Ⓛ' => 'ⓛ',		'Ⓜ' => 'ⓜ',		'Ⓝ' => 'ⓝ',		'Ⓞ' => 'ⓞ',
-		'Ⓟ' => 'ⓟ',		'Ⓠ' => 'ⓠ',		'Ⓡ' => 'ⓡ',		'Ⓢ' => 'ⓢ',
-		'Ⓣ' => 'ⓣ',		'Ⓤ' => 'ⓤ',		'Ⓥ' => 'ⓥ',		'Ⓦ' => 'ⓦ',
-		'Ⓧ' => 'ⓧ',		'Ⓨ' => 'ⓨ',		'Ⓩ' => 'ⓩ',		'Ⰰ' => 'ⰰ',
-		'Ⰱ' => 'ⰱ',		'Ⰲ' => 'ⰲ',		'Ⰳ' => 'ⰳ',		'Ⰴ' => 'ⰴ',
-		'Ⰵ' => 'ⰵ',		'Ⰶ' => 'ⰶ',		'Ⰷ' => 'ⰷ',		'Ⰸ' => 'ⰸ',
-		'Ⰹ' => 'ⰹ',		'Ⰺ' => 'ⰺ',		'Ⰻ' => 'ⰻ',		'Ⰼ' => 'ⰼ',
-		'Ⰽ' => 'ⰽ',		'Ⰾ' => 'ⰾ',		'Ⰿ' => 'ⰿ',		'Ⱀ' => 'ⱀ',
-		'Ⱁ' => 'ⱁ',		'Ⱂ' => 'ⱂ',		'Ⱃ' => 'ⱃ',		'Ⱄ' => 'ⱄ',
-		'Ⱅ' => 'ⱅ',		'Ⱆ' => 'ⱆ',		'Ⱇ' => 'ⱇ',		'Ⱈ' => 'ⱈ',
-		'Ⱉ' => 'ⱉ',		'Ⱊ' => 'ⱊ',		'Ⱋ' => 'ⱋ',		'Ⱌ' => 'ⱌ',
-		'Ⱍ' => 'ⱍ',		'Ⱎ' => 'ⱎ',		'Ⱏ' => 'ⱏ',		'Ⱐ' => 'ⱐ',
-		'Ⱑ' => 'ⱑ',		'Ⱒ' => 'ⱒ',		'Ⱓ' => 'ⱓ',		'Ⱔ' => 'ⱔ',
-		'Ⱕ' => 'ⱕ',		'Ⱖ' => 'ⱖ',		'Ⱗ' => 'ⱗ',		'Ⱘ' => 'ⱘ',
-		'Ⱙ' => 'ⱙ',		'Ⱚ' => 'ⱚ',		'Ⱛ' => 'ⱛ',		'Ⱜ' => 'ⱜ',
-		'Ⱝ' => 'ⱝ',		'Ⱞ' => 'ⱞ',		'Ⱡ' => 'ⱡ',		'Ɫ' => 'ɫ',
-		'Ᵽ' => 'ᵽ',		'Ɽ' => 'ɽ',		'Ⱨ' => 'ⱨ',		'Ⱪ' => 'ⱪ',
-		'Ⱬ' => 'ⱬ',		'Ⱶ' => 'ⱶ',		'Ⲁ' => 'ⲁ',		'Ⲃ' => 'ⲃ',
-		'Ⲅ' => 'ⲅ',		'Ⲇ' => 'ⲇ',		'Ⲉ' => 'ⲉ',		'Ⲋ' => 'ⲋ',
-		'Ⲍ' => 'ⲍ',		'Ⲏ' => 'ⲏ',		'Ⲑ' => 'ⲑ',		'Ⲓ' => 'ⲓ',
-		'Ⲕ' => 'ⲕ',		'Ⲗ' => 'ⲗ',		'Ⲙ' => 'ⲙ',		'Ⲛ' => 'ⲛ',
-		'Ⲝ' => 'ⲝ',		'Ⲟ' => 'ⲟ',		'Ⲡ' => 'ⲡ',		'Ⲣ' => 'ⲣ',
-		'Ⲥ' => 'ⲥ',		'Ⲧ' => 'ⲧ',		'Ⲩ' => 'ⲩ',		'Ⲫ' => 'ⲫ',
-		'Ⲭ' => 'ⲭ',		'Ⲯ' => 'ⲯ',		'Ⲱ' => 'ⲱ',		'Ⲳ' => 'ⲳ',
-		'Ⲵ' => 'ⲵ',		'Ⲷ' => 'ⲷ',		'Ⲹ' => 'ⲹ',		'Ⲻ' => 'ⲻ',
-		'Ⲽ' => 'ⲽ',		'Ⲿ' => 'ⲿ',		'Ⳁ' => 'ⳁ',		'Ⳃ' => 'ⳃ',
-		'Ⳅ' => 'ⳅ',		'Ⳇ' => 'ⳇ',		'Ⳉ' => 'ⳉ',		'Ⳋ' => 'ⳋ',
-		'Ⳍ' => 'ⳍ',		'Ⳏ' => 'ⳏ',		'Ⳑ' => 'ⳑ',		'Ⳓ' => 'ⳓ',
-		'Ⳕ' => 'ⳕ',		'Ⳗ' => 'ⳗ',		'Ⳙ' => 'ⳙ',		'Ⳛ' => 'ⳛ',
-		'Ⳝ' => 'ⳝ',		'Ⳟ' => 'ⳟ',		'Ⳡ' => 'ⳡ',		'Ⳣ' => 'ⳣ',
-		'ff' => 'ff',	'fi' => 'fi',	'fl' => 'fl',	'ffi' => 'ffi',
-		'ffl' => 'ffl',	'ſt' => 'st',	'st' => 'st',	'ﬓ' => 'մն',
-		'ﬔ' => 'մե',	'ﬕ' => 'մի',	'ﬖ' => 'վն',	'ﬗ' => 'մխ',
-		'Ａ' => 'ａ',		'Ｂ' => 'ｂ',		'Ｃ' => 'ｃ',		'Ｄ' => 'ｄ',
-		'Ｅ' => 'ｅ',		'Ｆ' => 'ｆ',		'Ｇ' => 'ｇ',		'Ｈ' => 'ｈ',
-		'Ｉ' => 'ｉ',		'Ｊ' => 'ｊ',		'Ｋ' => 'ｋ',		'Ｌ' => 'ｌ',
-		'Ｍ' => 'ｍ',		'Ｎ' => 'ｎ',		'Ｏ' => 'ｏ',		'Ｐ' => 'ｐ',
-		'Ｑ' => 'ｑ',		'Ｒ' => 'ｒ',		'Ｓ' => 'ｓ',		'Ｔ' => 'ｔ',
-		'Ｕ' => 'ｕ',		'Ｖ' => 'ｖ',		'Ｗ' => 'ｗ',		'Ｘ' => 'ｘ',
-		'Ｙ' => 'ｙ',		'Ｚ' => 'ｚ',		'

sources/subs/Editor.subs.php

Braces +45 added lines, -16 removed lines

@@ -62,13 +62,17 @@ 
 
 		// @deprecated since 1.1
 		if (!isset($context['drafts_autosave_frequency']) && !empty($context['drafts_autosave']) && !empty($options['drafts_autosave_enabled']))
-			$context['drafts_autosave_frequency'] = empty($modSettings['drafts_autosave_frequency']) ? 30000 : $modSettings['drafts_autosave_frequency'] * 1000;
+		{
+					$context['drafts_autosave_frequency'] = empty($modSettings['drafts_autosave_frequency']) ? 30000 : $modSettings['drafts_autosave_frequency'] * 1000;
+		}
 
 		// This really has some WYSIWYG stuff.
 		loadTemplate('GenericControls');
 		loadCSSFile('jquery.sceditor.css');
 		if (!empty($context['theme_variant']) && file_exists($settings['theme_dir'] . '/css/' . $context['theme_variant'] . '/jquery.sceditor.elk' . $context['theme_variant'] . '.css'))
-			loadCSSFile($context['theme_variant'] . '/jquery.sceditor.elk' . $context['theme_variant'] . '.css');
+		{
+					loadCSSFile($context['theme_variant'] . '/jquery.sceditor.elk' . $context['theme_variant'] . '.css');
+		}
 
 		// JS makes the editor go round
 		loadJavascriptFile(array('jquery.sceditor.bbcode.min.js', 'jquery.sceditor.elkarte.js', 'post.js', 'splittag.plugin.js', 'undo.plugin.min.js', 'dropAttachments.js'));
@@ -82,15 +86,21 @@ 
 		);
 		// Editor language file
 		if (!empty($txt['lang_locale']))
-			loadJavascriptFile($scripturl . '?action=jslocale;sa=sceditor', array('defer' => true), 'sceditor_language');
+		{
+					loadJavascriptFile($scripturl . '?action=jslocale;sa=sceditor', array('defer' => true), 'sceditor_language');
+		}
 
 		// Mentions?
 		if (!empty($context['mentions_enabled']))
-			loadJavascriptFile(array('jquery.atwho.min.js', 'jquery.caret.min.js', 'mentioning.plugin.js'));
+		{
+					loadJavascriptFile(array('jquery.atwho.min.js', 'jquery.caret.min.js', 'mentioning.plugin.js'));
+		}
 
 		// Our not so concise shortcut line
 		if (!isset($context['shortcuts_text']))
-			$context['shortcuts_text'] = $txt['shortcuts'];
+		{
+					$context['shortcuts_text'] = $txt['shortcuts'];
+		}
 
 		// Spellcheck?
 		$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && function_exists('pspell_new');
@@ -98,11 +108,13 @@ 
 		{
 			// Some hidden information is needed in order to make spell check work.
 			if (!isset($_REQUEST['xml']))
-				$context['insert_after_template'] .= '
+			{
+							$context['insert_after_template'] .= '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="UTF-8" target="spellWindow" action="' . $scripturl . '?action=spellcheck">
 			<input type="hidden" id="spellstring" name="spellstring" value="" />
 			<input type="hidden" id="fulleditor" name="fulleditor" value="" />
 		</form>';
+			}
 			loadJavascriptFile('spellcheck.js', array('defer' => true));
 		}
 	}
@@ -173,7 +185,9 @@ 
 		// Generate a list of buttons that shouldn't be shown
 		$disabled_tags = array();
 		if (!empty($modSettings['disabledBBC']))
-			$disabled_tags = explode(',', $modSettings['disabledBBC']);
+		{
+					$disabled_tags = explode(',', $modSettings['disabledBBC']);
+		}
 
 		// Map codes to tags
 		$translate_tags_to_code = array('b' => 'bold', 'i' => 'italic', 'u' => 'underline', 's' => 'strike', 'img' => 'image', 'url' => 'link', 'sup' => 'superscript', 'sub' => 'subscript', 'hr' => 'horizontalrule');
@@ -188,7 +202,9 @@ 
 				$context['disabled_tags']['orderedlist'] = true;
 			}
 			elseif (isset($translate_tags_to_code[$tag]))
-				$context['disabled_tags'][$translate_tags_to_code[$tag]] = true;
+			{
+							$context['disabled_tags'][$translate_tags_to_code[$tag]] = true;
+			}
 
 			// Tag is the same as the code, like font, color, size etc
 			$context['disabled_tags'][trim($tag)] = true;
@@ -199,7 +215,9 @@ 
 		foreach ($bbc_tags as $row => $tagRow)
 		{
 			if (!isset($context['bbc_toolbar'][$row]))
-				$context['bbc_toolbar'][$row] = array();
+			{
+							$context['bbc_toolbar'][$row] = array();
+			}
 
 			$tagsRow = array();
 
@@ -210,17 +228,23 @@ 
 				{
 					// Just add this code in the existing grouping
 					if (!isset($context['disabled_tags'][$tag]))
-						$tagsRow[] = $tag;
+					{
+											$tagsRow[] = $tag;
+					}
 				}
 
 				// If the row is not empty, and the last added tag is not a space, add a space.
 				if (!empty($tagsRow) && $tagsRow[count($tagsRow) - 1] !== 'space')
-					$tagsRow[] = 'space';
+				{
+									$tagsRow[] = 'space';
+				}
 			}
 
 			// Build that beautiful button row
 			if (!empty($tagsRow))
-				$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
+			{
+							$context['bbc_toolbar'][$row][] = implode(',', $tagsRow);
+			}
 		}
 	}
 
@@ -365,17 +389,22 @@ 
 					}
 
 					if ($last_row !== null)
-						$context['smileys'][$section][$last_row]['isLast'] = true;
+					{
+											$context['smileys'][$section][$last_row]['isLast'] = true;
+					}
 				}
 
 				Cache::instance()->put('posting_smileys', $context['smileys'], 480);
 			}
-			else
-				$context['smileys'] = $temp;
+			else {
+							$context['smileys'] = $temp;
+			}
 
 			// The smiley popup may take advantage of Jquery UI ....
 			if (!empty($context['smileys']['popup']))
-				$modSettings['jquery_include_ui'] = true;
+			{
+							$modSettings['jquery_include_ui'] = true;
+			}
 		}
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
 					ORDER BY smiley_row, smiley_order',
 					array(
 					),
-					function ($row)
+					function($row)
 					{
 						global $context;