SimpleMachines / SMF2.1

Sources/ManageRegistration.php

Braces +27 added lines, -19 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entrance point for the registration center, it checks permissions and forwards
@@ -31,8 +32,9 @@ 
 	global $context, $txt;
 
 	// Old templates might still request this.
-	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse')
-		redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'browse') {
+			redirectexit('action=admin;area=viewmembers;sa=browse' . (isset($_REQUEST['type']) ? ';type=' . $_REQUEST['type'] : ''));
+	}
 
 	$subActions = array(
 		'register' => array('AdminRegister', 'moderate_forum'),
@@ -99,9 +101,10 @@ 
 		checkSession();
 		validateToken('admin-regc');
 
-		foreach ($_POST as $key => $value)
-			if (!is_array($_POST[$key]))
+		foreach ($_POST as $key => $value) {
+					if (!is_array($_POST[$key]))
 				$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		}
 
 		$regOptions = array(
 			'interface' => 'admin',
@@ -161,12 +164,13 @@ 
 			)
 		);
 		$context['member_groups'] = array(0 => $txt['admin_register_group_none']);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['member_groups'][$row['id_group']] = $row['group_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['member_groups'][$row['id_group']] = $row['group_name'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$context['member_groups'] = array();
 	}
-	else
-		$context['member_groups'] = array();
 
 	// Basic stuff.
 	$context['sub_template'] = 'admin_register';
@@ -207,8 +211,9 @@ 
 		{
 			$context['editable_agreements']['.' . $lang['filename']] = $lang['name'];
 			// Are we editing this?
-			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename'])
-				$context['current_agreement'] = '.' . $lang['filename'];
+			if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename']) {
+							$context['current_agreement'] = '.' . $lang['filename'];
+			}
 		}
 	}
 
@@ -223,10 +228,11 @@ 
 
 		updateSettings(array('requireAgreement' => !empty($_POST['requireAgreement'])));
 
-		if ($bytes == strlen($to_write))
-			$context['saved_successful'] = true;
-		else
-			$context['could_not_save'] = true;
+		if ($bytes == strlen($to_write)) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['could_not_save'] = true;
+		}
 	}
 
 	$context['agreement'] = file_exists($boarddir . '/agreement' . $context['current_agreement'] . '.txt') ? $smcFunc['htmlspecialchars'](file_get_contents($boarddir . '/agreement' . $context['current_agreement'] . '.txt')) : '';
@@ -310,8 +316,9 @@ 
 
 	call_integration_hook('integrate_modify_registration_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template
 	$context['sub_template'] = 'show_settings';
@@ -322,8 +329,9 @@ 
 		checkSession();
 
 		// Are there some contacts missing?
-		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax']))
-			fatal_lang_error('admin_setting_coppa_require_contact');
+		if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax'])) {
+					fatal_lang_error('admin_setting_coppa_require_contact');
+		}
 
 		// Post needs to take into account line breaks.
 		$_POST['coppaPost'] = str_replace("\n", '<br>', empty($_POST['coppaPost']) ? '' : $_POST['coppaPost']);

Sources/ReportedContent.php

Braces +61 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Sets and call a function based on the given subaction. Acts as a dispatcher function.
@@ -54,8 +55,9 @@ 
 	);
 
 	// This comes under the umbrella of moderating posts.
-	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1')
-		isAllowedTo('moderate_forum');
+	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1') {
+			isAllowedTo('moderate_forum');
+	}
 
 	$subActions = array(
 		'show' => 'ShowReports',
@@ -70,11 +72,11 @@ 
 	call_integration_hook('integrate_reported_' . $context['report_type'], array(&$subActions));
 
 	// By default we call the open sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
-
-	else
-		$context['sub_action'] = 'show';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
+	} else {
+			$context['sub_action'] = 'show';
+	}
 
 	// Hi Ho Silver Away!
 	call_helper($subActions[$context['sub_action']]);
@@ -116,11 +118,13 @@ 
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
-		if (!empty($toClose))
-			updateReport('closed', 1, $toClose);
+		if (!empty($toClose)) {
+					updateReport('closed', 1, $toClose);
+		}
 
 		// Set the confirmation message.
 		$_SESSION['rc_confirmation'] = 'close_all';
@@ -175,8 +179,9 @@ 
 	global $context, $sourcedir, $scripturl, $txt;
 
 	// Have to at least give us something to work with.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please
 	$report_id = (int) $_REQUEST['rid'];
@@ -184,8 +189,9 @@ 
 	// Get the report details.
 	$report = getReportDetails($report_id);
 
-	if (!$report)
-		fatal_lang_error('mc_no_modreport_found');
+	if (!$report) {
+			fatal_lang_error('mc_no_modreport_found');
+	}
 
 	// Build the report data - basic details first, then extra stuff based on the type
 	$context['report'] = array(
@@ -211,8 +217,7 @@ 
 				'href' => $scripturl . '?action=profile;u=' . $report['id_user'],
 			),
 		);
-	}
-	else
+	} else
 	{
 		$extraDetails = array(
 			'topic_id' => $report['id_topic'],
@@ -235,8 +240,9 @@ 
 
 	$reportComments = getReportComments($report_id);
 
-	if (!empty($reportComments))
-		$context['report'] = array_merge($context['report'], $reportComments);
+	if (!empty($reportComments)) {
+			$context['report'] = array_merge($context['report'], $reportComments);
+	}
 
 	// What have the other moderators done to this message?
 	require_once($sourcedir . '/Modlog.php');
@@ -257,8 +263,7 @@ 
 			1,
 			true,
 		);
-	}
-	else
+	} else
 	{
 		$params = array(
 			'lm.id_topic = {int:id_topic}
@@ -358,16 +363,16 @@ 
 	createList($listOptions);
 
 	// Make sure to get the correct tab selected.
-	if ($context['report']['closed'])
-		$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	if ($context['report']['closed']) {
+			$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	}
 
 	// Finally we are done :P
 	if ($context['report_type'] == 'members')
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmemberreport'], $context['report']['user']['name']);
 		$context['sub_template'] = 'viewmemberreport';
-	}
-	else
+	} else
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmodreport'], $context['report']['subject'], $context['report']['author']['name']);
 		$context['sub_template'] = 'viewmodreport';
@@ -390,8 +395,9 @@ 
 	global $smcFunc, $scripturl, $user_info, $context;
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please.
 	$report_id = (int) $_REQUEST['rid'];
@@ -416,8 +422,9 @@ 
 		checkSession('get');
 		validateToken('mod-reportC-delete', 'get');
 
-		if (empty($_REQUEST['mid']))
-			fatal_lang_error('mc_reportedp_comment_none_found');
+		if (empty($_REQUEST['mid'])) {
+					fatal_lang_error('mc_reportedp_comment_none_found');
+		}
 
 		$comment_id = (int) $_REQUEST['mid'];
 
