elkarte / Elkarte

sources/subs/FollowUps.subs.php

Braces +6 added lines, -2 removed lines

@@ -41,7 +41,9 @@ 
 
 	$returns = array();
 	while ($row = $db->fetch_assoc($request))
-		$returns[$row['derived_from']][] = $row;
+	{
+			$returns[$row['derived_from']][] = $row;
+	}
 
 	return $returns;
 }
@@ -72,7 +74,9 @@ 
 
 	$returns = array();
 	while ($row = $db->fetch_assoc($request))
-		$returns = $row;
+	{
+			$returns = $row;
+	}
 
 	return $returns;
 }

sources/subs/Reports.subs.php

Braces +15 added lines, -5 removed lines

@@ -46,7 +46,9 @@ 
 	);
 	$boards = array();
 	while ($row = $db->fetch_assoc($request))
-		$boards[] = $row;
+	{
+			$boards[] = $row;
+	}
 
 	return $boards;
 }
@@ -83,7 +85,9 @@ 
 	);
 	$member_groups = array();
 	while ($row = $db->fetch_assoc($request))
-		$member_groups[$row['id_group']] = $row['group_name'];
+	{
+			$member_groups[$row['id_group']] = $row['group_name'];
+	}
 	$db->free_result($request);
 
 	return $member_groups;
@@ -118,7 +122,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$board_permissions[] = $row;
+	{
+			$board_permissions[] = $row;
+	}
 
 	$db->free_result($request);
 
@@ -168,7 +174,9 @@ 
 		),
 	);
 	while ($row = $db->fetch_assoc($request))
-		$rows[] = $row;
+	{
+			$rows[] = $row;
+	}
 	$db->free_result($request);
 
 	return $rows;
@@ -202,7 +210,9 @@ 
 
 	$perms = array();
 	while ($row = $db->fetch_assoc($request))
-		$perms[] = $row;
+	{
+			$perms[] = $row;
+	}
 	$db->free_result($request);
 
 	return $perms;

sources/controllers/PostModeration.controller.php

Spacing +2 added lines, -2 removed lines

@@ -375,7 +375,7 @@ 
 						'value' => $txt['mc_unapproved_attach_poster'],
 					),
 					'data' => array(
-						'function' => function ($data) {
+						'function' => function($data) {
 							return $data['poster']['link'];
 						},
 					),
@@ -404,7 +404,7 @@ 
 						'value' => $txt['post'],
 					),
 					'data' => array(
-						'function' => function ($data) {
+						'function' => function($data) {
 							global $modSettings;
 
 							return '<a href="' . $data['message']['href'] . '">' . Util::shorten_text($data['message']['subject'], !empty($modSettings['subject_length']) ? $modSettings['subject_length'] : 24) . '</a>';

Braces +81 added lines, -31 removed lines

@@ -79,12 +79,17 @@ 
 		}
 
 		if ($approve_boards == array(0))
-			$approve_query = '';
+		{
+					$approve_query = '';
+		}
 		elseif (!empty($approve_boards))
-			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		{
+					$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		}
 		// Nada, zip, etc...
-		else
-			$approve_query = ' AND 1=0';
+		else {
+					$approve_query = ' AND 1=0';
+		}
 
 		// We also need to know where we can delete topics and/or replies to.
 		if ($context['current_view'] === 'topics')
@@ -105,19 +110,29 @@ 
 
 		// Check if we have something to do?
 		if (isset($this->_req->query->approve))
-			$toAction[] = (int) $this->_req->query->approve;
+		{
+					$toAction[] = (int) $this->_req->query->approve;
+		}
 		// Just a deletion?
 		elseif (isset($this->_req->query->delete))
-			$toAction[] = (int) $this->_req->query->delete;
+		{
+					$toAction[] = (int) $this->_req->query->delete;
+		}
 		// Lots of approvals?
 		elseif (isset($this->_req->post->item))
-			$toAction = array_map('intval', $this->_req->post->item);
+		{
+					$toAction = array_map('intval', $this->_req->post->item);
+		}
 
 		// What are we actually doing.
 		if (isset($this->_req->query->approve) || (isset($this->_req->post->do) && $this->_req->post->do === 'approve'))
-			$curAction = 'approve';
+		{
+					$curAction = 'approve';
+		}
 		elseif (isset($this->_req->query->delete) || (isset($this->_req->post->do) && $this->_req->post->do === 'delete'))
-			$curAction = 'delete';
+		{
+					$curAction = 'delete';
+		}
 
 		// Right, so we have something to do?
 		if (!empty($toAction) && isset($curAction))
@@ -153,25 +168,35 @@ 
 			{
 				// If it's not within what our view is ignore it...
 				if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] !== 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] !== 'replies'))
-					continue;
+				{
+									continue;
+				}
 
 				$can_add = false;
 
 				// If we're approving this is simple.
 				if ($curAction === 'approve' && ($any_array == array(0) || in_array($row['id_board'], $any_array)))
-					$can_add = true;
+				{
+									$can_add = true;
+				}
 				// Delete requires more permission checks...
 				elseif ($curAction === 'delete')
 				{
 					// Own post is easy!
 					if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards)))
-						$can_add = true;
+					{
+											$can_add = true;
+					}
 					// Is it a reply to their own topic?
 					elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies)))
-						$can_add = true;
+					{
+											$can_add = true;
+					}
 					// Someone else's?
 					elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards)))
-						$can_add = true;
+					{
+											$can_add = true;
+					}
 				}
 
 				if ($can_add)
@@ -192,9 +217,12 @@ 
 			if (!empty($toAction))
 			{
 				if ($curAction === 'approve')
-					approveMessages($toAction, $details, $context['current_view']);
-				else
-					removeMessages($toAction, $details, $context['current_view']);
+				{
+									approveMessages($toAction, $details, $context['current_view']);
+				}
+				else {
+									removeMessages($toAction, $details, $context['current_view']);
+				}
 
 				Cache::instance()->remove('num_menu_errors');
 			}
@@ -274,29 +302,44 @@ 
 		$approve_boards = !empty($user_info['mod_cache']['ap']) ? $user_info['mod_cache']['ap'] : boardsAllowedTo('approve_posts');
 
 		if ($approve_boards == array(0))
-			$approve_query = '';
+		{
+					$approve_query = '';
+		}
 		elseif (!empty($approve_boards))
-			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
-		else
-			$approve_query = ' AND 0';
+		{
+					$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+		}
+		else {
+					$approve_query = ' AND 0';
+		}
 
 		// Get together the array of things to act on, if any.
 		$attachments = array();
 		if (isset($this->_req->query->approve))
-			$attachments[] = (int) $this->_req->query->approve;
+		{
+					$attachments[] = (int) $this->_req->query->approve;
+		}
 		elseif (isset($this->_req->query->delete))
-			$attachments[] = (int) $this->_req->query->delete;
+		{
+					$attachments[] = (int) $this->_req->query->delete;
+		}
 		elseif (isset($this->_req->post->item))
 		{
 			foreach ($this->_req->post->item as $item)
-				$attachments[] = (int) $item;
+			{
+							$attachments[] = (int) $item;
+			}
 		}
 
 		// Are we approving or deleting?
 		if (isset($this->_req->query->approve) || (isset($this->_req->post->do) && $this->_req->post->do === 'approve'))
