elkarte / Elkarte

sources/controllers/Recent.controller.php

Braces +27 added lines, -10 removed lines

@@ -187,19 +187,28 @@ 
 
 		// Recent posts by category id's
 		if (!empty($this->_req->query->c) && empty($board))
-			$categories = $this->_recentPostsCategory();
+		{
+					$categories = $this->_recentPostsCategory();
+		}
 		// Or recent posts by board id's?
 		elseif (!empty($this->_req->query->boards))
-			$this->_recentPostsBoards();
+		{
+					$this->_recentPostsBoards();
+		}
 		// Or just the recent posts for a specific board
 		elseif (!empty($board))
-			$this->_recentPostsBoard();
+		{
+					$this->_recentPostsBoard();
+		}
 		// All the recent posts across boards and categories it is then
-		else
-			$this->_recentPostsAll();
+		else {
+					$this->_recentPostsAll();
+		}
 
 		if (!empty($this->_maxMsgID))
-			$this->_grabber->setEarliestMsg(max(0, $modSettings['maxMsgID'] - $this->_maxMsgID[0] - $this->_start * $this->_maxMsgID[1]));
+		{
+					$this->_grabber->setEarliestMsg(max(0, $modSettings['maxMsgID'] - $this->_maxMsgID[0] - $this->_start * $this->_maxMsgID[1]));
+		}
 
 		// Set up the pageindex
 		$context['page_index'] = constructPageIndex($this->_base_url, $this->_start, min(100, $this->_total_posts), $this->_num_per_page, !empty($this->_flex_start));
@@ -335,7 +344,9 @@ 
 			$name = categoryName($categories[0]);
 
 			if (empty($name))
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			$context['linktree'][] = array(
 				'url' => $scripturl . $modSettings['default_forum_action'] . '#c' . $categories[0],
@@ -349,14 +360,18 @@ 
 		$boards = array_keys($boards_posts);
 
 		if (empty($boards))
-			throw new Elk_Exception('error_no_boards_selected');
+		{
+					throw new Elk_Exception('error_no_boards_selected');
+		}
 
 		// The query for getting the messages
 		$this->_grabber->setBoards($boards);
 
 		// If this category has a significant number of posts in it...
 		if ($this->_total_posts > 100 && $this->_total_posts > $modSettings['totalMessages'] / 15)
-			$this->_maxMsgID = array(400, 7);
+		{
+					$this->_maxMsgID = array(400, 7);
+		}
 
 		$this->_base_url = $scripturl . '?action=recent;c=' . implode(',', $categories);
 
@@ -409,7 +424,9 @@ 
 
 		// If this board has a significant number of posts in it...
 		if ($this->_total_posts > 80 && $this->_total_posts > $modSettings['totalMessages'] / $this->_num_per_page)
-			$this->_maxMsgID = array(600, 10);
+		{
+					$this->_maxMsgID = array(600, 10);
+		}
 
 		$this->_base_url = $scripturl . '?action=recent;board=' . $board . '.%1$d';
 		$this->_flex_start = true;

Spacing +1 added lines, -1 removed lines

@@ -445,7 +445,7 @@
 		if (!empty($modSettings['likes_enabled']))
 		{
 			// Just the message id please
-			$messages = array_map(function ($element) {
+			$messages = array_map(function($element) {
 				return (int) $element['id'];
 			}, $messages);
 

sources/controllers/PersonalMessage.controller.php

Braces +58 added lines, -21 removed lines

@@ -633,7 +633,9 @@ 
 				// Get the order right.
 				$orderBy = array();
 				foreach (array_reverse($pms) as $pm)
-					$orderBy[] = 'pm.id_pm = ' . $pm;
+				{
+									$orderBy[] = 'pm.id_pm = ' . $pm;
+				}
 
 				// Separate query for these bits, preparePMContext_callback will use it as required
 				$subjects_request = loadPMSubjectRequest($pms, $orderBy);
@@ -894,7 +896,9 @@ 
 			// Get a literal name list in case the user has JavaScript disabled.
 			$names = array();
 			foreach ($context['recipients']['to'] as $to)
-				$names[] = $to['name'];
+			{
+							$names[] = $to['name'];
+			}
 			$context['to_value'] = empty($names) ? '' : '"' . implode('", "', $names) . '"';
 		}
 		else
@@ -963,8 +967,7 @@ 
 			&& !allowedTo(array('admin_forum', 'moderate_forum', 'send_mail'))
 			&& $user_info['mod_cache']['bq'] === '0=1'
 			&& $user_info['mod_cache']['gq'] === '0=1'
-		)
-		{
+		) {
 			// How many have they sent this last hour?
 			$pmCount = pmCount($user_info['id'], 3600);
 
@@ -1095,7 +1098,9 @@ 
 					$post_errors->removeError('no_to');
 
 					foreach ($namesNotFound[$recipientType] as $name)
-						$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+					{
+											$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+					}
 				}
 			}
 		}
@@ -1166,7 +1171,9 @@ 
 			{
 				$post_errors->addError('bad_' . $recipientType);
 				foreach ($names as $name)
-					$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				{
+									$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				}
 			}
 
 			$this->messagePostError($namedRecipientList, $recipientList);
@@ -1440,12 +1447,16 @@ 
 		{
 			$pm_actions = array();
 			foreach ($this->_req->post->pms as $pm)
-				$pm_actions[(int) $pm] = $pm_action;
+			{
+							$pm_actions[(int) $pm] = $pm_action;
+			}
 		}
 
 		// No messages to action then bug out
 		if (empty($pm_actions))
-			redirectexit($context['current_label_redirect']);
+		{
+					redirectexit($context['current_label_redirect']);
+		}
 
 		// If we are in conversation, we may need to apply this to every message in that conversation.
 		if ($context['display_mode'] == 2 && isset($this->_req->query->conversation))