@@ -425,15 +432,17 @@ 
 		$comment = getCommentModDetails($comment_id);
 
 		// Perhaps somebody else already deleted this fine gem...
-		if (empty($comment))
-			fatal_lang_error('report_action_message_delete_issue');
+		if (empty($comment)) {
+					fatal_lang_error('report_action_message_delete_issue');
+		}
 
 		// Can you actually do this?
 		$comment_owner = $user_info['id'] == $comment['id_member'];
 
 		// Nope! sorry.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_delete_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_delete_cannot');
+		}
 
 		// All good!
 		deleteModComment($comment_id);
@@ -458,11 +467,13 @@ 
 	checkSession(isset($_REQUEST['save']) ? 'post' : 'get');
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
-	if (empty($_REQUEST['mid']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($_REQUEST['mid'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Integers only please.
 	$context['report_id'] = (int) $_REQUEST['rid'];
@@ -470,8 +481,9 @@ 
 
 	$context['comment'] = getCommentModDetails($context['comment_id']);
 
-	if (empty($context['comment']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($context['comment'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Set up the comforting bits...
 	$context['page_title'] = $txt['mc_reported_posts'];
@@ -482,15 +494,17 @@ 
 		validateToken('mod-reportC-edit');
 
 		// Make sure there is some data to edit on the DB.
-		if (empty($context['comment']))
-			fatal_lang_error('report_action_message_edit_issue');
+		if (empty($context['comment'])) {
+					fatal_lang_error('report_action_message_edit_issue');
+		}
 
 		// Still there, good, now lets see if you can actually edit it...
 		$comment_owner = $user_info['id'] == $context['comment']['id_member'];
 
 		// So, you aren't neither an admin or the comment owner huh? that's too bad.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_edit_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_edit_cannot');
+		}
 
 		// All good!
 		$edited_comment = trim($smcFunc['htmlspecialchars']($_POST['mod_comment']));
@@ -516,8 +530,9 @@ 
 	checkSession('get');
 
 	// We need to do something!
-	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed'])))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed']))) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// What are we gonna do?
 	$action = isset($_GET['ignore']) ? 'ignore' : 'closed';

Sources/Topic.php

Braces +31 added lines, -21 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Locks a topic... either by way of a moderator or the topic starter.
@@ -32,8 +33,9 @@ 
 	global $topic, $user_info, $sourcedir, $board, $smcFunc;
 
 	// Just quit if there's no topic to lock.
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -55,23 +57,28 @@ 
 
 	// Can you lock topics here, mister?
 	$user_lock = !allowedTo('lock_any');
-	if ($user_lock && $starter == $user_info['id'])
-		isAllowedTo('lock_own');
-	else
-		isAllowedTo('lock_any');
+	if ($user_lock && $starter == $user_info['id']) {
+			isAllowedTo('lock_own');
+	} else {
+			isAllowedTo('lock_any');
+	}
 
 	// Locking with high privileges.
-	if ($locked == '0' && !$user_lock)
-		$locked = '1';
+	if ($locked == '0' && !$user_lock) {
+			$locked = '1';
+	}
 	// Locking with low privileges.
-	elseif ($locked == '0')
-		$locked = '2';
+	elseif ($locked == '0') {
+			$locked = '2';
+	}
 	// Unlocking - make sure you don't unlock what you can't.
-	elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-		$locked = '0';
+	elseif ($locked == '2' || ($locked == '1' && !$user_lock)) {
+			$locked = '0';
+	}
 	// You cannot unlock this!
-	else
-		fatal_lang_error('locked_by_admin', 'user');
+	else {
+			fatal_lang_error('locked_by_admin', 'user');
+	}
 
 	// Actually lock the topic in the database with the new value.
 	$smcFunc['db_query']('', '
@@ -85,8 +92,9 @@ 
 	);
 
 	// If they are allowed a "moderator" permission, log it in the moderator log.
-	if (!$user_lock)
-		logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	if (!$user_lock) {
+			logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	}
 	// Notify people that this topic has been locked?
 	sendNotifications($topic, empty($locked) ? 'unlock' : 'lock');
 
@@ -112,8 +120,9 @@ 
 	isAllowedTo('make_sticky');
 
 	// You can't sticky a board or something!
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -147,8 +156,9 @@ 
 	// Log this sticky action - always a moderator thing.
 	logAction(empty($is_sticky) ? 'sticky' : 'unsticky', array('topic' => $topic, 'board' => $board));
 	// Notify people that this topic has been stickied?
-	if (empty($is_sticky))
-		sendNotifications($topic, 'sticky');
+	if (empty($is_sticky)) {
+			sendNotifications($topic, 'sticky');
+	}
 
 	// Take them back to the now stickied topic.
 	redirectexit('topic=' . $topic . '.' . $_REQUEST['start'] . ';moderate');

Sources/DbSearch-postgresql.php

Braces +25 added lines, -19 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Add the file functions to the $smcFunc array.
@@ -23,29 +24,33 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_search_query')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_search_query') {
+			$smcFunc += array(
 			'db_search_query' => 'smf_db_search_query',
 			'db_search_support' => 'smf_db_search_support',
 			'db_create_word_search' => 'smf_db_create_word_search',
 			'db_support_ignore' => false,
 			'db_search_language' => 'smf_db_search_language',
 		);
+	}
 
 	db_extend();
 
 	//pg 9.5 got ignore support
 	$version = $smcFunc['db_get_version']();
 	// if we got a Beta Version
-	if (stripos($version, 'beta') !== false)
-		$version = substr($version, 0, stripos($version, 'beta')).'.0';
+	if (stripos($version, 'beta') !== false) {
+			$version = substr($version, 0, stripos($version, 'beta')).'.0';
+	}
 	// or RC
-	if (stripos($version, 'rc') !== false)
-		$version = substr($version, 0, stripos($version, 'rc')).'.0';
+	if (stripos($version, 'rc') !== false) {
+			$version = substr($version, 0, stripos($version, 'rc')).'.0';
+	}
 
-	if (version_compare($version,'9.5.0','>='))
-		$smcFunc['db_support_ignore'] = true;
-}
+	if (version_compare($version,'9.5.0','>=')) {
+			$smcFunc['db_support_ignore'] = true;
+	}
+	}
 
 /**
  * This function will tell you whether this database type supports this search type.
@@ -104,16 +109,16 @@ 
 		),
 	);
 
-	if (isset($replacements[$identifier]))
-		$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	if (isset($replacements[$identifier])) {
+			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	}
 	if (preg_match('~^\s*INSERT\sIGNORE~i', $db_string) != 0)
 	{
 		$db_string = preg_replace('~^\s*INSERT\sIGNORE~i', 'INSERT', $db_string);
 		if ($smcFunc['db_support_ignore']){
 			//pg style "INSERT INTO.... ON CONFLICT DO NOTHING"
 			$db_string = $db_string.' ON CONFLICT DO NOTHING';
-		}
-		else
+		} else
 		{
 			// Don't error on multi-insert.
 			$db_values['db_error_skip'] = true;
@@ -121,8 +126,9 @@ 
 	}
 
 	//fix double quotes
-	if ($identifier == 'insert_into_log_messages_fulltext')
-		$db_values = str_replace('"', "'", $db_values);
+	if ($identifier == 'insert_into_log_messages_fulltext') {
+			$db_values = str_replace('"', "'", $db_values);
+	}
 
 	$return = $smcFunc['db_query']('', $db_string,
 		$db_values, $connection
@@ -164,9 +170,9 @@ 
 
 	$language_ftx = 'english';
 
-	if (!empty($modSettings['search_language']))
-		$language_ftx = $modSettings['search_language'];
-	else
+	if (!empty($modSettings['search_language'])) {
+			$language_ftx = $modSettings['search_language'];
+	} else
 	{
 		$request = $smcFunc['db_query']('','
 			SELECT cfgname FROM pg_ts_config WHERE oid = current_setting({string:default_language})::regconfig',

Sources/CacheAPI-apcu.php

Braces +10 added lines, -7 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -27,8 +28,9 @@ 
 	{
 		$supported = function_exists('apcu_fetch') && function_exists('apcu_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -50,10 +52,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apcu_delete($key . 'smf');
-		else
-			return apcu_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apcu_delete($key . 'smf');
+		} else {
+					return apcu_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**

Sources/Subs-Members.php

Braces +208 added lines, -151 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Delete one or more members.
@@ -43,30 +44,32 @@ 
 	setMemoryLimit('128M');
 
 	// If it's not an array, make it so!
-	if (!is_array($users))
-		$users = array($users);
-	else
-		$users = array_unique($users);
+	if (!is_array($users)) {
+			$users = array($users);
+	} else {
+			$users = array_unique($users);
+	}
 
 	// Make sure there's no void user in here.
 	$users = array_diff($users, array(0));
 
 	// How many are they deleting?
-	if (empty($users))
-		return;
-	elseif (count($users) == 1)
+	if (empty($users)) {
+			return;
+	} elseif (count($users) == 1)
 	{
 		list ($user) = $users;
 
-		if ($user == $user_info['id'])
-			isAllowedTo('profile_remove_own');
-		else
-			isAllowedTo('profile_remove_any');
-	}
-	else
+		if ($user == $user_info['id']) {
+					isAllowedTo('profile_remove_own');
+		} else {
+					isAllowedTo('profile_remove_any');
+		}
+	} else
 	{
-		foreach ($users as $k => $v)
-			$users[$k] = (int) $v;
+		foreach ($users as $k => $v) {
+					$users[$k] = (int) $v;
+		}
 
 		// Deleting more than one?  You can't have more than one account...
 		isAllowedTo('profile_remove_any');
@@ -88,26 +91,30 @@ 
 	$user_log_details = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['is_admin'])
-			$admins[] = $row['id_member'];
+		if ($row['is_admin']) {
+					$admins[] = $row['id_member'];
+		}
 		$user_log_details[$row['id_member']] = array($row['id_member'], $row['member_name']);
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($user_log_details))
-		return;
+	if (empty($user_log_details)) {
+			return;
+	}
 
 	// Make sure they aren't trying to delete administrators if they aren't one.  But don't bother checking if it's just themself.
 	if (!empty($admins) && ($check_not_admin || (!allowedTo('admin_forum') && (count($users) != 1 || $users[0] != $user_info['id']))))
 	{
 		$users = array_diff($users, $admins);
-		foreach ($admins as $id)
-			unset($user_log_details[$id]);
+		foreach ($admins as $id) {
+					unset($user_log_details[$id]);
+		}
 	}
 
 	// No one left?
-	if (empty($users))
-		return;
+	if (empty($users)) {
+			return;
+	}
 
 	// Log the action - regardless of who is deleting it.
 	$log_changes = array();
@@ -124,8 +131,9 @@ 
 		);
 
 		// Remove any cached data if enabled.
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('user_settings-' . $user[0], null, 60);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('user_settings-' . $user[0], null, 60);
+		}
 	}
 
 	// Make these peoples' posts guest posts.
@@ -388,8 +396,8 @@ 
 			'buddy_list' => implode(', buddy_list) != 0 OR FIND_IN_SET(', $users),
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$smcFunc['db_query']('', '
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
 			SET
 				pm_ignore_list = {string:pm_ignore_list},
@@ -401,6 +409,7 @@ 
 				'buddy_list' => implode(',', array_diff(explode(',', $row['buddy_list']), $users)),
 			)
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure no member's birthday is still sticking in the calendar...
@@ -455,29 +464,34 @@ 
 	elseif ($regOptions['interface'] == 'guest')
 	{
 		// You cannot register twice...
-		if (empty($user_info['is_guest']))
-			redirectexit();
+		if (empty($user_info['is_guest'])) {
+					redirectexit();
+		}
 
 		// Make sure they didn't just register with this session.
-		if (!empty($_SESSION['just_registered']) && empty($modSettings['disableRegisterCheck']))
-			fatal_lang_error('register_only_once', false);
+		if (!empty($_SESSION['just_registered']) && empty($modSettings['disableRegisterCheck'])) {
+					fatal_lang_error('register_only_once', false);
+		}
 	}
 
 	// Spaces and other odd characters are evil...
 	$regOptions['username'] = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $regOptions['username']));
 
 	// @todo Separate the sprintf?
-	if (empty($regOptions['email']) || !filter_var($regOptions['email'], FILTER_VALIDATE_EMAIL) || strlen($regOptions['email']) > 255)
-		$reg_errors[] = array('lang', 'profile_error_bad_email');
+	if (empty($regOptions['email']) || !filter_var($regOptions['email'], FILTER_VALIDATE_EMAIL) || strlen($regOptions['email']) > 255) {
+			$reg_errors[] = array('lang', 'profile_error_bad_email');
+	}
 
 	$username_validation_errors = validateUsername(0, $regOptions['username'], true, !empty($regOptions['check_reserved_name']));
-	if (!empty($username_validation_errors))
-		$reg_errors = array_merge($reg_errors, $username_validation_errors);
+	if (!empty($username_validation_errors)) {
+			$reg_errors = array_merge($reg_errors, $username_validation_errors);
+	}
 
 	// Generate a validation code if it's supposed to be emailed.
 	$validation_code = '';
-	if ($regOptions['require'] == 'activation')
-		$validation_code = generateValidationCode();
+	if ($regOptions['require'] == 'activation') {
+			$validation_code = generateValidationCode();
+	}
 
 	// If you haven't put in a password generate one.
 	if ($regOptions['interface'] == 'admin' && $regOptions['password'] == '')
@@ -487,8 +501,9 @@ 
 		$regOptions['password_check'] = $regOptions['password'];
 	}
 	// Does the first password match the second?
-	elseif ($regOptions['password'] != $regOptions['password_check'])
-		$reg_errors[] = array('lang', 'passwords_dont_match');
+	elseif ($regOptions['password'] != $regOptions['password_check']) {
+			$reg_errors[] = array('lang', 'passwords_dont_match');
+	}
 
 	// That's kind of easy to guess...
 	if ($regOptions['password'] == '')
@@ -502,13 +517,15 @@ 
 		$passwordError = validatePassword($regOptions['password'], $regOptions['username'], array($regOptions['email']));
 
 		// Password isn't legal?
-		if ($passwordError != null)
-			$reg_errors[] = array('lang', 'profile_error_password_' . $passwordError);
+		if ($passwordError != null) {
+					$reg_errors[] = array('lang', 'profile_error_password_' . $passwordError);
+		}
 	}
 
 	// You may not be allowed to register this email.
-	if (!empty($regOptions['check_email_ban']))
-		isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	if (!empty($regOptions['check_email_ban'])) {
+			isBannedEmail($regOptions['email'], 'cannot_register', $txt['ban_register_prohibited']);
+	}
 
 	// Check if the email address is in use.
 	$request = $smcFunc['db_query']('', '
@@ -523,8 +540,9 @@ 
 		)
 	);
 	// @todo Separate the sprintf?
-	if ($smcFunc['db_num_rows']($request) != 0)
-		$reg_errors[] = array('lang', 'email_in_use', false, array($smcFunc['htmlspecialchars']($regOptions['email'])));
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			$reg_errors[] = array('lang', 'email_in_use', false, array($smcFunc['htmlspecialchars']($regOptions['email'])));
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -539,24 +557,27 @@ 
 			1 = The text/index.
 			2 = Whether to log.
 			3 = sprintf data if necessary. */
