elkarte / Elkarte

sources/admin/ManageMembers.controller.php

Braces +153 added lines, -60 removed lines

@@ -99,9 +99,13 @@ 
 		foreach ($context['activation_numbers'] as $activation_type => $total_members)
 		{
 			if (in_array($activation_type, array(0, 2)))
-				$context['awaiting_activation'] += $total_members;
+			{
+							$context['awaiting_activation'] += $total_members;
+			}
 			elseif (in_array($activation_type, array(3, 4, 5)))
-				$context['awaiting_approval'] += $total_members;
+			{
+							$context['awaiting_approval'] += $total_members;
+			}
 		}
 
 		// For the page header... do we show activation?
@@ -160,7 +164,9 @@ 
 		if (!$context['show_approve'] && ($subAction !== 'browse' || $this->_req->query->type !== 'approve'))
 		{
 			if (!$context['show_activate'] && ($subAction !== 'browse' || $this->_req->query->type !== 'activate'))
-				$context['tabs']['search']['is_last'] = true;
+			{
+							$context['tabs']['search']['is_last'] = true;
+			}
 			unset($context['tabs']['approve']);
 		}
 
@@ -193,7 +199,9 @@ 
 
 		// Are we performing a mass action?
 		if (isset($this->_req->post->maction_on_members, $this->_req->post->maction) && !empty($this->_req->post->members))
-			$this->_multiMembersAction();
+		{
+					$this->_multiMembersAction();
+		}
 
 		// Check input after a member search has been submitted.
 		if ($context['sub_action'] === 'query')
@@ -267,14 +275,18 @@ 
 
 			$search_params = array();
 			if ($context['sub_action'] === 'query' && !empty($this->_req->query->params) && empty($this->_req->post->types))
-				$search_params = @json_decode(base64_decode($this->_req->query->params), true);
+			{
+							$search_params = @json_decode(base64_decode($this->_req->query->params), true);
+			}
 			elseif (!empty($this->_req->post))
 			{
 				$search_params['types'] = $this->_req->post->types;
 				foreach ($params as $param_name => $param_info)
 				{
 					if (isset($this->_req->post->{$param_name}))
-						$search_params[$param_name] = $this->_req->post->{$param_name};
+					{
+											$search_params[$param_name] = $this->_req->post->{$param_name};
+					}
 				}
 			}
 
@@ -288,17 +300,23 @@ 
 			{
 				// Not filled in?
 				if (!isset($search_params[$param_name]) || $search_params[$param_name] === '')
-					continue;
+				{
+									continue;
+				}
 
 				// Make sure numeric values are really numeric.
 				if (in_array($param_info['type'], array('int', 'age')))
-					$search_params[$param_name] = (int) $search_params[$param_name];
+				{
+									$search_params[$param_name] = (int) $search_params[$param_name];
+				}
 				// Date values have to match the specified format.
 				elseif ($param_info['type'] === 'date')
 				{
 					// Check if this date format is valid.
 					if (preg_match('/^\d{4}-\d{1,2}-\d{1,2}$/', $search_params[$param_name]) == 0)
-						continue;
+					{
+											continue;
+					}
 
 					$search_params[$param_name] = strtotime($search_params[$param_name]);
 				}
@@ -308,7 +326,9 @@ 
 				{
 					// Default to '=', just in case...
 					if (empty($range_trans[$search_params['types'][$param_name]]))
-						$search_params['types'][$param_name] = '=';
+					{
+											$search_params['types'][$param_name] = '=';
+					}
 
 					// Handle special case 'age'.
 					if ($param_info['type'] === 'age')
@@ -337,15 +357,18 @@ 
 					{
 						$query_parts[] = $param_info['db_fields'][0] . ' > ' . $search_params[$param_name] . ' AND ' . $param_info['db_fields'][0] . ' < ' . ($search_params[$param_name] + 86400);
 					}
-					else
-						$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
+					else {
+											$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
+					}
 				}
 				// Checkboxes.
 				elseif ($param_info['type'] === 'checkbox')
 				{
 					// Each checkbox or no checkbox at all is checked -> ignore.
 					if (!is_array($search_params[$param_name]) || count($search_params[$param_name]) == 0 || count($search_params[$param_name]) == count($param_info['values']))
-						continue;
+					{
+											continue;
+					}
 
 					$query_parts[] = ($param_info['db_fields'][0]) . ' IN ({array_string:' . $param_name . '_check})';
 					$where_params[$param_name . '_check'] = $search_params[$param_name];
@@ -356,9 +379,12 @@ 
 					$parameter = strtolower(strtr(Util::htmlspecialchars($search_params[$param_name], ENT_QUOTES), array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_')));
 
 					if (defined('DB_CASE_SENSITIVE'))
-						$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
-					else
-						$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+					{
+											$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
+					}
+					else {
+											$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
+					}
 
 					$where_params[$param_name . '_normal'] = '%' . $parameter . '%';
 				}
@@ -376,15 +402,19 @@ 
 
 			// Additional membergroups (these are only relevant if not all primary groups where selected!).
 			if (!empty($search_params['membergroups'][2]) && (empty($search_params['membergroups'][1]) || count($context['membergroups']) != count($search_params['membergroups'][1])))
-				foreach ($search_params['membergroups'][2] as $mg)
+			{
+							foreach ($search_params['membergroups'][2] as $mg)
 				{
 					$mg_query_parts[] = 'FIND_IN_SET({int:add_group_' . $mg . '}, mem.additional_groups) != 0';
+			}
 					$where_params['add_group_' . $mg] = $mg;
 				}
 
 			// Combine the one or two membergroup parts into one query part linked with an OR.
 			if (!empty($mg_query_parts))
-				$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+			{
+							$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+			}
 
 			// Get all selected post count related membergroups.
 			if (!empty($search_params['postgroups']) && count($search_params['postgroups']) != count($context['postgroups']))
@@ -397,8 +427,9 @@ 
 			$where = empty($query_parts) ? '1=1' : implode('
 				AND ', $query_parts);
 		}
-		else
-			$search_url_params = null;
+		else {
+					$search_url_params = null;
+		}
 
 		// Construct the additional URL part with the query info in it.
 		$context['params_url'] = $context['sub_action'] === 'query' ? ';sa=query;params=' . $search_url_params : '';
@@ -523,7 +554,9 @@ 
 
 							// Calculate number of days since last online.
 							if (empty($rowData['last_login']))
-								$difference = $txt['never'];
+							{
+															$difference = $txt['never'];
+							}
 							else
 							{
 								$difference = htmlTime($rowData['last_login']);
@@ -531,7 +564,9 @@ 
 
 							// Show it in italics if they're not activated...
 							if ($rowData['is_activated'] % 10 != 1)
-								$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+							{
+															$difference = sprintf('<em title="%1$s">%2$s</em>', $txt['not_activated'], $difference);
+							}
 
 							return $difference;
 						},
@@ -584,7 +619,9 @@ 
 
 		// Without enough permissions, don't show 'delete members' checkboxes.
 		if (!allowedTo('profile_remove_any'))
-			unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+		{
+					unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+		}
 
 		createList($listOptions);
 
@@ -612,7 +649,9 @@ 
 		{
 			// Don't delete yourself, idiot.
 			if ($this->_req->post->maction === 'delete' && $value == $user_info['id'])
-				continue;
+			{
+							continue;
+			}
 
 			$members[] = (int) $value;
 		}
@@ -620,7 +659,9 @@ 
 
 		// No members, nothing to do.
 		if (empty($members))
-			return;
+		{
+					return;
+		}
 
 		// Are we performing a delete?
 		if ($this->_req->post->maction === 'delete' && allowedTo('profile_remove_any'))
@@ -641,15 +682,21 @@ 
 				if ($this->_req->post->maction == $group . 'group' && !empty($this->_req->post->new_membergroup))
 				{
 					if ($group === 'p')
-						$type = 'force_primary';
-					else
-						$type = 'only_additional';
+					{
+											$type = 'force_primary';
+					}
+					else {
+											$type = 'only_additional';
+					}
 
 					// Change all the selected members' group.
 					if ($this->_req->post->new_membergroup != -1)
-						addMembersToGroup($members, $this->_req->post->new_membergroup, $type, true);
-					else
-						removeMembersFromGroups($members, null, true);
+					{
+											addMembersToGroup($members, $this->_req->post->new_membergroup, $type, true);
+					}
+					else {
+											removeMembersFromGroups($members, null, true);
+					}
 				}
 			}
 		}
@@ -679,11 +726,17 @@ 
 			$suggestions = array();
 
 			if ($ban_email)
-				$suggestions[] = 'email';
+			{
+							$suggestions[] = 'email';
+			}
 			if ($ban_name)
-				$suggestions[] = 'user';
+			{
+							$suggestions[] = 'user';
+			}
 			if ($ban_ips)
-				$suggestions[] = 'main_ip';
+			{
+							$suggestions[] = 'main_ip';
+			}
 
 			$members_data = getBasicMemberData($members, array('moderation' => true));
 			foreach ($members_data as $member)
@@ -750,7 +803,9 @@ 
 		$context['browse_type'] = isset($this->_req->query->type) ? $this->_req->query->type : (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 1 ? 'activate' : 'approve');
 
 		if (isset($context['tabs'][$context['browse_type']]))
-			$context['tabs'][$context['browse_type']]['is_selected'] = true;
+		{
+					$context['tabs'][$context['browse_type']]['is_selected'] = true;
+		}
 
 		// Allowed filters are those we can have, in theory.
 		$context['allowed_filters'] = $context['browse_type'] === 'approve' ? array(3, 4, 5) : array(0, 2);
@@ -762,12 +817,14 @@ 
 		{
 			// We have some of these...
 			if (in_array($type, $context['allowed_filters']) && $amount > 0)
-				$context['available_filters'][] = array(
+			{
+							$context['available_filters'][] = array(
 					'type' => $type,
 					'amount' => $amount,
 					'desc' => isset($txt['admin_browse_filter_type_' . $type]) ? $txt['admin_browse_filter_type_' . $type] : '?',
 					'selected' => $type == $context['current_filter']
 				);
+			}
 		}
 
 		// If the filter was not sent, set it to whatever has people in it!
@@ -791,7 +848,9 @@ 
 
 		// Are we showing duplicate information?
 		if (isset($this->_req->query->showdupes))
-			$_SESSION['showdupes'] = (int) $this->_req->query->showdupes;
+		{
+					$_SESSION['showdupes'] = (int) $this->_req->query->showdupes;
+		}
 		$context['show_duplicates'] = !empty($_SESSION['showdupes']);
 
 		// Determine which actions we should allow on this page.
@@ -799,27 +858,32 @@ 
 		{
 			// If we are approving deleted accounts we have a slightly different list... actually a mirror ;)
 			if ($context['current_filter'] == 4)
-				$context['allowed_actions'] = array(
+			{
+							$context['allowed_actions'] = array(
 					'reject' => $txt['admin_browse_w_approve_deletion'],
 					'ok' => $txt['admin_browse_w_reject'],
 				);
-			else
-				$context['allowed_actions'] = array(
+			}
+			else {
+							$context['allowed_actions'] = array(
 					'ok' => $txt['admin_browse_w_approve'],
 					'okemail' => $txt['admin_browse_w_approve'] . ' ' . $txt['admin_browse_w_email'],
 					'require_activation' => $txt['admin_browse_w_approve_require_activate'],
 					'reject' => $txt['admin_browse_w_reject'],
 					'rejectemail' => $txt['admin_browse_w_reject'] . ' ' . $txt['admin_browse_w_email'],
 				);
+			}
 		}
 		elseif ($context['browse_type'] === 'activate')
-			$context['allowed_actions'] = array(
+		{
+					$context['allowed_actions'] = array(
 				'ok' => $txt['admin_browse_w_activate'],
 				'okemail' => $txt['admin_browse_w_activate'] . ' ' . $txt['admin_browse_w_email'],
 				'delete' => $txt['admin_browse_w_delete'],
 				'deleteemail' => $txt['admin_browse_w_delete'] . ' ' . $txt['admin_browse_w_email'],
 				'remind' => $txt['admin_browse_w_remind'] . ' ' . $txt['admin_browse_w_email'],
 			);
+		}
 
 		// Create an option list for actions allowed to be done with selected members.
 		$allowed_actions = '
@@ -827,8 +891,10 @@ 
 				<option value="" disabled="disabled">' . str_repeat('&#8212;', strlen($txt['admin_browse_with_selected'])) . '</option>';
 
 		foreach ($context['allowed_actions'] as $key => $desc)
-			$allowed_actions .= '
+		{
+					$allowed_actions .= '
 				<option value="' . $key . '">' . '&#10148;&nbsp;' . $desc . '</option>';
+		}
 
 		// Setup the Javascript function for selecting an action for the list.
 		$javascript = '
@@ -841,14 +907,16 @@ 
 
 		// We have special messages for approving deletion of accounts - it's surprisingly logical - honest.
 		if ($context['current_filter'] == 4)
-			$javascript .= '
+		{
+					$javascript .= '
 				if (document.forms.postForm.todo.value.indexOf("reject") != -1)
 					message = "' . $txt['admin_browse_w_delete'] . '";
 				else
 					message = "' . $txt['admin_browse_w_reject'] . '";';
+		}
 		// Otherwise a nice standard message.
-		else
-			$javascript .= '
+		else {
+					$javascript .= '
 				if (document.forms.postForm.todo.value.indexOf("delete") != -1)
 					message = "' . $txt['admin_browse_w_delete'] . '";
 				else if (document.forms.postForm.todo.value.indexOf("reject") != -1)
@@ -857,6 +925,7 @@ 
 					message = "' . $txt['admin_browse_w_remind'] . '";
 				else
 					message = "' . ($context['browse_type'] === 'approve' ? $txt['admin_browse_w_approve'] : $txt['admin_browse_w_activate']) . '";';
+		}
 		$javascript .= '
 				if (confirm(message + " ' . $txt['admin_browse_warn'] . '"))
 					document.forms.postForm.submit();
@@ -990,9 +1059,12 @@ 
 							foreach ($rowData['duplicate_members'] as $member)
 							{
 								if ($member['id'])
-									$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="alert"' : '') . '>' . $member['name'] . '</a>';
-								else
-									$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+								{
+																	$member_links[] = '<a href="' . $scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="alert"' : '') . '>' . $member['name'] . '</a>';
+								}
+								else {
+																	$member_links[] = $member['name'] . ' (' . $txt['guest'] . ')';
+								}
 							}
 							return implode(', ', $member_links);
 						},
@@ -1045,13 +1117,18 @@ 
 
 		// Pick what column to actually include if we're showing duplicates.
 		if ($context['show_duplicates'])
-			unset($listOptions['columns']['email']);
-		else
-			unset($listOptions['columns']['duplicates']);
+		{
+					unset($listOptions['columns']['email']);
+		}
+		else {
+					unset($listOptions['columns']['duplicates']);
+		}
 
 		// Only show hostname on duplicates as it takes a lot of time.
 		if (!$context['show_duplicates'] || !empty($modSettings['disableHostnameLookup']))
-			unset($listOptions['columns']['hostname']);
+		{
+					unset($listOptions['columns']['hostname']);
+		}
 
 		// Is there any need to show filters?
 		if (isset($context['available_filters']))
@@ -1062,11 +1139,13 @@ 
 			);
 
 			foreach ($context['available_filters'] as $filter)
-				$listOptions['list_menu']['links'][] = array(
+			{
+							$listOptions['list_menu']['links'][] = array(
 					'is_selected' => $filter['selected'],
 					'href' => $scripturl . '?action=admin;area=viewmembers;sa=browse;type=' . $context['browse_type'] . ';filter=' . $filter['type'],
 					'label' => $filter['desc'] . ' - ' . $filter['amount'] . ' ' . ($filter['amount'] == 1 ? $txt['user'] : $txt['users'])
 				);
+			}
 		}
 
 		// Now that we have all the options, create the list.
@@ -1104,26 +1183,36 @@ 
 
 		// If we are applying a filter do just that - then redirect.
 		if (isset($this->_req->post->filter) && $this->_req->post->filter != $this->_req->post->orig_filter)
-			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $this->_req->query->type . ';sort=' . $this->_req->sort . ';filter=' . $this->_req->post->filter . ';start=' . $this->_req->start);
+		{
+					redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $this->_req->query->type . ';sort=' . $this->_req->sort . ';filter=' . $this->_req->post->filter . ';start=' . $this->_req->start);
+		}
 
 		// Nothing to do?
 		if (!isset($this->_req->post->todoAction) && !isset($this->_req->post->time_passed))
-			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $this->_req->query->type . ';sort=' . $this->_req->sort . ';filter=' . $current_filter . ';start=' . $this->_req->start);
+		{
+					redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $this->_req->query->type . ';sort=' . $this->_req->sort . ';filter=' . $current_filter . ';start=' . $this->_req->start);
+		}
 
 		// Are we dealing with members who have been waiting for > set amount of time?
 		if (isset($this->_req->post->time_passed))
