albertlast / SMF2.1

Sources/index.php

Braces +2 added lines, -1 removed lines

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

Sources/ManagePaid.php

Braces +202 added lines, -148 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the 'Paid Subscription' screen, calling
@@ -32,18 +33,19 @@ 
 	loadLanguage('ManagePaid');
 	loadTemplate('ManagePaid');
 
-	if (!empty($modSettings['paid_enabled']))
-		$subActions = array(
+	if (!empty($modSettings['paid_enabled'])) {
+			$subActions = array(
 			'modify' => array('ModifySubscription', 'admin_forum'),
 			'modifyuser' => array('ModifyUserSubscription', 'admin_forum'),
 			'settings' => array('ModifySubscriptionSettings', 'admin_forum'),
 			'view' => array('ViewSubscriptions', 'admin_forum'),
 			'viewsub' => array('ViewSubscribedUsers', 'admin_forum'),
 		);
-	else
-		$subActions = array(
+	} else {
+			$subActions = array(
 			'settings' => array('ModifySubscriptionSettings', 'admin_forum'),
 		);
+	}
 
 	// Default the sub-action to 'view subscriptions', but only if they have already set things up..
 	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (!empty($modSettings['paid_currency_symbol']) && !empty($modSettings['paid_enabled']) ? 'view' : 'settings');
@@ -59,8 +61,8 @@ 
 		'help' => '',
 		'description' => $txt['paid_subscriptions_desc'],
 	);
-	if (!empty($modSettings['paid_enabled']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
+	if (!empty($modSettings['paid_enabled'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
 			'view' => array(
 				'description' => $txt['paid_subs_view_desc'],
 			),
@@ -68,6 +70,7 @@ 
 				'description' => $txt['paid_subs_settings_desc'],
 			),
 		);
+	}
 
 	call_integration_hook('integrate_manage_subscriptions', array(&$subActions));
 
@@ -92,8 +95,9 @@ 
 	{
 		// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 		$modSettings['paid_currency'] = !empty($modSettings['paid_currency_code']) ? $modSettings['paid_currency_code'] : '';
-		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud')))
-			$modSettings['paid_currency'] = 'other';
+		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud'))) {
+					$modSettings['paid_currency'] = 'other';
+		}
 
 		// These are all the default settings.
 		$config_vars = array(
@@ -156,8 +160,7 @@ 
 			}
 		}
 		toggleOther();', true);
-	}
-	else
+	} else
 	{
 		$config_vars = array(
 			array('check', 'paid_enabled'),
@@ -166,8 +169,9 @@ 
 	}
 
 	// Just searching?
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template fired up.
 	require_once($sourcedir . '/ManageServer.php');
@@ -211,8 +215,9 @@ 
 			foreach (explode(',', $_POST['paid_email_to']) as $email)
 			{
 				$email = trim($email);
-				if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL))
-					$email_addresses[] = $email;
+				if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL)) {
+									$email_addresses[] = $email;
+				}
 				$_POST['paid_email_to'] = implode(',', $email_addresses);
 			}
 		}
@@ -249,8 +254,9 @@ 
 	global $context, $txt, $modSettings, $sourcedir, $scripturl;
 
 	// Not made the settings yet?
-	if (empty($modSettings['paid_currency_symbol']))
-		fatal_lang_error('paid_not_set_currency', false, $scripturl . '?action=admin;area=paidsubscribe;sa=settings');
+	if (empty($modSettings['paid_currency_symbol'])) {
+			fatal_lang_error('paid_not_set_currency', false, $scripturl . '?action=admin;area=paidsubscribe;sa=settings');
+	}
 
 	// Some basic stuff.
 	$context['page_title'] = $txt['paid_subs_view'];
@@ -270,10 +276,11 @@ 
 
 				foreach ($context['subscriptions'] as $data)
 				{
-					if (++$counter < $start)
-						continue;
-					elseif ($counter == $start + $items_per_page)
-						break;
+					if (++$counter < $start) {
+											continue;
+					} elseif ($counter == $start + $items_per_page) {
+											break;
+					}
 
 					$subscriptions[] = $data;
 				}
@@ -450,8 +457,9 @@ 
 			);
 			$id_group = 0;
 			$add_groups = '';
-			if ($smcFunc['db_num_rows']($request))
-				list ($id_group, $add_groups) = $smcFunc['db_fetch_row']($request);
+			if ($smcFunc['db_num_rows']($request)) {
+							list ($id_group, $add_groups) = $smcFunc['db_fetch_row']($request);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$changes = array();
@@ -463,8 +471,9 @@ 
 				{
 					// If their current primary group isn't what they had before the subscription, and their current group was
 					// granted by the sub, remove it.
-					if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group)
-						$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+					if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group) {
+											$changes[$id_member]['id_group'] = $member_data['old_id_group'];
+					}
 				}
 			}
 
@@ -477,15 +486,17 @@ 
 					// First let's get their groups sorted.
 					$current_groups = explode(',', $member_data['additional_groups']);
 					$new_groups = implode(',', array_diff($current_groups, $add_groups));
-					if ($new_groups != $member_data['additional_groups'])
-						$changes[$id_member]['additional_groups'] = $new_groups;
+					if ($new_groups != $member_data['additional_groups']) {
+											$changes[$id_member]['additional_groups'] = $new_groups;
+					}
 				}
 			}
 
 			// We're going through changes...
-			if (!empty($changes))
-				foreach ($changes as $id_member => $new_values)
+			if (!empty($changes)) {
+							foreach ($changes as $id_member => $new_values)
 					updateMemberData($id_member, $new_values);
+			}
 		}
 
 		// Delete the subscription
@@ -533,11 +544,13 @@ 
 				'M' => 24,
 				'Y' => 5,
 			);
-			if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || empty($_POST['span_value']) || $_POST['span_value'] < 1)
-				fatal_lang_error('paid_invalid_duration', false);
+			if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || empty($_POST['span_value']) || $_POST['span_value'] < 1) {
+							fatal_lang_error('paid_invalid_duration', false);
+			}
 
-			if ($_POST['span_value'] > $limits[$_POST['span_unit']])
-				fatal_lang_error('paid_invalid_duration_' . $_POST['span_unit'], false);
+			if ($_POST['span_value'] > $limits[$_POST['span_unit']]) {
+							fatal_lang_error('paid_invalid_duration_' . $_POST['span_unit'], false);
+			}
 
 			// Clean the span.
 			$span = $_POST['span_value'] . $_POST['span_unit'];
@@ -546,8 +559,9 @@ 
 			$cost = array('fixed' => sprintf('%01.2f', strtr($_POST['cost'], ',', '.')));
 
 			// There needs to be something.
-			if (empty($_POST['span_value']) || empty($_POST['cost']))
-				fatal_lang_error('paid_no_cost_value');
+			if (empty($_POST['span_value']) || empty($_POST['cost'])) {
+							fatal_lang_error('paid_no_cost_value');
+			}
 		}
 		// Flexible is harder but more fun ;)
 		else
@@ -561,8 +575,9 @@ 
 				'year' => sprintf('%01.2f', strtr($_POST['cost_year'], ',', '.')),
 			);
 
-			if (empty($_POST['cost_day']) && empty($_POST['cost_week']) && empty($_POST['cost_month']) && empty($_POST['cost_year']))
-				fatal_lang_error('paid_all_freq_blank');
+			if (empty($_POST['cost_day']) && empty($_POST['cost_week']) && empty($_POST['cost_month']) && empty($_POST['cost_year'])) {
+							fatal_lang_error('paid_all_freq_blank');
+			}
 		}
 		$cost = json_encode($cost);
 
@@ -571,9 +586,10 @@ 
 
 		// Yep, time to do additional groups.
 		$addgroups = array();
-		if (!empty($_POST['addgroup']))
-			foreach ($_POST['addgroup'] as $id => $dummy)
+		if (!empty($_POST['addgroup'])) {
+					foreach ($_POST['addgroup'] as $id => $dummy)
 				$addgroups[] = (int) $id;
+		}
 		$addgroups = implode(',', $addgroups);
 
 		// Is it new?!
@@ -682,18 +698,18 @@ 
 			{
 				$span_value = $match[1];
 				$span_unit = $match[2];
-			}
-			else
+			} else
 			{
 				$span_value = 0;
 				$span_unit = 'D';
 			}
 
 			// Is this a flexible one?