-		if ($error[0] == 'lang')
-			loadLanguage('Errors');
+		if ($error[0] == 'lang') {
+					loadLanguage('Errors');
+		}
 		$message = $error[0] == 'lang' ? (empty($error[3]) ? $txt[$error[1]] : vsprintf($txt[$error[1]], $error[3])) : $error[1];
 
 		// What to do, what to do, what to do.
 		if ($return_errors)
 		{
-			if (!empty($error[2]))
-				log_error($message, $error[2]);
+			if (!empty($error[2])) {
+							log_error($message, $error[2]);
+			}
 			$reg_errors[$key] = $message;
+		} else {
+					fatal_error($message, empty($error[2]) ? false : $error[2]);
 		}
-		else
-			fatal_error($message, empty($error[2]) ? false : $error[2]);
 	}
 
 	// If there's any errors left return them at once!
-	if (!empty($reg_errors))
-		return $reg_errors;
+	if (!empty($reg_errors)) {
+			return $reg_errors;
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -578,8 +599,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0)
-		fatal_lang_error('no_theme');
+	if (isset($regOptions['theme_vars']) && count(array_intersect(array_keys($regOptions['theme_vars']), $reservedVars)) != 0) {
+			fatal_lang_error('no_theme');
+	}
 
 	// Some of these might be overwritten. (the lower ones that are in the arrays below.)
 	$regOptions['register_vars'] = array(
@@ -621,14 +643,17 @@ 
 		$regOptions['register_vars']['validation_code'] = '';
 	}
 	// Maybe it can be activated right away?