-			$this->conditions['time_before'] = time() - 86400 * (int) $this->_req->post->time_passed;
+		{
+					$this->conditions['time_before'] = time() - 86400 * (int) $this->_req->post->time_passed;
+		}
 		// Coming from checkboxes - validate the members passed through to us.
 		else
 		{
 			$this->conditions['members'] = array();
 			foreach ($this->_req->post->todoAction as $id)
-				$this->conditions['members'][] = (int) $id;
+			{
+							$this->conditions['members'][] = (int) $id;
+			}
 		}
 
 		$data = retrieveMemberData($this->conditions);
 		if ($data['member_count'] == 0)
-			redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $this->_req->post->type . ';sort=' . $this->_req->sort . ';filter=' . $current_filter . ';start=' . $this->_req->start);
+		{
+					redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $this->_req->post->type . ';sort=' . $this->_req->sort . ';filter=' . $current_filter . ';start=' . $this->_req->start);
+		}
 
 		$this->member_info = $data['member_info'];
 		$this->conditions['members'] = $data['members'];
@@ -1162,12 +1251,16 @@ 
 			$log_action = $this->_req->post->todo === 'remind' ? 'remind_member' : 'approve_member';
 
 			foreach ($this->member_info as $member)
-				logAction($log_action, array('member' => $member['id']), 'admin');
+			{
+							logAction($log_action, array('member' => $member['id']), 'admin');
+			}
 		}
 
 		// Although updateMemberStats *may* catch this, best to do it manually just in case (Doesn't always sort out unapprovedMembers).
 		if (in_array($current_filter, array(3, 4)))
-			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $data['member_count'] ? $modSettings['unapprovedMembers'] - $data['member_count'] : 0)));
+		{
+					updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > $data['member_count'] ? $modSettings['unapprovedMembers'] - $data['member_count'] : 0)));
+		}
 
 		// Update the member's stats. (but, we know the member didn't change their name.)
 		require_once(SUBSDIR . '/Members.subs.php');

Spacing +5 added lines, -5 removed lines

