elkarte / Elkarte

sources/controllers/MergeTopics.controller.php

Braces +39 added lines, -14 removed lines

@@ -73,7 +73,9 @@ 
 		// If we don't know where you are from we know where you go
 		$from = $this->_req->getQuery('from', 'intval', null);
 		if (!isset($from))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		$target_board = $this->_req->getPost('targetboard', 'intval', $board);
 		$context['target_board'] = $target_board;
@@ -84,8 +86,9 @@ 
 			$can_approve_boards = !empty($user_info['mod_cache']['ap']) ? $user_info['mod_cache']['ap'] : boardsAllowedTo('approve_posts');
 			$onlyApproved = $can_approve_boards !== array(0) && !in_array($target_board, $can_approve_boards);
 		}
-		else
-			$onlyApproved = false;
+		else {
+					$onlyApproved = false;
+		}
 
 		// How many topics are on this board?  (used for paging.)
 		require_once(SUBSDIR . '/Topic.subs.php');
@@ -99,7 +102,9 @@ 
 
 		// @todo review: double check the logic
 		if (empty($topic_info) || ($topic_info['id_board'] != $board) || ($onlyApproved && empty($topic_info['approved'])))
-			throw new Elk_Exception('no_board');
+		{
+					throw new Elk_Exception('no_board');
+		}
 
 		// Tell the template a few things..
 		$context['origin_topic'] = $from;
@@ -111,7 +116,9 @@ 
 		$merge_boards = boardsAllowedTo('merge_any');
 
 		if (empty($merge_boards))
-			throw new Elk_Exception('cannot_merge_any', 'user');
+		{
+					throw new Elk_Exception('cannot_merge_any', 'user');
+		}
 
 		// Get a list of boards they can navigate to to merge.
 		require_once(SUBSDIR . '/Boards.subs.php');
@@ -120,7 +127,9 @@ 
 		);
 
 		if (!in_array(0, $merge_boards))
-			$boardListOptions['included_boards'] = $merge_boards;
+		{
+					$boardListOptions['included_boards'] = $merge_boards;
+		}
 		$boards_list = getBoardList($boardListOptions, true);
 		$context['boards'] = array();
 
@@ -137,7 +146,9 @@ 
 		$context['topics'] = mergeableTopics($target_board, $from, $onlyApproved, $this->_req->query->start);
 
 		if (empty($context['topics']) && count($context['boards']) <= 1)
-			throw new Elk_Exception('merge_need_more_topics');
+		{
+					throw new Elk_Exception('merge_need_more_topics');
+		}
 
 		$context['sub_template'] = 'merge';
 	}
@@ -174,15 +185,21 @@ 
 
 		// Handle URLs from action_mergeIndex.
 		if (!empty($this->_req->query->from) && !empty($this->_req->query->to))
-			$topics = array((int) $this->_req->query->from, (int) $this->_req->query->to);
+		{
+					$topics = array((int) $this->_req->query->from, (int) $this->_req->query->to);
+		}
 
 		// If we came from a form, the topic IDs came by post.
 		if (!empty($this->_req->post->topics) && is_array($this->_req->post->topics))
-			$topics = $this->_req->post->topics;
+		{
+					$topics = $this->_req->post->topics;
+		}
 
 		// There's nothing to merge with just one topic...
 		if (empty($topics) || !is_array($topics) || count($topics) == 1)
-			throw new Elk_Exception('merge_need_more_topics');
+		{
+					throw new Elk_Exception('merge_need_more_topics');
+		}
 
 		// Send the topics to the TopicsMerge class
 		$merger = new TopicsMerge($topics);
@@ -206,13 +223,17 @@ 
 
 		// No permissions to merge, your effort ends here
 		if (empty($allowedto_merge_boards))
-			throw new Elk_Exception('cannot_merge_any', 'user');
+		{
+					throw new Elk_Exception('cannot_merge_any', 'user');
+		}
 
 		// Make sure they can see all boards....
 		$query_boards = array('boards' => $merger->boards);
 
 		if (!in_array(0, $allowedto_merge_boards))
-			$query_boards['boards'] = array_merge($query_boards['boards'], $allowedto_merge_boards);
+		{
+					$query_boards['boards'] = array_merge($query_boards['boards'], $allowedto_merge_boards);
+		}
 
 		// Saved in a variable to (potentially) save a query later
 		require_once(SUBSDIR . '/Boards.subs.php');
@@ -224,7 +245,9 @@ 
 		);
 
 		if (!in_array(0, $allowedto_merge_boards))
-			$boardListOptions['included_boards'] = $allowedto_merge_boards;
+		{
+					$boardListOptions['included_boards'] = $allowedto_merge_boards;
+		}
 
 		$context += getBoardList($boardListOptions);
 
@@ -247,7 +270,9 @@ 
 			$context['target_board'] = $this->_req->getQuery('board', 'intval', 0);
 
 			foreach ($merger->topic_data as $id => $topic)
-				$context['topics'][$id]['selected'] = $topic['id'] == $merger->firstTopic;
+			{
+							$context['topics'][$id]['selected'] = $topic['id'] == $merger->firstTopic;
+			}
 
 			$context['page_title'] = $txt['merge'];
 			$context['sub_template'] = 'merge_extra_options';

sources/controllers/Memberlist.controller.php

Braces +84 added lines, -34 removed lines

@@ -51,7 +51,9 @@ 
 		$context['in_search'] = !empty($this->_req->post->search);
 
 		foreach ($context['custom_search_fields'] as $field)