-	elseif ($regOptions['require'] == 'nothing')
-		$regOptions['register_vars']['is_activated'] = 1;
+	elseif ($regOptions['require'] == 'nothing') {
+			$regOptions['register_vars']['is_activated'] = 1;
+	}
 	// Maybe it must be activated by email?
-	elseif ($regOptions['require'] == 'activation')
-		$regOptions['register_vars']['is_activated'] = 0;
+	elseif ($regOptions['require'] == 'activation') {
+			$regOptions['register_vars']['is_activated'] = 0;
+	}
 	// Otherwise it must be awaiting approval!
-	else
-		$regOptions['register_vars']['is_activated'] = 3;
+	else {
+			$regOptions['register_vars']['is_activated'] = 3;
+	}
 
 	if (isset($regOptions['memberGroup']))
 	{
@@ -647,24 +672,28 @@ 
 				'is_protected' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$unassignableGroups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$unassignableGroups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups))
-			$regOptions['register_vars']['id_group'] = 0;
+		if (in_array($regOptions['register_vars']['id_group'], $unassignableGroups)) {
+					$regOptions['register_vars']['id_group'] = 0;
+		}
 	}
 
 	// Integrate optional member settings to be set.
-	if (!empty($regOptions['extra_register_vars']))
-		foreach ($regOptions['extra_register_vars'] as $var => $value)
+	if (!empty($regOptions['extra_register_vars'])) {
+			foreach ($regOptions['extra_register_vars'] as $var => $value)
 			$regOptions['register_vars'][$var] = $value;
+	}
 
 	// Integrate optional user theme options to be set.
 	$theme_vars = array();