@@ -516,7 +516,7 @@ 
 						'value' => $txt['viewmembers_online'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							require_once(SUBSDIR . '/Members.subs.php');
@@ -559,7 +559,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $user_info;
 
 							return '<input type="checkbox" name="members[]" value="' . $rowData['id_member'] . '" class="input_check" ' . ($rowData['id_member'] == $user_info['id'] || $rowData['id_group'] == 1 || in_array(1, explode(',', $rowData['additional_groups'])) ? 'disabled="disabled"' : '') . ' />';
@@ -954,7 +954,7 @@ 
 						'value' => $txt['hostname'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return host_from_ip($rowData['member_ip']);
 						},
 						'class' => 'smalltext',
@@ -965,7 +965,7 @@ 
 						'value' => $context['current_filter'] == 4 ? $txt['viewmembers_online'] : $txt['date_registered'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $context;
 
 							return standardTime($rowData['' . ($context['current_filter'] == 4 ? 'last_login' : 'date_registered') . '']);
@@ -983,7 +983,7 @@ 
 						'style' => 'width: 20%;',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl, $txt;
 
 							$member_links = array();

sources/admin/ManageServer.controller.php

Braces +36 added lines, -12 removed lines

@@ -219,10 +219,14 @@ 
 
 			// Its either local or global cookies
 			if (!empty($this->_req->post->localCookies) && empty($this->_req->post->globalCookies))
-				unset($this->_req->post->globalCookies);
+			{
+							unset($this->_req->post->globalCookies);
+			}
 
 			if (!empty($this->_req->post->globalCookiesDomain) && strpos($boardurl, $this->_req->post->globalCookiesDomain) === false)
-				throw new Elk_Exception('invalid_cookie_domain', false);
+			{
+							throw new Elk_Exception('invalid_cookie_domain', false);
+			}
 
 			$settingsForm->setConfigValues((array) $this->_req->post);
 			$settingsForm->save();
@@ -347,13 +351,21 @@ 
 			foreach ($this->_req->post as $key => $value)
 			{
 				if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable')
-					continue;
+				{
+									continue;
+				}
 				elseif ($key === 'loadavg_auto_opt' && $value <= 1)
-					$this->_req->post->loadavg_auto_opt = '1.0';
+				{
+									$this->_req->post->loadavg_auto_opt = '1.0';
+				}
 				elseif ($key === 'loadavg_forum' && $value < 10)
-					$this->_req->post->loadavg_forum = '10.0';
+				{
+									$this->_req->post->loadavg_forum = '10.0';
+				}
 				elseif ($value < 2)
-					$this->_req->{$key} = '2.0';
+				{
+									$this->_req->{$key} = '2.0';
+				}
 			}
 
 			call_integration_hook('integrate_save_loadavg_settings');
@@ -401,17 +413,25 @@ 
 		foreach ($info_lines as $line)
 		{
 			if (preg_match('~(' . $remove . ')~', $line))
-				continue;
+			{
+							continue;
+			}
 
 			// New category?
 			if (strpos($line, '<h2>') !== false)
-				$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+			{
+							$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+			}
 
 			// Load it as setting => value or the old setting local master
 			if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-				$pinfo[$category][$val[1]] = $val[2];
+			{
+							$pinfo[$category][$val[1]] = $val[2];
+			}
 			elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-				$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+			{
+							$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+			}
 		}
 
 		// Load it in to context and display it
@@ -564,7 +584,9 @@ 
 			$supported = $value->isAvailable();
 
 			if (!empty($supported))
-				$detected_supported[$key] = $value->title();
+			{
+							$detected_supported[$key] = $value->title();
+			}
 		}
 
 		$txt['caching_information'] = str_replace('{supported_accelerators}', '<i>' . implode(', ', $detected_names) . '</i><br />', $txt['caching_information']);
@@ -618,7 +640,9 @@ 
 
 		// Don't say you're using that win-thing, no cookies for you :P
 		if (stripos(PHP_OS, 'win') === 0)
-			$context['settings_message'] = $txt['loadavg_disabled_windows'];
+		{
+					$context['settings_message'] = $txt['loadavg_disabled_windows'];
+		}
 		else
 		{
 			require_once(SUBSDIR . '/Server.subs.php');

sources/admin/ManageSecurity.controller.php

Braces +21 added lines, -7 removed lines

@@ -203,7 +203,9 @@ 
 
 			// Guest requiring verification!
 			if (empty($this->_req->post->posts_require_captcha) && !empty($this->_req->post->guests_require_captcha))
-				$this->_req->post->posts_require_captcha = -1;
+			{
+							$this->_req->post->posts_require_captcha = -1;
+			}
 
 			unset($config_vars['pm1'], $config_vars['pm2'], $config_vars['pm3'], $config_vars['guest_verify']);
 
@@ -227,7 +229,9 @@ 
 
 		// Some minor javascript for the guest post setting.
 		if ($modSettings['posts_require_captcha'])
-			addInlineJavascript('document.getElementById(\'guests_require_captcha\').disabled = true;', true);
+		{
+					addInlineJavascript('document.getElementById(\'guests_require_captcha\').disabled = true;', true);
+		}
 
 		$context['post_url'] = $scripturl . '?action=admin;area=securitysettings;save;sa=spam';
 		$context['settings_title'] = $txt['antispam_Settings'];
@@ -259,7 +263,9 @@ 
 
 		// Have we blocked anything in the last 7 days?
 		if (!empty($modSettings['badbehavior_enabled']))
-			$context['settings_message'][] = bb2_insert_stats(true) . ' <a class="linkbutton" href="' . $boardurl . '/index.php?action=admin;area=logs;sa=badbehaviorlog;desc">' . $txt['badbehavior_details'] . '</a>';
+		{
+					$context['settings_message'][] = bb2_insert_stats(true) . ' <a class="linkbutton" href="' . $boardurl . '/index.php?action=admin;area=logs;sa=badbehaviorlog;desc">' . $txt['badbehavior_details'] . '</a>';
+		}
 
 		// Current whitelist data
 		$whitelist = array('badbehavior_ip_wl', 'badbehavior_useragent_wl', 'badbehavior_url_wl');
@@ -269,10 +275,14 @@ 
 			$context[$list . '_desc'] = array();
 
 			if (!empty($modSettings[$list]))
-				$context[$list] = Util::unserialize($modSettings[$list]);
+			{
+							$context[$list] = Util::unserialize($modSettings[$list]);
+			}
 
 			if (!empty($modSettings[$list . '_desc']))
-				$context[$list . '_desc'] = Util::unserialize($modSettings[$list . '_desc']);
+			{
+							$context[$list . '_desc'] = Util::unserialize($modSettings[$list . '_desc']);
+			}
 		}
 
 		// Saving?
@@ -430,7 +440,9 @@ 
 
 		// Cannot use moderation if post moderation is not enabled.
 		if (!$modSettings['postmod_active'])
-			unset($config_vars['moderate']);
+		{
+					unset($config_vars['moderate']);
+		}
 
 		require_once(SUBSDIR . '/VerificationControls.class.php');
 		$known_verifications = loadVerificationControls();
@@ -442,8 +454,10 @@ 
 
 			$new_settings = $current_instance->settings();
 			if (!empty($new_settings) && is_array($new_settings))
-				foreach ($new_settings as $new_setting)
+			{
+							foreach ($new_settings as $new_setting)
 				$config_vars[] = $new_setting;
+			}
 		}
 
 		// @todo: it may be removed, it may stay, the two hooks may have different functions

sources/admin/ManageFeatures.controller.php

Braces +80 added lines, -28 removed lines

@@ -168,7 +168,9 @@ 
 
 			// Prevent absurd boundaries here - make it a day tops.
 			if (isset($this->_req->post->lastActive))
-				$this->_req->post->lastActive = min((int) $this->_req->post->lastActive, 1440);
+			{
+							$this->_req->post->lastActive = min((int) $this->_req->post->lastActive, 1440);
+			}
 
 			call_integration_hook('integrate_save_basic_settings');
 
@@ -420,7 +422,9 @@ 
 
 					// Something like enableModule('mentions', array('post', 'display');
 					foreach ($modules as $key => $val)
-						$function($key, $val);
+					{
+											$function($key, $val);
+					}
 				}
 			}
 
@@ -499,7 +503,9 @@ 
 
 		// Temporarily make each setting a modSetting!
 		foreach ($context['signature_settings'] as $key => $value)
-			$modSettings['signature_' . $key] = $value;
+		{
+					$modSettings['signature_' . $key] = $value;
+		}
 
 		// Make sure we check the right tags!
 		$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
@@ -514,17 +520,25 @@ 
 			$bbcTags = $codes->getTags();
 
 			if (!isset($this->_req->post->signature_bbc_enabledTags))
-				$this->_req->post->signature_bbc_enabledTags = array();
+			{
+							$this->_req->post->signature_bbc_enabledTags = array();
+			}
 			elseif (!is_array($this->_req->post->signature_bbc_enabledTags))
-				$this->_req->post->signature_bbc_enabledTags = array($this->_req->post->signature_bbc_enabledTags);
+			{
+							$this->_req->post->signature_bbc_enabledTags = array($this->_req->post->signature_bbc_enabledTags);
+			}
 
 			$sig_limits = array();
 			foreach ($context['signature_settings'] as $key => $value)
 			{
 				if ($key == 'allow_smileys')
-					continue;
+				{
+									continue;
+				}
 				elseif ($key == 'max_smileys' && empty($this->_req->post->signature_allow_smileys))
-					$sig_limits[] = -1;
+				{
+									$sig_limits[] = -1;
+				}
 				else
 				{
 					$current_key = $this->_req->getPost('signature_' . $key, 'intval');
@@ -606,7 +620,9 @@ 
 				foreach ($this->_req->post->reg as $value)
 				{
 					if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
-						$reg_fields[] = $value;
+					{
+											$reg_fields[] = $value;
+					}
 				}
 			}
 
@@ -614,7 +630,9 @@ 
 			$changes['registration_fields'] = empty($reg_fields) ? '' : implode(',', $reg_fields);
 
 			if (!empty($changes))
-				updateSettings($changes);
+			{
+							updateSettings($changes);
+			}
 		}
 
 		createToken('admin-scp');
@@ -874,7 +892,9 @@ 
 			loadLanguage('Errors');
 
 			if (isset($txt['custom_option_' . $this->_req->query->msg]))
-				$context['custom_option__error'] = $txt['custom_option_' . $this->_req->query->msg];
+			{
+							$context['custom_option__error'] = $txt['custom_option_' . $this->_req->query->msg];
+			}
 		}
 
 		// Load the profile language for section names.
@@ -928,9 +948,12 @@ 
 
 			// Enable and disable custom fields as required.
 			$enabled = array(0);
-			if(isset($this->_req->post->cust) && is_array($this->_req->post->cust)) {
+			if(isset($this->_req->post->cust) && is_array($this->_req->post->cust))
+			{
 				foreach ($this->_req->post->cust as $id)
-					$enabled[] = (int) $id;
+				{
+									$enabled[] = (int) $id;
+				}
 			}
 
 			updateRenamedProfileStatus($enabled);
@@ -943,11 +966,15 @@ 
 
 			// Everyone needs a name - even the (bracket) unknown...
 			if (trim($this->_req->post->field_name) == '')
-				redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=need_name');
+			{
+							redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=need_name');
+			}
 
 			// Regex you say?  Do a very basic test to see if the pattern is valid
 			if (!empty($this->_req->post->regex) && @preg_match($this->_req->post->regex, 'dummy') === false)
-				redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=regex_error');
+			{
+							redirectexit($scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $this->_req->query->fid . ';msg=regex_error');
+			}
 
 			$this->_req->post->field_name = $this->_req->getPost('field_name', 'Util::htmlspecialchars');
 			$this->_req->post->field_desc = $this->_req->getPost('field_desc', 'Util::htmlspecialchars');
@@ -968,7 +995,9 @@ 
 			// Some masking stuff...
 			$mask = $this->_req->getPost('mask', 'strval', '');
 			if ($mask == 'regex' && isset($this->_req->post->regex))
-				$mask .= $this->_req->post->regex;
+			{
+							$mask .= $this->_req->post->regex;
+			}
 
 			$field_length = $this->_req->getPost('max_length', 'intval', 255);
 			$enclose = $this->_req->getPost('enclose', 'strval', '');
@@ -998,7 +1027,9 @@ 
 
 							// Nada, zip, etc...
 							if (trim($v) == '')
-								continue;
+							{
+															continue;
+							}
 
 							// Otherwise, save it boy.
 							$field_options .= $v . ',';
@@ -1014,7 +1045,9 @@ 
 						}
 
 						if (isset($_POST['default_select']) && $_POST['default_select'] == 'no_default')
-							$default = 'no_default';
+						{
+													$default = 'no_default';
+						}
 
 						$field_options = substr($field_options, 0, -1);
 					}
@@ -1035,15 +1068,20 @@ 
 
 				// If there is nothing to the name, then let's start our own - for foreign languages etc.
 				if (isset($matches[1]))
-					$colname = $initial_colname = 'cust_' . strtolower($matches[1]);
-				else
-					$colname = $initial_colname = 'cust_' . mt_rand(1, 999999);
+				{
+									$colname = $initial_colname = 'cust_' . strtolower($matches[1]);
+				}
+				else {
+									$colname = $initial_colname = 'cust_' . mt_rand(1, 999999);
+				}
 
 				$unique = ensureUniqueProfileField($colname, $initial_colname);
 
 				// Still not a unique column name? Leave it up to the user, then.
 				if (!$unique)