-			$curAction = 'approve';
+		{
+					$curAction = 'approve';
+		}
 		elseif (isset($this->_req->query->delete) || (isset($this->_req->post->do) && $this->_req->post->do === 'delete'))
-			$curAction = 'delete';
+		{
+					$curAction = 'delete';
+		}
 
 		// Something to do, let's do it!
 		if (!empty($attachments) && isset($curAction))
@@ -313,9 +356,12 @@ 
 			if (!empty($attachments))
 			{
 				if ($curAction === 'approve')
-					approveAttachments($attachments);
-				else
-					removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+				{
+									approveAttachments($attachments);
+				}
+				else {
+									removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+				}
 
 				Cache::instance()->remove('num_menu_errors');
 			}
@@ -489,13 +535,17 @@ 
 
 		// If it's the first in a topic then the whole topic gets approved!
 		if ($message_info['id_first_msg'] == $current_msg)
-			approveTopics($topic, !$message_info['approved'], $message_info['id_member_started'] != $user_info['id']);
+		{
+					approveTopics($topic, !$message_info['approved'], $message_info['id_member_started'] != $user_info['id']);
+		}
 		else
 		{
 			approvePosts($current_msg, !$message_info['approved']);
 
 			if ($message_info['id_member'] != $user_info['id'])
-				logAction(($message_info['approved'] ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $message_info['subject'], 'member' => $message_info['id_member'], 'board' => $board));
+			{
+							logAction(($message_info['approved'] ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $message_info['subject'], 'member' => $message_info['id_member'], 'board' => $board));
+			}
 		}
 
 		Cache::instance()->remove('num_menu_errors');

sources/controllers/Groups.controller.php

Spacing +4 added lines, -4 removed lines

@@ -122,7 +122,7 @@ 
 						'value' => $txt['name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($base_url) {
+						'function' => function($rowData) use ($base_url) {
 							global $scripturl;
 
 							// Since the moderator group has no explicit members, no link is needed.
@@ -152,7 +152,7 @@ 
 						'value' => $txt['membergroups_icons'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
@@ -171,7 +171,7 @@ 
 						'value' => $txt['moderators'],
 					),
 					'data' => array(
-						'function' => function ($group) {
+						'function' => function($group) {
 							global $txt;
 
 							return empty($group['moderators']) ? '<em>' . $txt['membergroups_new_copy_none'] . '</em>' : implode(', ', $group['moderators']);
@@ -183,7 +183,7 @@ 
 						'value' => $txt['membergroups_members_top'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// No explicit members for the moderator group.

Braces +63 added lines, -23 removed lines

@@ -91,9 +91,11 @@ 
 		$context['page_title'] = $txt['viewing_groups'];
 		$current_area = isset($context['admin_menu_name']) ? $context['admin_menu_name'] : (isset($context['moderation_menu_name']) ? $context['moderation_menu_name'] : '');
 		if (!empty($current_area))
-			$context[$current_area]['tab_data'] = array(
+		{
+					$context[$current_area]['tab_data'] = array(
 				'title' => $txt['mc_group_requests'],
 			);
+		}
 
 		$base_url = $scripturl . (isset($context['admin_menu_name']) ? '?action=admin;area=membergroups;sa=members' : (isset($context['moderation_menu_name']) ? '?action=moderate;area=viewgroups;sa=members' : '?action=groups;sa=members'));
 
@@ -123,7 +125,9 @@ 
 
 							// Since the moderator group has no explicit members, no link is needed.
 							if ($rowData['id_group'] == 3)
-								$group_name = $rowData['group_name'];
+							{
+															$group_name = $rowData['group_name'];
+							}
 							else
 							{
 								$group_name = sprintf('<a href="%1$s;group=%2$d">%3$s</a>', '' . $base_url . '', $rowData['id_group'], $rowData['group_name_color']);
@@ -131,9 +135,13 @@ 
 
 							// Add a help option for moderator and administrator.
 							if ($rowData['id_group'] == 1)
-								$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							{
+															$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							}
 							elseif ($rowData['id_group'] == 3)
-								$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							{
+															$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							}
 
 							return $group_name;
 						},
@@ -152,9 +160,12 @@ 
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
-								return str_repeat('<img src="' . $settings['images_url'] . '/group_icons/' . $rowData['icons'][1] . '" alt="*" />', $rowData['icons'][0]);
-							else
-								return '';
+							{
+															return str_repeat('<img src="' . $settings['images_url'] . '/group_icons/' . $rowData['icons'][1] . '" alt="*" />', $rowData['icons'][0]);
+							}
+							else {
+															return '';
+							}
 						},
 					),
 					'sort' => array(
@@ -232,7 +243,9 @@ 
 
 		// No browsing of guests, membergroup 0 or moderators or non-existing groups.
 		if ($context['group'] === false || in_array($current_group, array(-1, 0, 3)))
-			throw new Elk_Exception('membergroup_does_not_exist', false);
+		{
+					throw new Elk_Exception('membergroup_does_not_exist', false);
+		}
 
 		$context['group']['id'] = $context['group']['id_group'];
 		$context['group']['name'] = $context['group']['group_name'];
@@ -265,19 +278,27 @@ 
 			);
 
 			if ($user_info['id'] == $id_member && $context['group']['group_type'] != 1)
-				$context['group']['can_moderate'] = true;
+			{
+							$context['group']['can_moderate'] = true;
+			}
 		}
 
 		// If this group is hidden then it can only "exist" if the user can moderate it!
 		if ($context['group']['hidden'] && !$context['group']['can_moderate'])
-			throw new Elk_Exception('membergroup_does_not_exist', false);
+		{
+					throw new Elk_Exception('membergroup_does_not_exist', false);
+		}
 
 		// You can only assign membership if you are the moderator and/or can manage groups!
 		if (!$context['group']['can_moderate'])
-			$context['group']['assignable'] = 0;
+		{
+					$context['group']['assignable'] = 0;
+		}
 		// Non-admins cannot assign admins.
 		elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum'))
-			$context['group']['assignable'] = 0;
+		{
+					$context['group']['assignable'] = 0;
+		}
 
 		// Removing member from group?
 		if (isset($this->_req->post->remove)
@@ -314,7 +335,9 @@ 
 				$member_names[$index] = trim(Util::strtolower($member_names[$index]));
 
 				if (strlen($member_names[$index]) == 0)
-					unset($member_names[$index]);
+				{
+									unset($member_names[$index]);
+				}
 			}
 
 			// Any members passed by ID?
@@ -324,7 +347,9 @@ 
 				foreach ($this->_req->post->member_add as $id)
 				{
 					if ($id > 0)
-						$member_ids[] = (int) $id;
+					{
+											$member_ids[] = (int) $id;
+					}
 				}
 			}
 
@@ -347,7 +372,9 @@ 
 
 			// Do the updates...
 			if (!empty($members))
-				addMembersToGroup($members, $current_group, $context['group']['hidden'] ? 'only_additional' : 'auto', true);
+			{
+							addMembersToGroup($members, $current_group, $context['group']['hidden'] ? 'only_additional' : 'auto', true);
+			}
 		}
 
 		// Sort out the sorting!
@@ -374,9 +401,12 @@ 
 
 		// The where on the query is interesting. Non-moderators should only see people who are in this group as primary.
 		if ($context['group']['can_moderate'])
-			$where = $context['group']['is_post_group'] ? 'in_post_group' : 'in_group';
-		else
-			$where = $context['group']['is_post_group'] ? 'in_post_group' : 'in_group_no_add';
+		{
+					$where = $context['group']['is_post_group'] ? 'in_post_group' : 'in_group';
+		}
+		else {
+					$where = $context['group']['is_post_group'] ? 'in_post_group' : 'in_group_no_add';
+		}
 
 		// Count members of the group.
 		$context['total_members'] = countMembersBy($where, array($where => $current_group));
@@ -393,7 +423,9 @@ 
 
 			// Italicize the online note if they aren't activated.
 			if ($row['is_activated'] % 10 != 1)
-				$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+			{
+							$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+			}
 
 			$context['members'][$id] = array(
 				'id' => $row['id_member'],
@@ -409,7 +441,9 @@ 
 		}
 
 		if (!empty($context['group']['assignable']))
-			loadJavascriptFile('suggest.js', array('defer' => true));
+		{
+					loadJavascriptFile('suggest.js', array('defer' => true));
+		}
 
 		// Select the template.
 		$context['sub_template'] = 'group_members';
@@ -433,7 +467,9 @@ 
 
 		// Verify we can be here.
 		if ($user_info['mod_cache']['gq'] == '0=1')
-			isAllowedTo('manage_membergroups');
+		{
+					isAllowedTo('manage_membergroups');
+		}
 
 		// Normally, we act normally...
 		$where = $user_info['mod_cache']['gq'] == '1=1' || $user_info['mod_cache']['gq'] == '0=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq'];
@@ -493,8 +529,10 @@ 
 						{
 							// Sanity check!
 							foreach ($groups['add'] as $key => $value)
-								if ($value == 0 || trim($value) == '')
+							{
+															if ($value == 0 || trim($value) == '')
 									unset($groups['add'][$key]);
+							}
 
 							assignGroupsToMember($id, $groups['primary'], $groups['add']);
 						}
@@ -525,7 +563,9 @@ 
 							);
 
 							if (!empty($custom_reason))