@@ -1716,7 +1727,9 @@ 
 				if (!empty($new_labels))
 				{
 					for ($i = max($searchArray) + 1, $n = max(array_keys($new_labels)); $i <= $n; $i++)
-						$searchArray[] = $i;
+					{
+											$searchArray[] = $i;
+					}
 				}
 
 				updateLabelsToPM($searchArray, $new_labels, $user_info['id']);
@@ -1754,9 +1767,11 @@ 
 
 				// Update/delete as appropriate.
 				foreach ($rule_changes as $k => $id)
-					if (!empty($context['rules'][$id]['actions']))
+				{
+									if (!empty($context['rules'][$id]['actions']))
 					{
 						updatePMRuleAction($id, $user_info['id'], $context['rules'][$id]['actions']);
+				}
 						unset($rule_changes[$k]);
 					}
 
@@ -1918,7 +1933,9 @@ 
 			$recipients = array();
 			$temp = loadPMRecipientsAll($context['pm_id'], true);
 			foreach ($temp as $recipient)
-				$recipients[] = $recipient['link'];
+			{
+							$recipients[] = $recipient['link'];
+			}
 
 			// Now let's get out and loop through the admins.
 			$admins = admins(isset($this->_req->post->id_admin) ? (int) $this->_req->post->id_admin : 0);
@@ -1970,7 +1987,9 @@ 
 
 			// Send a different email for each language.
 			foreach ($messagesToSend as $lang => $message)
-				sendpm($message['recipients'], $message['subject'], $message['body']);
+			{
+							sendpm($message['recipients'], $message['subject'], $message['body']);
+			}
 
 			// Give the user their own language back!
 			if (!empty($modSettings['userLanguage']))
@@ -2089,9 +2108,11 @@ 
 
 				// Need to get member names!
 				foreach ($context['rule']['criteria'] as $k => $criteria)
-					if ($criteria['t'] === 'mid' && !empty($criteria['v']))
+				{
+									if ($criteria['t'] === 'mid' && !empty($criteria['v']))
 					{
 						$members[(int) $criteria['v']] = $k;
+				}
 					}
 
 				if (!empty($members))
@@ -2099,7 +2120,9 @@ 
 					require_once(SUBSDIR . '/Members.subs.php');
 					$result = getBasicMemberData(array_keys($members));
 					foreach ($result as $row)
-						$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+					{
+											$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+					}
 				}
 			}
 			else
@@ -2226,7 +2249,9 @@ 
 			checkSession('post');
 			$toDelete = array();
 			foreach ($this->_req->post->delrule as $k => $v)
-				$toDelete[] = (int) $k;
+			{
+							$toDelete[] = (int) $k;
+			}
 
 			if (!empty($toDelete))
 			{
@@ -2621,7 +2646,9 @@ 
 
 				$labelStatements = array();
 				foreach ($this->_req->post->searchlabel as $label)
-					$labelStatements[] = $db->quote('FIND_IN_SET({string:label}, pmr.labels) != 0', array('label' => $label,));
+				{
+									$labelStatements[] = $db->quote('FIND_IN_SET({string:label}, pmr.labels) != 0', array('label' => $label,));
+				}
 
 				$this->_searchq_parameters ['label_implode'] = '(' . implode(' OR ', $labelStatements) . ')';
 			}
@@ -2665,7 +2692,9 @@ 
 			$members = membersBy('member_names', array('member_names' => $possible_users));
 
 			foreach ($possible_users as $key => $possible_user)
-				$this->_searchq_parameters ['guest_user_name_implode_' . $key] = defined('DB_CASE_SENSITIVE') ? strtolower($possible_user) : $possible_user;
+			{
+							$this->_searchq_parameters ['guest_user_name_implode_' . $key] = defined('DB_CASE_SENSITIVE') ? strtolower($possible_user) : $possible_user;
+			}
 
 			// Simply do nothing if there are too many members matching the criteria.
 			if (count($members) > $maxMembersToSearch)
@@ -2679,7 +2708,9 @@ 
 					$uq = array();
 					$name = defined('DB_CASE_SENSITIVE') ? 'LOWER(pm.from_name)' : 'pm.from_name';
 					foreach (array_keys($possible_users) as $key)
-						$uq[] = 'AND pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})';
+					{
+											$uq[] = 'AND pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})';
+					}
 					$userQuery = implode(' ', $uq);
 					$this->_searchq_parameters ['pm_from_name'] = defined('DB_CASE_SENSITIVE') ? 'LOWER(pm.from_name)' : 'pm.from_name';
 				}
@@ -2692,7 +2723,9 @@ 
 			{
 				$memberlist = array();
 				foreach ($members as $id)
-					$memberlist[] = $id;
+				{
+									$memberlist[] = $id;
+				}
 
 				// Use the name as as sent from or sent to
 				if ($context['folder'] === 'inbox')
@@ -2701,7 +2734,9 @@ 
 					$name = defined('DB_CASE_SENSITIVE') ? 'LOWER(pm.from_name)' : 'pm.from_name';
 
 					foreach (array_keys($possible_users) as $key)
-						$uq[] = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})))';
+					{
+											$uq[] = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND (' . $name . ' LIKE {string:guest_user_name_implode_' . $key . '})))';
+					}
 
 					$userQuery = implode(' ', $uq);
 				}
@@ -2806,7 +2841,9 @@ 
 
 		// Now we have all the parameters, combine them together for pagination and the like...
 		foreach ($this->_search_params as $k => $v)
-			$encoded[] = $k . '|\'|' . $v;
+		{
+					$encoded[] = $k . '|\'|' . $v;
+		}
 
 		// Base64 encode, then replace +/= with uri safe ones that can be reverted
 		$encoded = str_replace(array('+', '/', '='), array('-', '_', '.'), base64_encode(implode('|"|', $encoded)));

sources/controllers/Help.controller.php

Braces +21 added lines, -8 removed lines

@@ -101,10 +101,14 @@ 
 		global $txt, $helptxt, $context, $scripturl;
 
 		if (!isset($this->_req->query->help) || !is_string($this->_req->query->help))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		if (!isset($helptxt))
-			$helptxt = array();
+		{
+					$helptxt = array();
+		}
 
 		$help_str = Util::htmlspecialchars($this->_req->query->help);
 