-					throw new Elk_Exception('custom_option_not_unique');
+				{
+									throw new Elk_Exception('custom_option_not_unique');
+				}
 
 				// And create a new field
 				$new_field = array(
@@ -1091,7 +1129,9 @@ 
 					foreach ($context['field']['options'] as $k => $option)
 					{
 						if (trim($option) == '')
-							continue;
+						{
+													continue;
+						}
 
 						// Still exists?
 						if (in_array($option, $newOptions))
@@ -1106,7 +1146,9 @@ 
 					{
 						// Just been renamed?
 						if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-							updateRenamedProfileField($k, $newOptions, $context['field']['colname'], $option);
+						{
+													updateRenamedProfileField($k, $newOptions, $context['field']['colname'], $option);
+						}
 					}
 				}
 				// @todo Maybe we should adjust based on new text length limits?
@@ -1139,7 +1181,9 @@ 
 
 				// Just clean up any old selects - these are a pain!
 				if (($this->_req->post->field_type == 'select' || $this->_req->post->field_type == 'radio') && !empty($newOptions))
-					deleteOldProfileFieldSelects($newOptions, $context['field']['colname']);
+				{
+									deleteOldProfileFieldSelects($newOptions, $context['field']['colname']);
+				}
 			}
 		}
 		// Deleting?
@@ -1197,7 +1241,9 @@ 
 			foreach ($context['pm_limits'] as $group_id => $group)
 			{
 				if (isset($this->_req->post->group[$group_id]) && $this->_req->post->group[$group_id] != $group['max_messages'])
-					updateMembergroupProperties(array('current_group' => $group_id, 'max_messages' => $this->_req->post->group[$group_id]));
+				{
+									updateMembergroupProperties(array('current_group' => $group_id, 'max_messages' => $this->_req->post->group[$group_id]));
+				}
 			}
 
 			call_integration_hook('integrate_save_pmsettings_settings');
@@ -1260,12 +1306,16 @@ 
 		// Get all the time zones.
 		$all_zones = timezone_identifiers_list();
 		if ($all_zones === false)
-			unset($config_vars['default_timezone']);
+		{
+					unset($config_vars['default_timezone']);
+		}
 		else
 		{
 			// Make sure we set the value to the same as the printed value.
 			foreach ($all_zones as $zone)
-				$config_vars['default_timezone'][2][$zone] = $zone;
+			{
+							$config_vars['default_timezone'][2][$zone] = $zone;
+			}
 		}
 
 		call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
@@ -1565,7 +1615,9 @@ 
 
 	// Have we exhausted all the time we allowed?
 	if (time() - array_sum(explode(' ', $sig_start)) < 3)
-		return;
+	{
+			return;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $applied_sigs . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];

Spacing +7 added lines, -7 removed lines