-	if (!empty($regOptions['theme_vars']))
-		foreach ($regOptions['theme_vars'] as $var => $value)
+	if (!empty($regOptions['theme_vars'])) {
+			foreach ($regOptions['theme_vars'] as $var => $value)
 			$theme_vars[$var] = $value;
+	}
 
 	// Right, now let's prepare for insertion.
 	$knownInts = array(
@@ -687,14 +716,15 @@ 
 	foreach ($regOptions['register_vars'] as $var => $val)
 	{
 		$type = 'string';
-		if (in_array($var, $knownInts))
-			$type = 'int';
-		elseif (in_array($var, $knownFloats))
-			$type = 'float';
-		elseif (in_array($var, $knownInets))
-			$type = 'inet';
-		elseif ($var == 'birthdate')
-			$type = 'date';
+		if (in_array($var, $knownInts)) {
+					$type = 'int';
+		} elseif (in_array($var, $knownFloats)) {
+					$type = 'float';
+		} elseif (in_array($var, $knownInets)) {
+					$type = 'inet';
+		} elseif ($var == 'birthdate') {
+					$type = 'date';
+		}
 
 		$column_names[$var] = $type;
 		$values[$var] = $val;
@@ -713,17 +743,19 @@ 
 	call_integration_hook('integrate_post_register', array(&$regOptions, &$theme_vars, &$memberID));
 
 	// Update the number of members and latest member's info - and pass the name, but remove the 's.
-	if ($regOptions['register_vars']['is_activated'] == 1)
-		updateStats('member', $memberID, $regOptions['register_vars']['real_name']);
-	else
-		updateStats('member');
+	if ($regOptions['register_vars']['is_activated'] == 1) {
+			updateStats('member', $memberID, $regOptions['register_vars']['real_name']);
+	} else {
+			updateStats('member');
+	}
 
 	// Theme variables too?
 	if (!empty($theme_vars))
 	{
 		$inserts = array();
-		foreach ($theme_vars as $var => $val)
-			$inserts[] = array($memberID, $var, $val);
+		foreach ($theme_vars as $var => $val) {
+					$inserts[] = array($memberID, $var, $val);
+		}
 		$smcFunc['db_insert']('insert',
 			'{db_prefix}themes',
 			array('id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
@@ -738,10 +770,11 @@ 
 	// Administrative registrations are a bit different...
 	if ($regOptions['interface'] == 'admin')
 	{
-		if ($regOptions['require'] == 'activation')
-			$email_message = 'admin_register_activate';
-		elseif (!empty($regOptions['send_welcome_email']))
-			$email_message = 'admin_register_immediate';
+		if ($regOptions['require'] == 'activation') {
+					$email_message = 'admin_register_activate';
+		} elseif (!empty($regOptions['send_welcome_email'])) {
+					$email_message = 'admin_register_immediate';
+		}
 
 		if (isset($email_message))
 		{
@@ -792,16 +825,17 @@ 
 			'FORGOTPASSWORDLINK' => $scripturl . '?action=reminder',
 		);
 
-		if ($regOptions['require'] == 'activation')
-			$replacements += array(
+		if ($regOptions['require'] == 'activation') {
+					$replacements += array(
 				'ACTIVATIONLINK' => $scripturl . '?action=activate;u=' . $memberID . ';code=' . $validation_code,
 				'ACTIVATIONLINKWITHOUTCODE' => $scripturl . '?action=activate;u=' . $memberID,
 				'ACTIVATIONCODE' => $validation_code,
 			);
-		else
-			$replacements += array(
+		} else {
+					$replacements += array(
 				'COPPALINK' => $scripturl . '?action=coppa;u=' . $memberID,
 			);
+		}
 
 		$emaildata = loadEmailTemplate('register_' . ($regOptions['require'] == 'activation' ? 'activate' : 'coppa'), $replacements);
 
@@ -866,39 +900,45 @@ 
 		// Check each name in the list...
 		foreach ($reservedNames as $reserved)
 		{
-			if ($reserved == '')
-				continue;
+			if ($reserved == '') {
+							continue;
+			}
 
 			// The admin might've used entities too, level the playing field.
 			$reservedCheck = preg_replace('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'replaceEntities__callback', $reserved);
 
 			// Case sensitive name?
-			if (empty($modSettings['reserveCase']))
-				$reservedCheck = $smcFunc['strtolower']($reservedCheck);
+			if (empty($modSettings['reserveCase'])) {
+							$reservedCheck = $smcFunc['strtolower']($reservedCheck);
+			}
 
 			// If it's not just entire word, check for it in there somewhere...
-			if ($checkMe == $reservedCheck || ($smcFunc['strpos']($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord'])))
-				if ($fatal)
+			if ($checkMe == $reservedCheck || ($smcFunc['strpos']($checkMe, $reservedCheck) !== false && empty($modSettings['reserveWord']))) {
+							if ($fatal)
 					fatal_lang_error('username_reserved', 'password', array($reserved));
-				else
-					return true;
+			} else {
+									return true;
+				}
 		}
 
 		$censor_name = $name;
-		if (censorText($censor_name) != $name)
-			if ($fatal)
+		if (censorText($censor_name) != $name) {
+					if ($fatal)
 				fatal_lang_error('name_censored', 'password', array($name));
-			else
-				return true;
+		} else {
+							return true;
+			}
 	}
 
 	// Characters we just shouldn't allow, regardless.
-	foreach (array('*') as $char)
-		if (strpos($checkName, $char) !== false)
+	foreach (array('*') as $char) {
+			if (strpos($checkName, $char) !== false)
 			if ($fatal)
 				fatal_lang_error('username_reserved', 'password', array($char));
-			else
-				return true;
+	}
+			else {
+							return true;
+			}
 
 	// Get rid of any SQL parts of the reserved name...
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
@@ -980,8 +1020,9 @@ 
 				'permission' => $permission,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -989,9 +1030,9 @@ 
 	else
 	{
 		// First get the profile of the given board.
-		if (isset($board_info['id']) && $board_info['id'] == $board_id)
-			$profile_id = $board_info['profile'];
-		elseif ($board_id !== 0)
+		if (isset($board_info['id']) && $board_info['id'] == $board_id) {
+					$profile_id = $board_info['profile'];
+		} elseif ($board_id !== 0)
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT id_profile
@@ -1002,13 +1043,14 @@ 
 					'id_board' => $board_id,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) == 0)
-				fatal_lang_error('no_board');
+			if ($smcFunc['db_num_rows']($request) == 0) {
+							fatal_lang_error('no_board');
+			}
 			list ($profile_id) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
+		} else {
+					$profile_id = 1;
 		}
-		else
-			$profile_id = 1;
 
 		$request = $smcFunc['db_query']('', '
 			SELECT bp.id_group, bp.add_deny
@@ -1020,8 +1062,9 @@ 
 				'permission' => $permission,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$member_groups[$row['add_deny'] === '1' ? 'allowed' : 'denied'][] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$moderator_groups = array();
@@ -1030,8 +1073,7 @@ 
 		if (isset($board_info['moderator_groups']))
 		{
 			$moderator_groups = array_keys($board_info['moderator_groups']);
-		}
-		elseif ($board_id !== 0)
+		} elseif ($board_id !== 0)
 		{
 			// Get the groups that can moderate this board
 			$request = $smcFunc['db_query']('', '
@@ -1116,8 +1158,9 @@ 
 		)
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $members;
@@ -1190,10 +1233,12 @@ 
 	}
 
 	$query_parts = array();
-	if (!empty($email))
-		$query_parts[] = 'poster_email = {string:email_address}';
-	if (!empty($membername))
-		$query_parts[] = 'poster_name = {string:member_name}';
+	if (!empty($email)) {
+			$query_parts[] = 'poster_email = {string:email_address}';
+	}
+	if (!empty($membername)) {
+			$query_parts[] = 'poster_name = {string:member_name}';
+	}
 	$query = implode(' AND ', $query_parts);
 
 	// Finally, update the posts themselves!
@@ -1260,12 +1305,14 @@ 
 
 	$userReceiver = (int) !empty($_REQUEST['u']) ? $_REQUEST['u'] : 0;
 
-	if (empty($userReceiver))
-		fatal_lang_error('no_access', false);
+	if (empty($userReceiver)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Remove if it's already there...
-	if (in_array($userReceiver, $user_info['buddies']))
-		$user_info['buddies'] = array_diff($user_info['buddies'], array($userReceiver));
+	if (in_array($userReceiver, $user_info['buddies'])) {
+			$user_info['buddies'] = array_diff($user_info['buddies'], array($userReceiver));
+	}
 
 	// ...or add if it's not and if it's not you.
 	elseif ($user_info['id'] != $userReceiver)
@@ -1340,8 +1387,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If we want duplicates pass the members array off.
-	if ($get_duplicates)
-		populateDuplicateMembers($members);
+	if ($get_duplicates) {
+			populateDuplicateMembers($members);
+	}
 
 	return $members;
 }
@@ -1358,8 +1406,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// We know how many members there are in total.
-	if (empty($where) || $where == '1=1')
-		$num_members = $modSettings['totalMembers'];
+	if (empty($where) || $where == '1=1') {
+			$num_members = $modSettings['totalMembers'];
+	}
 
 	// The database knows the amount when there are extra conditions.
 	else
@@ -1395,16 +1444,19 @@ 
 		$members[$key]['duplicate_members'] = array();
 
 		// Store the IPs.
-		if (!empty($member['member_ip']))
-			$ips[] = $member['member_ip'];
-		if (!empty($member['member_ip2']))
-			$ips[] = $member['member_ip2'];
+		if (!empty($member['member_ip'])) {
+					$ips[] = $member['member_ip'];
+		}
+		if (!empty($member['member_ip2'])) {
+					$ips[] = $member['member_ip2'];
+		}
 	}
 
 	$ips = array_unique($ips);
 
-	if (empty($ips))
-		return false;
+	if (empty($ips)) {
+			return false;
+	}
 
 	// Fetch all members with this IP address, we'll filter out the current ones in a sec.
 	$request = $smcFunc['db_query']('', '
@@ -1434,10 +1486,12 @@ 
 			'ip2' => $row['member_ip2'],
 		);
 
-		if (in_array($row['member_ip'], $ips))
-			$duplicate_members[$row['member_ip']][] = $member_context;
-		if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips))
-			$duplicate_members[$row['member_ip2']][] = $member_context;
+		if (in_array($row['member_ip'], $ips)) {
+					$duplicate_members[$row['member_ip']][] = $member_context;
+		}
+		if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips)) {
+					$duplicate_members[$row['member_ip2']][] = $member_context;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1462,8 +1516,9 @@ 
 		$row['poster_ip'] = inet_dtop($row['poster_ip']);
 
 		// Don't collect lots of the same.
-		if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']]))
-			continue;
+		if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']])) {
+					continue;
+		}
 		$had_ips[$row['poster_ip']][] = $row['id_member'];
 
 		$duplicate_members[$row['poster_ip']][] = array(
@@ -1478,13 +1533,15 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Now we have all the duplicate members, stick them with their respective member in the list.
-	if (!empty($duplicate_members))
-		foreach ($members as $key => $member)
+	if (!empty($duplicate_members)) {
+			foreach ($members as $key => $member)
 		{
 			if (isset($duplicate_members[$member['member_ip']]))
 				$members[$key]['duplicate_members'] = $duplicate_members[$member['member_ip']];
-			if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']]))
-				$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+	}
+			if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']])) {
+							$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
+			}
 
 			// Check we don't have lots of the same member.
 			$member_track = array($member['id_member']);

Sources/SearchAPI-Standard.php

Braces +2 added lines, -1 removed lines

@@ -11,8 +11,9 @@
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Standard non full index, non custom index search

Sources/Class-BrowserDetect.php

Braces +88 added lines, -60 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class browser_detector
@@ -55,20 +56,25 @@ 
 		$this->_browsers['needs_size_fix'] = false;
 
 		// One at a time, one at a time, and in this order too
-		if ($this->isOpera())
-			$this->setupOpera();
+		if ($this->isOpera()) {
+					$this->setupOpera();
+		}
 		// Meh...
-		elseif ($this->isEdge())
-			$this->setupEdge();
+		elseif ($this->isEdge()) {
+					$this->setupEdge();
+		}
 		// Them webkits need to be set up too
-		elseif ($this->isWebkit())
-			$this->setupWebkit();
+		elseif ($this->isWebkit()) {
+					$this->setupWebkit();
+		}
 		// We may have work to do on Firefox...
-		elseif ($this->isFirefox())
-			$this->setupFirefox();
+		elseif ($this->isFirefox()) {
+					$this->setupFirefox();
+		}
 		// Old friend, old frenemy
-		elseif ($this->isIe())
-			$this->setupIe();
+		elseif ($this->isIe()) {
+					$this->setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -84,11 +90,12 @@ 
 			$this->_browsers['possibly_robot'] = !empty($user_info['possibly_robot']);
 
 			// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
-			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest'])
-				$this->_browsers['possibly_robot'] = false;
+			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest']) {
+							$this->_browsers['possibly_robot'] = false;
+			}
+		} else {
+					$this->_browsers['possibly_robot'] = false;
 		}
-		else
-			$this->_browsers['possibly_robot'] = false;
 
 		// Fill out the historical array as needed to support old mods that don't use isBrowser
 		$this->fillInformation();
@@ -106,8 +113,9 @@ 
 	*/
 	function isOpera()
 	{
-		if (!isset($this->_browsers['is_opera']))
-			$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		if (!isset($this->_browsers['is_opera'])) {
+					$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		}
 		return $this->_browsers['is_opera'];
 	}
 
@@ -118,8 +126,9 @@ 
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
-		if (!isset($this->_browsers['is_ie']))
-			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		if (!isset($this->_browsers['is_ie'])) {
+					$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		}
 		return $this->_browsers['is_ie'];
 	}
 
@@ -131,8 +140,9 @@ 
 	{
 		// IE11 is a bit different than earlier versions
 		// The isGecko() part is to ensure we get this right...
-		if (!isset($this->_browsers['is_ie11']))
-			$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		if (!isset($this->_browsers['is_ie11'])) {
+					$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		}
 		return $this->_browsers['is_ie11'];
  	}
 
@@ -142,8 +152,9 @@ 
 	*/
 	function isEdge()
 	{
-		if (!isset($this->_browsers['is_edge']))
-			$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		if (!isset($this->_browsers['is_edge'])) {
+					$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		}
 		return $this->_browsers['is_edge'];
 	}
 
@@ -153,8 +164,9 @@ 
 	*/
 	function isWebkit()
 	{
-		if (!isset($this->_browsers['is_webkit']))
-			$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		if (!isset($this->_browsers['is_webkit'])) {
+					$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		}
 		return $this->_browsers['is_webkit'];
 	}
 
@@ -164,8 +176,9 @@ 
 	*/
 	function isFirefox()
 	{
-		if (!isset($this->_browsers['is_firefox']))
-			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		if (!isset($this->_browsers['is_firefox'])) {
+					$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		}
 		return $this->_browsers['is_firefox'];
 	}
 
@@ -175,8 +188,9 @@ 
 	*/
 	function isWebTv()
 	{
-		if (!isset($this->_browsers['is_web_tv']))
-			$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		if (!isset($this->_browsers['is_web_tv'])) {
+					$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		}
 		return $this->_browsers['is_web_tv'];
 	}
 
@@ -186,8 +200,9 @@ 
 	*/
 	function isKonqueror()
 	{
-		if (!isset($this->_browsers['is_konqueror']))
-			$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		if (!isset($this->_browsers['is_konqueror'])) {
+					$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		}
 		return $this->_browsers['is_konqueror'];
 	}
 
@@ -197,8 +212,9 @@ 
 	*/
 	function isGecko()
 	{
-		if (!isset($this->_browsers['is_gecko']))
-			$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		if (!isset($this->_browsers['is_gecko'])) {
+					$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		}
 		return $this->_browsers['is_gecko'];
 	}
 
@@ -208,10 +224,12 @@ 
 	*/
 	function isOperaMini()
 	{
-		if (!isset($this->_browsers['is_opera_mini']))
-			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
-		if ($this->_browsers['is_opera_mini'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mini'])) {
+					$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
+		}
+		if ($this->_browsers['is_opera_mini']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -221,10 +239,12 @@ 
 	*/
 	function isOperaMobi()
 	{
-		if (!isset($this->_browsers['is_opera_mobi']))
-			$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
-		if ($this->_browsers['is_opera_mobi'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mobi'])) {
+					$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
+		}
+		if ($this->_browsers['is_opera_mobi']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -244,8 +264,9 @@ 
 		);
 
 		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
-		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
-			$this->_is_mobile = true;
+		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia']) {
+					$this->_is_mobile = true;
+		}
 
 		// @todo what to do with the blaPad? ... for now leave it detected as Safari ...
 		$this->_browsers['is_safari'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false && !$this->_browsers['is_chrome'] && !$this->_browsers['is_iphone'];
@@ -254,15 +275,17 @@ 
 		// if Chrome, get the major version
 		if ($this->_browsers['is_chrome'])
 		{
-			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 
 		// or if Safari get its major version
 		if ($this->_browsers['is_safari'])
 		{
-			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 	}
 
@@ -291,8 +314,9 @@ 
 			$this->_browsers['is_ie' . ((int) $trident_match[1] + 4)] = true;
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
-			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
-				$this->_browsers['is_ie_compat_view'] = true;
+			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4)) {
+							$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// Detect true IE6 and IE7 and not IE in compat mode.
@@ -326,8 +350,9 @@ 
 	 */
 	private function setupFirefox()
 	{
-		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -338,11 +363,13 @@ 
 	private function setupOpera()
 	{
 		// Opera 10+ uses the version tag at the end of the string
-		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
-		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 
 		// Needs size fix?
 		$this->_browsers['needs_size_fix'] = !empty($this->_browsers['is_opera6']);
@@ -353,8 +380,9 @@ 
 	 */
 	private function setupEdge()
 	{
-		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_edge' . (int) $match[1]] = true;
+		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_edge' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -367,9 +395,9 @@ 
 	{
 		global $context;
 
-		if ($this->_is_mobile)
-			$context['browser_body_id'] = 'mobile';
-		else
+		if ($this->_is_mobile) {
+					$context['browser_body_id'] = 'mobile';
+		} else
 		{
 			// add in any specific detection conversions here if you want a special body id e.g. 'is_opera9' => 'opera9'
 			$browser_priority = array(

Sources/ManageMembergroups.php

Braces +128 added lines, -88 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 
 /**
@@ -44,8 +45,9 @@ 
 	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (allowedTo('manage_membergroups') ? 'index' : 'settings');
 
 	// Is it elsewhere?
-	if (isset($subActions[$_REQUEST['sa']][2]))
-		require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	if (isset($subActions[$_REQUEST['sa']][2])) {
+			require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	}
 
 	// Do the permission check, you might not be allowed her.
 	isAllowedTo($subActions[$_REQUEST['sa']][1]);
@@ -104,19 +106,20 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 							$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -329,12 +332,14 @@ 
 		call_integration_hook('integrate_add_membergroup', array($id_group, $postCountBasedGroup));
 
 		// Update the post groups now, if this is a post group!
-		if (isset($_POST['min_posts']))
-			updateStats('postgroups');
+		if (isset($_POST['min_posts'])) {
+					updateStats('postgroups');
+		}
 
 		// You cannot set permissions for post groups if they are disabled.
-		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups']))
-			$_POST['perm_type'] = '';
+		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups'])) {
+					$_POST['perm_type'] = '';
+		}
 
 		if ($_POST['perm_type'] == 'predefined')
 		{
@@ -364,8 +369,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// Protected groups are... well, protected!
-				if ($copy_type == 1)
-					fatal_lang_error('membergroup_does_not_exist');
+				if ($copy_type == 1) {
+									fatal_lang_error('membergroup_does_not_exist');
+				}
 			}
 
 			// Don't allow copying of a real priviledged person!
@@ -383,18 +389,20 @@ 
 			$inserts = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions']))
-					$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions'])) {
+									$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}permissions',
 					array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'permission')
 				);
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_profile, permission, add_deny
@@ -405,17 +413,19 @@ 
 				)
 			);
 			$inserts = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}board_permissions',
 					array('id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'id_profile', 'permission')
 				);
+			}
 
 			// Also get some membergroup information if we're copying and not copying from guests...
 			if ($copy_id > 0 && $_POST['perm_type'] == 'copy')
@@ -468,14 +478,15 @@ 
 		$changed_boards['allow'] = array();
 		$changed_boards['deny'] = array();
 		$changed_boards['ignore'] = array();
-		foreach ($accesses as $group_id => $action)
-			$changed_boards[$action][] = (int) $group_id;
+		foreach ($accesses as $group_id => $action) {
+					$changed_boards[$action][] = (int) $group_id;
+		}
 
 		foreach (array('allow', 'deny') as $board_action)
 		{
 			// Only do this if they have special access requirements.
-			if (!empty($changed_boards[$board_action]))
-				$smcFunc['db_query']('', '
+			if (!empty($changed_boards[$board_action])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 					WHERE id_board IN ({array_int:board_list})',
@@ -487,11 +498,13 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
+			}
 		}
 
 		// If this is joinable then set it to show group membership in people's profiles.
-		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1)
-			updateSettings(array('show_group_membership' => 1));
+		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1) {
+					updateSettings(array('show_group_membership' => 1));
+		}
 
 		// Rebuild the group cache.
 		updateSettings(array(
@@ -512,8 +525,9 @@ 
 	$context['undefined_group'] = !isset($_REQUEST['postgroup']) && !isset($_REQUEST['generalgroup']);
 	$context['allow_protected'] = allowedTo('admin_forum');
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	$result = $smcFunc['db_query']('', '
 		SELECT id_group, group_name
@@ -530,11 +544,12 @@ 
 		)
 	);
 	$context['groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$context['groups'][] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$context['groups'][] = array(
 			'id' => $row['id_group'],
 			'name' => $row['group_name']
 		);
+	}
 	$smcFunc['db_free_result']($result);
 
 	$request = $smcFunc['db_query']('', '
@@ -551,12 +566,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -604,8 +620,9 @@ 
 	require_once($sourcedir . '/Subs-Membergroups.php');
 	$result = deleteMembergroups((int) $_REQUEST['group']);
 	// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-	if ($result === 'group_cannot_delete_sub')
-		fatal_lang_error('membergroups_cannot_delete_paid', false);
+	if ($result === 'group_cannot_delete_sub') {
+			fatal_lang_error('membergroups_cannot_delete_paid', false);
+	}
 
 	// Go back to the membergroup index.
 	redirectexit('action=admin;area=membergroups;');
@@ -627,8 +644,9 @@ 
 
 	$_REQUEST['group'] = isset($_REQUEST['group']) && $_REQUEST['group'] > 0 ? (int) $_REQUEST['group'] : 0;
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	// Make sure this group is editable.
 	if (!empty($_REQUEST['group']))
@@ -650,8 +668,9 @@ 
 	}
 
 	// Now, do we have a valid id?
-	if (empty($_REQUEST['group']))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (empty($_REQUEST['group'])) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// People who can manage boards are a bit special.
 	require_once($sourcedir . '/Subs-Members.php');
@@ -682,8 +701,9 @@ 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		$result = deleteMembergroups($_REQUEST['group']);
 		// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-		if ($result === 'group_cannot_delete_sub')
-			fatal_lang_error('membergroups_cannot_delete_paid', false);
+		if ($result === 'group_cannot_delete_sub') {
+					fatal_lang_error('membergroups_cannot_delete_paid', false);
+		}
 
 		redirectexit('action=admin;area=membergroups;');
 	}
@@ -760,16 +780,18 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$accesses[(int) $row['id_board']] = 'allow';
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$accesses[(int) $row['id_board']] = 'allow';
+				}
 				$smcFunc['db_free_result']($request);
 			}
 
 			$changed_boards['allow'] = array();
 			$changed_boards['deny'] = array();
 			$changed_boards['ignore'] = array();
-			foreach ($accesses as $group_id => $action)
-				$changed_boards[$action][] = (int) $group_id;
+			foreach ($accesses as $group_id => $action) {
+							$changed_boards[$action][] = (int) $group_id;
+			}
 
 			foreach (array('allow', 'deny') as $board_action)
 			{
@@ -785,8 +807,8 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$smcFunc['db_query']('', '
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = {string:member_group_access}
 						WHERE id_board = {int:current_board}',
@@ -796,11 +818,12 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Add the membergroup to all boards that hadn't been set yet.
-				if (!empty($changed_boards[$board_action]))
-					$smcFunc['db_query']('', '
+				if (!empty($changed_boards[$board_action])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 						WHERE id_board IN ({array_int:board_list})
@@ -814,6 +837,7 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 			}
 		}
 
@@ -839,12 +863,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), array((int) $_REQUEST['group'])))));
+			foreach ($updates as $additional_groups => $memberArray) {
+							updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array((int) $_REQUEST['group'])))));
+			}
 
 			// Sorry, but post groups can't moderate boards
 			$smcFunc['db_query']('', '
@@ -854,8 +880,7 @@ 
 					'current_group' => (int) $_REQUEST['group'],
 				)
 			);
-		}
-		elseif ($_REQUEST['group'] != 3)
+		} elseif ($_REQUEST['group'] != 3)
 		{
 			// Making it a hidden group? If so remove everyone with it as primary group (Actually, just make them additional).
 			if ($_POST['group_hidden'] == 2)
@@ -870,8 +895,9 @@ 
 					)
 				);
 				$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)
@@ -913,8 +939,9 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to update the setting?
-			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable))
-				updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable)) {
+							updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			}
 		}
 
 		// Do we need to set inherited permissions?
@@ -947,8 +974,9 @@ 
 				{
 					$moderators[$k] = trim($moderators[$k]);
 
-					if (strlen($moderators[$k]) == 0)
-						unset($moderators[$k]);
+					if (strlen($moderators[$k]) == 0) {
+											unset($moderators[$k]);
+					}
 				}
 
 				// Find all the id_member's for the member_name's in the list.
@@ -964,8 +992,9 @@ 
 							'count' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -973,8 +1002,9 @@ 
 			if (!empty($_POST['moderator_list']))
 			{
 				$moderators = array();
-				foreach ($_POST['moderator_list'] as $moderator)
-					$moderators[] = (int) $moderator;
+				foreach ($_POST['moderator_list'] as $moderator) {
+									$moderators[] = (int) $moderator;
+				}
 
 				if (!empty($moderators))
 				{
@@ -988,8 +1018,9 @@ 
 							'num_moderators' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -1001,8 +1032,9 @@ 
 			if (!empty($group_moderators))
 			{
 				$mod_insert = array();
-				foreach ($group_moderators as $moderator)
-					$mod_insert[] = array($_REQUEST['group'], $moderator);
+				foreach ($group_moderators as $moderator) {
+									$mod_insert[] = array($_REQUEST['group'], $moderator);
+				}
 
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}group_moderators',
@@ -1036,8 +1068,9 @@ 
 			'current_group' => (int) $_REQUEST['group'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -1074,14 +1107,16 @@ 
 		)
 	);
 	$context['group']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['group']['moderator_list'] = empty($context['group']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['group']['moderators']) . '&quot;';
 
-	if (!empty($context['group']['moderators']))
-		list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	if (!empty($context['group']['moderators'])) {
+			list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	}
 
 	// Get a list of boards this membergroup is allowed to see.
 	$context['boards'] = array();
@@ -1101,12 +1136,13 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// This category hasn't been set up yet..
-			if (!isset($context['categories'][$row['id_cat']]))
-				$context['categories'][$row['id_cat']] = array(
+			if (!isset($context['categories'][$row['id_cat']])) {
+							$context['categories'][$row['id_cat']] = array(
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'boards' => array()
 				);
+			}
 
 			// Set this board up, and let the template know when it's a child.  (indent them..)
 			$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -1154,19 +1190,22 @@ 
 				$image_info = getimagesize($settings['default_theme_dir'] . '/images/membericons/' . $value);
 
 				// If this is bigger than 128 in width or 32 in height, skip this one.
-				if ($image_info == false || $image_info[0] > 128 || $image_info[1] > 32)
-					continue;
+				if ($image_info == false || $image_info[0] > 128 || $image_info[1] > 32) {
+									continue;
+				}
 
 				// Else it's valid. Add it in.
-				else
-					$context['possible_icons'][] = $value;
+				else {
+									$context['possible_icons'][] = $value;
+				}
 			}
 		}
 	}
 
 	// Insert our JS, if we have possible icons.
-	if (!empty($context['possible_icons']))
-		loadJavaScriptFile('icondropdown.js', array('validate' => true), 'smf_icondropdown');
+	if (!empty($context['possible_icons'])) {
+			loadJavaScriptFile('icondropdown.js', array('validate' => true), 'smf_icondropdown');
+	}
 
 		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
 
@@ -1188,8 +1227,9 @@ 
 		)
 	);
 	$context['inheritable_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	call_integration_hook('integrate_view_membergroup');