@@ -113,7 +117,9 @@ 
 
 		// Load permission specific help
 		if (substr($help_str, 0, 14) == 'permissionhelp')
-			loadLanguage('ManagePermissions');
+		{
+					loadLanguage('ManagePermissions');
+		}
 
 		// Load our template
 		loadTemplate('Help');
@@ -135,16 +141,23 @@ 
 		foreach ($helps as $help)
 		{
 			if (isset($helptxt[$help]))
-				$context['help_text'] .= $helptxt[$help];
+			{
+							$context['help_text'] .= $helptxt[$help];
+			}
 			elseif (isset($txt[$help]))
-				$context['help_text'] .= $txt[$help];
-			else
-				// nothing :(
+			{
+							$context['help_text'] .= $txt[$help];
+			}
+			else {
+							// nothing :(
 				$context['help_text'] .= $help;
+			}
 		}
 
 		// Link to the forum URL, and include session id.
 		if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match))
-			$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
+		{
+					$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
+		}
 	}
 }

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/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/Profile.controller.php

Braces +36 added lines, -12 removed lines

@@ -85,7 +85,9 @@ 
 
 		// Don't reload this as we may have processed error strings.
 		if (empty($post_errors))
-			loadLanguage('Profile');
+		{
+					loadLanguage('Profile');
+		}
 		loadTemplate('Profile');
 
 		// Trigger profile pre-load event
@@ -107,19 +109,27 @@ 
 
 		// Is there an updated message to show?
 		if (isset($this->_req->query->updated))
-			$context['profile_updated'] = $txt['profile_updated_own'];
+		{
+					$context['profile_updated'] = $txt['profile_updated_own'];
+		}
 
 		// If it said no permissions that meant it wasn't valid!
 		if ($this->_profile_include_data && empty($this->_profile_include_data['permission']))
-			$this->_profile_include_data['enabled'] = false;
+		{
+					$this->_profile_include_data['enabled'] = false;
+		}
 
 		// No menu and guest? A warm welcome to register
 		if (!$this->_profile_include_data && $user_info['is_guest'])
-			is_not_guest();
+		{
+					is_not_guest();
+		}
 
 		// No menu means no access at all.
 		if (!$this->_profile_include_data || (isset($this->_profile_include_data['enabled']) && $this->_profile_include_data['enabled'] === false))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Make a note of the Unique ID for this menu.
 		$context['profile_menu_id'] = $context['max_menu_id'];
@@ -144,7 +154,9 @@ 
 
 		// Permissions for good measure.
 		if (!empty($this->_profile_include_data['permission']))
-			isAllowedTo($this->_profile_include_data['permission'][$context['user']['is_owner'] ? 'own' : 'any']);
+		{
+					isAllowedTo($this->_profile_include_data['permission'][$context['user']['is_owner'] ? 'own' : 'any']);
+		}
 
 		// Session validation and/or Token Checks
 		$this->_check_access();
@@ -169,23 +181,33 @@ 
 		{
 			// Set all the errors so the template knows what went wrong.
 			foreach ($post_errors as $error_type)
-				$context['modify_error'][$error_type] = true;
+			{
+							$context['modify_error'][$error_type] = true;
+			}
 		}
 		// If it's you then we should redirect upon save.
 		elseif (!empty($profile_vars) && $context['user']['is_owner'] && !$context['do_preview'])
-			redirectexit('action=profile;area=' . $this->_current_area . ';updated');
+		{
+					redirectexit('action=profile;area=' . $this->_current_area . ';updated');
+		}
 		elseif (!empty($this->_force_redirect))
-			redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $this->_memID) . ';area=' . $this->_current_area);
+		{
+					redirectexit('action=profile' . ($context['user']['is_owner'] ? '' : ';u=' . $this->_memID) . ';area=' . $this->_current_area);
+		}
 
 		// Let go to the right place
 		if (isset($this->_profile_include_data['file']))
-			require_once($this->_profile_include_data['file']);
+		{
+					require_once($this->_profile_include_data['file']);
+		}
 
 		callMenu($this->_profile_include_data);
 
 		// Set the page title if it's not already set...
 		if (!isset($context['page_title']))