-			if ($row['length'] == 'F')
-				$isFlexible = true;
-			else
-				$isFlexible = false;
+			if ($row['length'] == 'F') {
+							$isFlexible = true;
+			} else {
+							$isFlexible = false;
+			}
 
 			$context['sub'] = array(
 				'name' => $row['name'],
@@ -742,8 +758,9 @@ 
 		)
 	);
 	$context['groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['groups'][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['groups'][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// This always happens.
@@ -777,8 +794,9 @@ 
 		)
 	);
 	// Something wrong?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 	// Do the subscription context.
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$context['subscription'] = array(
@@ -1013,8 +1031,8 @@ 
 		))
 	);
 	$subscribers = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$subscribers[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$subscribers[] = array(
 			'id' => $row['id_sublog'],
 			'id_member' => $row['id_member'],
 			'name' => $row['name'],
@@ -1024,6 +1042,7 @@ 
 			'status' => $row['status'],
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] == 0 ? $txt['paid_finished'] : $txt['paid_pending']) : $txt['paid_active'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $subscribers;
@@ -1058,14 +1077,16 @@ 
 				'current_log_item' => $context['log_id'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		list ($context['sub_id']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!isset($context['subscriptions'][$context['sub_id']]))
-		fatal_lang_error('no_access', false);
+	if (!isset($context['subscriptions'][$context['sub_id']])) {
+			fatal_lang_error('no_access', false);
+	}
 	$context['current_subscription'] = $context['subscriptions'][$context['sub_id']];
 
 	// Searching?
@@ -1098,8 +1119,9 @@ 
 					'name' => $_POST['name'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('error_member_not_found');
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('error_member_not_found');
+			}
 
 			list ($id_member, $id_group) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -1115,14 +1137,15 @@ 
 					'current_member' => $id_member,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 0)
-				fatal_lang_error('member_already_subscribed');
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							fatal_lang_error('member_already_subscribed');
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Actually put the subscription in place.
-			if ($status == 1)
-				addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
-			else
+			if ($status == 1) {
+							addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
+			} else
 			{
 				$smcFunc['db_insert']('',
 					'{db_prefix}log_subscribed',
@@ -1149,20 +1172,20 @@ 
 					'current_log_item' => $context['log_id'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('no_access', false);
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('no_access', false);
+			}
 
 			list ($id_member, $old_status) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
 			// Pick the right permission stuff depending on what the status is changing from/to.
-			if ($old_status == 1 && $status != 1)
-				removeSubscription($context['sub_id'], $id_member);
-			elseif ($status == 1 && $old_status != 1)
+			if ($old_status == 1 && $status != 1) {
+							removeSubscription($context['sub_id'], $id_member);
+			} elseif ($status == 1 && $old_status != 1)
 			{
 				addSubscription($context['sub_id'], $id_member, 0, $starttime, $endtime);
-			}
-			else
+			} else
 			{
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_subscribed
@@ -1190,8 +1213,9 @@ 
 		if (!empty($_REQUEST['delsub']))
 		{
 			$toDelete = array();
-			foreach ($_REQUEST['delsub'] as $id => $dummy)
-				$toDelete[] = (int) $id;
+			foreach ($_REQUEST['delsub'] as $id => $dummy) {
+							$toDelete[] = (int) $id;
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_subscribe, id_member
@@ -1201,8 +1225,9 @@ 
 					'subscription_list' => $toDelete,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				removeSubscription($row['id_subscribe'], $row['id_member'], isset($_REQUEST['delete']));
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							removeSubscription($row['id_subscribe'], $row['id_member'], isset($_REQUEST['delete']));
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id']);
@@ -1246,9 +1271,9 @@ 
 			);
 			list ($context['sub']['username']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
+		} else {
+					$context['sub']['username'] = '';
 		}
-		else
-			$context['sub']['username'] = '';
 	}
 	// Otherwise load the existing info.
 	else
@@ -1265,8 +1290,9 @@ 
 				'blank_string' => '',
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1287,13 +1313,13 @@ 
 					{
 						foreach ($costs as $duration => $cost)
 						{
-							if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
-								$context['pending_payments'][$id] = array(
+							if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2]) {
+															$context['pending_payments'][$id] = array(
 									'desc' => sprintf($modSettings['paid_currency_symbol'], $cost . '/' . $txt[$duration]),
 								);
+							}
 						}
-					}
-					elseif ($costs['fixed'] == $pending[1])
+					} elseif ($costs['fixed'] == $pending[1])
 					{
 						$context['pending_payments'][$id] = array(
 							'desc' => sprintf($modSettings['paid_currency_symbol'], $costs['fixed']),
@@ -1311,8 +1337,9 @@ 
 					if ($_GET['pending'] == $id && $pending[3] == 'payback' && isset($context['pending_payments'][$id]))
 					{
 						// Flexible?
-						if (isset($_GET['accept']))
-							addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] == 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+						if (isset($_GET['accept'])) {
+													addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] == 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+						}
 						unset($pending_details[$id]);
 
 						$new_details = json_encode($pending_details);
@@ -1374,8 +1401,9 @@ 
 	global $smcFunc;
 
 	// Make it an array.
-	if (!is_array($users))
-		$users = array($users);
+	if (!is_array($users)) {
+			$users = array($users);
+	}
 
 	// Get all the members current groups.
 	$groups = array();
@@ -1413,14 +1441,16 @@ 
 		if ($row['id_group'] != 0)
 		{
 			// If this is changing - add the old one to the additional groups so it's not lost.
-			if ($row['id_group'] != $groups[$row['id_member']]['primary'])
-				$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			if ($row['id_group'] != $groups[$row['id_member']]['primary']) {
+							$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
+			}
 			$groups[$row['id_member']]['primary'] = $row['id_group'];
 		}
 
 		// Additional groups.
-		if (!empty($row['add_groups']))
-			$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		if (!empty($row['add_groups'])) {
+					$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1428,9 +1458,10 @@ 
 	foreach ($groups as $id => $group)
 	{
 		$group['additional'] = array_unique($group['additional']);
-		foreach ($group['additional'] as $key => $value)
-			if (empty($value))
+		foreach ($group['additional'] as $key => $value) {
+					if (empty($value))
 				unset($group['additional'][$key]);
+		}
 		$addgroups = implode(',', $group['additional']);
 
 		$smcFunc['db_query']('', '
@@ -1464,8 +1495,9 @@ 
 	loadSubscriptions();
 
 	// Exists, yes?
-	if (!isset($context['subscriptions'][$id_subscribe]))
-		return;
+	if (!isset($context['subscriptions'][$id_subscribe])) {
+			return;
+	}
 
 	$curSub = $context['subscriptions'][$id_subscribe];
 
@@ -1513,16 +1545,19 @@ 
 		list ($id_sublog, $endtime, $starttime) = $smcFunc['db_fetch_row']($request);
 
 		// If this has already expired but is active, extension means the period from now.
-		if ($endtime < time())
-			$endtime = time();
-		if ($starttime == 0)
-			$starttime = time();
+		if ($endtime < time()) {
+					$endtime = time();
+		}
+		if ($starttime == 0) {
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
-		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		if ($forceEndTime != 0) {
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$smcFunc['db_query']('', '
@@ -1552,8 +1587,9 @@ 
 	);
 
 	// Just in case the member doesn't exist.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return;
+	}
 
 	list ($old_id_group, $additional_groups) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
@@ -1570,16 +1606,18 @@ 
 		$id_group = $curSub['prim_group'];
 
 		// Ensure their old privileges are maintained.
-		if ($old_id_group != 0)
-			$newAddGroups[] = $old_id_group;
+		if ($old_id_group != 0) {
+					$newAddGroups[] = $old_id_group;
+		}
+	} else {
+			$id_group = $old_id_group;
 	}
-	else
-		$id_group = $old_id_group;
 
 	// Yep, make sure it's unique, and no empties.
-	foreach ($newAddGroups as $k => $v)
-		if (empty($v))
+	foreach ($newAddGroups as $k => $v) {
+			if (empty($v))
 			unset($newAddGroups[$k]);
+	}
 	$newAddGroups = array_unique($newAddGroups);
 	$newAddGroups = implode(',', $newAddGroups);
 
@@ -1615,16 +1653,19 @@ 
 		list ($id_sublog, $endtime, $starttime) = $smcFunc['db_fetch_row']($request);
 
 		// If this has already expired but is active, extension means the period from now.
-		if ($endtime < time())
-			$endtime = time();
-		if ($starttime == 0)
-			$starttime = time();
+		if ($endtime < time()) {
+					$endtime = time();
+		}
+		if ($starttime == 0) {
+					$starttime = time();
+		}
 
 		// Work out the new expiry date.
 		$endtime += $duration;
 
-		if ($forceEndTime != 0)
-			$endtime = $forceEndTime;
+		if ($forceEndTime != 0) {
+					$endtime = $forceEndTime;
+		}
 
 		// As everything else should be good, just update!
 		$smcFunc['db_query']('', '
@@ -1647,13 +1688,15 @@ 
 
 	// Otherwise a very simple insert.
 	$endtime = time() + $duration;
-	if ($forceEndTime != 0)
-		$endtime = $forceEndTime;
+	if ($forceEndTime != 0) {
+			$endtime = $forceEndTime;
+	}
 
-	if ($forceStartTime == 0)
-		$starttime = time();
-	else
-		$starttime = $forceStartTime;
+	if ($forceStartTime == 0) {
+			$starttime = time();
+	} else {
+			$starttime = $forceStartTime;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}log_subscribed',
@@ -1726,15 +1769,17 @@ 
 	$new_id_group = -1;
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		// The one we're removing?
 		if ($row['id_subscribe'] == $id_subscribe)
 		{
 			$removals = explode(',', $context['subscriptions'][$row['id_subscribe']]['add_groups']);
-			if ($context['subscriptions'][$row['id_subscribe']]['prim_group'] != 0)
-				$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			if ($context['subscriptions'][$row['id_subscribe']]['prim_group'] != 0) {
+							$removals[] = $context['subscriptions'][$row['id_subscribe']]['prim_group'];
+			}
 			$old_id_group = $row['old_id_group'];
 		}
 		// Otherwise things we allow.
@@ -1752,30 +1797,33 @@ 
 
 	// Now, for everything we are removing check they definitely are not allowed it.
 	$existingGroups = explode(',', $additional_groups);
-	foreach ($existingGroups as $key => $group)
-		if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
+	foreach ($existingGroups as $key => $group) {
+			if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
 			unset($existingGroups[$key]);
+	}
 
 	// Finally, do something with the current primary group.
 	if (in_array($id_group, $removals))
 	{
 		// If this primary group is actually allowed keep it.
-		if (in_array($id_group, $allowed))
-			$existingGroups[] = $id_group;
+		if (in_array($id_group, $allowed)) {
+					$existingGroups[] = $id_group;
+		}
 
 		// Either way, change the id_group back.
 		if ($new_id_group < 1)
 		{
 			// If we revert to the old id-group we need to ensure it wasn't from a subscription.
-			foreach ($context['subscriptions'] as $id => $group)
-				// It was? Make them a regular member then!
+			foreach ($context['subscriptions'] as $id => $group) {
+							// It was? Make them a regular member then!
 				if ($group['prim_group'] == $old_id_group)
 					$old_id_group = 0;
+			}
 
 			$id_group = $old_id_group;
+		} else {
+					$id_group = $new_id_group;
 		}
-		else
-			$id_group = $new_id_group;
 	}
 
 	// Crazy stuff, we seem to have our groups fixed, just make them unique
@@ -1795,8 +1843,8 @@ 
 	);
 
 	// Disable the subscription.
-	if (!$delete)
-		$smcFunc['db_query']('', '
+	if (!$delete) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_subscribed
 			SET status = {int:not_active}
 			WHERE id_member = {int:current_member}
@@ -1807,9 +1855,10 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
+	}
 	// Otherwise delete it!
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_subscribed
 			WHERE id_member = {int:current_member}
 				AND id_subscribe = {int:current_subscription}',
@@ -1818,7 +1867,8 @@ 
 				'current_subscription' => $id_subscribe,
 			)
 		);
-}
+	}
+	}
 
 /**
  * This just kind of caches all the subscription data.
@@ -1827,8 +1877,9 @@ 
 {
 	global $context, $txt, $modSettings, $smcFunc;
 
-	if (!empty($context['subscriptions']))
-		return;
+	if (!empty($context['subscriptions'])) {
+			return;
+	}
 
 	// Make sure this is loaded, just in case.
 	loadLanguage('ManagePaid');
@@ -1845,10 +1896,11 @@ 
 		// Pick a cost.
 		$costs = smf_json_decode($row['cost'], true);
 
-		if ($row['length'] != 'F' && !empty($modSettings['paid_currency_symbol']) && !empty($costs['fixed']))
-			$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
-		else
-			$cost = '???';
+		if ($row['length'] != 'F' && !empty($modSettings['paid_currency_symbol']) && !empty($costs['fixed'])) {
+					$cost = sprintf($modSettings['paid_currency_symbol'], $costs['fixed']);
+		} else {
+					$cost = '???';
+		}
 
 		// Do the span.
 		preg_match('~(\d*)(\w)~', $row['length'], $match);
@@ -1875,9 +1927,9 @@ 
 					$num_length *= 31556926;
 					break;
 			}
+		} else {
+					$length = '??';
 		}
-		else
-			$length = '??';
 
 		$context['subscriptions'][$row['id_subscribe']] = array(
 			'id' => $row['id_subscribe'],
@@ -1912,8 +1964,9 @@ 
 	{
 		$ind = $row['status'] == 0 ? 'finished' : 'total';
 
-		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		if (isset($context['subscriptions'][$row['id_subscribe']])) {
+					$context['subscriptions'][$row['id_subscribe']][$ind] = $row['member_count'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1927,8 +1980,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (isset($context['subscriptions'][$row['id_subscribe']]))
-			$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		if (isset($context['subscriptions'][$row['id_subscribe']])) {
+					$context['subscriptions'][$row['id_subscribe']]['pending'] = $row['total_pending'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }

Sources/Subs-Recent.php

Braces +5 added lines, -3 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get the latest posts of a forum.
@@ -59,8 +60,9 @@ 
 		censorText($row['body']);
 
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Build the array.
 		$posts[] = array(

Sources/SearchAPI-Custom.php

Braces +48 added lines, -34 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Used for the "custom search index" option
@@ -54,8 +55,9 @@ 
 			return;
 		}
 
-		if (empty($modSettings['search_custom_index_config']))
-			return;
+		if (empty($modSettings['search_custom_index_config'])) {
+					return;
+		}
 
 		$this->indexSettings = smf_json_decode($modSettings['search_custom_index_config'], true);
 
@@ -118,21 +120,23 @@ 
 
 		$subwords = text2words($word, $this->min_word_length, true);
 
-		if (empty($modSettings['search_force_index']))
-			$wordsSearch['words'][] = $word;
+		if (empty($modSettings['search_force_index'])) {
+					$wordsSearch['words'][] = $word;
+		}
 
 		// Excluded phrases don't benefit from being split into subwords.
-		if (count($subwords) > 1 && $isExcluded)
-			return;
-		else
+		if (count($subwords) > 1 && $isExcluded) {
+					return;
+		} else
 		{
 			foreach ($subwords as $subword)
 			{
 				if ($smcFunc['strlen']($subword) >= $this->min_word_length && !in_array($subword, $this->bannedWords))
 				{
 					$wordsSearch['indexed_words'][] = $subword;
-					if ($isExcluded)
-						$wordsExclude[] = $subword;
+					if ($isExcluded) {
+											$wordsExclude[] = $subword;
+					}
 				}
 			}
 		}
@@ -153,8 +157,9 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		if ($query_params['id_search']) {
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
 		foreach ($words['words'] as $regularWord)
@@ -163,30 +168,37 @@ 
 			$query_params['complex_body_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 		}
 
-		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		if ($query_params['user_query']) {
+					$query_where[] = '{raw:user_query}';
+		}
+		if ($query_params['board_query']) {
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		if ($query_params['topic']) {
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
+		if ($query_params['min_msg_id']) {
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
+		if ($query_params['max_msg_id']) {
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
+		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_phrases'] as $phrase)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_phrase_' . $count . '}';
+		}
 				$query_params['exclude_subject_phrase_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
 			}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
+		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_subject_words'] as $excludedWord)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : ' RLIKE ') . '{string:exclude_subject_words_' . $count . '}';
+		}
 				$query_params['exclude_subject_words_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($excludedWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $excludedWord), '\\\'') . '[[:>:]]';
 			}
 
@@ -199,8 +211,7 @@ 
 			{
 				$query_left_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_word = ' . $indexedWord . ' AND lsw' . $numTables . '.id_msg = m.id_msg)';
 				$query_where[] = '(lsw' . $numTables . '.id_word IS NULL)';
-			}
-			else
+			} else
 			{
 				$query_inner_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_msg = ' . ($prev_join === 0 ? 'm' : 'lsw' . $prev_join) . '.id_msg)';
 				$query_where[] = 'lsw' . $numTables . '.id_word = ' . $indexedWord;
@@ -236,16 +247,18 @@ 
 		$customIndexSettings = smf_json_decode($modSettings['search_custom_index_config'], true);
 
 		$inserts = array();
-		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word)
-			$inserts[] = array($word, $msgOptions['id']);
+		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word) {
+					$inserts[] = array($word, $msgOptions['id']);
+		}
 
-		if (!empty($inserts))
-			$smcFunc['db_insert']('ignore',
+		if (!empty($inserts)) {
+					$smcFunc['db_insert']('ignore',
 				'{db_prefix}log_search_words',
 				array('id_word' => 'int', 'id_msg' => 'int'),
 				$inserts,
 				array('id_word', 'id_msg')
 			);
+		}
 	}
 
 	/**
@@ -288,8 +301,9 @@ 
 			if (!empty($inserted_words))
 			{
 				$inserts = array();
-				foreach ($inserted_words as $word)
-					$inserts[] = array($word, $msgOptions['id']);
+				foreach ($inserted_words as $word) {
+									$inserts[] = array($word, $msgOptions['id']);
+				}
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}log_search_words',
 					array('id_word' => 'string', 'id_msg' => 'int'),

Sources/Subs-Membergroups.php

Braces +149 added lines, -112 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Delete one of more membergroups.
@@ -31,15 +32,16 @@ 
 	global $smcFunc, $modSettings, $txt;
 
 	// Make sure it's an array.
-	if (!is_array($groups))
-		$groups = array((int) $groups);
-	else
+	if (!is_array($groups)) {
+			$groups = array((int) $groups);
+	} else
 	{
 		$groups = array_unique($groups);
 
 		// Make sure all groups are integer.
-		foreach ($groups as $key => $value)
-			$groups[$key] = (int) $value;
+		foreach ($groups as $key => $value) {
+					$groups[$key] = (int) $value;
+		}
 	}
 
 	// Some groups are protected (guests, administrators, moderators, newbies).
@@ -56,15 +58,17 @@ 
 				'is_protected' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Make sure they don't delete protected groups!
 	$groups = array_diff($groups, array_unique($protected_groups));
-	if (empty($groups))
-		return 'no_group_found';
+	if (empty($groups)) {
+			return 'no_group_found';
+	}
 
 	// Make sure they don't try to delete a group attached to a paid subscription.
 	$subscriptions = array();
@@ -74,13 +78,14 @@ 
 		ORDER BY name');
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['id_group'], $groups))
-			$subscriptions[] = $row['name'];
-		else
+		if (in_array($row['id_group'], $groups)) {
+					$subscriptions[] = $row['name'];
+		} else
 		{
 			$add_groups = explode(',', $row['add_groups']);
-			if (count(array_intersect($add_groups, $groups)) != 0)
-				$subscriptions[] = $row['name'];
+			if (count(array_intersect($add_groups, $groups)) != 0) {
+							$subscriptions[] = $row['name'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
@@ -101,8 +106,9 @@ 
 			'group_list' => $groups,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			logAction('delete_group', array('group' => $row['group_name']), 'admin');
+	}
 	$smcFunc['db_free_result']($request);
 
 	call_integration_hook('integrate_delete_membergroups', array($groups));
@@ -187,12 +193,14 @@ 
 		)
 	);
 	$updates = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$updates[$row['additional_groups']][] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$updates[$row['additional_groups']][] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $additional_groups => $memberArray)
-		updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	foreach ($updates as $additional_groups => $memberArray) {
+			updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups))));
+	}
 
 	// No boards can provide access to these membergroups anymore.
 	$request = $smcFunc['db_query']('', '
@@ -204,12 +212,13 @@ 
 		)
 	);
 	$updates = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$updates[$row['member_groups']][] = $row['id_board'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$updates[$row['member_groups']][] = $row['id_board'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $member_groups => $boardArray)
-		$smcFunc['db_query']('', '
+	foreach ($updates as $member_groups => $boardArray) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET member_groups = {string:member_groups}
 			WHERE id_board IN ({array_int:board_lists})',
@@ -218,6 +227,7 @@ 
 				'member_groups' => implode(',', array_diff(explode(',', $member_groups), $groups)),
 			)
 		);
+	}
 
 	// Recalculate the post groups, as they likely changed.
 	updateStats('postgroups');
@@ -225,8 +235,9 @@ 
 	// Make a note of the fact that the cache may be wrong.
 	$settings_update = array('settings_updated' => time());
 	// Have we deleted the spider group?
-	if (isset($modSettings['spider_group']) && in_array($modSettings['spider_group'], $groups))
-		$settings_update['spider_group'] = 0;
+	if (isset($modSettings['spider_group']) && in_array($modSettings['spider_group'], $groups)) {
+			$settings_update['spider_group'] = 0;
+	}
 
 	updateSettings($settings_update);
 
@@ -250,22 +261,24 @@ 
 	global $smcFunc, $modSettings, $sourcedir;
 
 	// You're getting nowhere without this permission, unless of course you are the group's moderator.
-	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	if (!$permissionCheckDone) {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Assume something will happen.
 	updateSettings(array('settings_updated' => time()));
 
 	// Cleaning the input.
-	if (!is_array($members))
-		$members = array((int) $members);
-	else
+	if (!is_array($members)) {
+			$members = array((int) $members);
+	} else
 	{
 		$members = array_unique($members);
 
 		// Cast the members to integer.
-		foreach ($members as $key => $value)
-			$members[$key] = (int) $value;
+		foreach ($members as $key => $value) {
+					$members[$key] = (int) $value;
+		}
 	}
 
 	// Before we get started, let's check we won't leave the admin group empty!
@@ -277,14 +290,15 @@ 
 		// Remove any admins if there are too many.
 		$non_changing_admins = array_diff(array_keys($admins), $members);
 
-		if (empty($non_changing_admins))
-			$members = array_diff($members, array_keys($admins));
+		if (empty($non_changing_admins)) {
+					$members = array_diff($members, array_keys($admins));
+		}
 	}
 
 	// Just in case.
-	if (empty($members))
-		return false;
-	elseif ($groups === null)
+	if (empty($members)) {
+			return false;
+	} elseif ($groups === null)
 	{
 		// Wanna remove all groups from these members? That's easy.
 		$smcFunc['db_query']('', '
@@ -306,20 +320,21 @@ 
 		updateStats('postgroups', $members);
 
 		// Log what just happened.
-		foreach ($members as $member)
-			logAction('removed_all_groups', array('member' => $member), 'admin');
+		foreach ($members as $member) {
+					logAction('removed_all_groups', array('member' => $member), 'admin');
+		}
 
 		return true;
-	}
-	elseif (!is_array($groups))
-		$groups = array((int) $groups);
-	else
+	} elseif (!is_array($groups)) {
+			$groups = array((int) $groups);
+	} else
 	{
 		$groups = array_unique($groups);
 
 		// Make sure all groups are integer.
-		foreach ($groups as $key => $value)
-			$groups[$key] = (int) $value;
+		foreach ($groups as $key => $value) {
+					$groups[$key] = (int) $value;
+		}
 	}
 
 	// Fetch a list of groups members cannot be assigned to explicitly, and the group names of the ones we want.
@@ -335,10 +350,11 @@ 
 	$group_names = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] != -1)
-			$implicitGroups[] = $row['id_group'];
-		else
-			$group_names[$row['id_group']] = $row['group_name'];
+		if ($row['min_posts'] != -1) {
+					$implicitGroups[] = $row['id_group'];
+		} else {
+					$group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -357,8 +373,9 @@ 
 			)
 		);
 		$protected_groups = array(1);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// If you're not an admin yourself, you can't touch protected groups!
@@ -366,8 +383,9 @@ 
 	}
 
 	// Only continue if there are still groups and members left.
-	if (empty($groups) || empty($members))
-		return false;
+	if (empty($groups) || empty($members)) {
+			return false;
+	}
 
 	// First, reset those who have this as their primary group - this is the easy one.
 	$log_inserts = array();
@@ -381,8 +399,9 @@ 
 			'member_list' => $members,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$log_inserts[] = array('group' => $group_names[$row['id_group']], 'member' => $row['id_member']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$log_inserts[] = array('group' => $group_names[$row['id_group']], 'member' => $row['id_member']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	$smcFunc['db_query']('', '
@@ -414,16 +433,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// What log entries must we make for this one, eh?
-		foreach (explode(',', $row['additional_groups']) as $group)
-			if (in_array($group, $groups))
+		foreach (explode(',', $row['additional_groups']) as $group) {
+					if (in_array($group, $groups))
 				$log_inserts[] = array('group' => $group_names[$group], 'member' => $row['id_member']);
+		}
 
 		$updates[$row['additional_groups']][] = $row['id_member'];
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($updates as $additional_groups => $memberArray)
-		$smcFunc['db_query']('', '
+	foreach ($updates as $additional_groups => $memberArray) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET additional_groups = {string:additional_groups}
 			WHERE id_member IN ({array_int:member_list})',
@@ -432,6 +452,7 @@ 
 				'additional_groups' => implode(',', array_diff(explode(',', $additional_groups), $groups)),
 			)
 		);
+	}
 
 	// Their post groups may have changed now...
 	updateStats('postgroups', $members);
@@ -440,8 +461,9 @@ 
 	if (!empty($log_inserts) && !empty($modSettings['modlog_enabled']))
 	{
 		require_once($sourcedir . '/Logging.php');
-		foreach ($log_inserts as $extra)
-			logAction('removed_from_group', $extra, 'admin');
+		foreach ($log_inserts as $extra) {
+					logAction('removed_from_group', $extra, 'admin');
+		}
 	}
 
 	// Mission successful.
@@ -477,21 +499,23 @@ 
 	global $smcFunc, $sourcedir;
 
 	// Show your licence, but only if it hasn't been done yet.
-	if (!$permissionCheckDone)
-		isAllowedTo('manage_membergroups');
+	if (!$permissionCheckDone) {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Make sure we don't keep old stuff cached.
 	updateSettings(array('settings_updated' => time()));
 
-	if (!is_array($members))
-		$members = array((int) $members);
-	else
+	if (!is_array($members)) {
+			$members = array((int) $members);
+	} else
 	{
 		$members = array_unique($members);
 
 		// Make sure all members are integer.
-		foreach ($members as $key => $value)
-			$members[$key] = (int) $value;
+		foreach ($members as $key => $value) {
+					$members[$key] = (int) $value;
+		}
 	}
 	$group = (int) $group;
 
@@ -508,20 +532,23 @@ 
 	$group_names = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['min_posts'] != -1)
-			$implicitGroups[] = $row['id_group'];
-		else
-			$group_names[$row['id_group']] = $row['group_name'];
+		if ($row['min_posts'] != -1) {
+					$implicitGroups[] = $row['id_group'];
+		} else {
+					$group_names[$row['id_group']] = $row['group_name'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Sorry, you can't join an implicit group.
-	if (in_array($group, $implicitGroups) || empty($members))
-		return false;
+	if (in_array($group, $implicitGroups) || empty($members)) {
+			return false;
+	}
 
 	// Only admins can add admins...
-	if (!allowedTo('admin_forum') && $group == 1)
-		return false;
+	if (!allowedTo('admin_forum') && $group == 1) {
+			return false;
+	}
 	// ... and assign protected groups!
 	elseif (!allowedTo('admin_forum') && !$ignoreProtected)
 	{
@@ -539,13 +566,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Is it protected?
-		if ($is_protected == 1)
-			return false;
+		if ($is_protected == 1) {
+					return false;
+		}
 	}
 
 	// Do the actual updates.
-	if ($type == 'only_additional')
-		$smcFunc['db_query']('', '
+	if ($type == 'only_additional') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET additional_groups = CASE WHEN additional_groups = {string:blank_string} THEN {string:id_group_string} ELSE CONCAT(additional_groups, {string:id_group_string_extend}) END
 			WHERE id_member IN ({array_int:member_list})
@@ -559,8 +587,8 @@ 
 				'blank_string' => '',
 			)
 		);
-	elseif ($type == 'only_primary' || $type == 'force_primary')
-		$smcFunc['db_query']('', '
+	} elseif ($type == 'only_primary' || $type == 'force_primary') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET id_group = {int:id_group}
 			WHERE id_member IN ({array_int:member_list})' . ($type == 'force_primary' ? '' : '
@@ -572,8 +600,8 @@ 
 				'regular_group' => 0,
 			)
 		);
-	elseif ($type == 'auto')
-		$smcFunc['db_query']('', '
+	} elseif ($type == 'auto') {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET
 				id_group = CASE WHEN id_group = {int:regular_group} THEN {int:id_group} ELSE id_group END,
@@ -592,9 +620,11 @@ 
 				'id_group_string_extend' => ',' . $group,
 			)
 		);
+	}
 	// Ack!!?  What happened?
-	else
-		trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	else {
+			trigger_error('addMembersToGroup(): Unknown type \'' . $type . '\'', E_USER_WARNING);
+	}
 
 	call_integration_hook('integrate_add_members_to_group', array($members, $group, &$group_names));
 
@@ -603,8 +633,9 @@ 
 
 	// Log the data.
 	require_once($sourcedir . '/Logging.php');
-	foreach ($members as $member)
-		logAction('added_to_group', array('group' => $group_names[$group], 'member' => $member), 'admin');
+	foreach ($members as $member) {
+			logAction('added_to_group', array('group' => $group_names[$group], 'member' => $member), 'admin');
+	}
 
 	return true;
 }
@@ -632,8 +663,9 @@ 
 		)
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If there are more than $limit members, add a 'more' link.
@@ -641,10 +673,10 @@ 
 	{
 		array_pop($members);
 		return true;
+	} else {
+			return false;
+	}
 	}
-	else
-		return false;
-}
 
 /**
  * Retrieve a list of (visible) membergroups used by the cache.
@@ -669,8 +701,9 @@ 
 		)
 	);
 	$groupCache = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groupCache[] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groupCache[] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	return array(
@@ -718,8 +751,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We only list the groups they can see.
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
+					continue;
+		}
 
 		$row['icons'] = explode('#', $row['icons']);
 
@@ -754,12 +788,11 @@ 
 					'group_list' => $group_ids,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($query))
-				$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			while ($row = $smcFunc['db_fetch_assoc']($query)) {
+							$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			}
 			$smcFunc['db_free_result']($query);
-		}
-
-		else
+		} else
 		{
 			$query = $smcFunc['db_query']('', '
 				SELECT id_group, COUNT(*) AS num_members
@@ -770,8 +803,9 @@ 
 					'group_list' => $group_ids,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($query))
-				$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			while ($row = $smcFunc['db_fetch_assoc']($query)) {
+							$groups[$row['id_group']]['num_members'] += $row['num_members'];
+			}
 			$smcFunc['db_free_result']($query);
 
 			// Only do additional groups if we can moderate...
@@ -790,8 +824,9 @@ 
 						'blank_string' => '',
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($query))
-					$groups[$row['id_group']]['num_members'] += $row['num_members'];
+				while ($row = $smcFunc['db_fetch_assoc']($query)) {
+									$groups[$row['id_group']]['num_members'] += $row['num_members'];
+				}
 				$smcFunc['db_free_result']($query);
 			}
 		}
@@ -805,8 +840,9 @@ 
 				'group_list' => $group_ids,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($query))
-			$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($query)) {
+					$groups[$row['id_group']]['moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 		$smcFunc['db_free_result']($query);
 	}
 
@@ -815,8 +851,9 @@ 
 	{
 		$sort_ascending = strpos($sort, 'DESC') === false;
 
-		foreach ($groups as $group)
-			$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		foreach ($groups as $group) {
+					$sort_array[] = $group['id_group'] != 3 ? (int) $group['num_members'] : -1;
+		}
 
 		array_multisort($sort_array, $sort_ascending ? SORT_ASC : SORT_DESC, SORT_REGULAR, $groups);
 	}

Sources/Help.php

Braces +29 added lines, -22 removed lines

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

Sources/Subs-Menu.php

Braces +87 added lines, -63 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Create a menu.
@@ -64,22 +65,26 @@ 
 	$menu_context['current_action'] = isset($menuOptions['action']) ? $menuOptions['action'] : $context['current_action'];
 
 	// Allow extend *any* menu with a single hook
-	if (!empty($menu_context['current_action']))
-		call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	if (!empty($menu_context['current_action'])) {
+			call_integration_hook('integrate_' . $menu_context['current_action'] . '_areas', array(&$menuData));
+	}
 
 	// What is the current area selected?
-	if (isset($menuOptions['current_area']) || isset($_GET['area']))
-		$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['area'];
+	if (isset($menuOptions['current_area']) || isset($_GET['area'])) {
+			$menu_context['current_area'] = isset($menuOptions['current_area']) ? $menuOptions['current_area'] : $_GET['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)
+	if (!empty($menuOptions['extra_url_parameters'])) {
+			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'];
+	if (empty($menuOptions['disable_url_session_check'])) {
+			$menu_context['extra_parameters'] .= ';' . $context['session_var'] . '=' . $context['session_id'];
+	}
 
 	$include_data = array();
 
@@ -87,8 +92,9 @@ 
 	foreach ($menuData as $section_id => $section)
 	{
 		// Is this enabled - or has as permission check - which fails?
-		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission'])))
-			continue;
+		if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($section['permission']) && !allowedTo($section['permission']))) {
+					continue;
+		}
 
 		// Now we cycle through the sections to pick the right area.
 		foreach ($section['areas'] as $area_id => $area)
@@ -110,41 +116,45 @@ 
 					if (empty($area['hidden']))
 					{
 						// First time this section?
-						if (!isset($menu_context['sections'][$section_id]))
-							$menu_context['sections'][$section_id]['title'] = $section['title'];
+						if (!isset($menu_context['sections'][$section_id])) {
+													$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]);
 						// 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'];
+						if (isset($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['force_menu_into_arms_of_another_menu']) && $user_info['name'] == 'iamanoompaloompa')
-							$menu_context['sections'][$section_id]['areas'][$area_id] = safe_unserialize(base64_decode('YTozOntzOjU6ImxhYmVsIjtzOjEyOiJPb21wYSBMb29tcGEiO3M6MzoidXJsIjtzOjQzOiJodHRwOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL09vbXBhX0xvb21wYXM/IjtzOjQ6Imljb24iO3M6ODY6IjxpbWcgc3JjPSJodHRwOi8vd3d3LnNpbXBsZW1hY2hpbmVzLm9yZy9pbWFnZXMvb29tcGEuZ2lmIiBhbHQ9IkknbSBhbiBPb21wYSBMb29tcGEiIC8+Ijt9'));
-						elseif (isset($area['icon']) && file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
-						elseif (isset($area['icon']) && file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
-						elseif (isset($area['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
-
-						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon']))
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
-						elseif (isset($area['icon']))
+						if (!isset($area['force_menu_into_arms_of_another_menu']) && $user_info['name'] == 'iamanoompaloompa') {
+													$menu_context['sections'][$section_id]['areas'][$area_id] = safe_unserialize(base64_decode('YTozOntzOjU6ImxhYmVsIjtzOjEyOiJPb21wYSBMb29tcGEiO3M6MzoidXJsIjtzOjQzOiJodHRwOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL09vbXBhX0xvb21wYXM/IjtzOjQ6Imljb24iO3M6ODY6IjxpbWcgc3JjPSJodHRwOi8vd3d3LnNpbXBsZW1hY2hpbmVzLm9yZy9pbWFnZXMvb29tcGEuZ2lmIiBhbHQ9IkknbSBhbiBPb21wYSBMb29tcGEiIC8+Ijt9'));
+						} elseif (isset($area['icon']) && file_exists($settings['theme_dir'] . '/images/admin/' . $area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+						} elseif (isset($area['icon']) && file_exists($settings['default_theme_dir'] . '/images/admin/' . $area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<img src="' . $settings['default_images_url'] . '/admin/' . $area['icon'] . '" alt="">';
+						} elseif (isset($area['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area['icon'] . '"></span>';
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon'] = '<span class="generic_icons ' . $area_id . '"></span>';
+						}
+
+						if (isset($area['icon_class']) && empty($menu_context['sections'][$section_id]['areas'][$area_id]['icon'])) {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . $area['icon_class'];
+						} elseif (isset($area['icon']))
 						{
-							if ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon']))
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
-							elseif ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon']))
-								$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
+							if ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['theme_dir'] . '/images/admin/big/' . $area['icon'])) {
+															$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['theme_url'] . '/images/admin/big/' . $area['icon'];
+							} elseif ((substr($area['icon'], -4) === '.png' || substr($area['icon'], -4) === '.gif') && file_exists($settings['default_theme_dir'] . '/images/admin/big/' . $area['icon'])) {
+															$menu_context['sections'][$section_id]['areas'][$area_id]['icon_file'] = $settings['default_theme_url'] . '/images/admin/big/' . $area['icon'];
+							}
 
 							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area['icon']);
+						} else {
+													$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 						}
-						else
-							$menu_context['sections'][$section_id]['areas'][$area_id]['icon_class'] = $menu_context['current_action'] . '_menu_icon ' . str_replace(array('.png', '.gif'), '', $area_id);
 
 						// Some areas may be listed but not active, which we show as greyed out.
 						$menu_context['sections'][$section_id]['areas'][$area_id]['inactive'] = !empty($area['inactive']);
@@ -158,35 +168,41 @@ 
 							{
 								if ((empty($sub[1]) || allowedTo($sub[1])) && (!isset($sub['enabled']) || !empty($sub['enabled'])))
 								{
-									if ($first_sa == null)
-										$first_sa = $sa;
+									if ($first_sa == null) {
+																			$first_sa = $sa;
+									}
 
 									$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa] = array('label' => $sub[0]);
 									// Custom URL?
-									if (isset($sub['url']))
-										$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$sa]['url'] = $sub['url'];
+									if (isset($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;
+										if (empty($first_sa)) {
+																					$first_sa = $sa;
+										}
 
 										// Is this the current subsection?
-										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $sa)
-											$menu_context['current_subsection'] = $sa;
+										if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $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;
+										elseif (!isset($menu_context['current_subsection']) && !empty($sub[2])) {
+																					$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.
@@ -195,8 +211,9 @@ 
 								$menu_context['sections'][$section_id]['areas'][$area_id]['subsections'][$context['right_to_left'] ? $last_sa : $first_sa]['is_first'] = true;
 								$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;
+								if ($menu_context['current_area'] == $area_id && !isset($menu_context['current_subsection'])) {
+																	$menu_context['current_subsection'] = $first_sa;
+								}
 							}
 						}
 					}
@@ -230,23 +247,26 @@ 
 	$menu_context['base_url'] = isset($menuOptions['base_url']) ? $menuOptions['base_url'] : $scripturl . '?action=' . $menu_context['current_action'];
 
 	// 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;
+	if (isset($backup_area) && empty($found_section)) {
+			$menu_context['current_area'] = $backup_area;
+	}
 
 	// If there are sections quickly goes through all the sections to check if the base menu has an url
 	if (!empty($menu_context['current_section']))
 	{
 		$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;
+		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;
+		}
 
-		foreach ($menu_context['sections'] as $section_id => $section)
-			foreach ($section['areas'] as $area_id => $area)
+		foreach ($menu_context['sections'] as $section_id => $section) {
+					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;
 				}
 			}
@@ -257,8 +277,9 @@ 
 	{
 		// Never happened!
 		$context['max_menu_id']--;
-		if ($context['max_menu_id'] == 0)
-			unset($context['max_menu_id']);
+		if ($context['max_menu_id'] == 0) {
+					unset($context['max_menu_id']);
+		}
 
 		return false;
 	}
@@ -269,8 +290,9 @@ 
 	$context['template_layers'][] = $menu_context['layer_name'];
 
 	// Check we had something - for sanity sake.
-	if (empty($include_data))
-		return false;
+	if (empty($include_data)) {
+			return false;
+	}
 
 	// Finally - return information on the selected item.
 	$include_data += array(
@@ -293,12 +315,14 @@ 
 	global $context;
 
 	$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;
+	if (!isset($context[$menu_name])) {
+			return false;
+	}
 
 	$layer_index = array_search($context[$menu_name]['layer_name'], $context['template_layers']);
-	if ($layer_index !== false)
-		unset($context['template_layers'][$layer_index]);
+	if ($layer_index !== false) {
+			unset($context['template_layers'][$layer_index]);
+	}
 
 	unset($context[$menu_name]);
 }

Sources/BoardIndex.php

Braces +20 added lines, -13 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function shows the board index.
@@ -34,8 +35,9 @@ 
 	$context['canonical_url'] = $scripturl;
 
 	// Do not let search engines index anything if there is a random thing in $_GET.
-	if (!empty($_GET))
-		$context['robot_no_index'] = true;
+	if (!empty($_GET)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Retrieve the categories and boards.
 	require_once($sourcedir . '/Subs-BoardIndex.php');
@@ -62,11 +64,12 @@ 
 			$context['latest_posts'] = cache_quick_get('boardindex-latest_posts:' . md5($user_info['query_wanna_see_board'] . $user_info['language']), 'Subs-Recent.php', 'cache_getLastPosts', array($latestPostOptions));
 		}
 
-		if (!empty($context['latest_posts']) || !empty($context['latest_post']))
-			$context['info_center'][] = array(
+		if (!empty($context['latest_posts']) || !empty($context['latest_post'])) {
+					$context['info_center'][] = array(
 				'tpl' => 'recent',
 				'txt' => 'recent_posts',
 			);
+		}
 	}
 
 	// Load the calendar?
@@ -87,20 +90,22 @@ 
 		// This is used to show the "how-do-I-edit" help.
 		$context['calendar_can_edit'] = allowedTo('calendar_edit_any');
 
-		if ($context['show_calendar'])
-			$context['info_center'][] = array(
+		if ($context['show_calendar']) {
+					$context['info_center'][] = array(
 				'tpl' => 'calendar',
 				'txt' => $context['calendar_only_today'] ? 'calendar_today' : 'calendar_upcoming',
 			);
+		}
 	}
 
 	// And stats.
 	$context['show_stats'] = allowedTo('view_stats') && !empty($modSettings['trackStats']);
-	if ($settings['show_stats_index'])
-		$context['info_center'][] = array(
+	if ($settings['show_stats_index']) {
+			$context['info_center'][] = array(
 				'tpl' => 'stats',
 				'txt' => 'forum_stats',
 			);
+	}
 
 	// Now the online stuff
 	require_once($sourcedir . '/Subs-MembersOnline.php');
@@ -118,12 +123,14 @@ 
 			);
 
 	// Track most online statistics? (Subs-MembersOnline.php)
-	if (!empty($modSettings['trackStats']))
-		trackStatsUsersOnline($context['num_guests'] + $context['num_spiders'] + $context['num_users_online']);
+	if (!empty($modSettings['trackStats'])) {
+			trackStatsUsersOnline($context['num_guests'] + $context['num_spiders'] + $context['num_users_online']);
+	}
 
 	// Are we showing all membergroups on the board index?
-	if (!empty($settings['show_group_key']))
-		$context['membergroups'] = cache_quick_get('membergroup_list', 'Subs-Membergroups.php', 'cache_getMembergroupList', array());
+	if (!empty($settings['show_group_key'])) {
+			$context['membergroups'] = cache_quick_get('membergroup_list', 'Subs-Membergroups.php', 'cache_getMembergroupList', array());
+	}
 
 	// And back to normality.
 	$context['page_title'] = sprintf($txt['forum_index'], $context['forum_name']);

Sources/Subs-Admin.php

Braces +124 added lines, -89 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get a list of versions that are currently installed on the server.
@@ -45,8 +46,7 @@ 
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');
-		}
-		else
+		} else
 		{
 			$im_version = MagickGetVersionString();
 			$extension_version = 'MagickWand ' . phpversion('MagickWand');
@@ -61,9 +61,9 @@ 
 	if (in_array('db_server', $checkFor))
 	{
 		db_extend();
-		if (!isset($db_connection) || $db_connection === false)
-			trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
-		else
+		if (!isset($db_connection) || $db_connection === false) {
+					trigger_error('getServerVersions(): you need to be connected to the database in order to get its server version', E_USER_NOTICE);
+		} else
 		{
 			$versions['db_engine'] = array('title' => sprintf($txt['support_versions_db_engine'], $smcFunc['db_title']), 'version' => '');
 			$versions['db_engine']['version'] = $smcFunc['db_get_engine']();
@@ -74,24 +74,31 @@ 
 	}
 
 	// If we're using memcache we need the server info.
-	if (empty($memcached) && function_exists('memcache_get') && isset($modSettings['cache_memcached']) && trim($modSettings['cache_memcached']) != '')
-		get_memcached_server();
+	if (empty($memcached) && function_exists('memcache_get') && isset($modSettings['cache_memcached']) && trim($modSettings['cache_memcached']) != '') {
+			get_memcached_server();
+	}
 
 	// Check to see if we have any accelerators installed...
-	if (in_array('phpa', $checkFor) && isset($_PHPA))
-		$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
-	if (in_array('apc', $checkFor) && extension_loaded('apc'))
-		$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
-	if (in_array('memcache', $checkFor) && function_exists('memcache_set'))
-		$versions['memcache'] = array('title' => 'Memcached', 'version' => empty($memcached) ? '???' : memcache_get_version($memcached));
-	if (in_array('xcache', $checkFor) && function_exists('xcache_set'))
-		$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	if (in_array('phpa', $checkFor) && isset($_PHPA)) {
+			$versions['phpa'] = array('title' => 'ionCube PHP-Accelerator', 'version' => $_PHPA['VERSION']);
+	}
+	if (in_array('apc', $checkFor) && extension_loaded('apc')) {
+			$versions['apc'] = array('title' => 'Alternative PHP Cache', 'version' => phpversion('apc'));
+	}
+	if (in_array('memcache', $checkFor) && function_exists('memcache_set')) {
+			$versions['memcache'] = array('title' => 'Memcached', 'version' => empty($memcached) ? '???' : memcache_get_version($memcached));
+	}
+	if (in_array('xcache', $checkFor) && function_exists('xcache_set')) {
+			$versions['xcache'] = array('title' => 'XCache', 'version' => XCACHE_VERSION);
+	}
 
-	if (in_array('php', $checkFor))
-		$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	if (in_array('php', $checkFor)) {
+			$versions['php'] = array('title' => 'PHP', 'version' => PHP_VERSION, 'more' => '?action=admin;area=serversettings;sa=phpinfo');
+	}
 
-	if (in_array('server', $checkFor))
-		$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	if (in_array('server', $checkFor)) {
+			$versions['server'] = array('title' => $txt['support_versions_server'], 'version' => $_SERVER['SERVER_SOFTWARE']);
+	}
 
 	return $versions;
 }
@@ -131,11 +138,13 @@ 
 		fclose($fp);
 
 		// The comment looks rougly like... that.
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['SSI.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['SSI.php'] = $match[1];
+		}
 		// Not found!  This is bad.
-		else
-			$version_info['file_versions']['SSI.php'] = '??';
+		else {
+					$version_info['file_versions']['SSI.php'] = '??';
+		}
 	}
 
 	// Do the paid subscriptions handler?
@@ -146,11 +155,13 @@ 
 		fclose($fp);
 
 		// Found it?
-		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			$version_info['file_versions']['subscriptions.php'] = $match[1];
+		if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+					$version_info['file_versions']['subscriptions.php'] = $match[1];
+		}
 		// If we haven't how do we all get paid?
-		else
-			$version_info['file_versions']['subscriptions.php'] = '??';
+		else {
+					$version_info['file_versions']['subscriptions.php'] = '??';
+		}
 	}
 
 	// Load all the files in the Sources directory, except this file and the redirect.
@@ -165,11 +176,13 @@ 
 			fclose($fp);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-				$version_info['file_versions'][$entry] = $match[1];
+			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+							$version_info['file_versions'][$entry] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['file_versions'][$entry] = '??';
+			else {
+							$version_info['file_versions'][$entry] = '??';
+			}
 		}
 	}
 	$sources_dir->close();
@@ -188,11 +201,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info['tasks_versions'][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info['tasks_versions'][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info['tasks_versions'][$entry] = '??';
+				else {
+									$version_info['tasks_versions'][$entry] = '??';
+				}
 			}
 		}
 		$tasks_dir->close();
@@ -200,8 +215,9 @@ 
 
 	// Load all the files in the default template directory - and the current theme if applicable.
 	$directories = array('default_template_versions' => $settings['default_theme_dir']);
-	if ($settings['theme_id'] != 1)
-		$directories += array('template_versions' => $settings['theme_dir']);
+	if ($settings['theme_id'] != 1) {
+			$directories += array('template_versions' => $settings['theme_dir']);
+	}
 
 	foreach ($directories as $type => $dirname)
 	{
@@ -216,11 +232,13 @@ 
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$version_info[$type][$entry] = $match[1];
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
+									$version_info[$type][$entry] = $match[1];
+				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-					$version_info[$type][$entry] = '??';
+				else {
+									$version_info[$type][$entry] = '??';
+				}
 			}
 		}
 		$this_dir->close();
@@ -241,11 +259,13 @@ 
 			list ($name, $language) = explode('.', $entry);
 
 			// Look for the version comment in the file header.
-			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
-				$version_info['default_language_versions'][$language][$name] = $match[1];
+			if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1) {
+							$version_info['default_language_versions'][$language][$name] = $match[1];
+			}
 			// It wasn't found, but the file was... show a '??'.
-			else
-				$version_info['default_language_versions'][$language][$name] = '??';
+			else {
+							$version_info['default_language_versions'][$language][$name] = '??';
+			}
 		}
 	}
 	$this_dir->close();
@@ -260,8 +280,9 @@ 
 		ksort($version_info['tasks_versions']);
 
 		// For languages sort each language too.
-		foreach ($version_info['default_language_versions'] as $language => $dummy)
-			ksort($version_info['default_language_versions'][$language]);
+		foreach ($version_info['default_language_versions'] as $language => $dummy) {
+					ksort($version_info['default_language_versions'][$language]);
+		}
 	}
 	return $version_info;
 }
@@ -303,27 +324,31 @@ 
 	$settingsArray = trim(file_get_contents($boarddir . '/Settings.php'));
 
 	// Break it up based on \r or \n, and then clean out extra characters.
-	if (strpos($settingsArray, "\n") !== false)
-		$settingsArray = explode("\n", $settingsArray);
-	elseif (strpos($settingsArray, "\r") !== false)
-		$settingsArray = explode("\r", $settingsArray);
-	else
-		return;
+	if (strpos($settingsArray, "\n") !== false) {
+			$settingsArray = explode("\n", $settingsArray);
+	} elseif (strpos($settingsArray, "\r") !== false) {
+			$settingsArray = explode("\r", $settingsArray);
+	} else {
+			return;
+	}
 
 	// Presumably, the file has to have stuff in it for this function to be called :P.
-	if (count($settingsArray) < 10)
-		return;
+	if (count($settingsArray) < 10) {
+			return;
+	}
 
 	// remove any /r's that made there way in here
-	foreach ($settingsArray as $k => $dummy)
-		$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	foreach ($settingsArray as $k => $dummy) {
+			$settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n";
+	}
 
 	// go line by line and see whats changing
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
 		// Don't trim or bother with it if it's not a variable.
-		if (substr($settingsArray[$i], 0, 1) != '$')
-			continue;
+		if (substr($settingsArray[$i], 0, 1) != '$') {
+					continue;
+		}
 
 		$settingsArray[$i] = trim($settingsArray[$i]) . "\n";
 
@@ -335,8 +360,7 @@ 
 			{
 				updateDbLastError($val);
 				unset($config_vars[$var]);
-			}
-			elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+			} elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#');
 				$settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n";
@@ -347,34 +371,39 @@ 
 		}
 
 		// End of the file ... maybe
-		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>')
-			$end = $i;
+		if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>') {
+					$end = $i;
+		}
 	}
 
 	// This should never happen, but apparently it is happening.
-	if (empty($end) || $end < 10)
-		$end = count($settingsArray) - 1;
+	if (empty($end) || $end < 10) {
+			$end = count($settingsArray) - 1;
+	}
 
 	// Still more variables to go?  Then lets add them at the end.
 	if (!empty($config_vars))
 	{
-		if (trim($settingsArray[$end]) == '?' . '>')
-			$settingsArray[$end++] = '';
-		else
-			$end++;
+		if (trim($settingsArray[$end]) == '?' . '>') {
+					$settingsArray[$end++] = '';
+		} else {
+					$end++;
+		}
 
 		// Add in any newly defined vars that were passed
-		foreach ($config_vars as $var => $val)
-			$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		foreach ($config_vars as $var => $val) {
+					$settingsArray[$end++] = '$' . $var . ' = ' . $val . ';' . "\n";
+		}
 
 		$settingsArray[$end] = '?' . '>';
+	} else {
+			$settingsArray[$end] = trim($settingsArray[$end]);
 	}
-	else
-		$settingsArray[$end] = trim($settingsArray[$end]);
 
 	// Sanity error checking: the file needs to be at least 12 lines.
-	if (count($settingsArray) < 12)
-		return;
+	if (count($settingsArray) < 12) {
+			return;
+	}
 
 	// Try to avoid a few pitfalls:
 	//  - like a possible race condition,
@@ -382,8 +411,9 @@ 
 	//
 	// Check before you act: if cache is enabled, we can do a simple write test
 	// to validate that we even write things on this filesystem.
-	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
-		$cachedir = $boarddir . '/cache';
+	if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
+			$cachedir = $boarddir . '/cache';
+	}
 
 	$test_fp = @fopen($cachedir . '/settings_update.tmp', "w+");
 	if ($test_fp)
@@ -419,16 +449,18 @@ 
 			// Well this is not good at all, lets see if we can save this
 			$context['settings_message'] = 'settings_error';
 
-			if (file_exists($boarddir . '/Settings_bak.php'))
-				@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			if (file_exists($boarddir . '/Settings_bak.php')) {
+							@copy($boarddir . '/Settings_bak.php', $boarddir . '/Settings.php');
+			}
 		}
 	}
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
-	if (function_exists('opcache_invalidate'))
-		opcache_invalidate($boarddir . '/Settings.php', true);
-}
+	if (function_exists('opcache_invalidate')) {
+			opcache_invalidate($boarddir . '/Settings.php', true);
+	}
+	}
 
 /**
  * Saves the time of the last db error for the error log
@@ -454,8 +486,9 @@ 
 	global $options, $context, $smcFunc, $settings, $user_info;
 
 	// This must exist!
-	if (!isset($context['admin_preferences']))
-		return false;
+	if (!isset($context['admin_preferences'])) {
+			return false;
+	}
 
 	// This is what we'll be saving.
 	$options['admin_preferences'] = json_encode($context['admin_preferences']);
@@ -519,8 +552,9 @@ 
 	$emails_sent = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($prefs[$row['id_member']]['announcements']))
-			continue;
+		if (empty($prefs[$row['id_member']]['announcements'])) {
+					continue;
+		}
 
 		// Stick their particulars in the replacement data.
 		$replacements['IDMEMBER'] = $row['id_member'];
@@ -539,11 +573,12 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Any additional users we must email this to?
-	if (!empty($additional_recipients))
-		foreach ($additional_recipients as $recipient)
+	if (!empty($additional_recipients)) {
+			foreach ($additional_recipients as $recipient)
 		{
 			if (in_array($recipient['email'], $emails_sent))
 				continue;
+	}
 
 			$replacements['IDMEMBER'] = $recipient['id'];
 			$replacements['REALNAME'] = $recipient['name'];