-								$replacements['REASON'] = $custom_reason;
+							{
+															$replacements['REASON'] = $custom_reason;
+							}
 
 							$emaildata = loadEmailTemplate(empty($custom_reason) ? 'mc_group_reject' : 'mc_group_reject_reason', $replacements, $email['language']);
 

sources/admin/ManageNews.controller.php

Spacing +3 added lines, -3 removed lines

@@ -195,7 +195,7 @@ 
 						'value' => $txt['admin_edit_news'],
 					),
 					'data' => array(
-						'function' => function ($news) {
+						'function' => function($news) {
 							return '<textarea class="" id="data_' . $news['id'] . '" rows="3" name="news[]">' . $news['unparsed'] . '</textarea>
 								<br />
 								<div id="preview_' . $news['id'] . '"></div>';
@@ -208,7 +208,7 @@ 
 						'value' => $txt['preview'],
 					),
 					'data' => array(
-						'function' => function ($news) {
+						'function' => function($news) {
 							return '<div id="box_preview_' . $news['id'] . '">' . $news['parsed'] . '</div>';
 						},
 						'class' => 'newspreview',
@@ -220,7 +220,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($news) {
+						'function' => function($news) {
 							if (is_numeric($news['id']))
 								return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check" />';
 							else

Braces +132 added lines, -51 removed lines

@@ -106,7 +106,9 @@ 
 
 		// Force the right area...
 		if (substr($subAction, 0, 7) === 'mailing')
-			$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+		{
+					$context[$context['admin_menu_name']]['current_subsection'] = 'mailingmembers';
+		}
 
 		// Call the right function for this sub-action.
 		$action->dispatch($subAction);
@@ -141,8 +143,10 @@ 
 
 			// Remove the items that were selected.
 			foreach ($temp_news as $i => $news)
-				if (in_array($i, $this->_req->post->remove))
+			{
+							if (in_array($i, $this->_req->post->remove))
 					unset($temp_news[$i]);
+			}
 
 			// Update the database.
 			updateSettings(array('news' => implode("\n", $temp_news)));
@@ -157,7 +161,9 @@ 
 			foreach ($this->_req->post->news as $i => $news)
 			{
 				if (trim($news) == '')
-					unset($this->_req->post->news[$i]);
+				{
+									unset($this->_req->post->news[$i]);
+				}
 				else
 				{
 					$this->_req->post->news[$i] = Util::htmlspecialchars($this->_req->post->news[$i], ENT_QUOTES);
@@ -216,9 +222,12 @@ 
 					'data' => array(
 						'function' => function ($news) {
 							if (is_numeric($news['id']))
-								return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check" />';
-							else
-								return '';
+							{
+															return '<input type="checkbox" name="remove[]" value="' . $news['id'] . '" class="input_check" />';
+							}
+							else {
+															return '';
+							}
 						},
 						'class' => 'centertext',
 					),
@@ -297,20 +306,27 @@ 
 		// All of the members in post based and member based groups
 		$pg = array();
 		foreach ($allgroups['postgroups'] as $postgroup)
-			$pg[] = $postgroup['id'];
+		{
+					$pg[] = $postgroup['id'];
+		}
 
 		$mg = array();
 		foreach ($allgroups['membergroups'] as $membergroup)
-			$mg[] = $membergroup['id'];
+		{
+					$mg[] = $membergroup['id'];
+		}
 
 		// How many are in each group
 		$mem_groups = membersInGroups($pg, $mg, true, true);
 		foreach ($mem_groups as $id_group => $member_count)
 		{
 			if (isset($groups[$id_group]['member_count']))
-				$groups[$id_group]['member_count'] += $member_count;
-			else
-				$groups[$id_group]['member_count'] = $member_count;
+			{
+							$groups[$id_group]['member_count'] += $member_count;
+			}
+			else {
+							$groups[$id_group]['member_count'] = $member_count;
+			}
 		}
 
 		// Generate the include and exclude group select lists for the template
@@ -326,7 +342,9 @@ 
 		);
 
 		foreach ($groups as $group)
-			$groups[$group['id']]['status'] = 'off';
+		{
+					$groups[$group['id']]['status'] = 'off';
+		}
 
 		$context['exclude_groups'] = array(
 			'select_group' => $txt['admin_newsletters_exclude_groups'],
@@ -417,9 +435,12 @@ 
 			foreach ($mods as $row)
 			{
 				if (in_array(3, $context['recipients']))
-					$context['recipients']['exclude_members'][] = $row;
-				else
-					$context['recipients']['members'][] = $row;
+				{
+									$context['recipients']['exclude_members'][] = $row;
+				}
+				else {
+									$context['recipients']['members'][] = $row;
+				}
 			}
 		}
 
@@ -449,7 +470,9 @@ 
 		{
 			$members = array();
 			foreach ($this->_req->post->member_list as $member_id)
-				$members[] = (int) $member_id;
+			{
+							$members[] = (int) $member_id;
+			}
 
 			$this->_members = array_unique(array_merge($this->_members, $members));
 		}
@@ -459,7 +482,9 @@ 
 		{
 			$members = array();
 			foreach ($this->_req->post->exclude_member_list as $member_id)
-				$members[] = (int) $member_id;
+			{
+							$members[] = (int) $member_id;
+			}
 
 			$this->_exclude_members = array_unique(array_merge($this->_exclude_members, $members));
 		}
@@ -473,10 +498,14 @@ 
 	{
 		$toClean = array();
 		if (!empty($this->_req->post->members))
-			$toClean['_members'] = 'members';
+		{
+					$toClean['_members'] = 'members';
+		}
 
 		if (!empty($this->_req->post->exclude_members))
-			$toClean['_exclude_members'] = 'exclude_members';
+		{
+					$toClean['_exclude_members'] = 'exclude_members';
+		}
 
 		// Manual entries found?
 		if (!empty($toClean))
@@ -495,9 +524,12 @@ 
 				foreach ($temp as $index => $member)
 				{
 					if (strlen(trim($member)) > 0)
-						$temp[$index] = Util::htmlspecialchars(Util::strtolower(trim($member)));
-					else
-						unset($temp[$index]);
+					{
+											$temp[$index] = Util::htmlspecialchars(Util::strtolower(trim($member)));
+					}
+					else {
+											unset($temp[$index]);
+					}
 				}
 
 				// Find the members
@@ -545,7 +577,9 @@ 
 
 		// If by PM's I suggest we half the above number.
 		if (!empty($this->_req->post->send_pm))
-			$num_at_once /= 2;
+		{
+					$num_at_once /= 2;
+		}
 
 		checkSession();
 
@@ -574,7 +608,9 @@ 
 			foreach ($members as $member)
 			{
 				if ($member >= $context['start'])
-					$context['recipients']['exclude_members'][] = (int) $member;
+				{
+									$context['recipients']['exclude_members'][] = (int) $member;
+				}
 			}
 		}
 
@@ -585,7 +621,9 @@ 
 			foreach ($members as $member)
 			{
 				if ($member >= $context['start'])
-					$context['recipients']['members'][] = (int) $member;
+				{
+									$context['recipients']['members'][] = (int) $member;
+				}
 			}
 		}
 
@@ -595,13 +633,17 @@ 
 			if (is_array($this->_req->post->groups))
 			{
 				foreach ($this->_req->post->groups as $group => $dummy)
-					$context['recipients']['groups'][] = (int) $group;
+				{
+									$context['recipients']['groups'][] = (int) $group;
+				}
 			}
 			elseif (trim($this->_req->post->groups) != '')
 			{
 				$groups = explode(',', $this->_req->post->groups);
 				foreach ($groups as $group)
-					$context['recipients']['groups'][] = (int) $group;
+				{
+									$context['recipients']['groups'][] = (int) $group;
+				}
 			}
 		}
 
@@ -611,13 +653,17 @@ 
 			if (is_array($this->_req->post->exclude_groups))
 			{
 				foreach ($this->_req->post->exclude_groups as $group => $dummy)
-					$context['recipients']['exclude_groups'][] = (int) $group;
+				{
+									$context['recipients']['exclude_groups'][] = (int) $group;
+				}
 			}
 			elseif (trim($this->_req->post->exclude_groups) != '')
 			{
 				$groups = explode(',', $this->_req->post->exclude_groups);
 				foreach ($groups as $group)
-					$context['recipients']['exclude_groups'][] = (int) $group;
+				{
+									$context['recipients']['exclude_groups'][] = (int) $group;
+				}
 			}
 		}
 
@@ -629,18 +675,24 @@ 
 			{
 				$curmem = trim($curmem);
 				if ($curmem != '')
-					$context['recipients']['emails'][$curmem] = $curmem;
+				{
+									$context['recipients']['emails'][$curmem] = $curmem;
+				}
 			}
 		}
 
 		// If we're only cleaning drop out here.
 		if ($clean_only)
-			return null;
+		{
+					return null;
+		}
 
 		// Some functions we will need
 		require_once(SUBSDIR . '/Mail.subs.php');
 		if ($context['send_pm'])
-			require_once(SUBSDIR . '/PersonalMessage.subs.php');
+		{
+					require_once(SUBSDIR . '/PersonalMessage.subs.php');
+		}
 
 		// We are relying too much on writing to superglobals...
 		$base_subject = $this->_req->getPost('subject', 'strval', '');
@@ -655,15 +707,20 @@ 
 		{
 			// Prepare the message for HTML.
 			if (!empty($context['parse_html']))
-				$base_message = str_replace(array("\n", '  '), array('<br />' . "\n", '&nbsp; '), $base_message);
+			{
+							$base_message = str_replace(array("\n", '  '), array('<br />' . "\n", '&nbsp; '), $base_message);
+			}
 
 			// This is here to prevent spam filters from tagging this as spam.
 			if (preg_match('~\<html~i', $base_message) == 0)
 			{
 				if (preg_match('~\<body~i', $base_message) == 0)
-					$base_message = '<html><head><title>' . $base_subject . '</title></head>' . "\n" . '<body>' . $base_message . '</body></html>';
-				else
-					$base_message = '<html>' . $base_message . '</html>';
+				{
+									$base_message = '<html><head><title>' . $base_subject . '</title></head>' . "\n" . '<body>' . $base_message . '</body></html>';
+				}
+				else {
+									$base_message = '<html>' . $base_message . '</html>';
+				}
 			}
 		}
 
@@ -719,14 +776,18 @@ 
 		{
 			// Done as many as we can?
 			if ($i >= $num_at_once)
-				break;
+			{
+							break;
+			}
 
 			// Don't sent it twice!
 			unset($context['recipients']['emails'][$k]);
 
 			// Dammit - can't PM emails!
 			if ($context['send_pm'])
-				continue;
+			{
+							continue;
+			}
 
 			$to_member = array(
 				$email,
@@ -764,7 +825,9 @@ 
 				}
 
 				if (!empty($queryBuild))
-					$sendQuery .= implode(' OR ', $queryBuild);
+				{
+									$sendQuery .= implode(' OR ', $queryBuild);
+				}
 			}
 
 			if (!empty($context['recipients']['members']))
@@ -777,11 +840,15 @@ 
 
 			// If we've not got a query then we must be done!
 			if ($sendQuery === '()')
-				redirectexit('action=admin');
+			{
+							redirectexit('action=admin');
+			}
 
 			// Anything to exclude?
 			if (!empty($context['recipients']['exclude_groups']) && in_array(0, $context['recipients']['exclude_groups']))
-				$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+			{
+							$sendQuery .= ' AND mem.id_group != {int:regular_group}';
+			}
 
 			if (!empty($context['recipients']['exclude_members']))
 			{
@@ -791,7 +858,9 @@ 
 
 			// Force them to have it?
 			if (empty($context['email_force']))
-				$sendQuery .= ' AND mem.notify_announcements = {int:notify_announcements}';
+			{
+							$sendQuery .= ' AND mem.notify_announcements = {int:notify_announcements}';
+			}
 
 			require_once(SUBSDIR . '/News.subs.php');
 
@@ -804,16 +873,21 @@ 
 
 				// What groups are we looking at here?
 				if (empty($row['additional_groups']))
-					$groups = array($row['id_group'], $row['id_post_group']);
-				else
-					$groups = array_merge(
+				{
+									$groups = array($row['id_group'], $row['id_post_group']);
+				}
+				else {
+									$groups = array_merge(
 						array($row['id_group'], $row['id_post_group']),
 						explode(',', $row['additional_groups'])
 					);
+				}
 
 				// Excluded groups?
 				if (array_intersect($groups, $context['recipients']['exclude_groups']))
-					continue;
+				{
+									continue;
+				}
 
 				// We might need this
 				$cleanMemberName = empty($context['send_html']) || $context['send_pm'] ? un_htmlspecialchars($row['real_name']) : $row['real_name'];
@@ -837,18 +911,25 @@ 
 
 				// Send the actual email - or a PM!
 				if (!$context['send_pm'])
-					sendmail($row['email_address'], $subject, $message, null, null, !empty($context['send_html']), 5);
-				else
-					sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+				{
+									sendmail($row['email_address'], $subject, $message, null, null, !empty($context['send_html']), 5);
+				}
+				else {
+									sendpm(array('to' => array($row['id_member']), 'bcc' => array()), $subject, $message);
+				}
 			}
 		}
 
 		// If used our batch assume we still have a member.
 		if ($i >= $num_at_once)
-			$last_id_member = $context['start'];
+		{
+					$last_id_member = $context['start'];
+		}
 		// Or we didn't have one in range?
 		elseif (empty($last_id_member) && $context['start'] + $num_at_once < $context['max_id_member'])
-			$last_id_member = $context['start'] + $num_at_once;
+		{
+					$last_id_member = $context['start'] + $num_at_once;
+		}
 		// If we have no id_member then we're done.
 		elseif (empty($last_id_member) && empty($context['recipients']['emails']))
 		{

sources/admin/ManageBans.controller.php

Spacing +8 added lines, -8 removed lines

@@ -199,7 +199,7 @@ 
 						'value' => $txt['ban_added'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $context;
 							return standardTime($rowData['ban_time'], empty($context['ban_time_format']) ? true : $context['ban_time_format']);
 						},
@@ -214,7 +214,7 @@ 
 						'value' => $txt['ban_expires'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// This ban never expires...whahaha.
@@ -361,7 +361,7 @@ 
 								'style' => 'width: 60%;',
 							),
 							'data' => array(
-								'function' => function ($ban_item) {
+								'function' => function($ban_item) {
 									global $txt;
 
 									if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
@@ -389,7 +389,7 @@ 
 								'style' => 'width: 15%;',
 							),
 							'data' => array(
-								'function' => function ($ban_item) {
+								'function' => function($ban_item) {
 									global $txt, $context, $scripturl;
 
 									return '<a href="' . $scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $context['ban']['id'] . ';bi=' . $ban_item['id'] . '">' . $txt['ban_edit_trigger'] . '</a>';
@@ -603,7 +603,7 @@ 
 						'value' => $txt['ban_log_date'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return standardTime($rowData['log_time']);
 						},
 					),
@@ -1023,7 +1023,7 @@ 
 		if ($context['selected_entity'] === 'ip')
 		{
 			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function ($rowData) {
+				'function' => function($rowData) {
 					return range2ip(array(
 						$rowData['ip_low1'],
 						$rowData['ip_low2'],
@@ -1053,7 +1053,7 @@ 
 		elseif ($context['selected_entity'] === 'hostname')
 		{
 			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function ($rowData) {
+				'function' => function($rowData) {
 					return strtr(Util::htmlspecialchars($rowData['hostname']), array('%' => '*'));
 				},
 			);
@@ -1065,7 +1065,7 @@ 
 		elseif ($context['selected_entity'] === 'email')
 		{
 			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function ($rowData) {
+				'function' => function($rowData) {
 					return strtr(Util::htmlspecialchars($rowData['email_address']), array('%' => '*'));
 				},
 			);

Braces +57 added lines, -23 removed lines

@@ -138,9 +138,12 @@ 
 
 		// Create a date string so we don't overload them with date info.
 		if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-			$context['ban_time_format'] = $user_info['time_format'];
-		else
-			$context['ban_time_format'] = $matches[0];
+		{
+					$context['ban_time_format'] = $user_info['time_format'];
+		}
+		else {
+					$context['ban_time_format'] = $matches[0];
+		}
 
 		// Lets build a nice create list to show them the bans
 		$listOptions = array(
@@ -221,15 +224,20 @@ 
 
 							// This ban never expires...whahaha.
 							if ($rowData['expire_time'] === null)
-								return $txt['never'];
+							{
+															return $txt['never'];
+							}
 
 							// This ban has already expired.
 							elseif ($rowData['expire_time'] < time())
-								return sprintf('<span class="error">%1$s</span>', $txt['ban_expired']);
+							{
+															return sprintf('<span class="error">%1$s</span>', $txt['ban_expired']);
+							}
 
 							// Still need to wait a few days for this ban to expire.
-							else
-								return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+							else {
+															return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+							}
 						},
 					),
 					'sort' => array(
@@ -317,7 +325,9 @@ 
 
 		// Saving a new or edited ban?
 		if ((isset($this->_req->post->add_ban) || isset($this->_req->post->modify_ban) || isset($this->_req->post->remove_selection)) && !$ban_errors->hasErrors())
-			$this->action_edit2();
+		{
+					$this->action_edit2();
+		}
 
 		$ban_group_id = isset($context['ban']['id']) ? $context['ban']['id'] : $this->_req->getQuery('bg', 'intval', 0);
 
@@ -369,11 +379,16 @@ 
 									global $txt;
 
 									if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
-										return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
+									{
+																			return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
+									}
 									elseif ($ban_item['type'] == 'user')
-										return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
-									else
-										return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+									{
+																			return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
+									}
+									else {
+																			return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+									}
 								},
 							),
 						),
@@ -482,7 +497,9 @@ 
 
 						// Would be nice if we could also ban the hostname.
 						if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $context['ban_suggestions']['main_ip']) == 1 || isValidIPv6($context['ban_suggestions']['main_ip'])) && empty($modSettings['disableHostnameLookup']))
-							$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+						{
+													$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+						}
 
 						$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
 					}
@@ -532,7 +549,9 @@ 
 
 			// 'Delete all entries' button was pressed.
 			if (!empty($this->_req->post->removeAll))
-				removeBanLogs();
+			{
+							removeBanLogs();
+			}
 			// 'Delete selection' button was pressed.
 			else
 			{
@@ -703,10 +722,13 @@ 
 
 			// Adding a new ban group
 			if (empty($ban_info['id']))
-				$ban_group_id = insertBanGroup($ban_info);
+			{
+							$ban_group_id = insertBanGroup($ban_info);
+			}
 			// Editing an existing ban group
-			else
-				$ban_group_id = updateBanGroup($ban_info);
+			else {
+							$ban_group_id = updateBanGroup($ban_info);
+			}
 
 			if ($ban_group_id !== false)
 			{
@@ -732,7 +754,9 @@ 
 
 			// They may have entered a name not using the member select box
 			if (isset($this->_req->query->u))
-				$context['ban_suggestions'] = array_merge($context['ban_suggestions'], getMemberData((int) $this->_req->query->u));
+			{
+							$context['ban_suggestions'] = array_merge($context['ban_suggestions'], getMemberData((int) $this->_req->query->u));
+			}
 			elseif (isset($this->_req->query->user))
 			{
 				$context['ban']['from_user'] = false;
@@ -742,7 +766,9 @@ 
 
 			// Not strictly necessary, but it's nice
 			if (!empty($context['ban_suggestions']['member']['id']))
-				$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+			{
+							$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+			}
 
 			return $this->action_edit();
 		}
@@ -789,7 +815,9 @@ 
 		$ban_id = $this->_req->get('bi', 'intval', 0);
 
 		if (empty($ban_group))
-			throw new Elk_Exception('ban_not_found', false);
+		{
+					throw new Elk_Exception('ban_not_found', false);
+		}
 
 		// Adding a new trigger
 		if (isset($this->_req->post->add_new_trigger) && !empty($this->_req->post->ban_suggestions))
@@ -806,7 +834,9 @@ 
 			$dummy['ban_suggestions'] = (array) array_shift($this->_req->post->ban_suggestions);
 			saveTriggers($dummy, $ban_group, 0, $ban_id);
 			if (!empty($this->_req->post->ban_suggestions))
-				saveTriggers((array) $this->_req->post, $ban_group);
+			{
+							saveTriggers((array) $this->_req->post, $ban_group);
+			}
 
 			redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
 		}
@@ -847,7 +877,9 @@ 
 		{
 			$ban_row = banDetails($ban_id, $ban_group);
 			if (empty($ban_row))
-				throw new Elk_Exception('ban_not_found', false);
+			{
+							throw new Elk_Exception('ban_not_found', false);
+			}
 			$row = $ban_row[$ban_id];
 
 			// Load it up for the template
@@ -911,7 +943,9 @@ 
 
 			// Rehabilitate some members.
 			if ($this->_req->query->entity == 'member')
-				updateBanMembers();
+			{
+							updateBanMembers();
+			}
 
 			// Make sure the ban cache is refreshed.
 			updateSettings(array('banLastUpdated' => time()));

sources/admin/ManageMembergroups.controller.php

Spacing +5 added lines, -5 removed lines

@@ -143,7 +143,7 @@ 
 						'value' => $txt['membergroups_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							// Since the moderator group has no explicit members, no link is needed.
@@ -173,7 +173,7 @@ 
 						'value' => $txt['membergroups_icons'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
@@ -192,7 +192,7 @@ 
 						'value' => $txt['membergroups_members_top'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// No explicit members for the moderator group.
@@ -255,7 +255,7 @@ 
 						'value' => $txt['membergroups_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d">%3$s</a>', $scripturl, $rowData['id_group'], $rowData['group_name_color']);
@@ -271,7 +271,7 @@ 
 						'value' => $txt['membergroups_icons'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))

Braces +99 added lines, -35 removed lines

@@ -142,7 +142,9 @@ 
 
 							// Since the moderator group has no explicit members, no link is needed.
 							if ($rowData['id_group'] == 3)
-								$group_name = $rowData['group_name'];
+							{
+															$group_name = $rowData['group_name'];
+							}
 							else
 							{
 								$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d">%3$s</a>', $scripturl, $rowData['id_group'], $rowData['group_name_color']);
@@ -150,9 +152,13 @@ 
 
 							// Add a help option for moderator and administrator.
 							if ($rowData['id_group'] == 1)
-								$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							{
+															$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							}
 							elseif ($rowData['id_group'] == 3)
-								$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							{
+															$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							}
 
 							return $group_name;
 						},
@@ -171,9 +177,12 @@ 
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
-								return str_repeat('<img src="' . $settings['images_url'] . '/group_icons/' . $rowData['icons'][1] . '" alt="*" />', $rowData['icons'][0]);
-							else
-								return '';
+							{
+															return str_repeat('<img src="' . $settings['images_url'] . '/group_icons/' . $rowData['icons'][1] . '" alt="*" />', $rowData['icons'][0]);
+							}
+							else {
+															return '';
+							}
 						},
 					),
 					'sort' => array(
@@ -269,9 +278,12 @@ 
 							global $settings;
 
 							if (!empty($rowData['icons'][0]) && !empty($rowData['icons'][1]))
-								return str_repeat('<img src="' . $settings['images_url'] . '/group_icons/' . $rowData['icons'][1] . '" alt="*" />', $rowData['icons'][0]);
-							else
-								return '';
+							{
+															return str_repeat('<img src="' . $settings['images_url'] . '/group_icons/' . $rowData['icons'][1] . '" alt="*" />', $rowData['icons'][0]);
+							}
+							else {
+															return '';
+							}
 						},
 					),
 					'sort' => array(
@@ -377,7 +389,9 @@ 
 
 			// You cannot set permissions for post groups if they are disabled.
 			if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups']))
-				$this->_req->post->perm_type = '';
+			{
+							$this->_req->post->perm_type = '';
+			}
 
 			if ($this->_req->post->perm_type == 'predefined')
 			{
@@ -397,7 +411,9 @@ 
 
 					// Keep protected groups ... well, protected!
 					if ($copy_type['group_type'] == 1)
-						throw new Elk_Exception('membergroup_does_not_exist');
+					{
+											throw new Elk_Exception('membergroup_does_not_exist');
+					}
 				}
 
 				// Don't allow copying of a real privileged person!
@@ -406,11 +422,15 @@ 
 
 				// Also get some membergroup information if we're copying and not copying from guests...
 				if ($copy_id > 0 && $this->_req->post->perm_type == 'copy')
-					updateCopiedGroup($id_group, $copy_id);
+				{
+									updateCopiedGroup($id_group, $copy_id);
+				}
 
 				// If inheriting say so...
 				elseif ($this->_req->post->perm_type == 'inherit')
-					updateInheritedGroup($id_group, $copy_id);
+				{
+									updateInheritedGroup($id_group, $copy_id);
+				}
 			}
 
 			// Make sure all boards selected are stored in a proper array.
@@ -420,18 +440,24 @@ 
 			$changed_boards['deny'] = array();
 			$changed_boards['ignore'] = array();
 			foreach ($accesses as $group_id => $action)
-				$changed_boards[$action][] = (int) $group_id;
+			{
+							$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]))
-					assignGroupToBoards($id_group, $changed_boards, $board_action);
+				{
+									assignGroupToBoards($id_group, $changed_boards, $board_action);
+				}
 			}
 
 			// If this is joinable then set it to show group membership in people's profiles.
 			if (empty($modSettings['show_group_membership']) && $group_type > 1)
-				updateSettings(array('show_group_membership' => 1));
+			{
+							updateSettings(array('show_group_membership' => 1));
+			}
 
 			// Rebuild the group cache.
 			updateSettings(array(
@@ -453,7 +479,9 @@ 
 		$context['allow_protected'] = allowedTo('admin_forum');
 
 		if (!empty($modSettings['deny_boards_access']))
-			loadLanguage('ManagePermissions');
+		{
+					loadLanguage('ManagePermissions');
+		}
 
 		$context['groups'] = getBasicMembergroupData(array('globalmod'), array(), 'min_posts, id_group != {int:global_mod_group}, group_name');
 
@@ -462,7 +490,9 @@ 
 
 		// Include a list of boards per category for easy toggling.
 		foreach ($context['categories'] as $category)
-			$context['categories'][$category['id']]['child_ids'] = array_keys($category['boards']);
+		{
+					$context['categories'][$category['id']]['child_ids'] = array_keys($category['boards']);
+		}
 
 		createToken('admin-mmg');
 	}
@@ -512,17 +542,23 @@ 
 		$current_group = array();
 
 		if (!empty($modSettings['deny_boards_access']))
-			loadLanguage('ManagePermissions');
+		{
+					loadLanguage('ManagePermissions');
+		}
 
 		require_once(SUBSDIR . '/Membergroups.subs.php');
 
 		// Make sure this group is editable.
 		if (!empty($current_group_id))
-			$current_group = membergroupById($current_group_id);
+		{
+					$current_group = membergroupById($current_group_id);
+		}
 
 		// Now, do we have a valid id?
 		if (!allowedTo('admin_forum') && !empty($current_group_id) && $current_group['group_type'] == 1)
-			throw new Elk_Exception('membergroup_does_not_exist', false);
+		{
+					throw new Elk_Exception('membergroup_does_not_exist', false);
+		}
 
 		// The delete this membergroup button was pressed.
 		if (isset($this->_req->post->delete))
@@ -531,7 +567,9 @@ 
 			validateToken('admin-mmg');
 
 			if (empty($current_group_id))
-				throw new Elk_Exception('membergroup_does_not_exist', false);
+			{
+							throw new Elk_Exception('membergroup_does_not_exist', false);
+			}
 
 			// Let's delete the group
 			deleteMembergroups($current_group['id_group']);
@@ -546,7 +584,9 @@ 
 			validateToken('admin-mmg');
 
 			if (empty($current_group_id))
-				throw new Elk_Exception('membergroup_does_not_exist', false);
+			{
+							throw new Elk_Exception('membergroup_does_not_exist', false);
+			}
 
 			// Empty values will be replaced by validator values where they exist
 			$empty_post = array('max_messages' => null, 'min_posts' => null, 'group_type' => null, 'group_desc' => '',
@@ -632,18 +672,24 @@ 
 
 					// Add the membergroup to all boards that hadn't been set yet.
 					if (!empty($changed_boards[$board_action]))
-						assignGroupToBoards($current_group['id_group'], $changed_boards, $board_action);
+					{
+											assignGroupToBoards($current_group['id_group'], $changed_boards, $board_action);
+					}
 				}
 			}
 
 			// Remove everyone from this group!
 			if ($min_posts != -1)
-				detachDeletedGroupFromMembers($current_group['id_group']);
+			{
+							detachDeletedGroupFromMembers($current_group['id_group']);
+			}
 			elseif ($current_group['id_group'] != 3)
 			{
 				// Making it a hidden group? If so remove everyone with it as primary group (Actually, just make them additional).
 				if ($our_post['group_hidden'] == 2)
-					setGroupToHidden($current_group['id_group']);
+				{
+									setGroupToHidden($current_group['id_group']);
+				}
 
 				// Either way, let's check our "show group membership" setting is correct.
 				validateShowGroupMembership();
@@ -673,18 +719,24 @@ 
 						$moderators[$k] = trim($moderators[$k]);
 
 						if (strlen($moderators[$k]) == 0)
-							unset($moderators[$k]);
+						{
+													unset($moderators[$k]);
+						}
 					}
 
 					// Find all the id_member's for the member_name's in the list.
 					if (!empty($moderators))
-						$group_moderators = getIDMemberFromGroupModerators($moderators);
+					{
+											$group_moderators = getIDMemberFromGroupModerators($moderators);
+					}
 				}
 				else
 				{
 					$moderators = array();
 					foreach ($this->_req->post->moderator_list as $moderator)
-						$moderators[] = (int) $moderator;
+					{
+											$moderators[] = (int) $moderator;
+					}
 
 					$group_moderators = array();
 					if (!empty($moderators))
@@ -692,13 +744,17 @@ 
 						require_once(SUBSDIR . '/Members.subs.php');
 						$members = getBasicMemberData($moderators);
 						foreach ($members as $member)
-							$group_moderators[] = $member['id_member'];
+						{
+													$group_moderators[] = $member['id_member'];
+						}
 					}
 				}
 
 				// Found some?
 				if (!empty($group_moderators))
-					assignGroupModerators($current_group['id_group'], $group_moderators);
+				{
+									assignGroupModerators($current_group['id_group'], $group_moderators);
+				}
 			}
 
 			// There might have been some post group changes.
@@ -720,7 +776,9 @@ 
 		$row = membergroupById($current_group['id_group'], true);
 
 		if (empty($row) || (!allowedTo('admin_forum') && $row['group_type'] == 1))
-			throw new Elk_Exception('membergroup_does_not_exist', false);
+		{
+					throw new Elk_Exception('membergroup_does_not_exist', false);
+		}
 
 		$row['icons'] = explode('#', $row['icons']);
 
@@ -748,7 +806,9 @@ 
 		$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);
+		{
+					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();
@@ -759,7 +819,9 @@ 
 
 			// Include a list of boards per category for easy toggling.
 			foreach ($context['categories'] as $category)
-				$context['categories'][$category['id']]['child_ids'] = array_keys($category['boards']);
+			{
+							$context['categories'][$category['id']]['child_ids'] = array_keys($category['boards']);
+			}
 		}
 
 		// Finally, get all the groups this could be inherited off.
@@ -772,7 +834,9 @@ 
 
 		// Use the autosuggest script when needed
 		if ($context['group']['id'] != 3 && $context['group']['id'] != 4)
-			loadJavascriptFile('suggest.js', array('defer' => true));
+		{
+					loadJavascriptFile('suggest.js', array('defer' => true));
+		}
 
 		createToken('admin-mmg');
 	}

sources/admin/ManageSearchEngines.controller.php

Spacing +3 added lines, -3 removed lines

@@ -260,7 +260,7 @@ 
 						'value' => $txt['spider_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=sengines;sa=editspiders;sid=%2$d">%3$s</a>', $scripturl, $rowData['id_spider'], htmlspecialchars($rowData['spider_name'], ENT_COMPAT, 'UTF-8'));
@@ -276,7 +276,7 @@ 
 						'value' => $txt['spider_last_seen'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $context, $txt;
 
 							return isset($context['spider_last_seen'][$rowData['id_spider']]) ? standardTime($context['spider_last_seen'][$rowData['id_spider']]) : $txt['spider_last_never'];
@@ -461,7 +461,7 @@ 
 						'value' => $txt['spider_time'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return standardTime($rowData['log_time']);
 						},
 					),

Braces +36 added lines, -15 removed lines

@@ -85,7 +85,9 @@ 
 
 		// Make sure it's valid - note that regular members are given id_group = 1 which is reversed in Load.php - no admins here!
 		if (isset($this->_req->post->spider_group) && !isset($config_vars['spider_group'][2][$this->_req->post->spider_group]))
-			$this->_req->post->spider_group = 0;
+		{
+					$this->_req->post->spider_group = 0;
+		}
 
 		// Setup the template.
 		$context['page_title'] = $txt['settings'];
@@ -124,9 +126,11 @@ 
 		foreach ($config_vars as $variable)
 		{
 			if ($variable[1] != 'spider_mode')
-				$javascript_function .= '
+			{
+							$javascript_function .= '
 				if (document.getElementById(\'' . $variable[1] . '\'))
 					document.getElementById(\'' . $variable[1] . '\').disabled = disabledState;';
+			}
 		}
 
 		$javascript_function .= '
@@ -162,9 +166,12 @@ 
 		{
 			// Unfortunately, regular members have to be 1 because 0 is for disabled.
 			if ($row['id'] == 0)
-				$config_vars['spider_group'][2][1] = $row['name'];
-			else
-				$config_vars['spider_group'][2][$row['id']] = $row['name'];
+			{
+							$config_vars['spider_group'][2][1] = $row['name'];
+			}
+			else {
+							$config_vars['spider_group'][2][$row['id']] = $row['name'];
+			}
 		}
 
 		// Notify the integration that we're preparing to mess up with search engine settings...
@@ -201,7 +208,9 @@ 
 
 		// Are we adding a new one?
 		if (!empty($this->_req->post->addSpider))
-			return $this->action_editspiders();
+		{
+					return $this->action_editspiders();
+		}
 		// User pressed the 'remove selection button'.
 		elseif (!empty($this->_req->post->removeSpiders) && !empty($this->_req->post->remove) && is_array($this->_req->post->remove))
 		{
@@ -357,7 +366,9 @@ 
 			{
 				$test = ip2range(trim($set));
 				if (!empty($test))
-					$ips[] = $set;
+				{
+									$ips[] = $set;
+				}
 			}
 			$ips = implode(',', $ips);
 
@@ -383,7 +394,9 @@ 
 
 		// An edit?
 		if ($context['id_spider'])
-			$context['spider'] = getSpiderDetails($context['id_spider']);
+		{
+					$context['spider'] = getSpiderDetails($context['id_spider']);
+		}
 
 		createToken('admin-ses');
 	}
@@ -495,16 +508,21 @@ 
 			{
 				// Feature disabled?
 				if (empty($row['data']['viewing']['value']) && isset($modSettings['spider_mode']) && $modSettings['spider_mode'] < 3)
-					$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
-				else
-					$urls[$k] = array($row['data']['viewing']['value'], -1);
+				{
+									$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = '<em>' . $txt['spider_disabled'] . '</em>';
+				}
+				else {
+									$urls[$k] = array($row['data']['viewing']['value'], -1);
+				}
 			}
 
 			// Now stick in the new URLs.
 			require_once(SUBSDIR . '/Who.subs.php');
 			$urls = determineActions($urls, 'whospider_');
 			foreach ($urls as $k => $new_url)
-				$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = $new_url;
+			{
+							$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = $new_url;
+			}
 		}
 
 		$context['page_title'] = $txt['spider_logs'];
@@ -556,12 +574,15 @@ 
 			<select name="new_date" onchange="document.spider_stat_list.submit();">';
 
 		if (empty($date_choices))
-			$date_select .= '
+		{
+					$date_select .= '
 				<option></option>';
-		else
-			foreach ($date_choices as $id => $text)
+		}
+		else {
+					foreach ($date_choices as $id => $text)
 				$date_select .= '
 				<option value="' . $id . '"' . ($current_date == $id ? ' selected="selected"' : '') . '>' . $text . '</option>';
+		}
 
 		$date_select .= '
 			</select>

sources/admin/Modlog.controller.php

Spacing +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($entry) {
+						'function' => function($entry) {
 							return '<input type="checkbox" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled="disabled"') . ' />';
 						},
 						'class' => 'centertext',

Braces +24 added lines, -11 removed lines

@@ -53,13 +53,18 @@ 
 
 		// Trying to view the admin log, lets check you can.
 		if ($context['log_type'] == 3)
-			isAllowedTo('admin_forum');
+		{
+					isAllowedTo('admin_forum');
+		}
 
 		// These change dependant on whether we are viewing the moderation or admin log.
 		if ($context['log_type'] == 3 || $this->_req->query->action === 'admin')
-			$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
-		else
-			$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+		{
+					$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
+		}
+		else {
+					$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+		}
 
 		$context['can_delete'] = allowedTo('admin_forum');
 
@@ -106,14 +111,20 @@ 
 		$context['order'] = isset($this->_req->query->sort) && isset($searchTypes[$this->_req->query->sort]) ? $this->_req->query->sort : 'member';
 
 		if (!isset($search_params['string']) || (!empty($this->_req->post->search) && $search_params['string'] != $this->_req->post->search))
-			$search_params_string = $this->_req->getPost('search', 'trim', '');
-		else
-			$search_params_string = $search_params['string'];
+		{
+					$search_params_string = $this->_req->getPost('search', 'trim', '');
+		}
+		else {
+					$search_params_string = $search_params['string'];
+		}
 
 		if (isset($this->_req->post->search_type) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-			$search_params_type = isset($this->_req->post->search_type) && isset($searchTypes[$this->_req->post->search_type]) ? $this->_req->query->search_type : $context['order'];
-		else
-			$search_params_type = $search_params['type'];
+		{
+					$search_params_type = isset($this->_req->post->search_type) && isset($searchTypes[$this->_req->post->search_type]) ? $this->_req->query->search_type : $context['order'];
+		}
+		else {
+					$search_params_type = $search_params['type'];
+		}
 
 		$search_params_column = $searchTypes[$search_params_type]['sql'];
 		$search_params = array(
@@ -136,7 +147,9 @@ 
 			$regex = '';
 			$search = explode(' ', $search_params['string']);
 			foreach ($search as $word)
-				$regex .= '(?=[\w\s]*' . $word . ')';
+			{
+							$regex .= '(?=[\w\s]*' . $word . ')';
+			}
 
 			// For the moment they can only search for ONE action!
 			foreach ($txt as $key => $text)