-			$this->_search_fields['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']);
+		{
+					$this->_search_fields['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']);
+		}
 	}
 
 	/**
@@ -165,7 +167,9 @@ 
 
 		// Add in any custom profile columns
 		if (ml_CustomProfile())
-			$context['columns'] += $context['custom_profile_fields']['columns'];
+		{
+					$context['columns'] += $context['custom_profile_fields']['columns'];
+		}
 
 		// The template may appreciate how many columns it needs to display
 		$context['colspan'] = 0;
@@ -196,8 +200,9 @@ 
 				'view_all_members' => array('text' => 'view_all_members', 'image' => 'mlist.png', 'lang' => true, 'url' => $scripturl . '?action=memberlist;sa=all', 'active' => true),
 			);
 		}
-		else
-			$context['memberlist_buttons'] = array();
+		else {
+					$context['memberlist_buttons'] = array();
+		}
 
 		// Make fields available to the template
 		$context['search_fields'] = $this->_search_fields;
@@ -209,17 +214,26 @@ 
 		call_integration_hook('integrate_memberlist_buttons');
 
 		if (!allowedTo('send_email_to_members'))
-			unset($context['columns']['email_address']);
+		{
+					unset($context['columns']['email_address']);
+		}
 		if (isset($context['disabled_fields']['website']))
-			unset($context['columns']['website']);
+		{
+					unset($context['columns']['website']);
+		}
 		if (isset($context['disabled_fields']['posts']))
-			unset($context['columns']['posts']);
+		{
+					unset($context['columns']['posts']);
+		}
 
 		// Jump to the sub action.
 		if (isset($subActions[$context['listing_by']]))
-			$this->{$subActions[$context['listing_by']][1]}();
-		else
-			$this->{$subActions['all'][1]}();
+		{
+					$this->{$subActions[$context['listing_by']][1]}();
+		}
+		else {
+					$this->{$subActions['all'][1]}();
+		}
 	}
 
 	/**
@@ -257,30 +271,39 @@ 
 		{
 			// Maybe there's something cached already.
 			if (!empty($modSettings['memberlist_cache']))
-				$memberlist_cache = Util::unserialize($modSettings['memberlist_cache']);
+			{
+							$memberlist_cache = Util::unserialize($modSettings['memberlist_cache']);
+			}
 
 			// The chunk size for the cached index.
 			$cache_step_size = 500;
 
 			// Only update the cache if something changed or no cache existed yet.
 			if (empty($memberlist_cache) || empty($modSettings['memberlist_updated']) || $memberlist_cache['last_update'] < $modSettings['memberlist_updated'])
-				$memberlist_cache = ml_memberCache($cache_step_size);
+			{
+							$memberlist_cache = ml_memberCache($cache_step_size);
+			}
 
 			$context['num_members'] = $memberlist_cache['num_members'];
 		}
 		// Without cache we need an extra query to get the amount of members.
-		else
-			$context['num_members'] = ml_memberCount();
+		else {
+					$context['num_members'] = ml_memberCount();
+		}
 
 		// Set defaults for sort (real_name)
 		if (!isset($sort) || !isset($context['columns'][$sort]['sort']))
-			$sort = 'real_name';
+		{
+					$sort = 'real_name';
+		}
 
 		// Looking at a specific rolodex letter?
 		if (!is_numeric($start))
 		{
 			if (preg_match('~^[^\'\\\\/]~u', Util::strtolower($start), $match) === 0)
-				throw new Elk_Exception('Hacker?', false);
+			{
+							throw new Elk_Exception('Hacker?', false);
+			}
 
 			$start = ml_alphaStart($match[0]);
 		}
@@ -288,7 +311,9 @@ 
 		// Build out the letter selection link bar
 		$context['letter_links'] = '';
 		for ($i = 97; $i < 123; $i++)
-			$context['letter_links'] .= '<a href="' . $scripturl . '?action=memberlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . chr($i - 32) . '</a> ';
+		{
+					$context['letter_links'] .= '<a href="' . $scripturl . '?action=memberlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . chr($i - 32) . '</a> ';
+		}
 
 		// Sort out the column information.
 		foreach ($context['columns'] as $col => $column_details)
@@ -304,7 +329,9 @@ 
 			$context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>';
 			$context['columns'][$col]['selected'] = $sort == $col;
 			if ($context['columns'][$col]['selected'])
-				$context['columns'][$col]['class'] .= ' selected';
+			{
+							$context['columns'][$col]['class'] .= ' selected';
+			}
 		}
 
 		// Are we sorting the results
@@ -350,7 +377,9 @@ 
 		{
 			$first_offset = floor(($memberlist_cache['num_members'] - $modSettings['defaultMaxMembers'] - $start) / $cache_step_size) * $cache_step_size;
 			if ($first_offset < 0)
-				$first_offset = 0;
+			{
+							$first_offset = 0;
+			}
 			$second_offset = ceil(($memberlist_cache['num_members'] - $start) / $cache_step_size) * $cache_step_size;
 
 			$where = 'mem.real_name BETWEEN {string:real_name_low} AND {string:real_name_high}';
@@ -361,7 +390,9 @@ 
 
 		// Add custom fields parameters too.
 		if (!empty($context['custom_profile_fields']['parameters']))
-			$query_parameters += $context['custom_profile_fields']['parameters'];
+		{
+					$query_parameters += $context['custom_profile_fields']['parameters'];
+		}
 
 		// Select the members from the database.
 		ml_selectMembers($query_parameters, $where, $limit, $sort);
@@ -413,17 +444,23 @@ 
 			foreach ($input_fields as $val)
 			{
 				if (in_array($val, $fields_key))
-					$context['search_defaults'] = $input_fields;
+				{
+									$context['search_defaults'] = $input_fields;
+				}
 			}
 			$context['old_search_value'] = $search;
 
 			// No fields?  Use default...
 			if (empty($input_fields))
-				$input_fields = array('name');
+			{
+							$input_fields = array('name');
+			}
 
 			// Set defaults for how the results are sorted
 			if (!isset($sort) || !isset($context['columns'][$sort]))
-				$sort = 'real_name';
+			{
+							$sort = 'real_name';
+			}
 
 			// Build the column link / sort information.
 			foreach ($context['columns'] as $col => $column_details)
@@ -431,7 +468,9 @@ 
 				$context['columns'][$col]['href'] = $scripturl . '?action=memberlist;sa=search;start=0;sort=' . $col;
 
 				if ((!isset($desc) && $col == $sort) || ($col != $sort && !empty($column_details['default_sort_rev'])))
-					$context['columns'][$col]['href'] .= ';desc';
+				{
+									$context['columns'][$col]['href'] .= ';desc';
+				}
 
 				$context['columns'][$col]['href'] .= ';search=' . $search . ';fields=' . implode(',', $input_fields);
 				$context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>';
@@ -455,17 +494,24 @@ 
 
 			// Search for a name
 			if (in_array('name', $input_fields))
-				$fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
-			else
-				$fields = array();
+			{
+							$fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
+			}
+			else {
+							$fields = array();
+			}
 
 			// Search for websites.
 			if (in_array('website', $input_fields))
-				$fields += array(7 => 'website_title', 'website_url');
+			{
+							$fields += array(7 => 'website_title', 'website_url');
+			}
 
 			// Search for groups.
 			if (in_array('group', $input_fields))
-				$fields += array(9 => 'COALESCE(group_name, {string:blank_string})');
+			{
+							$fields += array(9 => 'COALESCE(group_name, {string:blank_string})');
+			}
 
 			// Search for an email address?
 			if (in_array('email', $input_fields))
@@ -473,8 +519,9 @@ 
 				$fields += array(2 => allowedTo('moderate_forum') ? 'email_address' : '(hide_email = 0 AND email_address');
 				$condition = allowedTo('moderate_forum') ? '' : ')';
 			}
-			else
-				$condition = '';
+			else {
+							$condition = '';
+			}
 
 			if (defined('DB_CASE_SENSITIVE'))
 			{
@@ -517,7 +564,9 @@ 
 			}
 
 			if (empty($fields))
-				redirectexit('action=memberlist');
+			{
+							redirectexit('action=memberlist');
+			}
 
 			$validFields = array_unique($validFields);
 			$query = $search == '' ? '= {string:blank_string}' : (defined('DB_CASE_SENSITIVE') ? 'LIKE LOWER({string:search})' : 'LIKE {string:search}');
@@ -528,8 +577,9 @@ 
 			$context['letter_links'] = '';
 			$context['page_index'] = constructPageIndex($scripturl . '?action=memberlist;sa=search;search=' . $search . ';fields=' . implode(',', $validFields), $start, $numResults, $modSettings['defaultMaxMembers']);
 		}
-		else
-			redirectexit('action=memberlist');
+		else {
+					redirectexit('action=memberlist');
+		}
 
 		$context['linktree'][] = array(
 			'url' => $scripturl . '?action=memberlist;sa=search',

sources/controllers/OpenID.controller.php

Braces +42 added lines, -15 removed lines

@@ -47,15 +47,21 @@ 
 
 		// Is OpenID even enabled?
 		if (empty($modSettings['enableOpenID']))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// The OpenID provider did not respond with the OpenID mode? Throw an error..
 		if (!isset($this->_req->query->openid_mode))
-			throw new Elk_Exception('openid_return_no_mode', false);
+		{
+					throw new Elk_Exception('openid_return_no_mode', false);
+		}
 
 		// @todo Check for error status!
 		if ($this->_req->query->openid_mode !== 'id_res')
-			throw new Elk_Exception('openid_not_resolved');
+		{
+					throw new Elk_Exception('openid_not_resolved');
+		}
 
 		// We'll need our subs.
 		require_once(SUBSDIR . '/OpenID.subs.php');
@@ -73,7 +79,9 @@ 
 
 		// Did they tell us to remove any associations?
 		if (!empty($this->_req->query->openid_invalidate_handle))
-			$openID->removeAssociation($this->_req->query->openid_invalidate_handle);
+		{
+					$openID->removeAssociation($this->_req->query->openid_invalidate_handle);
+		}
 
 		// Get the OpenID server info.
 		$server_info = $openID->getServerInfo($this->_req->query->openid_identity);
@@ -81,20 +89,28 @@ 
 		// Get the association data.
 		$assoc = $openID->getAssociation($server_info['server'], $this->_req->query->openid_assoc_handle, true);
 		if ($assoc === null)
-			throw new Elk_Exception('openid_no_assoc');
+		{
+					throw new Elk_Exception('openid_no_assoc');
+		}
 
 		// Verify the OpenID signature.
 		if (!$this->_verify_string($assoc['secret']))
-			throw new Elk_Exception('openid_sig_invalid', 'critical');
+		{
+					throw new Elk_Exception('openid_sig_invalid', 'critical');
+		}
 
 		if (!isset($_SESSION['openid']['saved_data'][$this->_req->query->t]))
-			throw new Elk_Exception('openid_load_data');
+		{
+					throw new Elk_Exception('openid_load_data');
+		}
 
 		$openid_uri = $_SESSION['openid']['saved_data'][$this->_req->query->t]['openid_uri'];
 		$modSettings['cookieTime'] = $_SESSION['openid']['saved_data'][$this->_req->query->t]['cookieTime'];
 
 		if (empty($openid_uri))
-			throw new Elk_Exception('openid_load_data');
+		{
+					throw new Elk_Exception('openid_load_data');
+		}
 
 		// Any save fields to restore?
 		$openid_save_fields = isset($this->_req->query->sf) ? json_decode(base64_decode($this->_req->query->sf), true) : array();
@@ -127,11 +143,17 @@ 
 			);
 
 			if (isset($this->_req->query->openid_sreg_nickname))
-				$_SESSION['openid']['nickname'] = $this->_req->query->openid_sreg_nickname;
+			{
+							$_SESSION['openid']['nickname'] = $this->_req->query->openid_sreg_nickname;
+			}
 			if (isset($this->_req->query->openid_sreg_email))
-				$_SESSION['openid']['email'] = $this->_req->query->openid_sreg_email;
+			{
+							$_SESSION['openid']['email'] = $this->_req->query->openid_sreg_email;
+			}
 			if (isset($this->_req->query->openid_sreg_dob))
-				$_SESSION['openid']['dob'] = $this->_req->query->openid_sreg_dob;
+			{
+							$_SESSION['openid']['dob'] = $this->_req->query->openid_sreg_dob;
+			}
 
 			// Were we just verifying the registration state?
 			if (isset($this->_req->query->sa) && $this->_req->query->sa === 'register2')
@@ -140,7 +162,9 @@ 
 				if (!empty($openid_save_fields))
 				{
 					foreach ($openid_save_fields as $id => $value)
-						$this->_req->post->{$id} = $value;
+					{
+											$this->_req->post->{$id} = $value;
+					}
 				}
 
 				$controller = new Register_Controller(new Event_Manager());
@@ -148,8 +172,9 @@ 
 				$controller->do_register(true);
 				return null;
 			}
-			else
-				redirectexit('action=register');
+			else {
+							redirectexit('action=register');
+			}
 		}
 		elseif (isset($this->_req->query->sa) && $this->_req->query->sa === 'revalidate' && $user_settings['openid_uri'] == $openid_uri)
 		{
@@ -181,7 +206,9 @@ 
 
 			// Activation required?
 			if (!checkActivation())
-				return false;
+			{
+							return false;
+			}
 
 			// Finally do the login.
 			doLogin();

sources/controllers/MarkRead.controller.php

Braces +54 added lines, -24 removed lines

@@ -123,8 +123,9 @@ 
 
 				return;
 			}
-			else
-				obExit(false);
+			else {
+							obExit(false);
+			}
 		}
 
 		$this->_dispatch();
@@ -138,8 +139,9 @@ 
 			);
 		}
 		// No need to do anything, just die :'(
-		else
-			obExit(false);
+		else {
+					obExit(false);
+		}
 	}
 
 	/**
@@ -200,12 +202,16 @@ 
 
 		$markRead = array();
 		foreach ($topics as $id_topic)
-			$markRead[] = array($user_info['id'], (int) $id_topic, $modSettings['maxMsgID'], (int) !empty($logged_topics[$id_topic]));
+		{
+					$markRead[] = array($user_info['id'], (int) $id_topic, $modSettings['maxMsgID'], (int) !empty($logged_topics[$id_topic]));
+		}
 
 		markTopicsRead($markRead, true);
 
 		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		{
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		return 'action=unreadreplies';
 	}
@@ -231,17 +237,24 @@ 
 		{
 			// If they read the whole topic, go back to the beginning.
 			if ($topic_msg_id >= $topicinfo['id_last_msg'])
-				$earlyMsg = 0;
+			{
+							$earlyMsg = 0;
+			}
 			// If they want to mark the whole thing read, same.
 			elseif ($topic_msg_id <= $topicinfo['id_first_msg'])
-				$earlyMsg = 0;
+			{
+							$earlyMsg = 0;
+			}
 			// Otherwise, get the latest message before the named one.
-			else
-				$earlyMsg = previousMessage($topic_msg_id, $topic);
+			else {
+							$earlyMsg = previousMessage($topic_msg_id, $topic);
+			}
 		}
 		// Marking read from first page?  That's the whole topic.
 		elseif ($this->_req->query->start == 0)
-			$earlyMsg = 0;
+		{
+					$earlyMsg = 0;
+		}
 		else
 		{
 			list ($earlyMsg) = messageAt((int) $this->_req->query->start, $topic);
@@ -280,7 +293,9 @@ 
 		}
 
 		if (!empty($board))
-			$boards[] = (int) $board;
+		{
+					$boards[] = (int) $board;
+		}
 
 		if (isset($this->_req->query->children) && !empty($boards))
 		{
@@ -291,7 +306,9 @@ 
 		$boards = array_keys(boardsPosts($boards, $categories));
 
 		if (empty($boards))
-			return '';
+		{
+					return '';
+		}
 
 		// Mark boards as read.
 		markBoardsRead($boards, isset($this->_req->query->unread), true);
@@ -299,7 +316,9 @@ 
 		foreach ($boards as $b)
 		{
 			if (isset($_SESSION['topicseen_cache'][$b]))
-				$_SESSION['topicseen_cache'][$b] = array();
+			{
+							$_SESSION['topicseen_cache'][$b] = array();
+			}
 		}
 
 		$this->_querystring_board_limits = $this->_req->getQuery('sa') === 'board' ? ';boards=' . implode(',', $boards) . ';start=%d' : '';
@@ -315,29 +334,40 @@ 
 
 		// The default is the most logical: newest first.
 		if (!isset($this->_req->query->sort) || !in_array($this->_req->query->sort, $sort_methods))
-			$this->_querystring_sort_limits = isset($this->_req->query->asc) ? ';asc' : '';
+		{
+					$this->_querystring_sort_limits = isset($this->_req->query->asc) ? ';asc' : '';
+		}
 		// But, for other methods the default sort is ascending.
-		else
-			$this->_querystring_sort_limits = ';sort=' . $this->_req->query->sort . (isset($this->_req->query->desc) ? ';desc' : '');
+		else {
+					$this->_querystring_sort_limits = ';sort=' . $this->_req->query->sort . (isset($this->_req->query->desc) ? ';desc' : '');
+		}
 
 		if (!isset($this->_req->query->unread))
 		{
 			// Find all boards with the parents in the board list
 			$boards_to_add = accessibleBoards(null, $boards);
 			if (!empty($boards_to_add))
-				markBoardsRead($boards_to_add);
+			{
+							markBoardsRead($boards_to_add);
+			}
 
 			if (empty($board))
-				return '';
-			else
-				return 'board=' . $board . '.0';
+			{
+							return '';
+			}
+			else {
+							return 'board=' . $board . '.0';
+			}
 		}
 		else
 		{
 			if (empty($board_info['parent']))
-				return '';
-			else
-				return 'board=' . $board_info['parent'] . '.0';
+			{
+							return '';
+			}
+			else {
+							return 'board=' . $board_info['parent'] . '.0';
+			}
 		}
 	}
 }
\ No newline at end of file

sources/controllers/ProfileInfo.controller.php

Braces +90 added lines, -36 removed lines

@@ -51,13 +51,17 @@ 
 		$this->_memID = currentMemberID();
 
 		if (!isset($context['user']['is_owner']))
-			$context['user']['is_owner'] = (int) $this->_memID === (int) $user_info['id'];
+		{
+					$context['user']['is_owner'] = (int) $this->_memID === (int) $user_info['id'];
+		}
 
 		loadLanguage('Profile');
 
 		// Attempt to load the member's profile data.
 		if (!loadMemberContext($this->_memID) || !isset($memberContext[$this->_memID]))
-			throw new Elk_Exception('not_a_user', false);
+		{
+					throw new Elk_Exception('not_a_user', false);
+		}
 	}
 
 	/**
@@ -469,14 +473,20 @@ 
 
 		// Is the load average too high to allow searching just now?
 		if (!empty($modSettings['loadavg_show_posts']) && $modSettings['current_load'] >= $modSettings['loadavg_show_posts'])
-			throw new Elk_Exception('loadavg_show_posts_disabled', false);
+		{
+					throw new Elk_Exception('loadavg_show_posts_disabled', false);
+		}
 
 		// If we're specifically dealing with attachments use that function!
 		if ($action === 'attach')
-			return $this->action_showAttachments();
+		{
+					return $this->action_showAttachments();
+		}
 		// Instead, if we're dealing with unwatched topics (and the feature is enabled) use that other function.
 		elseif ($action === 'unwatchedtopics' && $modSettings['enable_unwatch'])
-			return $this->action_showUnwatched();
+		{
+					return $this->action_showUnwatched();
+		}
 
 		// Are we just viewing topics?
 		$context['is_topics'] = $action === 'topics' ? true : false;
@@ -495,9 +505,12 @@ 
 		}
 
 		if ($context['is_topics'])
-			$msgCount = count_user_topics($this->_memID, $board);
-		else
-			$msgCount = count_user_posts($this->_memID, $board);
+		{
+					$msgCount = count_user_topics($this->_memID, $board);
+		}
+		else {
+					$msgCount = count_user_posts($this->_memID, $board);
+		}
 
 		list ($min_msg_member, $max_msg_member) = findMinMaxUserMessage($this->_memID, $board);
 		$range_limit = '';
@@ -527,15 +540,19 @@ 
 				$margin *= 5;
 				$range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin);
 			}
-			else
-				$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
+			else {
+							$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
+			}
 		}
 
 		// Find this user's posts or topics started
 		if ($context['is_topics'])
-			$rows = load_user_topics($this->_memID, $start, $maxIndex, $range_limit, $reverse, $board);
-		else
-			$rows = load_user_posts($this->_memID, $start, $maxIndex, $range_limit, $reverse, $board);
+		{
+					$rows = load_user_topics($this->_memID, $start, $maxIndex, $range_limit, $reverse, $board);
+		}
+		else {
+					$rows = load_user_posts($this->_memID, $start, $maxIndex, $range_limit, $reverse, $board);
+		}
 
 		// Start counting at the number of the first message displayed.
 		$counter = $reverse ? $context['start'] + $maxIndex + 1 : $context['start'];
@@ -613,17 +630,22 @@ 
 			);
 
 			if ($user_info['id'] == $row['id_member_started'])
-				$board_ids['own'][$row['id_board']][] = $counter;
+			{
+							$board_ids['own'][$row['id_board']][] = $counter;
+			}
 			$board_ids['any'][$row['id_board']][] = $counter;
 		}
 
 		// All posts were retrieved in reverse order, get them right again.
 		if ($reverse)
-			$context['posts'] = array_reverse($context['posts'], true);
+		{
+					$context['posts'] = array_reverse($context['posts'], true);
+		}
 
 		// These are all the permissions that are different from board to board..
 		if ($context['is_topics'])
-			$permissions = array(
+		{
+					$permissions = array(
 				'own' => array(
 					'post_reply_own' => 'can_reply',
 				),
@@ -632,8 +654,9 @@ 
 					'mark_any_notify' => 'can_mark_notify',
 				)
 			);
-		else
-			$permissions = array(
+		}
+		else {
+					$permissions = array(
 				'own' => array(
 					'post_reply_own' => 'can_reply',
 					'delete_own' => 'can_delete',
@@ -644,6 +667,7 @@ 
 					'delete_any' => 'can_delete',
 				)
 			);
+		}
 
 		// For every permission in the own/any lists...
 		foreach ($permissions as $type => $list)
@@ -655,18 +679,24 @@ 
 
 				// Hmm, they can do it on all boards, can they?
 				if (!empty($boards) && $boards[0] == 0)
-					$boards = array_keys($board_ids[$type]);
+				{
+									$boards = array_keys($board_ids[$type]);
+				}
 
 				// Now go through each board they can do the permission on.
 				foreach ($boards as $board_id)
 				{
 					// There aren't any posts displayed from this board.
 					if (!isset($board_ids[$type][$board_id]))
-						continue;
+					{
+											continue;
+					}
 
 					// Set the permission to true ;).
 					foreach ($board_ids[$type][$board_id] as $counter)
-						$context['posts'][$counter]['tests'][$allowed] = true;
+					{
+											$context['posts'][$counter]['tests'][$allowed] = true;
+					}
 				}
 			}
 		}
@@ -692,7 +722,9 @@ 
 
 		// Make sure we can't actually see anything...
 		if (empty($boardsAllowed))
-			$boardsAllowed = array(-1);
+		{
+					$boardsAllowed = array(-1);
+		}
 
 		// This is all the information required to list attachments.
 		$listOptions = array(
@@ -742,9 +774,12 @@ 
 							global $scripturl;
 
 							if ($rowData['is_image'] && !empty($rowData['id_thumb']))
-								return '<img src="' . $scripturl . '?action=dlattach;attach=' . $rowData['id_thumb'] . ';image" />';
-							else
-								return '<img src="' . $scripturl . '?action=dlattach;attach=' . $rowData['id'] . ';thumb" />';
+							{
+															return '<img src="' . $scripturl . '?action=dlattach;attach=' . $rowData['id_thumb'] . ';image" />';
+							}
+							else {
+															return '<img src="' . $scripturl . '?action=dlattach;attach=' . $rowData['id'] . ';thumb" />';
+							}
 						},
 						'class' => 'centertext recent_attachments',
 					),
@@ -812,7 +847,9 @@ 
 
 		// Only the owner can see the list (if the function is enabled of course)
 		if ($user_info['id'] != $this->_memID || !$modSettings['enable_unwatch'])
-			return;
+		{
+					return;
+		}
 
 		// And here they are: the topics you don't like
 		$listOptions = array(
@@ -928,7 +965,9 @@ 
 
 		// Is the load average too high to allow searching just now?
 		if (!empty($modSettings['loadavg_userstats']) && $modSettings['current_load'] >= $modSettings['loadavg_userstats'])
-			throw new Elk_Exception('loadavg_userstats_disabled', false);
+		{
+					throw new Elk_Exception('loadavg_userstats_disabled', false);
+		}
 
 		loadTemplate('ProfileInfo');
 
@@ -999,9 +1038,12 @@ 
 
 		// Determine which groups this user is in.
 		if (empty($user_profile[$this->_memID]['additional_groups']))
-			$curGroups = array();
-		else
-			$curGroups = explode(',', $user_profile[$this->_memID]['additional_groups']);
+		{
+					$curGroups = array();
+		}
+		else {
+					$curGroups = explode(',', $user_profile[$this->_memID]['additional_groups']);
+		}
 
 		$curGroups[] = $user_profile[$this->_memID]['id_group'];
 		$curGroups[] = $user_profile[$this->_memID]['id_post_group'];
@@ -1015,13 +1057,16 @@ 
 		foreach ($board_list as $row)
 		{
 			if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod'])
-				$context['no_access_boards'][] = array(
+			{
+							$context['no_access_boards'][] = array(
 					'id' => $row['id_board'],
 					'name' => $row['board_name'],
 					'is_last' => false,
 				);
+			}
 			elseif ($row['id_profile'] != 1 || $row['is_mod'])
-				$context['boards'][$row['id_board']] = array(
+			{
+							$context['boards'][$row['id_board']] = array(
 					'id' => $row['id_board'],
 					'name' => $row['board_name'],
 					'url' => $scripturl, '?board=', $row['id_board'], '.0',
@@ -1029,10 +1074,13 @@ 
 					'profile' => $row['id_profile'],
 					'profile_name' => $context['profiles'][$row['id_profile']]['name'],
 				);
+			}
 		}
 
 		if (!empty($context['no_access_boards']))
-			$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+		{
+					$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+		}
 
 		$context['member']['permissions'] = array(
 			'general' => array(),
@@ -1042,7 +1090,9 @@ 
 		// If you're an admin we know you can do everything, we might as well leave.
 		$context['member']['has_all_permissions'] = in_array(1, $curGroups);
 		if ($context['member']['has_all_permissions'])
-			return;
+		{
+					return;
+		}
 
 		// Get all general permissions for the groups this member is in
 		$context['member']['permissions']['general'] = getMemberGeneralPermissions($curGroups);
@@ -1060,7 +1110,9 @@ 
 
 		// Firstly, can we actually even be here?
 		if (!allowedTo('issue_warning') && (empty($modSettings['warning_show']) || ($modSettings['warning_show'] == 1 && !$context['user']['is_owner'])))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		loadTemplate('ProfileInfo');
 
@@ -1154,7 +1206,9 @@ 
 		foreach ($context['level_effects'] as $limit => $dummy)
 		{
 			if ($context['member']['warning'] >= $limit)
-				$context['current_level'] = $limit;
+			{
+							$context['current_level'] = $limit;
+			}
 		}
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -715,7 +715,7 @@ 
 				),
 			),
 			'data_check' => array(
-				'class' => function ($data) {
+				'class' => function($data) {
 					return $data['approved'] ? '' : 'approvebg';
 				},
 			),
@@ -738,7 +738,7 @@ 
 						'value' => '',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							if ($rowData['is_image'] && !empty($rowData['id_thumb']))

sources/controllers/Reminder.controller.php

Braces +66 added lines, -24 removed lines

@@ -85,12 +85,16 @@ 
 
 		// You must enter a username/email address.
 		if (empty($where))
-			throw new Elk_Exception('username_no_exist', false);
+		{
+					throw new Elk_Exception('username_no_exist', false);
+		}
 
 		// Make sure we are not being slammed
 		// Don't call this if you're coming from the "Choose a reminder type" page - otherwise you'll likely get an error
 		if (!isset($this->_req->post->reminder_type) || !in_array($this->_req->post->reminder_type, array('email', 'secret')))
-			spamProtection('remind');
+		{
+					spamProtection('remind');
+		}
 
 		// Find this member
 		$member = findUser($where, $where_params);
@@ -102,15 +106,20 @@ 
 		{
 			// Awaiting approval...
 			if (trim($member['validation_code']) === '')
-				throw new Elk_Exception($txt['registration_not_approved'] . ' <a class="linkbutton" href="' . $scripturl . '?action=register;sa=activate;user=' . $this->_req->post->user . '">' . $txt['here'] . '</a>.', false);
-			else
-				throw new Elk_Exception($txt['registration_not_activated'] . ' <a class="linkbutton" href="' . $scripturl . '?action=register;sa=activate;user=' . $this->_req->post->user . '">' . $txt['here'] . '</a>.', false);
+			{
+							throw new Elk_Exception($txt['registration_not_approved'] . ' <a class="linkbutton" href="' . $scripturl . '?action=register;sa=activate;user=' . $this->_req->post->user . '">' . $txt['here'] . '</a>.', false);
+			}
+			else {
+							throw new Elk_Exception($txt['registration_not_activated'] . ' <a class="linkbutton" href="' . $scripturl . '?action=register;sa=activate;user=' . $this->_req->post->user . '">' . $txt['here'] . '</a>.', false);
+			}
 		}
 
 		// You can't get emailed if you have no email address.
 		$member['email_address'] = trim($member['email_address']);
 		if ($member['email_address'] === '')
-			throw new Elk_Exception($txt['no_reminder_email'] . '<br />' . $txt['send_email'] . ' <a href="mailto:' . $webmaster_email . '">webmaster</a> ' . $txt['to_ask_password'] . '.');
+		{
+					throw new Elk_Exception($txt['no_reminder_email'] . '<br />' . $txt['send_email'] . ' <a href="mailto:' . $webmaster_email . '">webmaster</a> ' . $txt['to_ask_password'] . '.');
+		}
 
 		// If they have no secret question then they can only get emailed the item, or they are requesting the email, send them an email.
 		if (empty($member['secret_question'])
@@ -149,7 +158,9 @@ 
 		}
 		// Otherwise are ready to answer the question?
 		elseif (isset($this->_req->post->reminder_type) && $this->_req->post->reminder_type === 'secret')
-			return secretAnswerInput();
+		{
+					return secretAnswerInput();
+		}
 
 		// No we're here setup the context for template number 2!
 		createToken('remind');
@@ -173,7 +184,9 @@ 
 
 		// You need a code!
 		if (!isset($this->_req->query->code))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Fill the context array.
 		$context += array(
@@ -203,13 +216,19 @@ 
 		validateToken('remind-sp');
 
 		if (empty($this->_req->post->u) || !isset($this->_req->post->passwrd1, $this->_req->post->passwrd2))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		if ($this->_req->post->passwrd1 != $this->_req->post->passwrd2)
-			throw new Elk_Exception('passwords_dont_match', false);
+		{
+					throw new Elk_Exception('passwords_dont_match', false);
+		}
 
 		if ($this->_req->post->passwrd1 === '')
-			throw new Elk_Exception('no_password', false);
+		{
+					throw new Elk_Exception('no_password', false);
+		}
 
 		$member_id = $this->_req->getPost('u', 'intval', -1);
 		$code = $this->_req->getPost('code', 'trim', '');
@@ -222,7 +241,9 @@ 
 
 		// Does this user exist at all? Is he activated? Does he have a validation code?
 		if (empty($member) || $member['is_activated'] != 1 || $member['validation_code'] === '')
-			throw new Elk_Exception('invalid_userid', false);
+		{
+					throw new Elk_Exception('invalid_userid', false);
+		}
 
 		// Is the password actually valid to the forums rules?
 		require_once(SUBSDIR . '/Auth.subs.php');
@@ -230,7 +251,9 @@ 
 
 		// What - it's not?
 		if ($passwordError !== null)
-			throw new Elk_Exception('profile_error_password_' . $passwordError, false);
+		{
+					throw new Elk_Exception('profile_error_password_' . $passwordError, false);
+		}
 
 		// Quit if this code is not right.
 		if (empty($code) || $member['validation_code'] !== substr(hash('sha256', $code), 0, 10))
@@ -249,9 +272,12 @@ 
 		$sha_passwd = $this->_req->post->passwrd1;
 		require_once(SUBSDIR . '/Members.subs.php');
 		if (isset($this->_req->post->otp))
-			updateMemberData($member_id, array('validation_code' => '', 'passwd' => validateLoginPassword($sha_passwd, '', $member['member_name'], true), 'enable_otp' => 0));
-		else
-			updateMemberData($member_id, array('validation_code' => '', 'passwd' => validateLoginPassword($sha_passwd, '', $member['member_name'], true)));
+		{
+					updateMemberData($member_id, array('validation_code' => '', 'passwd' => validateLoginPassword($sha_passwd, '', $member['member_name'], true), 'enable_otp' => 0));
+		}
+		else {
+					updateMemberData($member_id, array('validation_code' => '', 'passwd' => validateLoginPassword($sha_passwd, '', $member['member_name'], true)));
+		}
 
 		call_integration_hook('integrate_reset_pass', array($member['member_name'], $member['member_name'], $this->_req->post->passwrd1));
 
@@ -281,7 +307,9 @@ 
 
 		// Hacker?  How did you get this far without an email or username?
 		if (empty($this->_req->post->uid))
-			throw new Elk_Exception('username_no_exist', false);
+		{
+					throw new Elk_Exception('username_no_exist', false);
+		}
 
 		loadLanguage('Login');
 
@@ -289,7 +317,9 @@ 
 		require_once(SUBSDIR . '/Members.subs.php');
 		$member = getBasicMemberData((int) $this->_req->post->uid, array('authentication' => true));
 		if (empty($member))
-			throw new Elk_Exception('username_no_exist', false);
+		{
+					throw new Elk_Exception('username_no_exist', false);
+		}
 
 		// Check if the secret answer is correct.
 		if ($member['secret_question'] === '' || $member['secret_answer'] === '' || md5($this->_req->post->secret_answer) !== $member['secret_answer'])
@@ -308,11 +338,15 @@ 
 
 		// You can't use a blank one!
 		if (strlen(trim($this->_req->post->passwrd1)) === 0)
-			throw new Elk_Exception('no_password', false);
+		{
+					throw new Elk_Exception('no_password', false);
+		}
 
 		// They have to be the same too.
 		if ($this->_req->post->passwrd1 != $this->_req->post->passwrd2)
-			throw new Elk_Exception('passwords_dont_match', false);
+		{
+					throw new Elk_Exception('passwords_dont_match', false);
+		}
 
 		// Make sure they have a strong enough password.
 		require_once(SUBSDIR . '/Auth.subs.php');
@@ -320,7 +354,9 @@ 
 
 		// Invalid?
 		if ($passwordError !== null)
-			throw new Elk_Exception('profile_error_password_' . $passwordError, false);
+		{
+					throw new Elk_Exception('profile_error_password_' . $passwordError, false);
+		}
 
 		// Alright, so long as 'yer sure.
 		require_once(SUBSDIR . '/Auth.subs.php');
@@ -360,19 +396,25 @@ 
 
 	// Check they entered something...
 	if (empty($_POST['uid']))
-		throw new Elk_Exception('username_no_exist', false);
+	{
+			throw new Elk_Exception('username_no_exist', false);
+	}
 
 	// Get the stuff....
 	require_once(SUBSDIR . '/Members.subs.php');
 	$member = getBasicMemberData((int) $_POST['uid'], array('authentication' => true));
 	if (empty($member))
-		throw new Elk_Exception('username_no_exist', false);
+	{
+			throw new Elk_Exception('username_no_exist', false);
+	}
 
 	$context['account_type'] = !empty($member['openid_uri']) ? 'openid' : 'password';
 
 	// If there is NO secret question - then throw an error.
 	if (trim($member['secret_question']) === '')
-		throw new Elk_Exception('registration_no_secret_question', false);
+	{
+			throw new Elk_Exception('registration_no_secret_question', false);
+	}
 
 	// Ask for the answer...
 	$context['remind_user'] = $member['id_member'];

sources/controllers/ProfileSubscriptions.controller.php

Braces +33 added lines, -12 removed lines

@@ -80,12 +80,16 @@ 
 			$this->_gateways[$id] = new $gateway['display_class']();
 
 			if (!$this->_gateways[$id]->gatewayEnabled())
-				unset($this->_gateways[$id]);
+			{
+							unset($this->_gateways[$id]);
+			}
 		}
 
 		// No gateways yet, no way to pay then, blame the admin !
 		if (empty($this->_gateways))
-			throw new Elk_Exception($txt['paid_admin_not_setup_gateway']);
+		{
+					throw new Elk_Exception($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Get the members current subscriptions.
 		$context['current'] = loadMemberSubscriptions($memID, $context['subscriptions']);
@@ -94,18 +98,25 @@ 
 		foreach ($context['current'] as $id => $current)
 		{
 			if ($current['status'] == 1)
-				$context['subscriptions'][$id]['subscribed'] = true;
+			{
+							$context['subscriptions'][$id]['subscribed'] = true;
+			}
 		}
 
 		// Simple "done"?
 		if (isset($this->_req->query->done))
-			$this->_orderDone($memID);
+		{
+					$this->_orderDone($memID);
+		}
 		// They have selected a subscription to order.
 		elseif (isset($this->_req->query->confirm) && isset($this->_req->post->sub_id) && is_array($this->_req->post->sub_id))
-			$this->_confirmOrder($memID);
+		{
+					$this->_confirmOrder($memID);
+		}
 		// Show the users whats available and what they have
-		else
-			$context['sub_template'] = 'user_subscription';
+		else {
+					$context['sub_template'] = 'user_subscription';
+		}
 	}
 
 	/**
@@ -214,7 +225,9 @@ 
 
 		// Hopefully just one, if not we use the last one.
 		foreach ($this->_req->post->sub_id as $k => $v)
-			$this->_id_sub = (int) $k;
+		{
+					$this->_id_sub = (int) $k;
+		}
 
 		// Selecting a subscription that does not exist or is not active?
 		if (!isset($this->_id_sub, $context['subscriptions'][$this->_id_sub]) || $context['subscriptions'][$this->_id_sub]['active'] == 0)
@@ -250,7 +263,9 @@ 
 
 		// No active payment gateways, then no way to pay, time to bail out, blame the admin
 		if (empty($context['gateways']))
-			throw new Elk_Exception($txt['paid_admin_not_setup_gateway']);
+		{
+					throw new Elk_Exception($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Now we are going to assume they want to take this out ;)
 		$new_data = array($this->_order['id'], $context['value'], $period, 'prepay');
@@ -261,18 +276,24 @@ 
 			// What are the details like?
 			$current_pending = array();
 			if ($context['current'][$this->_order['id']]['pending_details'] != '')
-				$current_pending = Util::unserialize($context['current'][$this->_order['id']]['pending_details']);
+			{
+							$current_pending = Util::unserialize($context['current'][$this->_order['id']]['pending_details']);
+			}
 
 			// Don't get silly.
 			if (count($current_pending) > 9)
-				$current_pending = array();
+			{
+							$current_pending = array();
+			}
 
 			// Only record real pending payments as will otherwise confuse the admin!
 			$pending_count = 0;
 			foreach ($current_pending as $pending)
 			{
 				if (trim($pending[3]) === 'payback')
-					$pending_count++;
+				{
+									$pending_count++;
+				}
 			}
 
 			// If its already pending, don't increase the pending count

sources/controllers/MessageIndex.controller.php

Braces +102 added lines, -39 removed lines

@@ -171,7 +171,9 @@ 
 		{
 			// Don't index a sort result etc.
 			if (!in_array($k, array('board', 'start', $session_name)))
-				$context['robot_no_index'] = true;
+			{
+							$context['robot_no_index'] = true;
+			}
 		}
 
 		if (!empty($this->_req->query->start) && (!is_numeric($this->_req->query->start) || $this->_req->query->start % $context['messages_per_page'] != 0))
@@ -202,9 +204,12 @@ 
 
 		// Make sure the starting place makes sense and construct the page index.
 		if (isset($this->_req->query->sort))
-			$sort_string = ';sort=' . $this->_req->query->sort . (isset($this->_req->query->desc) ? ';desc' : '');
-		else
-			$sort_string = '';
+		{
+					$sort_string = ';sort=' . $this->_req->query->sort . (isset($this->_req->query->desc) ? ';desc' : '');
+		}
+		else {
+					$sort_string = '';
+		}
 
 		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d' . $sort_string, $this->_req->query->start, $board_info['total_topics'], $maxindex, true);
 		$context['start'] = &$this->_req->query->start;
@@ -234,7 +239,9 @@ 
 		if (!empty($board_info['moderators']))
 		{
 			foreach ($board_info['moderators'] as $mod)
-				$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+			{
+							$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+			}
 		}
 
 		// Mark current and parent boards as seen.
@@ -249,8 +256,9 @@ 
 				$board_list = array_keys($board_info['parent_boards']);
 				$board_list[] = $board;
 			}
-			else
-				$board_list = array($board);
+			else {
+							$board_list = array($board);
+			}
 
 			// Mark boards as read. Boards alone, no need for topics.
 			markBoardsRead($board_list, false, false);
@@ -276,8 +284,9 @@ 
 			// From now on, they've seen it. So we reset notifications.
 			$context['is_marked_notify'] = resetSentBoardNotification($user_info['id'], $board);
 		}
-		else
-			$context['is_marked_notify'] = false;
+		else {
+					$context['is_marked_notify'] = false;
+		}
 
 		// 'Print' the header and board info.
 		$context['page_title'] = strip_tags($board_info['name']);
@@ -357,8 +366,9 @@ 
 			$maxindex = $board_info['total_topics'] < $start + $maxindex + 1 ? $board_info['total_topics'] - $start : $maxindex;
 			$start = $board_info['total_topics'] < $start + $maxindex + 1 ? 0 : $board_info['total_topics'] - $start - $maxindex;
 		}
-		else
-			$fake_ascending = false;
+		else {
+					$fake_ascending = false;
+		}
 
 		$context['topics'] = array();
 
@@ -383,7 +393,9 @@ 
 
 		// Fix the sequence of topics if they were retrieved in the wrong order. (for speed reasons...)
 		if ($fake_ascending)
-			$context['topics'] = array_reverse($context['topics'], true);
+		{
+					$context['topics'] = array_reverse($context['topics'], true);
+		}
 
 		$topic_ids = array_keys($context['topics']);
 
@@ -438,10 +450,13 @@ 
 
 			// Can we use quick moderation checkboxes?
 			if ($options['display_quick_mod'] == 1)
-				$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+			{
+							$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
+			}
 			// Or the icons?
-			else
-				$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+			else {
+							$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
+			}
 		}
 
 		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
@@ -451,7 +466,9 @@ 
 		}
 
 		if (!empty($context['boards']) && $context['start'] == 0)
-			$template_layers->add('display_child_boards');
+		{
+					$template_layers->add('display_child_boards');
+		}
 
 		// If there are children, but no topics and no ability to post topics...
 		$context['no_topic_listing'] = !empty($context['boards']) && empty($context['topics']) && !$context['can_post_new'];
@@ -471,13 +488,15 @@ 
 
 		// They can only mark read if they are logged in and it's enabled!
 		if (!$user_info['is_guest'] && $settings['show_mark_read'])
-			$context['normal_buttons']['markread'] = array(
+		{
+					$context['normal_buttons']['markread'] = array(
 				'text' => 'mark_read_short',
 				'image' => 'markread.png',
 				'lang' => true,
 				'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id'],
 				'custom' => 'onclick="return markboardreadButton(this);"'
 			);
+		}
 
 		// Allow adding new buttons easily.
 		call_integration_hook('integrate_messageindex_buttons');
@@ -497,10 +516,14 @@ 
 
 		// Lets go straight to the restore area.
 		if ($this->_req->getPost('qaction') === 'restore' && !empty($this->_req->post->topics))
-			redirectexit('action=restoretopic;topics=' . implode(',', $this->_req->post->topics) . ';' . $context['session_var'] . '=' . $context['session_id']);
+		{
+					redirectexit('action=restoretopic;topics=' . implode(',', $this->_req->post->topics) . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
 		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		{
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		// This is going to be needed to send off the notifications and for updateLastMessages().
 		require_once(SUBSDIR . '/Post.subs.php');
@@ -547,19 +570,33 @@ 
 		}
 
 		if (!$user_info['is_guest'])
-			$possibleActions[] = 'markread';
+		{
+					$possibleActions[] = 'markread';
+		}
 		if (!empty($boards_can['make_sticky']))
-			$possibleActions[] = 'sticky';
+		{
+					$possibleActions[] = 'sticky';
+		}
 		if (!empty($boards_can['move_any']) || !empty($boards_can['move_own']))
-			$possibleActions[] = 'move';
+		{
+					$possibleActions[] = 'move';
+		}
 		if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own']))
-			$possibleActions[] = 'remove';
+		{
+					$possibleActions[] = 'remove';
+		}
 		if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own']))
-			$possibleActions[] = 'lock';
+		{
+					$possibleActions[] = 'lock';
+		}
 		if (!empty($boards_can['merge_any']))
-			$possibleActions[] = 'merge';
+		{
+					$possibleActions[] = 'merge';
+		}
 		if (!empty($boards_can['approve_posts']))
-			$possibleActions[] = 'approve';
+		{
+					$possibleActions[] = 'approve';
+		}
 
 		// Two methods: $_REQUEST['actions'] (id_topic => action), and $_REQUEST['topics'] and $this->_req->post->qaction.
 		// (if action is 'move', $_REQUEST['move_to'] or $_REQUEST['move_tos'][$topic] is used.)
@@ -567,14 +604,18 @@ 
 		{
 			// If the action isn't valid, just quit now.
 			if (empty($this->_req->post->qaction) || !in_array($this->_req->post->qaction, $possibleActions))
-				redirectexit($redirect_url);
+			{
+							redirectexit($redirect_url);
+			}
 
 			// Merge requires all topics as one parameter and can be done at once.
 			if ($this->_req->post->qaction === 'merge')
 			{
 				// Merge requires at least two topics.
 				if (empty($this->_req->post->topics) || count($this->_req->post->topics) < 2)
-					redirectexit($redirect_url);
+				{
+									redirectexit($redirect_url);
+				}
 
 				$controller = new MergeTopics_Controller(new Event_Manager());
 				$controller->pre_dispatch();
@@ -583,7 +624,9 @@ 
 
 			// Just convert to the other method, to make it easier.
 			foreach ($this->_req->post->topics as $topic)
-				$actions[(int) $topic] = $this->_req->post->qaction;
+			{
+							$actions[(int) $topic] = $this->_req->post->qaction;
+			}
 		}
 		else
 		{
@@ -592,7 +635,9 @@ 
 
 		// Weird... how'd you get here?
 		if (empty($actions))
-			redirectexit($redirect_url);
+		{
+					redirectexit($redirect_url);
+		}
 
 		// Validate each action.
 		$all_actions = array();
@@ -600,7 +645,9 @@ 
 		foreach ($actions as $topic => $action)
 		{
 			if (in_array($action, $possibleActions))
-				$all_actions[(int) $topic] = $action;
+			{
+							$all_actions[(int) $topic] = $action;
+			}
 		}
 
 		$stickyCache = array();
@@ -620,7 +667,9 @@ 
 				if (!empty($board))
 				{
 					if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts')))
-						continue;
+					{
+											continue;
+					}
 				}
 				else
 				{
@@ -703,23 +752,33 @@ 
 
 		// Do all the stickies...
 		if (!empty($stickyCache))
-			toggleTopicSticky($stickyCache, true);
+		{
+					toggleTopicSticky($stickyCache, true);
+		}
 
 		// Move sucka! (this is, by the by, probably the most complicated part....)
 		if (!empty($moveCache[0]))
-			moveTopicsPermissions($moveCache);
+		{
+					moveTopicsPermissions($moveCache);
+		}
 
 		// Now delete the topics...
 		if (!empty($removeCache))
-			removeTopicsPermissions($removeCache);
+		{
+					removeTopicsPermissions($removeCache);
+		}
 
 		// Approve the topics...
 		if (!empty($approveCache))
-			approveTopics($approveCache, true, true);
+		{
+					approveTopics($approveCache, true, true);
+		}
 
 		// And (almost) lastly, lock the topics...
 		if (!empty($lockCache))
-			toggleTopicsLock($lockCache, true);
+		{
+					toggleTopicsLock($lockCache, true);
+		}
 
 		if (!empty($markCache))
 		{
@@ -727,7 +786,9 @@ 
 
 			$markArray = array();
 			foreach ($markCache as $topic)
-				$markArray[] = array($user_info['id'], $topic, $modSettings['maxMsgID'], (int) !empty($logged_topics[$topic]));
+			{
+							$markArray[] = array($user_info['id'], $topic, $modSettings['maxMsgID'], (int) !empty($logged_topics[$topic]));
+			}
 
 			markTopicsRead($markArray, true);
 		}
@@ -740,7 +801,9 @@ 
 		));
 
 		if (!empty($affectedBoards))
-			updateLastMessages(array_keys($affectedBoards));
+		{
+					updateLastMessages(array_keys($affectedBoards));
+		}
 
 		redirectexit($redirect_url);
 	}

sources/controllers/ModerationCenter.controller.php

Braces +141 added lines, -55 removed lines

@@ -39,7 +39,9 @@ 
 
 		// Now call the menu action.
 		if (isset($this->_mod_include_data['file']))
-			require_once($this->_mod_include_data['file']);
+		{
+					require_once($this->_mod_include_data['file']);
+		}
 
 		callMenu($this->_mod_include_data);
 	}
@@ -56,7 +58,9 @@ 
 
 		// Don't run this twice... and don't conflict with the admin bar.
 		if (isset($context['admin_area']))
-			return;
+		{
+					return;
+		}
 
 		$context['can_moderate_boards'] = $user_info['mod_cache']['bq'] != '0=1';
 		$context['can_moderate_groups'] = $user_info['mod_cache']['gq'] != '0=1';
@@ -64,7 +68,9 @@ 
 
 		// Everyone using this area must be allowed here!
 		if (!$context['can_moderate_boards'] && !$context['can_moderate_groups'] && !$context['can_moderate_approvals'])
-			isAllowedTo('access_mod_center');
+		{
+					isAllowedTo('access_mod_center');
+		}
 
 		// We're gonna want a menu of some kind.
 		require_once(SUBSDIR . '/Menu.subs.php');
@@ -273,7 +279,9 @@ 
 
 		// We got something - didn't we? DIDN'T WE!
 		if ($mod_include_data === false)
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Retain the ID information in case required by a subaction.
 		$context['moderation_menu_id'] = $context['max_menu_id'];
@@ -293,16 +301,20 @@ 
 		);
 
 		if (isset($mod_include_data['current_area']) && $mod_include_data['current_area'] != 'index')
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'],
 				'name' => $mod_include_data['label'],
 			);
+		}
 
 		if (!empty($mod_include_data['current_subsection']) && $mod_include_data['subsections'][$mod_include_data['current_subsection']][0] != $mod_include_data['label'])
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=moderate;area=' . $mod_include_data['current_area'] . ';sa=' . $mod_include_data['current_subsection'],
 				'name' => $mod_include_data['subsections'][$mod_include_data['current_subsection']][0],
 			);
+		}
 
 		// Finally, store this, so that if we're called from the class, it can use it.
 		$this->_mod_include_data = $mod_include_data;
@@ -334,17 +346,24 @@ 
 		}
 
 		if ($context['can_moderate_groups'])
-			$valid_blocks['g'] = 'groupRequests';
+		{
+					$valid_blocks['g'] = 'groupRequests';
+		}
 
 		if ($context['can_moderate_boards'])
-			$valid_blocks['w'] = 'watchedUsers';
+		{
+					$valid_blocks['w'] = 'watchedUsers';
+		}
 
 		$valid_blocks['n'] = 'latestNews';
 
 		if (empty($user_settings['mod_prefs']))
-			$user_blocks = 'n' . ($context['can_moderate_boards'] ? 'wra' : '') . ($context['can_moderate_groups'] ? 'g' : '');
-		else
-			list (, $user_blocks) = explode('|', $user_settings['mod_prefs']);
+		{
+					$user_blocks = 'n' . ($context['can_moderate_boards'] ? 'wra' : '') . ($context['can_moderate_groups'] ? 'g' : '');
+		}
+		else {
+					list (, $user_blocks) = explode('|', $user_settings['mod_prefs']);
+		}
 
 		$user_blocks = str_split($user_blocks);
 
@@ -356,7 +375,9 @@ 
 				$block = 'block_' . $block;
 
 				if (method_exists($this, $block))
-					$context['mod_blocks'][] = $this->{$block}();
+				{
+									$context['mod_blocks'][] = $this->{$block}();
+				}
 			}
 		}
 	}
@@ -388,7 +409,9 @@ 
 
 		// legit?
 		if (empty($notice) || !$context['can_moderate_boards'])
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		list ($context['notice_body'], $context['notice_subject']) = $notice;
 
@@ -427,11 +450,15 @@ 
 
 		// This comes under the umbrella of moderating posts.
 		if ($user_info['mod_cache']['bq'] === '0=1')
-			isAllowedTo('moderate_forum');
+		{
+					isAllowedTo('moderate_forum');
+		}
 
 		// Are they wanting to view a particular report?
 		if (!empty($this->_req->query->report))
-			return $this->action_modReport();
+		{
+					return $this->action_modReport();
+		}
 
 		// This should not be needed...
 		$show_pms = false;
@@ -460,9 +487,13 @@ 
 
 			// Update the report...
 			if (isset($this->_req->query->ignore))
-				updateReportsStatus($rid, 'ignore', (int) $this->_req->query->ignore);
+			{
+							updateReportsStatus($rid, 'ignore', (int) $this->_req->query->ignore);
+			}
 			elseif (isset($this->_req->query->close))
-				updateReportsStatus($rid, 'close', (int) $this->_req->query->close);
+			{
+							updateReportsStatus($rid, 'close', (int) $this->_req->query->close);
+			}
 
 			// Time to update.
 			updateSettings(array('last_mod_report_action' => time()));
@@ -549,8 +580,10 @@ 
 
 			// Add the board name to the report array
 			foreach ($context['reports'] as $id_report => $report)
-				if (!empty($board_names[$report['board']]))
+			{
+							if (!empty($board_names[$report['board']]))
 					$context['reports'][$id_report]['board_name'] = $board_names[$report['board']]['board_name'];
+			}
 		}
 
 		// Now get all the people who reported it.
@@ -560,7 +593,8 @@ 
 			foreach ($comments as $id_rep => $rows)
 			{
 				foreach ($rows as $row)
-					$context['reports'][$id_rep]['comments'][] = array(
+				{
+									$context['reports'][$id_rep]['comments'][] = array(
 						'id' => $row['id_comment'],
 						'message' => $row['comment'],
 						'raw_time' => $row['time_sent'],
@@ -574,6 +608,7 @@ 
 							'href' => $row['id_member'] ? $scripturl . '?action=profile;u=' . $row['id_member'] : '',
 						),
 					);
+				}
 			}
 		}
 	}
@@ -602,7 +637,9 @@ 
 		);
 
 		if ($context['can_moderate_groups'])
-			$context['homepage_blocks']['g'] = $txt['mc_group_requests'];
+		{
+					$context['homepage_blocks']['g'] = $txt['mc_group_requests'];
+		}
 
 		if ($context['can_moderate_boards'])
 		{
@@ -618,8 +655,9 @@ 
 			$pref_binary = 5;
 			$show_reports = 1;
 		}
-		else
-			list ($show_reports, $mod_blocks, $pref_binary) = explode('|', $user_settings['mod_prefs']);
+		else {
+					list ($show_reports, $mod_blocks, $pref_binary) = explode('|', $user_settings['mod_prefs']);
+		}
 
 		// Are we saving?
 		if (isset($this->_req->post->save))
@@ -642,23 +680,29 @@ 
 			// Do blocks first!
 			$mod_blocks = '';
 			if (!empty($this->_req->post->mod_homepage))
-				foreach ($this->_req->post->mod_homepage as $k => $v)
+			{
+							foreach ($this->_req->post->mod_homepage as $k => $v)
 				{
 					// Make sure they can add this...
 					if (isset($context['homepage_blocks'][$k]))
 						$mod_blocks .= $k;
+			}
 				}
 
 			// Now check other options!
 			$pref_binary = 0;
 
 			if ($context['can_moderate_approvals'] && !empty($this->_req->post->mod_notify_approval))
-				$pref_binary |= 4;
+			{
+							$pref_binary |= 4;
+			}
 
 			if ($context['can_moderate_boards'])
 			{
 				if (!empty($this->_req->post->mod_notify_report))
-					$pref_binary |= ($this->_req->post->mod_notify_report == 2 ? 1 : 2);
+				{
+									$pref_binary |= ($this->_req->post->mod_notify_report == 2 ? 1 : 2);
+				}
 
 				$show_reports = !empty($this->_req->post->mod_show_reports) ? 1 : 0;
 			}
@@ -710,7 +754,9 @@ 
 
 		// If it's an edit load it.
 		if ($context['is_edit'])
-			modLoadTemplate($context['id_template']);
+		{
+					modLoadTemplate($context['id_template']);
+		}
 
 		// Wait, we are saving?
 		if (isset($this->_req->post->save))
@@ -748,13 +794,18 @@ 
 
 					// If it wasn't visible and now is they've effectively added it.
 					if ($context['template_data']['personal'] && !$recipient_id)
-						logAction('add_warn_template', array('template' => $template_title));
+					{
+											logAction('add_warn_template', array('template' => $template_title));
+					}
 					// Conversely if they made it personal it's a delete.
 					elseif (!$context['template_data']['personal'] && $recipient_id)
-						logAction('delete_warn_template', array('template' => $template_title));
+					{
+											logAction('delete_warn_template', array('template' => $template_title));
+					}
 					// Otherwise just an edit.
-					else
-						logAction('modify_warn_template', array('template' => $template_title));
+					else {
+											logAction('modify_warn_template', array('template' => $template_title));
+					}
 				}
 				else
 				{
@@ -773,10 +824,14 @@ 
 				$context['template_data']['personal'] = !empty($this->_req->post->make_personal);
 
 				if (empty($template_title))
-					$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
+				{
+									$context['warning_errors'][] = $txt['mc_warning_template_error_no_title'];
+				}
 
 				if (empty($template_body))
-					$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+				{
+									$context['warning_errors'][] = $txt['mc_warning_template_error_no_body'];
+				}
 			}
 		}
 
@@ -795,7 +850,9 @@ 
 		// Have to at least give us something
 		$report = $this->_req->getQuery('report', 'intval', 0);
 		if (empty($report))
-			throw new Elk_Exception('mc_no_modreport_specified');
+		{
+					throw new Elk_Exception('mc_no_modreport_specified');
+		}
 
 		// This should not be needed...
 		$show_pms = false;
@@ -810,7 +867,9 @@ 
 
 		// So did we find anything?
 		if ($row === false)
-			throw new Elk_Exception('mc_no_modreport_found');
+		{
+					throw new Elk_Exception('mc_no_modreport_found');
+		}
 
 		// Woohoo we found a report and they can see it!  Bad news is we have more work to do
 		// If they are adding a comment then... add a comment.
@@ -999,7 +1058,9 @@ 
 
 		// Make sure to get the correct tab selected.
 		if ($context['report']['closed'])
-			$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+		{
+					$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+		}
 
 		// Finally we are done :P
 		loadTemplate('ModerationCenter');
@@ -1051,9 +1112,12 @@ 
 			// Clicked on remove or using checkboxes to multi delete
 			$toDelete = array();
 			if (isset($this->_req->query->delete))
-				$toDelete[] = (int) $this->_req->query->delete;
-			else
-				$toDelete = array_map('intval', $this->_req->post->delete);
+			{
+							$toDelete[] = (int) $this->_req->query->delete;
+			}
+			else {
+							$toDelete = array_map('intval', $this->_req->post->delete);
+			}
 
 			if (!empty($toDelete))
 			{
@@ -1061,7 +1125,9 @@ 
 
 				// If they don't have permission we'll let it error - either way no chance of a security slip here!
 				foreach ($toDelete as $did)
-					$remover->removeMessage($did);
+				{
+									$remover->removeMessage($did);
+				}
 			}
 		}
 
@@ -1078,12 +1144,17 @@ 
 			$delete_boards = boardsAllowedTo('delete_any');
 
 			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';
+			}
 		}
 
 		// This is all the information required for a watched user listing.
@@ -1183,9 +1254,12 @@ 
 							global $scripturl;
 
 							if ($member['last_post_id'])
-								return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
-							else
-								return $member['last_post'];
+							{
+															return '<a href="' . $scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
+							}
+							else {
+															return $member['last_post'];
+							}
 						},
 					),
 				),
@@ -1260,14 +1334,20 @@ 
 		$context['url_start'] = '?action=moderate;area=warnings;sa=log;sort=' . $context['order'];
 
 		if (!isset($search_params['string']) || (!empty($this->_req->post->search) && $search_params['string'] != $this->_req->post->search))
-			$search_params_string = empty($this->_req->post->search) ? '' : $this->_req->post->search;
-		else
-			$search_params_string = $search_params['string'];
+		{
+					$search_params_string = empty($this->_req->post->search) ? '' : $this->_req->post->search;
+		}
+		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->post->search_type : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-		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->post->search_type : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+		}
+		else {
+					$search_params_type = $search_params['type'];
+		}
 
 		$search_params_column = $searchTypes[$search_params_type]['sql'];
 		$search_params = array(
@@ -1358,8 +1438,10 @@ 
 
 							// If a notice was sent, provide a link to it
 							if (!empty($warning['id_notice']))
-								$output .= '
+							{
+															$output .= '
 									<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=480,height=320\');return false;" target="_blank" class="new_win" title="' . $txt['profile_warning_previous_notice'] . '"><i class="icon icon-small i-search" title"' . $txt['profile_warning_previous_notice'] . '"></i></a>';
+							}
 							return $output;
 						},
 					),
@@ -1677,7 +1759,9 @@ 
 
 		// Make sure they can even moderate someone!
 		if ($user_info['mod_cache']['gq'] === '0=1')
-			return 'group_requests_block';
+		{
+					return 'group_requests_block';
+		}
 
 		$context['group_requests'] = groupRequests();
 
@@ -1842,7 +1926,9 @@ 
 		global $context, $user_info, $scripturl;
 
 		if ($user_info['mod_cache']['bq'] === '0=1')
-			return 'reported_posts_block';
+		{
+					return 'reported_posts_block';
+		}
 
 		$context['reported_posts'] = array();
 

Spacing +6 added lines, -6 removed lines

@@ -75,7 +75,7 @@ 
 
 		if (!empty($options['admin_preferences']))
 		{
-			$context['admin_preferences'] = serializeToJson($options['admin_preferences'], function ($array_form) {
+			$context['admin_preferences'] = serializeToJson($options['admin_preferences'], function($array_form) {
 				global $context;
 
 				$context['admin_preferences'] = $array_form;
@@ -1133,7 +1133,7 @@ 
 						'value' => $txt['mc_watched_users_warning'],
 					),
 					'data' => array(
-						'function' => function ($member) {
+						'function' => function($member) {
 							global $scripturl;
 
 							return allowedTo('issue_warning') ? '<a href="' . $scripturl . '?action=profile;area=issuewarning;u=' . $member['id'] . '">' . $member['warning'] . '%</a>' : $member['warning'] . '%';
@@ -1179,7 +1179,7 @@ 
 						'value' => $txt['mc_watched_users_last_post'],
 					),
 					'data' => array(
-						'function' => function ($member) {
+						'function' => function($member) {
 							global $scripturl;
 
 							if ($member['last_post_id'])
@@ -1214,7 +1214,7 @@ 
 			$listOptions['columns'] = array(
 				'posts' => array(
 					'data' => array(
-						'function' => function ($post) {
+						'function' => function($post) {
 							return template_user_watch_post_callback($post);
 						},
 					),
@@ -1348,7 +1348,7 @@ 
 						'value' => $txt['profile_warning_previous_reason'],
 					),
 					'data' => array(
-						'function' => function ($warning) {
+						'function' => function($warning) {
 							global $scripturl, $txt;
 
 							$output = '
@@ -1495,7 +1495,7 @@ 
 						'style' => 'width: 4%;text-align: center;',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="checkbox" name="deltpl[]" value="' . $rowData['id_comment'] . '" class="input_check" />';
 						},
 						'class' => 'centertext',