-			$context['page_title'] = $txt['profile'] . (isset($txt[$this->_current_area]) ? ' - ' . $txt[$this->_current_area] : '');
+		{
+					$context['page_title'] = $txt['profile'] . (isset($txt[$this->_current_area]) ? ' - ' . $txt[$this->_current_area] : '');
+		}
 	}
 
 	/**
@@ -734,7 +756,9 @@ 
 				if (!empty($context['profile_execute_on_save']))
 				{
 					foreach ($context['profile_execute_on_save'] as $saveFunc)
-						$saveFunc();
+					{
+											$saveFunc();
+					}
 				}
 
 				// Let them know it worked!

sources/controllers/Register.controller.php

Braces +153 added lines, -55 removed lines

@@ -62,7 +62,9 @@ 
 
 		// Check if the administrator has it disabled.
 		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3')
-			throw new Elk_Exception('registration_disabled', false);
+		{
+					throw new Elk_Exception('registration_disabled', false);
+		}
 	}
 
 	/**
@@ -112,14 +114,20 @@ 
 
 		// If this user is an admin - redirect them to the admin registration page.
 		if (allowedTo('moderate_forum') && !$user_info['is_guest'])
-			redirectexit('action=admin;area=regcenter;sa=register');
+		{
+					redirectexit('action=admin;area=regcenter;sa=register');
+		}
 		// You are not a guest, so you are a member - and members don't get to register twice!
 		elseif (empty($user_info['is_guest']))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		// Confused and want to contact the admins instead
 		if (isset($this->_req->post->show_contact))
-			redirectexit('action=register;sa=contact');
+		{
+					redirectexit('action=register;sa=contact');
+		}
 
 		// If we have language support enabled then they need to be loaded
 		if ($this->_load_language_support())
@@ -181,7 +189,9 @@ 
 		}
 		// Make sure they don't squeeze through without agreeing.
 		elseif ($current_step > 1 && $context['require_agreement'] && !$context['checkbox_agreement'] && !$context['registration_passed_agreement'])
-			$current_step = 1;
+		{
+					$current_step = 1;
+		}
 
 		// Show the user the right form.
 		$context['sub_template'] = $current_step == 1 ? 'registration_agreement' : 'registration_form';
@@ -207,13 +217,16 @@ 
 
 		// Prepare the time gate! Done like this to allow later steps to reset the limit for any reason
 		if (!isset($_SESSION['register']))
-			$_SESSION['register'] = array(
+		{
+					$_SESSION['register'] = array(
 				'timenow' => time(),
 				// minimum number of seconds required on this page for registration
 				'limit' => 8,
 			);
-		else
-			$_SESSION['register']['timenow'] = time();
+		}
+		else {
+					$_SESSION['register']['timenow'] = time();
+		}
 
 		// If you have to agree to the agreement, it needs to be fetched from the file.
 		$agreement = new \Agreement($user_info['language']);
@@ -270,7 +283,9 @@ 
 		$context['registration_errors'] = array();
 		$reg_errors = ErrorContext::context('register', 0);
 		if ($reg_errors->hasErrors())
-			$context['registration_errors'] = $reg_errors->prepareErrors();
+		{
+					$context['registration_errors'] = $reg_errors->prepareErrors();
+		}
 
 		createToken('register');
 	}
@@ -299,34 +314,50 @@ 
 
 		checkSession();
 		if (!validateToken('register', 'post', true, false))
-			$reg_errors->addError('token_verification');
+		{
+					$reg_errors->addError('token_verification');
+		}
 
 		// If we're using an agreement checkbox, did they check it?
 		if (!empty($modSettings['checkboxAgreement']) && !empty($this->_req->post->checkbox_agreement))
-			$_SESSION['registration_agreed'] = true;
+		{
+					$_SESSION['registration_agreed'] = true;
+		}
 
 		// Using coppa and the registration checkbox?
 		if (!empty($modSettings['coppaAge']) && !empty($modSettings['checkboxAgreement']) && !empty($this->_req->post->accept_agreement))
-			$_SESSION['skip_coppa'] = true;
+		{
+					$_SESSION['skip_coppa'] = true;
+		}
 
 		// Well, if you don't agree, you can't register.
 		if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed']))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		if (!empty($modSettings['requireAgreement']) && !empty($modSettings['requirePrivacypolicy']) && !empty($this->_req->post->checkbox_privacypol))
-			$_SESSION['registration_privacypolicy'] = true;
+		{
+					$_SESSION['registration_privacypolicy'] = true;
+		}
 
 		// Well, if you don't agree, you can't register.
 		if (!empty($modSettings['requireAgreement']) && !empty($modSettings['requirePrivacypolicy']) && empty($_SESSION['registration_privacypolicy']))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		// Make sure they came from *somewhere*, have a session.
 		if (!isset($_SESSION['old_url']))
-			redirectexit('action=register');
+		{
+					redirectexit('action=register');
+		}
 
 		// If we don't require an agreement, we need a extra check for coppa.
 		if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge']))
-			$_SESSION['skip_coppa'] = !empty($this->_req->post->accept_agreement);
+		{
+					$_SESSION['skip_coppa'] = !empty($this->_req->post->accept_agreement);
+		}
 
 		// Are they under age, and under age users are banned?
 		if (!empty($modSettings['coppaAge']) && empty($modSettings['coppaType']) && empty($_SESSION['skip_coppa']))
@@ -337,7 +368,9 @@ 
 
 		// Check the time gate for miscreants. First make sure they came from somewhere that actually set it up.
 		if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit']))
-			redirectexit('action=register');
+		{
+					redirectexit('action=register');
+		}
 
 		// Failing that, check the time limit for excessive speed.
 		if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit'])
@@ -371,7 +404,9 @@ 
 
 		// Checks already done if coming from the action
 		if ($verifiedOpenID)
-			$this->_can_register();
+		{
+					$this->_can_register();
+		}
 
 		// Clean the form values
 		foreach ($this->_req->post as $key => $value)
@@ -384,7 +419,9 @@ 
 
 		// A little security to any secret answer ... @todo increase?
 		if ($this->_req->getPost('secret_answer', 'trim', '') !== '')
-			$this->_req->post->secret_answer = md5($this->_req->post->secret_answer);
+		{
+					$this->_req->post->secret_answer = md5($this->_req->post->secret_answer);
+		}
 
 		// Needed for isReservedName() and registerMember().
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -395,15 +432,20 @@ 
 			$this->_req->post->real_name = trim(preg_replace('~[\t\n\r \x0B\0\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}]+~u', ' ', $this->_req->post->real_name));
 			$has_real_name = true;
 		}
-		else
-			$has_real_name = false;
+		else {
+					$has_real_name = false;
+		}
 
 		// Handle a string as a birth date...
 		if ($this->_req->getPost('birthdate', 'trim', '') !== '')
-			$this->_req->post->birthdate = Util::strftime('%Y-%m-%d', strtotime($this->_req->post->birthdate));
+		{
+					$this->_req->post->birthdate = Util::strftime('%Y-%m-%d', strtotime($this->_req->post->birthdate));
+		}
 		// Or birthdate parts...
 		elseif (!empty($this->_req->post->bday1) && !empty($this->_req->post->bday2))
-			$this->_req->post->birthdate = sprintf('%04d-%02d-%02d', empty($this->_req->post->bday3) ? 0 : (int) $this->_req->post->bday3, (int) $this->_req->post->bday1, (int) $this->_req->post->bday2);
+		{
+					$this->_req->post->birthdate = sprintf('%04d-%02d-%02d', empty($this->_req->post->bday3) ? 0 : (int) $this->_req->post->bday3, (int) $this->_req->post->bday1, (int) $this->_req->post->bday2);
+		}
 
 		// By default assume email is hidden, only show it if we tell it to.
 		$this->_req->post->hide_email = !empty($this->_req->post->allow_email) ? 0 : 1;
@@ -416,12 +458,17 @@ 
 
 			// Did we find it?
 			if (isset($context['languages'][$this->_req->post->lngfile]))
-				$_SESSION['language'] = $this->_req->post->lngfile;
-			else
-				unset($this->_req->post->lngfile);
+			{
+							$_SESSION['language'] = $this->_req->post->lngfile;
+			}
+			else {
+							unset($this->_req->post->lngfile);
+			}
 		}
 		elseif (isset($this->_req->post->lngfile))
-			unset($this->_req->post->lngfile);
+		{
+					unset($this->_req->post->lngfile);
+		}
 
 		// Set the options needed for registration.
 		$regOptions = array(
@@ -443,7 +490,9 @@ 
 
 		// Registration options are always default options...
 		if (isset($this->_req->post->default_options))
-			$this->_req->post->options = isset($this->_req->post->options) ? $this->_req->post->options + $this->_req->post->default_options : $this->_req->post->default_options;
+		{
+					$this->_req->post->options = isset($this->_req->post->options) ? $this->_req->post->options + $this->_req->post->default_options : $this->_req->post->default_options;
+		}
 
 		$regOptions['theme_vars'] = isset($this->_req->post->options) && is_array($this->_req->post->options) ? $this->_req->post->options : array();
 
@@ -458,7 +507,9 @@ 
 		{
 			// Don't allow overriding of the theme variables.
 			if (isset($regOptions['theme_vars'][$row['colname']]))
-				unset($regOptions['theme_vars'][$row['colname']]);
+			{
+							unset($regOptions['theme_vars'][$row['colname']]);
+			}
 
 			// Prepare the value!
 			$value = isset($this->_req->post->customfield[$row['colname']]) ? trim($this->_req->post->customfield[$row['colname']]) : '';
@@ -471,7 +522,9 @@ 
 				{
 					$err_params = array($row['name']);
 					if ($is_valid === 'custom_field_not_number')
-						$err_params[] = $row['field_length'];
+					{
+											$err_params[] = $row['field_length'];
+					}
 
 					$reg_errors->addError(array($is_valid, $err_params));
 				}
@@ -479,7 +532,9 @@ 
 
 			// Is this required but not there?
 			if (trim($value) === '' && $row['show_reg'] > 1)
-				$reg_errors->addError(array('custom_field_empty', array($row['name'])));
+			{
+							$reg_errors->addError(array('custom_field_empty', array($row['name'])));
+			}
 		}
 
 		// Lets check for other errors before trying to register the member.
@@ -500,8 +555,10 @@ 
 			// What do we need to save?
 			$save_variables = array();
 			foreach ($this->_req->post as $k => $v)
-				if (!in_array($k, array('sc', 'sesc', $context['session_var'], 'passwrd1', 'passwrd2', 'regSubmit')))
+			{
+							if (!in_array($k, array('sc', 'sesc', $context['session_var'], 'passwrd1', 'passwrd2', 'regSubmit')))
 					$save_variables[$k] = $v;
+			}
 
 			require_once(SUBSDIR . '/OpenID.subs.php');
 			$openID = new OpenID();
@@ -528,7 +585,9 @@ 
 		if ($reg_errors->hasErrors(1) && !$user_info['is_admin'])
 		{
 			foreach ($reg_errors->prepareErrors(1) as $error)
-				throw new Elk_Exception($error, 'general');
+			{
+							throw new Elk_Exception($error, 'general');
+			}
 		}
 
 		// Was there actually an error of some kind dear boy?
@@ -561,7 +620,9 @@ 
 
 		// If COPPA has been selected then things get complicated, setup the template.
 		if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa']))
-			redirectexit('action=register;sa=coppa;member=' . $memberID);
+		{
+					redirectexit('action=register;sa=coppa;member=' . $memberID);
+		}
 		// Basic template variable setup.
 		elseif (!empty($modSettings['registration_method']))
 		{
@@ -593,11 +654,15 @@ 
 
 		// You can't register if it's disabled.
 		if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3)
-			throw new Elk_Exception('registration_disabled', false);
+		{
+					throw new Elk_Exception('registration_disabled', false);
+		}
 
 		// Make sure they didn't just register with this session.
 		if (!empty($_SESSION['just_registered']) && empty($modSettings['disableRegisterCheck']))
-			throw new Elk_Exception('register_only_once', false);
+		{
+					throw new Elk_Exception('register_only_once', false);
+		}
 	}
 
 	/**
@@ -645,7 +710,9 @@ 
 		);
 
 		if ($has_real_name && trim($this->_req->post->real_name) != '' && !isReservedName($this->_req->post->real_name) && Util::strlen($this->_req->post->real_name) < 60)
-			$possible_strings[] = 'real_name';
+		{
+					$possible_strings[] = 'real_name';
+		}
 
 		// Some of these fields we may not want.
 		if (!empty($modSettings['registration_fields']))
@@ -657,13 +724,16 @@ 
 
 			// Website is a little different
 			if (!in_array('website', $reg_fields))
-				$exclude_fields = array_merge($exclude_fields, array('website_url', 'website_title'));
+			{
+							$exclude_fields = array_merge($exclude_fields, array('website_url', 'website_title'));
+			}
 
 			// We used to accept signature on registration but it's being abused by spammers these days, so no more.
 			$exclude_fields[] = 'signature';
 		}
-		else
-			$exclude_fields = array('signature', 'website_url', 'website_title');
+		else {
+					$exclude_fields = array('signature', 'website_url', 'website_title');
+		}
 
 		$possible_strings = array_diff($possible_strings, $exclude_fields);
 		$possible_ints = array_diff($possible_ints, $exclude_fields);
@@ -674,20 +744,28 @@ 
 
 		// Include the additional options that might have been filled in.
 		foreach ($possible_strings as $var)
-			if (isset($this->_req->post->{$var}))
+		{
+					if (isset($this->_req->post->{$var}))
 				$extra_register_vars[$var] = Util::htmlspecialchars($this->_req->post->{$var}, ENT_QUOTES);
+		}
 
 		foreach ($possible_ints as $var)
-			if (isset($this->_req->post->{$var}))
+		{
+					if (isset($this->_req->post->{$var}))
 				$extra_register_vars[$var] = (int) $this->_req->post->{$var};
+		}
 
 		foreach ($possible_floats as $var)
-			if (isset($this->_req->post->{$var}))
+		{
+					if (isset($this->_req->post->{$var}))
 				$extra_register_vars[$var] = (float) $this->_req->post->{$var};
+		}
 
 		foreach ($possible_bools as $var)
-			if (isset($this->_req->post->{$var}))
+		{
+					if (isset($this->_req->post->{$var}))
 				$extra_register_vars[$var] = empty($this->_req->post->{$var}) ? 0 : 1;
+		}
 
 		return $extra_register_vars;
 	}
@@ -799,7 +877,9 @@ 
 
 		// Logged in users should not bother to activate their accounts
 		if (!empty($user_info['id']))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		loadLanguage('Login');
 		loadTemplate('Login');
@@ -810,7 +890,9 @@ 
 		{
 			// Immediate 0 or disabled 3 means no need to try and activate
 			if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3')
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// Otherwise its simply invalid
 			$context['member_id'] = 0;
@@ -849,7 +931,9 @@ 
 
 		// Quit if this code is not right.
 		if ($this->_activate_validate_code() === false)
-			return;
+		{
+					return;
+		}
 
 		// Validation complete - update the database!
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -1024,7 +1108,9 @@ 
 
 		// No User ID??
 		if (!isset($this->_req->query->member))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Get the user details...
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -1032,7 +1118,9 @@ 
 
 		// If doesn't exist or not pending coppa
 		if (empty($member) || $member['is_activated'] != 5)
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		if (isset($this->_req->query->form))
 		{
@@ -1122,7 +1210,9 @@ 
 			require_once(SUBSDIR . '/Graphics.subs.php');
 
 			if (!showCodeImage($code))
-				header('HTTP/1.1 400 Bad Request');
+			{
+							header('HTTP/1.1 400 Bad Request');
+			}
 		}
 		// Or direct link to the sound
 		elseif ($this->_req->query->format === '.wav')
@@ -1130,7 +1220,9 @@ 
 			require_once(SUBSDIR . '/Sound.subs.php');
 
 			if (!createWaveFile($code))
-				header('HTTP/1.1 400 Bad Request');
+			{
+							header('HTTP/1.1 400 Bad Request');
+			}
 		}
 
 		// Why die when we can exit to live another day...
@@ -1150,7 +1242,9 @@ 
 		// Users have no need to use this, just send a PM
 		// Disabled, you cannot enter.
 		if (!$user_info['is_guest'] || empty($modSettings['enable_contactform']) || $modSettings['enable_contactform'] === 'disabled')
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		loadLanguage('Login');
 		loadTemplate('Register');
@@ -1189,7 +1283,9 @@ 
 
 			// Any form errors
 			if (!$validator->validate($this->_req->post))
-				$context['errors'] = $validator->validation_errors();
+			{
+							$context['errors'] = $validator->validation_errors();
+			}
 
 			// Get the clean data
 			$this->_req->post = new ArrayObject($validator->validation_data(), ArrayObject::ARRAY_AS_PROPS);
@@ -1219,7 +1315,9 @@ 
 
 		// Show the contact done form or the form itself
 		if (isset($this->_req->query->done))
-			$context['sub_template'] = 'contact_form_done';
+		{
+					$context['sub_template'] = 'contact_form_done';
+		}
 		else
 		{
 			loadJavascriptFile('mailcheck.min.js');

sources/controllers/Auth.controller.php

Braces +112 added lines, -41 removed lines

@@ -61,7 +61,9 @@ 
 
 		// You are already logged in, go take a tour of the boards
 		if (!empty($user_info['id']))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		// Load the Login template/language file.
 		loadLanguage('Login');
@@ -85,9 +87,12 @@ 
 
 		// Set the login URL - will be used when the login process is done (but careful not to send us to an attachment).
 		if (isset($_SESSION['old_url']) && validLoginUrl($_SESSION['old_url'], true))
-			$_SESSION['login_url'] = $_SESSION['old_url'];
-		else
-			unset($_SESSION['login_url']);
+		{
+					$_SESSION['login_url'] = $_SESSION['old_url'];
+		}
+		else {
+					unset($_SESSION['login_url']);
+		}
 
 		// Create a one time token.
 		createToken('login');
@@ -116,7 +121,9 @@ 
 
 		// Beyond this point you are assumed to be a guest trying to login.
 		if (!$user_info['is_guest'])
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		// Are you guessing with a script?
 		checkSession('post');
@@ -125,17 +132,25 @@ 
 
 		// Set the login_url if it's not already set (but careful not to send us to an attachment).
 		if (empty($_SESSION['login_url']) && isset($_SESSION['old_url']) && validLoginUrl($_SESSION['old_url'], true))
-			$_SESSION['login_url'] = $_SESSION['old_url'];
+		{
+					$_SESSION['login_url'] = $_SESSION['old_url'];
+		}
 
 		// Been guessing a lot, haven't we?
 		if (isset($_SESSION['failed_login']) && $_SESSION['failed_login'] >= $modSettings['failed_login_threshold'] * 3)
-			throw new Elk_Exception('login_threshold_fail', 'critical');
+		{
+					throw new Elk_Exception('login_threshold_fail', 'critical');
+		}
 
 		// Set up the cookie length.  (if it's invalid, just fall through and use the default.)
 		if (isset($_POST['cookieneverexp']) || (!empty($_POST['cookielength']) && $_POST['cookielength'] == -1))
-			$modSettings['cookieTime'] = 3153600;
+		{
+					$modSettings['cookieTime'] = 3153600;
+		}
 		elseif (!empty($_POST['cookielength']) && ($_POST['cookielength'] >= 1 && $_POST['cookielength'] <= 525600))
-			$modSettings['cookieTime'] = (int) $_POST['cookielength'];
+		{
+					$modSettings['cookieTime'] = (int) $_POST['cookielength'];
+		}
 
 		loadLanguage('Login');
 
@@ -164,7 +179,9 @@ 
 			$open_id = new OpenID();
 
 			if (($open_id->validate($_POST['openid_identifier'])) !== 'no_data')
-				return $open_id;
+			{
+							return $open_id;
+			}
 			else
 			{
 				$context['login_errors'] = array($txt['openid_not_found']);
@@ -181,7 +198,9 @@ 
 
 		// No one needs a username that long, plus we only support 80 chars in the db
 		if (Util::strlen($_POST['user']) > 80)
-			$_POST['user'] = Util::substr($_POST['user'], 0, 80);
+		{
+					$_POST['user'] = Util::substr($_POST['user'], 0, 80);
+		}
 
 		// Can't use a password > 64 characters sorry, to long and only good for a DoS attack
 		// Plus we expect a 64 character one from SHA-256
@@ -282,7 +301,9 @@ 
 
 				// To many tries, maybe they need a reminder
 				if ($_SESSION['failed_login'] >= $modSettings['failed_login_threshold'])
-					redirectexit('action=reminder');
+				{
+									redirectexit('action=reminder');
+				}
 				else
 				{
 					Errors::instance()->log_error($txt['incorrect_password'] . ' - <span class="remove">' . $user_settings['member_name'] . '</span>', 'user');
@@ -332,7 +353,9 @@ 
 
 				// Hmm... don't remember it, do you?  Here, try the password reminder ;).
 				if ($_SESSION['failed_login'] >= $modSettings['failed_login_threshold'])
-					redirectexit('action=reminder');
+				{
+									redirectexit('action=reminder');
+				}
 				// We'll give you another chance...
 				else
 				{
@@ -366,7 +389,9 @@ 
 		}
 		// Check their activation status.
 		if (!checkActivation())
-			return false;
+		{
+					return false;
+		}
 
 		doLogin();
 	}
@@ -390,16 +415,22 @@ 
 
 		// Make sure they aren't being auto-logged out.
 		if (!$internal)
-			checkSession('get');
+		{
+					checkSession('get');
+		}
 
 		require_once(SUBSDIR . '/Auth.subs.php');
 
 		if (isset($_SESSION['pack_ftp']))
-			$_SESSION['pack_ftp'] = null;
+		{
+					$_SESSION['pack_ftp'] = null;
+		}
 
 		// They cannot be open ID verified any longer.
 		if (isset($_SESSION['openid']))
-			unset($_SESSION['openid']);
+		{
+					unset($_SESSION['openid']);
+		}
 
 		// It won't be first login anymore.
 		unset($_SESSION['first_login']);
@@ -419,7 +450,9 @@ 
 		$types = array('admin', 'moderate');
 		call_integration_hook('integrate_validateSession', array(&$types));
 		foreach ($types as $type)
-			unset($_SESSION[$type . '_time']);
+		{
+					unset($_SESSION[$type . '_time']);
+		}
 
 		$_SESSION['log_time'] = 0;
 
@@ -438,7 +471,9 @@ 
 		if ($redirect)
 		{
 			if (empty($_SESSION['logout_url']))
-				redirectexit('', detectServer()->is('needs_login_fix'));
+			{
+							redirectexit('', detectServer()->is('needs_login_fix'));
+			}
 			elseif (!empty($_SESSION['logout_url']) && (substr($_SESSION['logout_url'], 0, 7) !== 'http://' && substr($_SESSION['logout_url'], 0, 8) !== 'https://'))
 			{
 				unset($_SESSION['logout_url']);
@@ -474,7 +509,9 @@ 
 
 		// Never redirect to an attachment
 		if (validLoginUrl($_SERVER['REQUEST_URL']))
-			$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+		{
+					$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+		}
 
 		$context['sub_template'] = 'kick_guest';
 		$context['page_title'] = $txt['login'];
@@ -520,7 +557,9 @@ 
 		{
 			// Strike!  You're outta there!
 			if ($_GET['member'] != $user_info['id'])
-				throw new Elk_Exception('login_cookie_error', false);
+			{
+							throw new Elk_Exception('login_cookie_error', false);
+			}
 
 			$user_info['can_mod'] = allowedTo('access_mod_center') || (!$user_info['is_guest'] && ($user_info['mod_cache']['gq'] != '0=1' || $user_info['mod_cache']['bq'] != '0=1' || ($modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']))));
 			if ($user_info['can_mod'] && isset($user_settings['openid_uri']) && empty($user_settings['openid_uri']))
@@ -644,11 +683,15 @@ 
 			{
 				// Try iconv first, for no particular reason.
 				if (function_exists('iconv'))
-					$other_passwords['iconv'] = sha1(strtolower(iconv('UTF-8', $modSettings['previousCharacterSet'], $user_settings['member_name'])) . un_htmlspecialchars(iconv('UTF-8', $modSettings['previousCharacterSet'], $_POST['passwrd'])));
+				{
+									$other_passwords['iconv'] = sha1(strtolower(iconv('UTF-8', $modSettings['previousCharacterSet'], $user_settings['member_name'])) . un_htmlspecialchars(iconv('UTF-8', $modSettings['previousCharacterSet'], $_POST['passwrd'])));
+				}
 
 				// Say it aint so, iconv failed!
 				if (empty($other_passwords['iconv']) && function_exists('mb_convert_encoding'))
-					$other_passwords[] = sha1(strtolower(mb_convert_encoding($user_settings['member_name'], 'UTF-8', $modSettings['previousCharacterSet'])) . un_htmlspecialchars(mb_convert_encoding($_POST['passwrd'], 'UTF-8', $modSettings['previousCharacterSet'])));
+				{
+									$other_passwords[] = sha1(strtolower(mb_convert_encoding($user_settings['member_name'], 'UTF-8', $modSettings['previousCharacterSet'])) . un_htmlspecialchars(mb_convert_encoding($_POST['passwrd'], 'UTF-8', $modSettings['previousCharacterSet'])));
+				}
 			}
 		}
 		// SHA-256 will be 64 characters long, lets check some of these possibilities
@@ -698,7 +741,9 @@ 
 	global $context, $txt, $scripturl, $user_settings, $modSettings;
 
 	if (!isset($context['login_errors']))
-		$context['login_errors'] = array();
+	{
+			$context['login_errors'] = array();
+	}
 
 	// What is the true activation status of this account?
 	$activation_status = $user_settings['is_activated'] > 10 ? $user_settings['is_activated'] - 10 : $user_settings['is_activated'];
@@ -711,7 +756,9 @@ 
 	}
 	// Awaiting approval still?
 	elseif ($activation_status == 3)
-		throw new Elk_Exception('still_awaiting_approval', 'user');
+	{
+			throw new Elk_Exception('still_awaiting_approval', 'user');
+	}
 	// Awaiting deletion, changed their mind?
 	elseif ($activation_status == 4)
 	{
@@ -766,7 +813,9 @@ 
 
 	// Reset the login threshold.
 	if (isset($_SESSION['failed_login']))
-		unset($_SESSION['failed_login']);
+	{
+			unset($_SESSION['failed_login']);
+	}
 
 	$user_info['is_guest'] = false;
 	$user_settings['additional_groups'] = explode(',', $user_settings['additional_groups']);
@@ -780,7 +829,9 @@ 
 	{
 		// Let's validate if they really want..
 		if (!empty($modSettings['auto_admin_session']) && $modSettings['auto_admin_session'] == 1)
-			$_SESSION['admin_time'] = time();
+		{
+					$_SESSION['admin_time'] = time();
+		}
 
 		unset($_SESSION['just_registered']);
 	}
@@ -790,9 +841,12 @@ 
 
 	// We want to know if this is first login
 	if (isFirstLogin($user_info['id']))
-		$_SESSION['first_login'] = true;
-	else
-		unset($_SESSION['first_login']);
+	{
+			$_SESSION['first_login'] = true;
+	}
+	else {
+			unset($_SESSION['first_login']);
+	}
 
 	// You're one of us: need to know all about you now, IP, stuff.
 	$req = request();
@@ -808,14 +862,19 @@ 
 
 	// Log this entry, only if we have it enabled.
 	if (!empty($modSettings['loginHistoryDays']))
-		logLoginHistory($user_info['id'], $user_info['ip'], $user_info['ip2']);
+	{
+			logLoginHistory($user_info['id'], $user_info['ip'], $user_info['ip2']);
+	}
 
 	// Just log you back out if it's in maintenance mode and you AREN'T an admin.
 	if (empty($maintenance) || allowedTo('admin_forum'))
-		redirectexit('action=auth;sa=check;member=' . $user_info['id'], detectServer()->is('needs_login_fix'));
-	else
-		redirectexit('action=logout;' . $context['session_var'] . '=' . $context['session_id'], detectServer()->is('needs_login_fix'));
-}
+	{
+			redirectexit('action=auth;sa=check;member=' . $user_info['id'], detectServer()->is('needs_login_fix'));
+	}
+	else {
+			redirectexit('action=logout;' . $context['session_var'] . '=' . $context['session_id'], detectServer()->is('needs_login_fix'));
+	}
+	}
 
 /**
  * MD5 Encryption used for older passwords. (SMF 1.0.x/YaBB SE 1.5.x hashing)
@@ -843,7 +902,9 @@ 
 {
 	// Too long or too short?
 	if (strlen($passwd_hash) != 34)
-		return false;
+	{
+			return false;
+	}
 
 	// Range of characters allowed.
 	$range = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
@@ -855,7 +916,9 @@ 
 
 	$hash = md5($salt . $passwd, true);
 	for (; $count != 0; --$count)
-		$hash = md5($hash . $passwd, true);
+	{
+			$hash = md5($hash . $passwd, true);
+	}
 
 	$output = substr($passwd_hash, 0, 12);
 	$i = 0;
@@ -865,20 +928,28 @@ 
 		$output .= $range[$value & 0x3f];
 
 		if ($i < 16)
-			$value |= ord($hash[$i]) << 8;
+		{
+					$value |= ord($hash[$i]) << 8;
+		}
 
 		$output .= $range[($value >> 6) & 0x3f];
 
 		if ($i++ >= 16)
-			break;
+		{
+					break;
+		}
 
 		if ($i < 16)
-			$value |= ord($hash[$i]) << 16;
+		{
+					$value |= ord($hash[$i]) << 16;
+		}
 
 		$output .= $range[($value >> 12) & 0x3f];
 
 		if ($i++ >= 16)
-			break;
+		{
+					break;
+		}
 
 		$output .= $range[($value >> 18) & 0x3f];
 	}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
 		if (!empty($_POST['otp_token']))
 		{
 			require_once(EXTDIR . '/GoogleAuthenticator.php');
-			$ga = New GoogleAuthenticator();
+			$ga = new GoogleAuthenticator();
 
 			$ga->getCode($user_settings['otp_secret']);
 			$checkResult = $ga->verifyCode($user_settings['otp_secret'], $_POST['otp_token'], 2);

sources/controllers/Notify.controller.php

Braces +6 added lines, -2 removed lines

@@ -85,7 +85,9 @@ 
 
 		// Make sure the topic has been specified.
 		if (empty($topic))
-			throw new Elk_Exception('not_a_topic', false);
+		{
+					throw new Elk_Exception('not_a_topic', false);
+		}
 
 		// What do we do?  Better ask if they didn't say..
 		if (empty($this->_req->query->sa))
@@ -210,7 +212,9 @@ 
 
 		// You have to specify a board to turn notifications on!
 		if (empty($board))
-			throw new Elk_Exception('no_board', false);
+		{
+					throw new Elk_Exception('no_board', false);
+		}
 
 		// No subaction: find out what to do.
 		if (empty($this->_req->query->sa))