@@ -657,7 +657,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							$isChecked = $rowData['disabled'] ? '' : ' checked="checked"';
 							$onClickHandler = $rowData['can_show_register'] ? sprintf('onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
 							return sprintf('<input type="checkbox" name="active[]" id="active_%1$s" value="%1$s" class="input_check" %2$s %3$s />', $rowData['id'], $isChecked, $onClickHandler);
@@ -672,7 +672,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked="checked"' : '';
 							$isDisabled = $rowData['can_show_register'] ? '' : ' disabled="disabled"';
 							return sprintf('<input type="checkbox" name="reg[]" id="reg_%1$s" value="%1$s" class="input_check" %2$s %3$s />', $rowData['id'], $isChecked, $isDisabled);
@@ -734,7 +734,7 @@ 
 						'value' => $txt['custom_profile_fieldname'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>', $scripturl, $rowData['id_field'], $rowData['field_name'], $rowData['field_desc']);
@@ -751,7 +751,7 @@ 
 						'value' => $txt['custom_profile_fieldtype'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
@@ -770,7 +770,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							$isChecked = $rowData['active'] ? ' checked="checked"' : '';
 							return sprintf('<input type="checkbox" name="cust[]" id="cust_%1$s" value="%1$s" class="input_check"%2$s />', $rowData['id_field'], $isChecked);
 						},
@@ -787,7 +787,7 @@ 
 						'value' => $txt['custom_profile_placement'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 							$placement = 'custom_profile_placement_';
 
@@ -939,7 +939,7 @@ 
 
 			// Enable and disable custom fields as required.
 			$enabled = array(0);
-			if(isset($this->_req->post->cust) && is_array($this->_req->post->cust)) {
+			if (isset($this->_req->post->cust) && is_array($this->_req->post->cust)) {
 				foreach ($this->_req->post->cust as $id)
 					$enabled[] = (int) $id;
 			}

sources/admin/ManageBoards.controller.php

Braces +126 added lines, -49 removed lines

@@ -147,18 +147,21 @@ 
 
 			// Top is special, its the top!
 			if ($this->_req->query->move_to === 'top')
-				$boardOptions = array(
+			{
+							$boardOptions = array(
 					'move_to' => $this->_req->query->move_to,
 					'target_category' => (int) $this->_req->query->target_cat,
 					'move_first_child' => true,
 				);
+			}
 			// Moving it after another board
-			else
-				$boardOptions = array(
+			else {
+							$boardOptions = array(
 					'move_to' => $this->_req->query->move_to,
 					'target_board' => (int) $this->_req->query->target_board,
 					'move_first_child' => true,
 				);
+			}
 
 			// Use modifyBoard to perform the action
 			modifyBoard((int) $this->_req->query->src_board, $boardOptions);
@@ -210,14 +213,17 @@ 
 				foreach ($boardList[$catid] as $boardid)
 				{
 					if (!isset($context['categories'][$catid]['move_link']))
-						$context['categories'][$catid]['move_link'] = array(
+					{
+											$context['categories'][$catid]['move_link'] = array(
 							'child_level' => 0,
 							'label' => $txt['mboards_order_before'] . ' \'' . htmlspecialchars($boards[$boardid]['name'], ENT_COMPAT, 'UTF-8') . '\'',
 							'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security,
 						);
+					}
 
 					if (!$context['categories'][$catid]['boards'][$boardid]['move'])
-					$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
+					{
+										$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
 						array(
 							'child_level' => $boards[$boardid]['level'],
 							'label' => $txt['mboards_order_after'] . '\'' . htmlspecialchars($boards[$boardid]['name'], ENT_COMPAT, 'UTF-8') . '\'',
@@ -229,18 +235,25 @@ 
 							'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=child;' . $security,
 						),
 					);
+					}
 
 					$difference = $boards[$boardid]['level'] - $prev_child_level;
 					if ($difference == 1)
-						array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+					{
+											array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+					}
 					elseif ($difference < 0)
 					{
 						if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+						{
+													$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+						}
 
 						for ($i = 0; $i < -$difference; $i++)
-							if (($temp = array_pop($stack)) !== null)
+						{
+													if (($temp = array_pop($stack)) !== null)
 								array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp);
+						}
 					}
 
 					$prev_board = $boardid;
@@ -249,16 +262,22 @@ 
 				}
 
 				if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-					$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+				{
+									$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+				}
 				elseif (!empty($stack))
-					$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+				{
+									$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+				}
 
 				if (empty($boardList[$catid]))
-					$context['categories'][$catid]['move_link'] = array(
+				{
+									$context['categories'][$catid]['move_link'] = array(
 						'child_level' => 0,
 						'label' => $txt['mboards_order_before'] . ' \'' . htmlspecialchars($tree['node']['name'], ENT_COMPAT, 'UTF-8') . '\'',
 						'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security,
 					);
+				}
 			}
 		}
 
@@ -317,7 +336,9 @@ 
 		}
 		// Category doesn't exist, man... sorry.
 		elseif (!isset($cat_tree[$this->cat]))
-			redirectexit('action=admin;area=manageboards');
+		{
+					redirectexit('action=admin;area=manageboards');
+		}
 		else
 		{
 			$context['category'] = array(
@@ -330,21 +351,27 @@ 
 			);
 
 			foreach ($boardList[$this->cat] as $child_board)
-				$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+			{
+							$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+			}
 		}
 
 		$prevCat = 0;
 		foreach ($cat_tree as $catid => $tree)
 		{
 			if ($catid == $this->cat && $prevCat > 0)
-				$context['category_order'][$prevCat]['selected'] = true;
+			{
+							$context['category_order'][$prevCat]['selected'] = true;
+			}
 			elseif ($catid != $this->cat)
-				$context['category_order'][$catid] = array(
+			{
+							$context['category_order'][$catid] = array(
 					'id' => $catid,
 					'name' => $txt['mboards_order_after'] . $tree['node']['name'],
 					'selected' => false,
 					'true_name' => $tree['node']['name']
 				);
+			}
 
 			$prevCat = $catid;
 		}
@@ -393,7 +420,9 @@ 
 			$catOptions = array();
 
 			if (isset($this->_req->post->cat_order))
-				$catOptions['move_after'] = (int) $this->_req->post->cat_order;
+			{
+							$catOptions['move_after'] = (int) $this->_req->post->cat_order;
+			}
 
 			// Change "This & That" to "This &amp; That" but don't change "&cent" to "&amp;cent;"...
 			$catOptions['cat_name'] = preg_replace('~[&]([^;]{8}|[^;]{0,8}$)~', '&amp;$1', $this->_req->post->cat_name);
@@ -401,9 +430,12 @@ 
 			$catOptions['is_collapsible'] = isset($this->_req->post->collapse);
 
 			if (isset($this->_req->post->add))
-				createCategory($catOptions);
-			else
-				modifyCategory($this->cat, $catOptions);
+			{
+							createCategory($catOptions);
+			}
+			else {
+							modifyCategory($this->cat, $catOptions);
+			}
 		}
 		// If they want to delete - first give them confirmation.
 		elseif (isset($this->_req->post->delete) && !isset($this->_req->post->confirmation) && !isset($this->_req->post->empty))
@@ -418,12 +450,15 @@ 
 			if (isset($this->_req->post->delete_action) && $this->_req->post->delete_action == 1)
 			{
 				if (empty($this->_req->post->cat_to))
-					throw new Elk_Exception('mboards_delete_error');
+				{
+									throw new Elk_Exception('mboards_delete_error');
+				}
 
 				deleteCategories(array($this->cat), (int) $this->_req->post->cat_to);
 			}
-			else
-				deleteCategories(array($this->cat));
+			else {
+							deleteCategories(array($this->cat));
+			}
 		}
 
 		redirectexit('action=admin;area=manageboards');
@@ -470,7 +505,9 @@ 
 
 			// Category doesn't exist, man... sorry.
 			if (empty($this->cat))
-				redirectexit('action=admin;area=manageboards');
+			{
+							redirectexit('action=admin;area=manageboards');
+			}
 
 			// Some things that need to be setup for a new board.
 			$curBoard = array(
@@ -534,7 +571,9 @@ 
 
 		// Category doesn't exist, man... sorry.
 		if (!isset($boardList[$curBoard['category']]))
-			redirectexit('action=admin;area=manageboards');
+		{
+					redirectexit('action=admin;area=manageboards');
+		}
 
 		foreach ($boardList[$curBoard['category']] as $boardid)
 		{
@@ -566,24 +605,30 @@ 
 			$context['can_move_children'] = false;
 			$context['children'] = $boards[$this->boardid]['tree']['children'];
 			foreach ($context['board_order'] as $board)
-				if ($board['is_child'] === false && $board['selected'] === false)
+			{
+							if ($board['is_child'] === false && $board['selected'] === false)
 					$context['can_move_children'] = true;
+			}
 		}
 
 		// Get other available categories.
 		$context['categories'] = array();
 		foreach ($cat_tree as $catID => $tree)
-			$context['categories'][] = array(
+		{
+					$context['categories'][] = array(
 				'id' => $catID == $curBoard['category'] ? 0 : $catID,
 				'name' => $tree['node']['name'],
 				'selected' => $catID == $curBoard['category']
 			);
+		}
 
 		$context['board']['moderators'] = getBoardModerators($this->boardid);
 		$context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['board']['moderators']) . '&quot;';
 
 		if (!empty($context['board']['moderators']))
-			list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+		{
+					list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+		}
 
 		$context['themes'] = getAllThemes();
 
@@ -646,7 +691,9 @@ 
 			elseif (!empty($this->_req->post->placement) && !empty($this->_req->post->board_order))
 			{
 				if (!in_array($this->_req->post->placement, array('before', 'after', 'child')))
-					throw new Elk_Exception('mangled_post', false);
+				{
+									throw new Elk_Exception('mangled_post', false);
+				}
 
 				$boardOptions['move_to'] = $this->_req->post->placement;
 				$boardOptions['target_board'] = (int) $this->_req->post->board_order;
@@ -664,14 +711,20 @@ 
 				foreach ($this->_req->post->groups as $group => $action)
 				{
 					if ($action == 'allow')
-						$boardOptions['access_groups'][] = (int) $group;
+					{
+											$boardOptions['access_groups'][] = (int) $group;
+					}
 					elseif ($action == 'deny')
-						$boardOptions['deny_groups'][] = (int) $group;
+					{
+											$boardOptions['deny_groups'][] = (int) $group;
+					}
 				}
 			}
 
 			if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255)
-				throw new Elk_Exception('too_many_groups', false);
+			{
+							throw new Elk_Exception('too_many_groups', false);
+			}
 
 			// Change '1 & 2' to '1 &amp; 2', but not '&amp;' to '&amp;amp;'...
 			$boardOptions['board_name'] = preg_replace('~[&]([^;]{8}|[^;]{0,8}$)~', '&amp;$1', $this->_req->post->board_name);
@@ -685,7 +738,9 @@ 
 			{
 				$moderators = array();
 				foreach ($this->_req->post->moderator_list as $moderator)
-					$moderators[(int) $moderator] = (int) $moderator;
+				{
+									$moderators[(int) $moderator] = (int) $moderator;
+				}
 
 				$boardOptions['moderators'] = $moderators;
 			}
@@ -704,13 +759,19 @@ 
 
 				// If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board.
 				if ($boardOptions['redirect'] && empty($properties['oldRedirect']) && $properties['numPosts'])
-					unset($boardOptions['redirect']);
+				{
+									unset($boardOptions['redirect']);
+				}
 				// Reset the redirection count when switching on/off.
 				elseif (empty($boardOptions['redirect']) != empty($properties['oldRedirect']))
-					$boardOptions['num_posts'] = 0;
+				{
+									$boardOptions['num_posts'] = 0;
+				}
 				// Resetting the count?
 				elseif ($boardOptions['redirect'] && !empty($this->_req->post->reset_redirect))
-					$boardOptions['num_posts'] = 0;
+				{
+									$boardOptions['num_posts'] = 0;
+				}
 			}
 
 			call_integration_hook('integrate_save_board', array($board_id, &$boardOptions));
@@ -720,22 +781,29 @@ 
 			{
 				// New boards by default go to the bottom of the category.
 				if (empty($this->_req->post->new_cat))
-					$boardOptions['target_category'] = (int) $this->_req->post->cur_cat;
+				{
+									$boardOptions['target_category'] = (int) $this->_req->post->cur_cat;
+				}
 				if (!isset($boardOptions['move_to']))
-					$boardOptions['move_to'] = 'bottom';
+				{
+									$boardOptions['move_to'] = 'bottom';
+				}
 
 				createBoard($boardOptions);
 			}
 			// ...or update an existing board.
-			else
-				modifyBoard($board_id, $boardOptions);
+			else {
+							modifyBoard($board_id, $boardOptions);
+			}
 		}
 		elseif (isset($this->_req->post->delete) && !isset($this->_req->post->confirmation) && !isset($this->_req->post->no_children))
 		{
-			if ($posts) {
+			if ($posts)
+			{
 				throw new Elk_Exception('mboards_delete_board_has_posts');
 			}
-			else {
+			else
+			{
 				$this->action_board();
 			}
 			return;
@@ -743,25 +811,32 @@ 
 		elseif (isset($this->_req->post->delete))
 		{
 			// First, check if our board still has posts or topics.
-			if ($posts) {
+			if ($posts)
+			{
 				throw new Elk_Exception('mboards_delete_board_has_posts');
 			}
 			else if (isset($this->_req->post->delete_action) && $this->_req->post->delete_action == 1)
 			{
 				// Check if we are moving all the current sub-boards first - before we start deleting!
 				if (empty($this->_req->post->board_to))
-					throw new Elk_Exception('mboards_delete_board_error');
+				{
+									throw new Elk_Exception('mboards_delete_board_error');
+				}
 
 				deleteBoards(array($board_id), (int) $this->_req->post->board_to);
 			}
-			else
-				deleteBoards(array($board_id), 0);
+			else {
+							deleteBoards(array($board_id), 0);
+			}
 		}
 
 		if (isset($this->_req->query->rid) && $this->_req->query->rid == 'permissions')
-			redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
-		else
-			redirectexit('action=admin;area=manageboards');
+		{
+					redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
+		}
+		else {
+					redirectexit('action=admin;area=manageboards');
+		}
 	}
 
 	/**
@@ -826,7 +901,9 @@ 
 		$boards = getBoardList(array('override_permissions' => true, 'not_redirection' => true), true);
 		$recycle_boards = array('');
 		foreach ($boards as $board)
-			$recycle_boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		{
+					$recycle_boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		}
 
 		// Here and the board settings...
 		$config_vars = array(

sources/admin/ManageCalendarModule.controller.php

Braces +15 added lines, -7 removed lines

@@ -242,14 +242,19 @@ 
 			$this->_req->post->holiday = $this->_req->getPost('holiday', 'intval', 0);
 
 			if (isset($this->_req->post->delete))
-				removeHolidays($this->_req->post->holiday);
+			{
+							removeHolidays($this->_req->post->holiday);
+			}
 			else
 			{
 				$date = Util::strftime($this->_req->post->year <= 4 ? '0004-%m-%d' : '%Y-%m-%d', mktime(0, 0, 0, $this->_req->post->month, $this->_req->post->day, $this->_req->post->year));
 				if (isset($this->_req->post->edit))
-					editHoliday($this->_req->post->holiday, $date, $this->_req->post->title);
-				else
-					insertHoliday($date, $this->_req->post->title);
+				{
+									editHoliday($this->_req->post->holiday, $date, $this->_req->post->title);
+				}
+				else {
+									insertHoliday($date, $this->_req->post->title);
+				}
 			}
 
 			redirectexit('action=admin;area=managecalendar;sa=holidays');
@@ -267,8 +272,9 @@ 
 			);
 		}
 		// If it's not new load the data.
-		else
-			$context['holiday'] = getHoliday($this->_req->query->holiday);
+		else {
+					$context['holiday'] = getHoliday($this->_req->query->holiday);
+		}
 
 		// Last day for the drop down?
 		$context['holiday']['last_day'] = (int) Util::strftime('%d', mktime(0, 0, 0, $context['holiday']['month'] == 12 ? 1 : $context['holiday']['month'] + 1, 0, $context['holiday']['month'] == 12 ? $context['holiday']['year'] + 1 : $context['holiday']['year']));
@@ -337,7 +343,9 @@ 
 		$boards_list = getBoardList(array('override_permissions' => true, 'not_redirection' => true), true);
 		$boards = array('');
 		foreach ($boards_list as $board)
-			$boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		{
+					$boards[$board['id_board']] = $board['cat_name'] . ' - ' . $board['board_name'];
+		}
 
 		// Look, all the calendar settings - of which there are many!
 		$config_vars = array(

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 			'settings' => array(
 				'cal_enabled' => 1,
 			),
-			'setting_callback' => function ($value) {
+			'setting_callback' => function($value) {
 				if ($value)
 				{
 					enableModules('calendar', array('admin', 'post', 'boardindex', 'display'));
@@ -164,7 +164,7 @@ 
 						'value' => $txt['date'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// Recurring every year or just a single year?

sources/admin/ManageScheduledTasks.controller.php

Braces +24 added lines, -8 removed lines

@@ -107,7 +107,9 @@ 
 			foreach ($this->_req->post->enable_task as $id => $enabled)
 			{
 				if ($enabled)
-					$enablers[] = (int) $id;
+				{
+									$enablers[] = (int) $id;
+				}
 			}
 
 			// Do the update!
@@ -123,7 +125,9 @@ 
 			// Lets figure out which ones they want to run.
 			$tasks = array();
 			foreach ($this->_req->post->run_task as $task => $dummy)
-				$tasks[] = (int) $task;
+			{
+							$tasks[] = (int) $task;
+			}
 
 			// Load up the tasks.
 			$nextTasks = loadTasks($tasks);
@@ -135,11 +139,15 @@ 
 			ignore_user_abort(true);
 
 			foreach ($nextTasks as $task_id => $taskname)
-				run_this_task($task_id, $taskname);
+			{
+							run_this_task($task_id, $taskname);
+			}
 
 			// Things go as expected?  If not save the error in session
 			if (!empty($context['scheduled_errors']))
-				$_SESSION['st_error'] = $context['scheduled_errors'];
+			{
+							$_SESSION['st_error'] = $context['scheduled_errors'];
+			}
 
 			redirectexit('action=admin;area=scheduledtasks;done');
 		}
@@ -273,7 +281,9 @@ 
 
 		// Cleaning...
 		if (!isset($this->_req->query->tid))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 		$this->_req->query->tid = (int) $this->_req->query->tid;
 
 		// Saving?
@@ -287,9 +297,13 @@ 
 
 			// If a half is empty then assume zero offset!
 			if (!isset($matches[2]) || $matches[2] > 59)
-				$matches[2] = 0;
+			{
+							$matches[2] = 0;
+			}
 			if (!isset($matches[1]) || $matches[1] > 23)
-				$matches[1] = 0;
+			{
+							$matches[1] = 0;
+			}
 
 			// Now the offset is easy; easy peasy - except we need to offset by a few hours...
 			$offset = $matches[1] * 3600 + $matches[2] * 60 - date('Z');
@@ -300,7 +314,9 @@ 
 
 			// Don't allow one minute intervals.
 			if ($interval == 1 && $unit === 'm')
-				$interval = 2;
+			{
+							$interval = 2;
+			}
 
 			// Is it disabled?
 			$disabled = !isset($this->_req->post->enabled) ? 1 : 0;

Spacing +2 added lines, -2 removed lines

@@ -374,7 +374,7 @@ 
 						'value' => $txt['scheduled_log_time_run'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return standardTime($rowData['time_run'], true);
 						},
 					),
@@ -405,7 +405,7 @@ 
 						'value' => $txt['scheduled_log_completed'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return '<i class="icon ' . ($rowData['task_completed'] ? 'i-check' : 'i-fail') . '" title="' . sprintf($txt[$rowData['task_completed'] ? 'maintain_done' : 'maintain_fail'], $rowData['name']) . '" />';

sources/admin/CoreFeatures.controller.php

Braces +63 added lines, -26 removed lines

@@ -76,15 +76,20 @@ 
 				$tokenValidation = validateToken('admin-core', 'post', false);
 
 				if (empty($tokenValidation))
-					return 'token_verify_fail';
+				{
+									return 'token_verify_fail';
+				}
+			}
+			else {
+							validateToken('admin-core');
 			}
-			else
-				validateToken('admin-core');
 
 			$this->_save_core_features($core_features);
 
 			if (!isset($this->_req->query->xml))
-				redirectexit('action=admin;area=corefeatures;' . $context['session_var'] . '=' . $context['session_id']);
+			{
+							redirectexit('action=admin;area=corefeatures;' . $context['session_var'] . '=' . $context['session_id']);
+			}
 		}
 
 		// Put them in context.
@@ -96,11 +101,15 @@ 
 
 		// Don't show them this twice!
 		if ($context['is_new_install'])
-			updateSettings(array('admin_features' => ''));
+		{
+					updateSettings(array('admin_features' => ''));
+		}
 
 		// sub_template is already generic_xml and the token is created somewhere else
 		if (isset($this->_req->query->xml))
-			return true;
+		{
+					return true;
+		}
 
 		$context['sub_template'] = 'core_features';
 		$context['page_title'] = $txt['core_settings_title'];
@@ -137,13 +146,16 @@ 
 				'save_callback' => 'custom_profiles_toggle_callback',
 				'setting_callback' => function ($value) {
 					if (!$value)
-						return array(
+					{
+											return array(
 							'disabled_profile_fields' => '',
 							'registration_fields' => '',
 							'displayFields' => '',
 						);
-					else
-						return array();
+					}
+					else {
+											return array();
+					}
 				},
 			),
 			// k = karma.
@@ -171,9 +183,12 @@ 
 					$current = !empty($modSettings['enabled_mentions']) ? explode(',', $modSettings['enabled_mentions']) : array();
 
 					if (!empty($value))
-						return array('enabled_mentions' => implode(',', array_merge($current, array('likemsg', 'rlikemsg'))));
-					else
-						return array('enabled_mentions' => implode(',', array_diff($current, array('likemsg', 'rlikemsg'))));
+					{
+											return array('enabled_mentions' => implode(',', array_merge($current, array('likemsg', 'rlikemsg'))));
+					}
+					else {
+											return array('enabled_mentions' => implode(',', array_diff($current, array('likemsg', 'rlikemsg'))));
+					}
 				},
 			),
 			// ml = moderation log.
@@ -205,8 +220,9 @@ 
 
 						return array('warning_moderate' => 0);
 					}
-					else
-						return array();
+					else {
+											return array();
+					}
 				},
 			),
 			// ps = Paid Subscriptions.
@@ -245,8 +261,9 @@ 
 							'warning_mute' => 60,
 						);
 					}
-					else
-						$returnSettings = array();
+					else {
+											$returnSettings = array();
+					}
 
 					$returnSettings['warning_settings'] = $warning_settings;
 					return $returnSettings;
@@ -261,7 +278,9 @@ 
 				'setting_callback' => function ($value) {
 					// Turn off the spider group if disabling.
 					if (!$value)
-						return array('spider_group' => 0, 'show_spider_online' => 0);
+					{
+											return array('spider_group' => 0, 'show_spider_online' => 0);
+					}
 				},
 				'on_save' => function () {
 					require_once(SUBSDIR . '/SearchEngines.subs.php');
@@ -293,7 +312,9 @@ 
 			$class = $file->getBasename('.controller.php') . '_Controller';
 
 			if (method_exists($class, 'addCoreFeature'))
-				$class::addCoreFeature($core_features);
+			{
+							$class::addCoreFeature($core_features);
+			}
 		}
 
 		$integrations = Hooks::instance()->discoverIntegrations(ADDONSDIR);
@@ -339,7 +360,9 @@ 
 
 		// Convert this to a format that admin search will understand
 		foreach ($core_features as $id => $data)
-			$return_data[] = array('switch', isset($data['title']) ? $data['title'] : $txt['core_settings_item_' . $id]);
+		{
+					$return_data[] = array('switch', isset($data['title']) ? $data['title'] : $txt['core_settings_item_' . $id]);
+		}
 
 		return $return_data;
 	}
@@ -366,9 +389,13 @@ 
 
 		// By default do the basic settings.
 		if (isset($this->_req->query->sa, $subActions[$this->_req->query->sa]))
-			$context['sub_action'] = $this->_req->query->sa;
+		{
+					$context['sub_action'] = $this->_req->query->sa;
+		}
 		elseif (!empty($defaultAction))
-			$context['sub_action'] = $defaultAction;
+		{
+					$context['sub_action'] = $defaultAction;
+		}
 		else
 		{
 			$temp = array_keys($subActions);
@@ -395,7 +422,9 @@ 
 
 			// Enabled?
 			if (!empty($feature_id))
-				$setting_changes['admin_features'][] = $id;
+			{
+							$setting_changes['admin_features'][] = $id;
+			}
 
 			// Setting values to change?
 			if (isset($feature['settings']))
@@ -403,7 +432,9 @@ 
 				foreach ($feature['settings'] as $key => $value)
 				{
 					if (empty($feature_id) || (!empty($feature_id) && ($value < 2 || empty($modSettings[$key]))))
-						$setting_changes[$key] = !empty($feature_id) ? $value : !$value;
+					{
+											$setting_changes[$key] = !empty($feature_id) ? $value : !$value;
+					}
 				}
 			}
 
@@ -412,12 +443,16 @@ 
 			{
 				$returned_settings = $feature['setting_callback'](!empty($feature_id));
 				if (!empty($returned_settings))
-					$setting_changes = array_merge($setting_changes, $returned_settings);
+				{
+									$setting_changes = array_merge($setting_changes, $returned_settings);
+				}
 			}
 
 			// Standard save callback?
 			if (isset($feature['on_save']))
-				$feature['on_save']();
+			{
+							$feature['on_save']();
+			}
 		}
 
 		// Make sure this one setting is a string!
@@ -428,7 +463,9 @@ 
 
 		// This is needed to let menus appear if cache > 2
 		if ($modSettings['cache_enable'] > 2)
-			clean_cache('data');
+		{
+					clean_cache('data');
+		}
 
 		// Any post save things?
 		foreach ($core_features as $id => $feature)

Spacing +9 added lines, -9 removed lines

@@ -135,7 +135,7 @@ 
 			'cp' => array(
 				'url' => 'action=admin;area=featuresettings;sa=profile',
 				'save_callback' => 'custom_profiles_toggle_callback',
-				'setting_callback' => function ($value) {
+				'setting_callback' => function($value) {
 					if (!$value)
 						return array(
 							'disabled_profile_fields' => '',
@@ -159,7 +159,7 @@ 
 				'settings' => array(
 					'likes_enabled' => 1,
 				),
-				'setting_callback' => function ($value) {
+				'setting_callback' => function($value) {
 					global $modSettings;
 
 					require_once(SUBSDIR . '/Mentions.subs.php');
@@ -196,7 +196,7 @@ 
 			// pm = post moderation.
 			'pm' => array(
 				'url' => 'action=admin;area=permissions;sa=postmod',
-				'setting_callback' => function ($value) {
+				'setting_callback' => function($value) {
 					// Cannot use warning post moderation if disabled!
 					if (!$value)
 					{
@@ -224,7 +224,7 @@ 
 			// w = warning.
 			'w' => array(
 				'url' => 'action=admin;area=securitysettings;sa=moderation',
-				'setting_callback' => function ($value) {
+				'setting_callback' => function($value) {
 					global $modSettings;
 
 					list ($modSettings['warning_enable'], $modSettings['user_limit'], $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
@@ -258,12 +258,12 @@ 
 				'settings' => array(
 					'spider_mode' => 1,
 				),
-				'setting_callback' => function ($value) {
+				'setting_callback' => function($value) {
 					// Turn off the spider group if disabling.
 					if (!$value)
 						return array('spider_group' => 0, 'show_spider_online' => 0);
 				},
-				'on_save' => function () {
+				'on_save' => function() {
 					require_once(SUBSDIR . '/SearchEngines.subs.php');
 				},
 			),
@@ -308,14 +308,14 @@ 
 
 			if (method_exists($integration['class'], 'setting_callback'))
 			{
-				$core_features[$integration['id']]['setting_callback'] = function ($value) use ($integration) {
+				$core_features[$integration['id']]['setting_callback'] = function($value) use ($integration) {
 					$integration['class']::setting_callback($value);
 				};
 			}
 
 			if (method_exists($integration['class'], 'on_save'))
 			{
-				$core_features[$integration['id']]['on_save'] = function () use ($integration) {
+				$core_features[$integration['id']]['on_save'] = function() use ($integration) {
 					$integration['class']::on_save();
 				};
 			}
@@ -466,7 +466,7 @@ 
 		}
 
 		// Sort by title attribute
-		uasort($features, function ($a, $b) {
+		uasort($features, function($a, $b) {
 			return strcmp(strtolower($a['title']), strtolower($b['title']));
 		});
 

sources/admin/ManagePermissions.controller.php

Braces +183 added lines, -69 removed lines

@@ -175,7 +175,9 @@ 
 
 		// pid = profile id
 		if (!empty($this->_req->query->pid))
-			$this->_pid = (int) $this->_req->query->pid;
+		{
+					$this->_pid = (int) $this->_req->query->pid;
+		}
 
 		// Needed for <5.4 due to lack of $this support in closures
 		$_pid = isset($this->_pid) ? $this->_pid : null;
@@ -219,7 +221,9 @@ 
 							// Since the moderator group has no explicit members, no link is needed.
 							// Since guests and regular members are not groups, no link is needed.
 							if (in_array($rowData['id_group'], array(-1, 0, 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']);
@@ -227,12 +231,16 @@ 
 
 							// Add a help option for guests, regular members, moderator and administrator.
 							if (!empty($rowData['help']))
-								$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=' . $rowData['help'] . '" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							{
+															$group_name .= sprintf(' (<a href="%1$s?action=quickhelp;help=' . $rowData['help'] . '" onclick="return reqOverlayDiv(this.href);" class="helpicon i-help"></a>)', $scripturl);
+							}
 
 							if (!empty($rowData['children']))
-								$group_name .= '
+							{
+															$group_name .= '
 									<br />
 									<span class="smalltext">' . $txt['permissions_includes_inherited'] . ': &quot;' . implode('&quot;, &quot;', $rowData['children']) . '&quot;</span>';
+							}
 
 							return $group_name;
 						},
@@ -253,11 +261,16 @@ 
 
 							// No explicit members for guests and the moderator group.
 							if (in_array($rowData['id_group'], array(-1, 3)))
-								return $txt['membergroups_guests_na'];
+							{
+															return $txt['membergroups_guests_na'];
+							}
 							elseif ($rowData['can_search'])
-								return '<a href="' . $scripturl . '?action=moderate;area=viewgroups;sa=members;group=' . $rowData['id_group'] . '">' . comma_format($rowData['num_members']) . '</a>';
-							else
-								return comma_format($rowData['num_members']);
+							{
+															return '<a href="' . $scripturl . '?action=moderate;area=viewgroups;sa=members;group=' . $rowData['id_group'] . '">' . comma_format($rowData['num_members']) . '</a>';
+							}
+							else {
+															return comma_format($rowData['num_members']);
+							}
 						},
 					),
 					'sort' => array(
@@ -298,7 +311,9 @@ 
 							global $scripturl, $txt;
 
 							if ($rowData['id_group'] != 1)
-								return '<a href="' . $scripturl . '?action=admin;area=permissions;sa=modify;group=' . $rowData['id_group'] . '' . (isset($_pid) ? ';pid=' . $_pid : '') . '">' . $txt['membergroups_modify'] . '</a>';
+							{
+															return '<a href="' . $scripturl . '?action=admin;area=permissions;sa=modify;group=' . $rowData['id_group'] . '' . (isset($_pid) ? ';pid=' . $_pid : '') . '">' . $txt['membergroups_modify'] . '</a>';
+							}
 
 							return '';
 						},
@@ -313,7 +328,9 @@ 
 					'data' => array(
 						'function' => function ($rowData) {
 							if ($rowData['id_group'] != 1)
-								return '<input type="checkbox" name="group[]" value="' . $rowData['id_group'] . '" class="input_check" />';
+							{
+															return '<input type="checkbox" name="group[]" value="' . $rowData['id_group'] . '" class="input_check" />';
+							}
 
 							return '';
 						},
@@ -391,9 +408,12 @@ 
 								global $scripturl;
 
 								if ($rowData['can_search'])
-									return '<a href="' . $scripturl . '?action=moderate;area=viewgroups;sa=members;group=' . $rowData['id_group'] . '">' . comma_format($rowData['num_members']) . '</a>';
-								else
-									return comma_format($rowData['num_members']);
+								{
+																	return '<a href="' . $scripturl . '?action=moderate;area=viewgroups;sa=members;group=' . $rowData['id_group'] . '">' . comma_format($rowData['num_members']) . '</a>';
+								}
+								else {
+																	return comma_format($rowData['num_members']);
+								}
 							},
 						),
 						'sort' => array(
@@ -434,11 +454,14 @@ 
 								global $scripturl, $txt;
 
 								if ($rowData['id_parent'] == -2)
-										return '<a href="' . $scripturl . '?action=admin;area=permissions;sa=modify;group=' . $rowData['id_group'] . (isset($_pid) ? ';pid=' . $_pid : '') . '">' . $txt['membergroups_modify'] . '</a>';
-									else
-										return '<span class="smalltext">' . $txt['permissions_includes_inherited_from'] . '&quot;' . $rowData['parent_name'] . '&quot;</span>
+								{
+																		return '<a href="' . $scripturl . '?action=admin;area=permissions;sa=modify;group=' . $rowData['id_group'] . (isset($_pid) ? ';pid=' . $_pid : '') . '">' . $txt['membergroups_modify'] . '</a>';
+								}
+									else {
+																			return '<span class="smalltext">' . $txt['permissions_includes_inherited_from'] . '&quot;' . $rowData['parent_name'] . '&quot;</span>
 											<br />
 											<a href="' . $scripturl . '?action=admin;area=permissions;sa=modify;group=' . $rowData['id_parent'] . (isset($_pid) ? ';pid=' . $_pid : '') . '">' . $txt['membergroups_modify_parent'] . '</a>';
+									}
 							}
 						),
 					),
@@ -468,7 +491,9 @@ 
 		if (!empty($this->_pid))
 		{
 			if (!isset($context['profiles'][$this->_pid]))
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// Change the selected tab to better reflect that this really is a board profile.
 			$context[$context['admin_menu_name']]['current_subsection'] = 'profiles';
@@ -506,12 +531,16 @@ 
 
 			$changes = array();
 			foreach ($this->_req->post->boardprofile as $board => $profile)
-				$changes[(int) $profile][] = (int) $board;
+			{
+							$changes[(int) $profile][] = (int) $board;
+			}
 
 			if (!empty($changes))
 			{
 				foreach ($changes as $profile => $boards)
-					assignPermissionProfileToBoard($profile, $boards);
+				{
+									assignPermissionProfileToBoard($profile, $boards);
+				}
 			}
 
 			$context['edit_all'] = false;
@@ -524,7 +553,9 @@ 
 		{
 			$js = 'new Array(';
 			foreach ($context['profiles'] as $id => $profile)
-				$js .= '{name: ' . JavaScriptEscape($profile['name']) . ', id: ' . $id . '},';
+			{
+							$js .= '{name: ' . JavaScriptEscape($profile['name']) . ', id: ' . $id . '},';
+			}
 
 			addJavascriptVar(array(
 				'permission_profiles' => substr($js, 0, -1) . ')',
@@ -551,7 +582,9 @@ 
 				$boards[$boardid]['description'] = $bbc_parser->parseBoard($boards[$boardid]['description']);
 
 				if (!isset($context['profiles'][$boards[$boardid]['profile']]))
-					$boards[$boardid]['profile'] = 1;
+				{
+									$boards[$boardid]['profile'] = 1;
+				}
 
 				$context['categories'][$catid]['boards'][$boardid] = array(
 					'id' => &$boards[$boardid]['id'],
@@ -583,14 +616,20 @@ 
 
 		// Make sure only one of the quick options was selected.
 		if ((!empty($this->_req->post->predefined) && ((isset($this->_req->post->copy_from) && $this->_req->post->copy_from !== 'empty') || !empty($this->_req->post->permissions))) || (!empty($this->_req->post->copy_from) && $this->_req->post->copy_from !== 'empty' && !empty($this->_req->post->permissions)))
-			throw new Elk_Exception('permissions_only_one_option', false);
+		{
+					throw new Elk_Exception('permissions_only_one_option', false);
+		}
 
 		if (empty($this->_req->post->group) || !is_array($this->_req->post->group))
-			$this->_req->post->group = array();
+		{
+					$this->_req->post->group = array();
+		}
 
 		// Only accept numeric values for selected membergroups.
 		foreach ($this->_req->post->group as $id => $group_id)
-			$this->_req->post->group[$id] = (int) $group_id;
+		{
+					$this->_req->post->group[$id] = (int) $group_id;
+		}
 		$this->_req->post->group = array_unique($this->_req->post->group);
 
 		$this->_pid = $this->_req->getQuery('pid', 'intval', 0);
@@ -600,28 +639,37 @@ 
 
 		// No modifying the predefined profiles.
 		if ($this->_pid > 1 && $this->_pid < 5)
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Clear out any cached authority.
 		updateSettings(array('settings_updated' => time()));
 
 		// No groups where selected.
 		if (empty($this->_req->post->group))
-			redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+		{
+					redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+		}
 
 		// Set a predefined permission profile.
 		if (!empty($this->_req->post->predefined))
 		{
 			// Make sure it's a predefined permission set we expect.
 			if (!in_array($this->_req->post->predefined, array('restrict', 'standard', 'moderator', 'maintenance')))
-				redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			{
+							redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			}
 
 			foreach ($this->_req->post->group as $group_id)
 			{
 				if (!empty($this->_pid))
-					setPermissionLevel($this->_req->post->predefined, $group_id, $this->_pid);
-				else
-					setPermissionLevel($this->_req->post->predefined, $group_id);
+				{
+									setPermissionLevel($this->_req->post->predefined, $group_id, $this->_pid);
+				}
+				else {
+									setPermissionLevel($this->_req->post->predefined, $group_id);
+				}
 			}
 		}
 		// Set a permission profile based on the permissions of a selected group.
@@ -629,17 +677,23 @@ 
 		{
 			// Just checking the input.
 			if (!is_numeric($this->_req->post->copy_from))
-				redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			{
+							redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			}
 
 			// Make sure the group we're copying to is never included.
 			$this->_req->post->group = array_diff($this->_req->post->group, array($this->_req->post->copy_from));
 
 			// No groups left? Too bad.
 			if (empty($this->_req->post->group))
-				redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			{
+							redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			}
 
 			if (empty($this->_pid))
-				copyPermission($this->_req->post->copy_from, $this->_req->post->group, $this->illegal_permissions, $this->illegal_guest_permissions);
+			{
+							copyPermission($this->_req->post->copy_from, $this->_req->post->group, $this->illegal_permissions, $this->illegal_guest_permissions);
+			}
 
 			// Now do the same for the board permissions.
 			copyBoardPermission($this->_req->post->copy_from, $this->_req->post->group, $bid, $this->illegal_guest_permissions);
@@ -655,14 +709,19 @@ 
 
 			// Check whether our input is within expected range.
 			if (!in_array($this->_req->post->add_remove, array('add', 'clear', 'deny')) || !in_array($permissionType, array('membergroup', 'board')))
-				redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			{
+							redirectexit('action=admin;area=permissions;pid=' . $this->_pid);
+			}
 
 			if ($this->_req->post->add_remove === 'clear')
 			{
 				if ($permissionType === 'membergroup')
-					deletePermission($this->_req->post->group, $permission, $this->illegal_permissions);
-				else
-					deleteBoardPermission($this->_req->post->group, $bid, $permission);
+				{
+									deletePermission($this->_req->post->group, $permission, $this->illegal_permissions);
+				}
+				else {
+									deleteBoardPermission($this->_req->post->group, $bid, $permission);
+				}
 			}
 			// Add a permission (either 'set' or 'deny').
 			else
@@ -672,21 +731,30 @@ 
 				foreach ($this->_req->post->group as $groupID)
 				{
 					if ($groupID == -1 && in_array($permission, $this->illegal_guest_permissions))
-						continue;
+					{
+											continue;
+					}
 
 					if ($permissionType === 'membergroup' && $groupID != 1 && $groupID != 3 && (empty($this->illegal_permissions) || !in_array($permission, $this->illegal_permissions)))
-						$permChange[] = array($permission, $groupID, $add_deny);
+					{
+											$permChange[] = array($permission, $groupID, $add_deny);
+					}
 					elseif ($permissionType !== 'membergroup')
-						$permChange[] = array($permission, $groupID, $add_deny, $bid);
+					{
+											$permChange[] = array($permission, $groupID, $add_deny, $bid);
+					}
 				}
 
 				if (!empty($permChange))
 				{
 					if ($permissionType === 'membergroup')
-						replacePermission($permChange);
+					{
+											replacePermission($permChange);
+					}
 					// Board permissions go into the other table.
-					else
-						replaceBoardPermission($permChange);
+					else {
+											replaceBoardPermission($permChange);
+					}
 				}
 			}
 
@@ -705,14 +773,18 @@ 
 		global $context, $txt;
 
 		if (!isset($this->_req->query->group))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		require_once(SUBSDIR . '/ManagePermissions.subs.php');
 		$context['group']['id'] = (int) $this->_req->query->group;
 
 		// It's not likely you'd end up here with this setting disabled.
 		if ($this->_req->query->group == 1)
-			redirectexit('action=admin;area=permissions');
+		{
+					redirectexit('action=admin;area=permissions');
+		}
 
 		loadAllPermissions();
 		loadPermissionProfiles();
@@ -727,12 +799,17 @@ 
 
 			// Cannot edit an inherited group!
 			if ($parent != -2)
-				throw new Elk_Exception('cannot_edit_permissions_inherited');
+			{
+							throw new Elk_Exception('cannot_edit_permissions_inherited');
+			}
 		}
 		elseif ($context['group']['id'] == -1)
-			$context['group']['name'] = $txt['membergroups_guests'];
-		else
-			$context['group']['name'] = $txt['membergroups_members'];
+		{
+					$context['group']['name'] = $txt['membergroups_guests'];
+		}
+		else {
+					$context['group']['name'] = $txt['membergroups_members'];
+		}
 
 		$context['profile']['id'] = $this->_req->getQuery('pid', 'intval', 0);
 
@@ -763,7 +840,9 @@ 
 
 		// General permissions?
 		if ($context['permission_type'] === 'membergroup')
-			$permissions['membergroup'] = fetchPermissions($this->_req->query->group);
+		{
+					$permissions['membergroup'] = fetchPermissions($this->_req->query->group);
+		}
 
 		// Fetch current board permissions...
 		$permissions['board'] = fetchBoardPermissions($context['group']['id'], $context['permission_type'], $context['profile']['id']);
@@ -785,8 +864,9 @@ 
 							$curPerm['any']['select'] = in_array($perm['id'] . '_any', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_any', $permissions[$permissionType]['denied']) ? 'denied' : 'off');
 							$curPerm['own']['select'] = in_array($perm['id'] . '_own', $permissions[$permissionType]['allowed']) ? 'on' : (in_array($perm['id'] . '_own', $permissions[$permissionType]['denied']) ? 'denied' : 'off');
 						}
-						else
-							$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'denied' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
+						else {
+													$curPerm['select'] = in_array($perm['id'], $permissions[$permissionType]['denied']) ? 'denied' : (in_array($perm['id'], $permissions[$permissionType]['allowed']) ? 'on' : 'off');
+						}
 					}
 				}
 			}
@@ -814,11 +894,15 @@ 
 
 		// Cannot modify predefined profiles.
 		if ($this->_pid > 1 && $this->_pid < 5)
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Verify this isn't inherited.
 		if ($current_group_id == -1 || $current_group_id == 0)
-			$parent = -2;
+		{
+					$parent = -2;
+		}
 		else
 		{
 			require_once(SUBSDIR . '/Membergroups.subs.php');
@@ -827,7 +911,9 @@ 
 		}
 
 		if ($parent != -2)
-			throw new Elk_Exception('cannot_edit_permissions_inherited');
+		{
+					throw new Elk_Exception('cannot_edit_permissions_inherited');
+		}
 
 		$givePerms = array('membergroup' => array(), 'board' => array());
 
@@ -845,11 +931,13 @@ 
 				if (is_array($perm_array))
 				{
 					foreach ($perm_array as $permission => $value)
-						if ($value === 'on' || $value === 'deny')
+					{
+											if ($value === 'on' || $value === 'deny')
 						{
 							// Don't allow people to escalate themselves!
 							if (in_array($permission, $this->illegal_permissions))
 								continue;
+					}
 
 							$givePerms[$perm_type][] = array($permission, $current_group_id, $value === 'deny' ? 0 : 1);
 						}
@@ -863,7 +951,9 @@ 
 			deleteInvalidPermissions($current_group_id, $this->illegal_permissions);
 
 			if (!empty($givePerms['membergroup']))
-				replacePermission($givePerms['membergroup']);
+			{
+							replacePermission($givePerms['membergroup']);
+			}
 		}
 
 		// Insert the boardpermissions.
@@ -873,7 +963,9 @@ 
 		if (!empty($givePerms['board']))
 		{
 			foreach ($givePerms['board'] as $k => $v)
-				$givePerms['board'][$k][] = $profileid;
+			{
+							$givePerms['board'][$k][] = $profileid;
+			}
 			replaceBoardPermission($givePerms['board']);
 		}
 
@@ -918,11 +1010,15 @@ 
 
 			// Clear all deny permissions...if we want that.
 			if (empty($modSettings['permission_enable_deny']))
-				clearDenyPermissions();
+			{
+							clearDenyPermissions();
+			}
 
 			// Make sure there are no postgroup based permissions left.
 			if (empty($modSettings['permission_enable_postgroups']))
-				clearPostgroupPermissions();
+			{
+							clearPostgroupPermissions();
+			}
 
 			redirectexit('action=admin;area=permissions;sa=settings');
 		}
@@ -993,11 +1089,15 @@ 
 
 			// Just showing the boxes?
 			if (!isset($this->_req->post->rename_profile))
-				$context['show_rename_boxes'] = true;
+			{
+							$context['show_rename_boxes'] = true;
+			}
 			else
 			{
 				foreach ($this->_req->post->rename_profile as $id => $name)
-					renamePermissionProfile($id, $name);
+				{
+									renamePermissionProfile($id, $name);
+				}
 			}
 		}
 		// Deleting?
@@ -1008,8 +1108,10 @@ 
 
 			$profiles = array();
 			foreach ($this->_req->post->delete_profile as $profile)
-				if ($profile > 4)
+			{
+							if ($profile > 4)
 					$profiles[] = (int) $profile;
+			}
 
 			deletePermissionProfiles($profiles);
 		}
@@ -1027,7 +1129,9 @@ 
 			// Can't delete special ones.
 			$context['profiles'][$id]['can_edit'] = isset($txt['permissions_profile_' . $profile['unformatted_name']]) ? false : true;
 			if ($context['profiles'][$id]['can_edit'])
-				$context['can_edit_something'] = true;
+			{
+							$context['can_edit_something'] = true;
+			}
 
 			// You can only delete it if you can edit it AND it's not in use.
 			$context['profiles'][$id]['can_delete'] = $context['profiles'][$id]['can_edit'] && empty($profile['in_use']) ? true : false;
@@ -1078,7 +1182,9 @@ 
 		// What are the permissions we are querying?
 		$all_permissions = array();
 		foreach ($mappings as $perm_set)
-			$all_permissions = array_merge($all_permissions, $perm_set);
+		{
+					$all_permissions = array_merge($all_permissions, $perm_set);
+		}
 
 		// If we're saving the changes then do just that - save them.
 		if (!empty($this->_req->post->save_changes) && ($context['current_profile'] == 1 || $context['current_profile'] > 4))
@@ -1104,14 +1210,18 @@ 
 							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
 						}
 						elseif ($temp[$group['id']] === 'moderate')
-							$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
+						{
+													$new_permissions[] = array($context['current_profile'], $group['id'], $data[1], 1);
+						}
 					}
 				}
 			}
 
 			// Insert new permissions.
 			if (!empty($new_permissions))
-				insertBoardPermission($new_permissions);
+			{
+							insertBoardPermission($new_permissions);
+			}
 		}
 
 		// Now get all the permissions!
@@ -1128,10 +1238,14 @@ 
 					{
 						// Full allowance?
 						if ($index == 0)
-							$context['profile_groups'][$id_group][$key] = 'allow';
+						{
+													$context['profile_groups'][$id_group][$key] = 'allow';
+						}
 						// Otherwise only bother with moderate if not on allow.
 						elseif ($context['profile_groups'][$id_group][$key] !== 'allow')
-							$context['profile_groups'][$id_group][$key] = 'moderate';
+						{
+													$context['profile_groups'][$id_group][$key] = 'moderate';
+						}
 					}
 				}
 			}

Spacing +11 added lines, -11 removed lines

@@ -213,7 +213,7 @@ 
 						'value' => $txt['membergroups_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl, $txt;
 
 							// Since the moderator group has no explicit members, no link is needed.
@@ -248,7 +248,7 @@ 
 						'class' => 'grid17',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $scripturl;
 
 							// No explicit members for guests and the moderator group.
@@ -271,7 +271,7 @@ 
 						'class' => 'grid17',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return $rowData['num_permissions']['allowed'];
 						},
 					),
@@ -283,7 +283,7 @@ 
 						'class' => 'grid17',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return $rowData['num_permissions']['denied'];
 						},
 					),
@@ -294,7 +294,7 @@ 
 						'class' => 'grid17',
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($_pid) {
+						'function' => function($rowData) use ($_pid) {
 							global $scripturl, $txt;
 
 							if ($rowData['id_group'] != 1)
@@ -311,7 +311,7 @@ 
 						'style' => 'width:4%;',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							if ($rowData['id_group'] != 1)
 								return '<input type="checkbox" name="group[]" value="' . $rowData['id_group'] . '" class="input_check" />';
 
@@ -357,7 +357,7 @@ 
 							'class' => 'grid25',
 						),
 						'data' => array(
-							'function' => function ($rowData) {
+							'function' => function($rowData) {
 								global $scripturl;
 
 								return sprintf('<a href="%1$s?action=admin;area=permissions;sa=members;group=%2$d">%3$s</a>', $scripturl, $rowData['id_group'], $rowData['group_name_color']);
@@ -387,7 +387,7 @@ 
 							'class' => 'grid10',
 						),
 						'data' => array(
-							'function' => function ($rowData) {
+							'function' => function($rowData) {
 								global $scripturl;
 
 								if ($rowData['can_search'])
@@ -407,7 +407,7 @@ 
 							'class' => 'grid8',
 						),
 						'data' => array(
-							'function' => function ($rowData) {
+							'function' => function($rowData) {
 								return $rowData['num_permissions']['allowed'];
 							},
 						),
@@ -419,7 +419,7 @@ 
 							'class' => 'grid8',
 						),
 						'data' => array(
-							'function' => function ($rowData) {
+							'function' => function($rowData) {
 								return $rowData['num_permissions']['denied'];
 							},
 						),
@@ -430,7 +430,7 @@ 
 							'class' => 'grid17',
 						),
 						'data' => array(
-							'function' => function ($rowData) use ($_pid) {
+							'function' => function($rowData) use ($_pid) {
 								global $scripturl, $txt;
 
 								if ($rowData['id_parent'] == -2)