elkarte / Elkarte

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

Braces +75 added lines, -27 removed lines

@@ -58,11 +58,15 @@ 
 
 		// And... which topic were you splitting, again?
 		if (empty($topic))
-			throw new Elk_Exception('numbers_one_to_nine', false);
+		{
+					throw new Elk_Exception('numbers_one_to_nine', false);
+		}
 
 		// Load up the "dependencies" - the template, getMsgMemberID().
 		if (!isset($this->_req->query->xml))
-			loadTemplate('SplitTopics');
+		{
+					loadTemplate('SplitTopics');
+		}
 
 		// Need some utilities to deal with topics
 		require_once(SUBSDIR . '/Boards.subs.php');
@@ -104,7 +108,9 @@ 
 
 		// Validate "at".
 		if (empty($this->_req->query->at))
-			throw new Elk_Exception('numbers_one_to_nine', false);
+		{
+					throw new Elk_Exception('numbers_one_to_nine', false);
+		}
 
 		// We deal with topics here.
 		require_once(SUBSDIR . '/Boards.subs.php');
@@ -116,22 +122,30 @@ 
 		// Retrieve message info for the message at the split point.
 		$messageInfo = basicMessageInfo($splitAt, false, true);
 		if ($messageInfo === false)
-			throw new Elk_Exception('cant_find_messages');
+		{
+					throw new Elk_Exception('cant_find_messages');
+		}
 
 		// If not approved validate they can approve it.
 		if ($modSettings['postmod_active'] && !$messageInfo['topic_approved'])
-			isAllowedTo('approve_posts');
+		{
+					isAllowedTo('approve_posts');
+		}
 
 		// If this topic has unapproved posts, we need to count them too...
 		if ($modSettings['postmod_active'] && allowedTo('approve_posts'))
-			$messageInfo['num_replies'] += $messageInfo['unapproved_posts'] - ($messageInfo['topic_approved'] ? 0 : 1);
+		{
+					$messageInfo['num_replies'] += $messageInfo['unapproved_posts'] - ($messageInfo['topic_approved'] ? 0 : 1);
+		}
 
 		// If they can more it as well, allow the template to give them a move to board list
 		$context['can_move'] = allowedTo('move_any') || allowedTo('move_own');
 
 		// Check if there is more than one message in the topic.  (there should be.)
 		if ($messageInfo['num_replies'] < 1)
-			throw new Elk_Exception('topic_one_post', false);
+		{
+					throw new Elk_Exception('topic_one_post', false);
+		}
 
 		// Check if this is the first message in the topic (if so, the first and second option won't be available)
 		if ($messageInfo['id_first_msg'] == $splitAt)
@@ -187,7 +201,9 @@ 
 		if ($this->_req->post->step2 === 'selective')
 		{
 			if (!empty($this->_req->post->at))
-				$_SESSION['split_selection'][$topic][] = (int) $this->_req->post->at;
+			{
+							$_SESSION['split_selection'][$topic][] = (int) $this->_req->post->at;
+			}
 
 			$this->action_splitSelectTopics();
 			return true;
@@ -207,10 +223,14 @@ 
 
 		// Fetch the message IDs of the topic that are at or after the message.
 		if ($this->_req->post->step2 === 'afterthis')
-			$messagesToBeSplit = messagesSince($topic, $splitAt, true);
+		{
+					$messagesToBeSplit = messagesSince($topic, $splitAt, true);
+		}
 		// Only the selected message has to be split. That should be easy.
 		elseif ($this->_req->post->step2 === 'onlythis')
-			$messagesToBeSplit[] = $splitAt;
+		{
+					$messagesToBeSplit[] = $splitAt;
+		}
 		// There's another action?!
 		else
 		{
@@ -228,7 +248,9 @@ 
 		// Create a link to this in the old topic.
 		// @todo Does this make sense if the topic was unapproved before? We are not yet sure if the resulting topic is unapproved.
 		if ($_SESSION['messageRedirect'])
-			postSplitRedirect($_SESSION['reason'], $_SESSION['new_topic_subject'], $boards['destination'], $context['new_topic']);
+		{
+					postSplitRedirect($_SESSION['reason'], $_SESSION['new_topic_subject'], $boards['destination'], $context['new_topic']);
+		}
 
 		$this->_unset_session_values();
 
@@ -275,7 +297,9 @@ 
 		// Create a link to this in the old topic.
 		// @todo Does this make sense if the topic was unapproved before? We are not yet sure if the resulting topic is unapproved.
 		if ($_SESSION['messageRedirect'])
-			postSplitRedirect($_SESSION['reason'], $_SESSION['new_topic_subject'], $boards['destination'], $context['new_topic']);
+		{
+					postSplitRedirect($_SESSION['reason'], $_SESSION['new_topic_subject'], $boards['destination'], $context['new_topic']);
+		}
 
 		$this->_unset_session_values();
 	}
@@ -341,7 +365,9 @@ 
 
 		// All of the js for topic split selection is needed
 		if (!isset($this->_req->query->xml))
-			loadJavascriptFile('topic.js');
+		{
+					loadJavascriptFile('topic.js');
+		}
 
 		// Are we using a custom messages per page?
 		$context['messages_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
@@ -360,7 +386,9 @@ 
 
 			// You can't split the last message off.
 			if (empty($context['not_selected']['start']) && count($original_msgs['not_selected']) <= 1 && $this->_req->query->move === 'down')
-				$this->_req->query->move = '';
+			{
+							$this->_req->query->move = '';
+			}
 
 			if (!empty($_SESSION['split_selection'][$topic]))
 			{
@@ -378,11 +406,16 @@ 
 			$_id_msg = $this->_req->getQuery('msg', 'intval');
 
 			if ($this->_req->query->move === 'reset')
-				$_SESSION['split_selection'][$topic] = array();
+			{
+							$_SESSION['split_selection'][$topic] = array();
+			}
 			elseif ($this->_req->query->move === 'up')
-				$_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_id_msg));
-			else
-				$_SESSION['split_selection'][$topic][] = $_id_msg;
+			{
+							$_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_id_msg));
+			}
+			else {
+							$_SESSION['split_selection'][$topic][] = $_id_msg;
+			}
 		}
 
 		// Make sure the selection is still accurate.
@@ -395,17 +428,22 @@ 
 			));
 			$selection = $_SESSION['split_selection'][$topic];
 		}
-		else
-			$selection = array();
+		else {
+					$selection = array();
+		}
 
 		// Get the number of messages (not) selected to be split.
 		$split_counts = countSplitMessages($topic, !$modSettings['postmod_active'] || allowedTo('approve_posts'), $selection);
 		foreach ($split_counts as $key => $num_messages)
-			$context[$key]['num_messages'] = $num_messages;
+		{
+					$context[$key]['num_messages'] = $num_messages;
+		}
 
 		// Fix an oversize starting page (to make sure both pageindexes are properly set).
 		if ($context['selected']['start'] >= $context['selected']['num_messages'])
-			$context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page'])));
+		{
+					$context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page'])));
+		}
 
 		$page_index_url = $scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_SESSION['new_topic_subject']), array('%' => '%%')) . ';topic=' . $topic;
 
@@ -420,7 +458,9 @@ 
 
 		// Now retrieve the selected messages.
 		if (!empty($_SESSION['split_selection'][$topic]))
-			$context['selected']['messages'] = selectMessages($topic, $context['selected']['start'], $context['messages_per_page'], array('included' => $_SESSION['split_selection'][$topic]), $modSettings['postmod_active'] && !allowedTo('approve_posts'));
+		{
+					$context['selected']['messages'] = selectMessages($topic, $context['selected']['start'], $context['messages_per_page'], array('included' => $_SESSION['split_selection'][$topic]), $modSettings['postmod_active'] && !allowedTo('approve_posts'));
+		}
 
 		// The XMLhttp method only needs the stuff that changed, so let's compare.
 		if (isset($this->_req->query->xml))
@@ -442,7 +482,9 @@ 
 				foreach ($change_array as $section => $msg_array)
 				{
 					if (empty($msg_array))
-						continue;
+					{
+											continue;
+					}
 
 					foreach ($msg_array as $id_msg)
 					{
@@ -453,7 +495,9 @@ 
 						);
 
 						if ($change_type === 'insert')
-							$context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg];
+						{
+													$context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg];
+						}
 					}
 				}
 			}
@@ -470,10 +514,14 @@ 
 		// Clean up the subject.
 		$subname = $this->_req->getPost('subname', 'trim', $this->_req->getQuery('subname', 'trim', null));
 		if (isset($subname) && empty($this->_new_topic_subject))
-			$this->_new_topic_subject = Util::htmlspecialchars($subname);
+		{
+					$this->_new_topic_subject = Util::htmlspecialchars($subname);
+		}
 
 		if (empty($this->_new_topic_subject))
-			$this->_new_topic_subject = $txt['new_topic'];
+		{
+					$this->_new_topic_subject = $txt['new_topic'];
+		}
 
 		// Save in session so its available across all the form pages
 		if (empty($_SESSION['move_to_board']))

sources/controllers/Who.controller.php

Braces +27 added lines, -11 removed lines

@@ -56,7 +56,9 @@ 
 
 		// You can't do anything if this is off.
 		if (empty($modSettings['who_enabled']))
-			throw new Elk_Exception('who_off', false);
+		{
+					throw new Elk_Exception('who_off', false);
+		}
 
 		// Load the 'Who' template.
 		loadTemplate('Who');
@@ -94,7 +96,9 @@ 
 			$context['show_methods']['spiders'] = $txt['who_show_spiders_only'];
 		}
 		elseif (empty($modSettings['show_spider_online']) && isset($_SESSION['who_online_filter']) && $_SESSION['who_online_filter'] === 'spiders')
-			unset($_SESSION['who_online_filter']);
+		{
+					unset($_SESSION['who_online_filter']);
+		}
 
 		// Does the user prefer a different sort direction?
 		if (isset($this->_req->query->sort) && isset($sort_methods[$this->_req->query->sort]))
@@ -119,11 +123,15 @@ 
 
 		$conditions = array();
 		if (!allowedTo('moderate_forum'))
-			$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+		{
+					$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+		}
 
 		// Fallback to top filter?
 		if (isset($this->_req->post->submit_top, $this->_req->post->show_top))
-			$this->_req->post->show = $this->_req->post->show_top;
+		{
+					$this->_req->post->show = $this->_req->post->show_top;
+		}
 
 		// Does the user wish to apply a filter?
 		if (isset($this->_req->post->show) && isset($show_methods[$this->_req->post->show]))
@@ -137,8 +145,9 @@ 
 			$context['show_by'] = $_SESSION['who_online_filter'];
 			$conditions[] = $show_methods[$_SESSION['who_online_filter']];
 		}
-		else
-			$context['show_by'] = $_SESSION['who_online_filter'] = 'all';
+		else {
+					$context['show_by'] = $_SESSION['who_online_filter'] = 'all';
+		}
 
 		require_once(SUBSDIR . '/Members.subs.php');
 		$totalMembers = countMembersOnline($conditions);
@@ -161,7 +170,9 @@ 
 		{
 			$actions = Util::unserialize($row['url']);
 			if ($actions === false)
-				continue;
+			{
+							continue;
+			}
 
 			// Send the information to the template.
 			$context['members'][$row['session']] = array(
@@ -227,16 +238,21 @@ 
 		foreach ($context['members'] as $i => $member)
 		{
 			if ($member['id'] != 0)
-				$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+			{
+							$member['id'] = loadMemberContext($member['id']) ? $member['id'] : 0;
+			}
 
 			// Keep the IP that came from the database.
 			$memberContext[$member['id']]['ip'] = $member['ip'];
 			$context['members'][$i]['action'] = isset($url_data[$i]) ? $url_data[$i] : $txt['who_hidden'];
 
 			if ($member['id'] == 0 && isset($spiderContext[$member['id_spider']]))
-				$context['members'][$i] += $spiderContext[$member['id_spider']];
-			else
-				$context['members'][$i] += $memberContext[$member['id']];
+			{
+							$context['members'][$i] += $spiderContext[$member['id_spider']];
+			}
+			else {
+							$context['members'][$i] += $memberContext[$member['id']];
+			}
 		}
 
 		// Some people can't send personal messages...

sources/controllers/Draft.controller.php

Braces +21 added lines, -7 removed lines

@@ -91,7 +91,9 @@ 
 
 		// Safe is safe.
 		if ($this->_memID != $user_info['id'])
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		require_once(SUBSDIR . '/Drafts.subs.php');
 
@@ -101,7 +103,9 @@ 
 
 		// If just deleting a draft, do it and then redirect back.
 		if (!empty($this->_req->query->delete) || !empty($this->_req->post->delete))
-			$this->_action_delete('action=profile;u=' . $this->_memID . ';area=showdrafts;start=' . $context['start']);
+		{
+					$this->_action_delete('action=profile;u=' . $this->_memID . ';area=showdrafts;start=' . $context['start']);
+		}
 
 		// Get things started
 		$msgCount = draftsCount($this->_memID, 0);
@@ -166,7 +170,9 @@ 
 
 		// If the drafts were retrieved in reverse order, get them right again.
 		if ($reverse)
-			$context['drafts'] = array_reverse($context['drafts'], true);
+		{
+					$context['drafts'] = array_reverse($context['drafts'], true);
+		}
 
 		// Menu tab
 		$context[$context['profile_menu_name']]['tab_data'] = array(
@@ -195,15 +201,19 @@ 
 
 		// Quick check how we got here.
 		if ($this->_memID != $user_info['id'])
-			// empty($modSettings['drafts_enabled']) || empty($modSettings['drafts_pm_enabled']))
+		{
+					// empty($modSettings['drafts_enabled']) || empty($modSettings['drafts_pm_enabled']))
 			throw new Elk_Exception('no_access', false);
+		}
 
 		// Set up what we will need
 		$context['start'] = $this->_req->getQuery('start', 'intval', 0);
 
 		// If just deleting a draft, do it and then redirect back.
 		if (!empty($this->_req->query->delete) || !empty($this->_req->post->delete))
-			return $this->_action_delete('action=pm;sa=showpmdrafts;start=' . $context['start']);
+		{
+					return $this->_action_delete('action=pm;sa=showpmdrafts;start=' . $context['start']);
+		}
 
 		// Perhaps a draft was selected for editing? if so pass this off
 		if (!empty($this->_req->query->id_draft) && !empty($context['drafts_pm_save']))
@@ -264,7 +274,9 @@ 
 
 		// If the drafts were retrieved in reverse order, then put them in the right order again.
 		if ($reverse)
-			$context['drafts'] = array_reverse($context['drafts'], true);
+		{
+					$context['drafts'] = array_reverse($context['drafts'], true);
+		}
 
 		// Off to the template we go
 		$context['page_title'] = $txt['drafts'];
@@ -300,7 +312,9 @@ 
 		}
 
 		if (!empty($toDelete))
-			deleteDrafts($toDelete, $this->_memID);
+		{
+					deleteDrafts($toDelete, $this->_memID);
+		}
 
 		redirectexit($redirect);
 	}

sources/controllers/Announce.controller.php

Braces +39 added lines, -16 removed lines

@@ -42,7 +42,9 @@ 
 
 		// You need to announce something
 		if (empty($topic))
-			throw new Elk_Exception('topic_gone', false);
+		{
+					throw new Elk_Exception('topic_gone', false);
+		}
 
 		// Language files
 		loadLanguage('Post');
@@ -82,7 +84,9 @@ 
 		// Build a list of groups that can see this board
 		$groups = array_merge($board_info['groups'], array(1));
 		foreach ($groups as $id => $group)
-			$groups[$id] = (int) $group;
+		{
+					$groups[$id] = (int) $group;
+		}
 
 		// Prepare for a group selection list in the template
 		$context['groups'] = getGroups($groups);
@@ -123,17 +127,24 @@ 
 
 		// Load any supplied membergroups (from announcement_send template pause loop)
 		if (isset($this->_req->post->membergroups))
-			$_who = explode(',', $this->_req->post->membergroups);
-		else
-			$_who = $this->_req->post->who;
+		{
+					$_who = explode(',', $this->_req->post->membergroups);
+		}
+		else {
+					$_who = $this->_req->post->who;
+		}
 
 		// Check that at least one membergroup was selected (set from announce sub template)
 		if (empty($_who))
-			throw new Elk_Exception('no_membergroup_selected');
+		{
+					throw new Elk_Exception('no_membergroup_selected');
+		}
 
 		// Make sure all membergroups are integers and can access the board of the announcement.
 		foreach ($_who as $id => $mg)
-			$who[$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
+		{
+					$who[$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
+		}
 
 		// Get the topic details that we are going to send
 		require_once(SUBSDIR . '/Topic.subs.php');
@@ -159,7 +170,9 @@ 
 
 		// Have we allowed members to opt out of announcements?
 		if (!empty($modSettings['allow_disableAnnounce']))
-			$conditions['notify_announcements'] = 1;
+		{
+					$conditions['notify_announcements'] = 1;
+		}
 
 		$data = retrieveMemberData($conditions);
 
@@ -169,20 +182,28 @@ 
 			logAction('announce_topic', array('topic' => $topic), 'user');
 
 			if (!empty($this->_req->post->move) && allowedTo('move_any'))
-				redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($this->_req->post->goback) ? '' : ';goback'));
+			{
+							redirectexit('action=movetopic;topic=' . $topic . '.0' . (empty($this->_req->post->goback) ? '' : ';goback'));
+			}
 			elseif (!empty($this->_req->post->goback))
-				redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
-			else
-				redirectexit('board=' . $board . '.0');
+			{
+							redirectexit('topic=' . $topic . '.new;boardseen#new', isBrowser('ie'));
+			}
+			else {
+							redirectexit('board=' . $board . '.0');
+			}
 		}
 
 		$this->_send_announcement($data['member_info'], $topic_info);
 
 		// Provide an overall indication of progress, this is not strictly correct
 		if ($data['member_count'] < $conditions['limit'])
-			$context['percentage_done'] = 100;
-		else
-			$context['percentage_done'] = round(100 * $context['start'] / $modSettings['latestMember'], 1);
+		{
+					$context['percentage_done'] = 100;
+		}
+		else {
+					$context['percentage_done'] = round(100 * $context['start'] / $modSettings['latestMember'], 1);
+		}
 
 		// Prepare for the template
 		$context['move'] = empty($this->_req->post->move) ? 0 : 1;
@@ -193,7 +214,9 @@ 
 
 		// Go back to the correct language for the user ;)
 		if (!empty($modSettings['userLanguage']))
-			loadLanguage('Post');
+		{
+					loadLanguage('Post');
+		}
 	}
 
 	/**

sources/controllers/Display.controller.php

Braces +111 added lines, -39 removed lines

@@ -106,7 +106,9 @@ 
 
 		// What are you gonna display if these are empty?!
 		if (empty($topic))
-			throw new Elk_Exception('no_board', false);
+		{
+					throw new Elk_Exception('no_board', false);
+		}
 
 		// Load the template
 		loadTemplate('Display');
@@ -131,13 +133,17 @@ 
 			foreach ($this->_req->query as $k => $v)
 			{
 				if (!in_array($k, array('topic', 'board', 'start', session_name())))
-					$context['robot_no_index'] = true;
+				{
+									$context['robot_no_index'] = true;
+				}
 			}
 		}
 
 		$this->_start = $this->_req->getQuery('start');
 		if (!empty($this->_start) && (!is_numeric($this->_start) || $this->_start % $context['messages_per_page'] !== 0))
-			$context['robot_no_index'] = true;
+		{
+					$context['robot_no_index'] = true;
+		}
 
 		// Find the previous or next topic.  Make a fuss if there are no more.
 		if ($this->_req->getQuery('prev_next') === 'prev' || $this->_req->getQuery('prev_next') === 'next')
@@ -176,7 +182,9 @@ 
 		// Load the topic details
 		$topicinfo = getTopicInfo($topic_parameters, 'all', $topic_selects, $topic_tables);
 		if (empty($topicinfo))
-			throw new Elk_Exception('not_a_topic', false);
+		{
+					throw new Elk_Exception('not_a_topic', false);
+		}
 
 		// Is this a moved topic that we are redirecting to?
 		if (!empty($topicinfo['id_redirect_topic']) && !isset($this->_req->query->noredir))
@@ -208,7 +216,9 @@ 
 
 		// Add up unapproved replies to get real number of replies...
 		if ($modSettings['postmod_active'] && allowedTo('approve_posts'))
-			$context['real_num_replies'] += $topicinfo['unapproved_posts'] - ($topicinfo['approved'] ? 0 : 1);
+		{
+					$context['real_num_replies'] += $topicinfo['unapproved_posts'] - ($topicinfo['approved'] ? 0 : 1);
+		}
 
 		// If this topic has unapproved posts, we need to work out how many posts the user can see, for page indexing.
 		if (!$includeUnapproved && $topicinfo['unapproved_posts'] && !$user_info['is_guest'])
@@ -218,9 +228,12 @@ 
 			$total_visible_posts = $context['num_replies'] + $myUnapprovedPosts + ($topicinfo['approved'] ? 1 : 0);
 		}
 		elseif ($user_info['is_guest'])
-			$total_visible_posts = $context['num_replies'] + ($topicinfo['approved'] ? 1 : 0);
-		else
-			$total_visible_posts = $context['num_replies'] + $topicinfo['unapproved_posts'] + ($topicinfo['approved'] ? 1 : 0);
+		{
+					$total_visible_posts = $context['num_replies'] + ($topicinfo['approved'] ? 1 : 0);
+		}
+		else {
+					$total_visible_posts = $context['num_replies'] + $topicinfo['unapproved_posts'] + ($topicinfo['approved'] ? 1 : 0);
+		}
 
 		// When was the last time this topic was replied to?  Should we warn them about it?
 		$context['oldTopicError'] = false;
@@ -228,7 +241,9 @@ 
 		{
 			$mgsOptions = basicMessageInfo($topicinfo['id_last_msg'], true);
 			if ($mgsOptions !== false)
-				$context['oldTopicError'] = $mgsOptions['poster_time'] + $modSettings['oldTopicDays'] * 86400 < time() && empty($topicinfo['is_sticky']);
+			{
+							$context['oldTopicError'] = $mgsOptions['poster_time'] + $modSettings['oldTopicDays'] * 86400 < time() && empty($topicinfo['is_sticky']);
+			}
 		}
 
 		// The start isn't a number; it's information about what to do, where to go.
@@ -255,7 +270,9 @@ 
 			{
 				$timestamp = (int) substr($this->_start, 4);
 				if ($timestamp === 0)
-					$this->_start = 0;
+				{
+									$this->_start = 0;
+				}
 				else
 				{
 					// Find the number of messages posted before said time...
@@ -268,9 +285,13 @@ 
 			{
 				$this->_virtual_msg = (int) substr($this->_start, 3);
 				if (!$topicinfo['unapproved_posts'] && $this->_virtual_msg >= $topicinfo['id_last_msg'])
-					$context['start_from'] = $total_visible_posts - 1;
+				{
+									$context['start_from'] = $total_visible_posts - 1;
+				}
 				elseif (!$topicinfo['unapproved_posts'] && $this->_virtual_msg <= $topicinfo['id_first_msg'])
-					$context['start_from'] = 0;
+				{
+									$context['start_from'] = 0;
+				}
 				else
 				{
 					$only_approved = $modSettings['postmod_active'] && $topicinfo['unapproved_posts'] && !allowedTo('approve_posts');
@@ -284,15 +305,19 @@ 
 
 		// Create a previous next string if the selected theme has it as a selected option.
 		if ($modSettings['enablePreviousNext'])
-			$context['links'] += array(
+		{
+					$context['links'] += array(
 				'go_prev' => $scripturl . '?topic=' . $topic . '.0;prev_next=prev#new',
 				'go_next' => $scripturl . '?topic=' . $topic . '.0;prev_next=next#new'
 			);
+		}
 
 		// Check if spellchecking is both enabled and actually working. (for quick reply.)
 		$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && function_exists('pspell_new');
 		if ($context['show_spellchecking'])
-			loadJavascriptFile('spellcheck.js', array('defer' => true));
+		{
+					loadJavascriptFile('spellcheck.js', array('defer' => true));
+		}
 
 		// Are we showing signatures - or disabled fields?
 		$context['signature_enabled'] = substr($modSettings['signature_settings'], 0, 1) == 1;
@@ -311,7 +336,9 @@ 
 		// Did we report a post to a moderator just now?
 		$context['report_sent'] = isset($this->_req->query->reportsent);
 		if ($context['report_sent'])
-			$this->_template_layers->add('report_sent');
+		{
+					$this->_template_layers->add('report_sent');
+		}
 
 		// Let's get nosey, who is viewing this topic?
 		if (!empty($settings['display_who_viewing']))
@@ -323,10 +350,14 @@ 
 		// If all is set, but not allowed... just unset it.
 		$can_show_all = !empty($modSettings['enableAllMessages']) && $total_visible_posts > $context['messages_per_page'] && $total_visible_posts < $modSettings['enableAllMessages'];
 		if (isset($this->_req->query->all) && !$can_show_all)
-			unset($this->_req->query->all);
+		{
+					unset($this->_req->query->all);
+		}
 		// Otherwise, it must be allowed... so pretend start was -1.
 		elseif (isset($this->_req->query->all))
-			$this->_start = -1;
+		{
+					$this->_start = -1;
+		}
 
 		// Construct the page index, allowing for the .START method...
 		$context['page_index'] = constructPageIndex($scripturl . '?topic=' . $topic . '.%1$d', $this->_start, $total_visible_posts, $context['messages_per_page'], true, array('all' => $can_show_all, 'all_selected' => isset($this->_req->query->all)));
@@ -422,14 +453,18 @@ 
 
 			$mark_at_msg = max($messages);
 			if ($mark_at_msg >= $topicinfo['id_last_msg'])
-				$mark_at_msg = $modSettings['maxMsgID'];
+			{
+							$mark_at_msg = $modSettings['maxMsgID'];
+			}
 			if ($mark_at_msg >= $topicinfo['new_from'])
 			{
 				markTopicsRead(array($user_info['id'], $topic, $mark_at_msg, $topicinfo['unwatched']), $topicinfo['new_from'] !== 0);
 				$numNewTopics = getUnreadCountSince($board, empty($_SESSION['id_msg_last_visit']) ? 0 : $_SESSION['id_msg_last_visit']);
 
 				if (empty($numNewTopics))
-					$boardseen = true;
+				{
+									$boardseen = true;
+				}
 			}
 
 			updateReadNotificationsFor($topic, $board);
@@ -451,7 +486,9 @@ 
 
 			// Fetch attachments.
 			if (!empty($modSettings['attachmentEnable']) && allowedTo('view_attachments'))
-				$attachments = getAttachments($messages, $includeUnapproved, 'filter_accessible_attachment', $all_posters);
+			{
+							$attachments = getAttachments($messages, $includeUnapproved, 'filter_accessible_attachment', $all_posters);
+			}
 
 			$msg_parameters = array(
 				'message_list' => $messages,
@@ -463,7 +500,9 @@ 
 
 			// What?  It's not like it *couldn't* be only guests in this topic...
 			if (!empty($posters))
-				loadMemberData($posters);
+			{
+							loadMemberData($posters);
+			}
 
 			// Load in the likes for this group of messages
 			if (!empty($modSettings['likes_enabled']))
@@ -503,7 +542,9 @@ 
 
 			// Go to the last message if the given time is beyond the time of the last message.
 			if (isset($context['start_from']) && $context['start_from'] >= $topicinfo['num_replies'])
-				$context['start_from'] = $topicinfo['num_replies'];
+			{
+							$context['start_from'] = $topicinfo['num_replies'];
+			}
 
 			// Since the anchor information is needed on the top of the page we load these variables beforehand.
 			$context['first_message'] = isset($messages[$firstIndex]) ? $messages[$firstIndex] : $messages[0];
@@ -556,7 +597,9 @@ 
 			'can_restore_msg' => 'move_any',
 		);
 		foreach ($common_permissions as $contextual => $perm)
-			$context[$contextual] = allowedTo($perm);
+		{
+					$context[$contextual] = allowedTo($perm);
+		}
 
 		// Permissions with _any/_own versions.  $context[YYY] => ZZZ_any/_own.
 		$anyown_permissions = array(
@@ -567,7 +610,9 @@ 
 			'can_reply_unapproved' => 'post_unapproved_replies',
 		);
 		foreach ($anyown_permissions as $contextual => $perm)
-			$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+		{
+					$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+		}
 
 		// Cleanup all the permissions with extra stuff...
 		$context['can_mark_notify'] &= !$context['user']['is_guest'];
@@ -675,7 +720,9 @@ 
 
 		// Restore topic. eh?  No monkey business.
 		if ($context['can_restore_topic'])
-			$context['mod_buttons'][] = array('text' => 'restore_topic', 'image' => '', 'lang' => true, 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		{
+					$context['mod_buttons'][] = array('text' => 'restore_topic', 'image' => '', 'lang' => true, 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
 		// Quick reply & modify enabled?
 		if ($context['can_reply'] && !empty($options['display_quick_reply']))
@@ -709,13 +756,17 @@ 
 		require_once(SUBSDIR . '/Messages.subs.php');
 
 		if (empty($this->_req->post->msgs))
-			redirectexit('topic=' . $topic . '.' . $this->_req->getQuery('start', 'intval'));
+		{
+					redirectexit('topic=' . $topic . '.' . $this->_req->getQuery('start', 'intval'));
+		}
 
 		$messages = array_map('intval', $this->_req->post->msgs);
 
 		// We are restoring messages. We handle this in another place.
 		if (isset($this->_req->query->restore_selected))
-			redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+		{
+					redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
 		if (isset($this->_req->query->split_selection))
 		{
@@ -730,16 +781,23 @@ 
 
 		// Allowed to delete any message?
 		if (allowedTo('delete_any'))
-			$allowed_all = true;
+		{
+					$allowed_all = true;
+		}
 		// Allowed to delete replies to their messages?
 		elseif (allowedTo('delete_replies'))
-			$allowed_all = $topic_info['id_member_started'] == $user_info['id'];
-		else
-			$allowed_all = false;
+		{
+					$allowed_all = $topic_info['id_member_started'] == $user_info['id'];
+		}
+		else {
+					$allowed_all = false;
+		}
 
 		// Make sure they're allowed to delete their own messages, if not any.
 		if (!$allowed_all)
-			isAllowedTo('delete_own');
+		{
+					isAllowedTo('delete_own');
+		}
 
 		// Allowed to remove which messages?
 		$messages = determineRemovableMessages($topic, $messages, $allowed_all);
@@ -754,10 +812,14 @@ 
 		{
 			// Just skip the first message - if it's not the last.
 			if ($message == $first_message && $message != $last_message)
-				continue;
+			{
+							continue;
+			}
 			// If the first message is going then don't bother going back to the topic as we're effectively deleting it.
 			elseif ($message == $first_message)
-				$topicGone = true;
+			{
+							$topicGone = true;
+			}
 
 			$remover->removeMessage($message);
 		}
@@ -782,20 +844,28 @@ 
 
 		// If the query returned false, bail.
 		if ($messages_request === false)
-			return false;
+		{
+					return false;
+		}
 
 		// Remember which message this is.  (ie. reply #83)
 		if ($counter === null || $reset)
-			$counter = $context['start'];
+		{
+					$counter = $context['start'];
+		}
 
 		// Start from the beginning...
 		if ($reset)
-			return currentContext($messages_request, $reset);
+		{
+					return currentContext($messages_request, $reset);
+		}
 
 		// Attempt to get the next message.
 		$message = currentContext($messages_request);
 		if (!$message)
-			return false;
+		{
+					return false;
+		}
 
 		// If you're a lazy bum, you probably didn't give a subject...
 		$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -901,7 +971,9 @@ 
 		);
 
 		if (!empty($output['modified']['name']))
-			$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name'], standardTime($output['modified']['timestamp']));
+		{
+					$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name'], standardTime($output['modified']['timestamp']));
+		}
 
 		if (!empty($output['member']['karma']['allow']))
 		{

sources/controllers/Likes.controller.php

Braces +54 added lines, -25 removed lines

@@ -39,7 +39,9 @@ 
 
 		// If likes are disabled, we don't go any further
 		if (empty($modSettings['likes_enabled']))
-			throw new Elk_Exception('feature_disabled', true);
+		{
+					throw new Elk_Exception('feature_disabled', true);
+		}
 	}
 
 	/**
@@ -182,9 +184,12 @@ 
 
 		// No longer liked, return to whence you came
 		if (!isset($this->_req->query->profile))
-			redirectexit('topic=' . $topic . '.msg' . $this->_id_liked . '#msg' . $this->_id_liked);
-		else
-			redirectexit('action=profile;area=showlikes;sa=given;u=' . $user_info['id']);
+		{
+					redirectexit('topic=' . $topic . '.msg' . $this->_id_liked . '#msg' . $this->_id_liked);
+		}
+		else {
+					redirectexit('action=profile;area=showlikes;sa=given;u=' . $user_info['id']);
+		}
 	}
 
 	/**
@@ -249,7 +254,9 @@ 
 
 		// Past the post threshold?
 		if (!$user_info['is_admin'] && !empty($modSettings['likeMinPosts']) && $user_info['posts'] < $modSettings['likeMinPosts'])
-			$check = false;
+		{
+					$check = false;
+		}
 
 		// If they have exceeded their limits, provide a message for the ajax response
 		if ($check === false)
@@ -272,9 +279,12 @@ 
 		require_once(SUBSDIR . '/Likes.subs.php');
 
 		if ($this->_req->getQuery('sa') === 'received')
-			$this->_action_showReceived();
-		else
-			$this->_action_showGiven();
+		{
+					$this->_action_showReceived();
+		}
+		else {
+					$this->_action_showGiven();
+		}
 	}
 
 	/**
@@ -636,7 +646,9 @@ 
 
 		// Likes are not on, your quest for statistics ends here
 		if (empty($modSettings['likes_enabled']))
-			throw new Elk_Exception('feature_disabled', true);
+		{
+					throw new Elk_Exception('feature_disabled', true);
+		}
 
 		// And you can see the stats
 		isAllowedTo('like_posts_stats');
@@ -679,7 +691,9 @@ 
 
 		// Likes are not on, your quest for statistics ends here
 		if (empty($modSettings['likes_enabled']))
-			throw new Elk_Exception('feature_disabled', true);
+		{
+					throw new Elk_Exception('feature_disabled', true);
+		}
 
 		// Worthy to view like statistics?
 		isAllowedTo('like_posts_stats');
@@ -734,9 +748,12 @@ 
 
 		// Set the response
 		if (!empty($data))
-			$this->_likes_response = array('result' => true, 'data' => $data);
-		else
-			$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		{
+					$this->_likes_response = array('result' => true, 'data' => $data);
+		}
+		else {
+					$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		}
 
 		// Off we go
 		$this->likeResponse();
@@ -757,9 +774,12 @@ 
 		$data = dbMostLikedTopic();
 
 		if (!empty($data))
-			$this->_likes_response = array('result' => true, 'data' => $data);
-		else
-			$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		{
+					$this->_likes_response = array('result' => true, 'data' => $data);
+		}
+		else {
+					$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		}
 
 		$this->likeResponse();
 	}
@@ -775,9 +795,12 @@ 
 		$data = dbMostLikedBoard();
 
 		if (!empty($data))
-			$this->_likes_response = array('result' => true, 'data' => $data);
-		else
-			$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		{
+					$this->_likes_response = array('result' => true, 'data' => $data);
+		}
+		else {
+					$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		}
 
 		$this->likeResponse();
 	}
@@ -793,9 +816,12 @@ 
 		$data = dbMostLikesReceivedUser();
 
 		if (!empty($data))
-			$this->_likes_response = array('result' => true, 'data' => $data);
-		else
-			$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		{
+					$this->_likes_response = array('result' => true, 'data' => $data);
+		}
+		else {
+					$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		}
 
 		$this->likeResponse();
 	}
@@ -812,9 +838,12 @@ 
 		$data = dbMostLikesGivenUser();
 
 		if (!empty($data))
-			$this->_likes_response = array('result' => true, 'data' => $data);
-		else
-			$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		{
+					$this->_likes_response = array('result' => true, 'data' => $data);
+		}
+		else {
+					$this->_likes_response = array('result' => false, 'error' => $txt['like_post_error_something_wrong']);
+		}
 		$this->likeResponse();
 	}
 }

Spacing +2 added lines, -2 removed lines

@@ -350,7 +350,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($row) {
+						'function' => function($row) {
 							global $txt;
 
 							$result = '<a href="' . $row['delete'] . '" onclick="return confirm(\'' . $txt['likes_confirm_delete'] . '\');" title="' . $txt['likes_delete'] . '"><i class="icon i-delete"></i></a>';
@@ -452,7 +452,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($row) {
+						'function' => function($row) {
 							global $txt;
 
 							$result = '<a href="' . $row['who'] . '" title="' . $txt['likes_show_who'] . '"><i class="icon i-users"></i></a>';

sources/controllers/Attachment.controller.php

Braces +18 added lines, -7 removed lines

@@ -164,8 +164,9 @@ 
 			}
 		}
 		// Could not find the files you claimed to have sent
-		else
-			$context['json_data'] = array('result' => false, 'data' => $txt['no_files_uploaded']);
+		else {
+					$context['json_data'] = array('result' => false, 'data' => $txt['no_files_uploaded']);
+		}
 	}
 
 	/**
@@ -298,7 +299,9 @@ 
 		if (!isset($this->_req->query->attach))
 		{
 			if (!isset($this->_req->query->id))
-				$this->action_no_attach();
+			{
+							$this->action_no_attach();
+			}
 
 			if ($this->_req->query->id === 'ila')
 			{
@@ -413,7 +416,9 @@ 
 
 		// If it isn't yet approved, do they have permission to view it?
 		if (!$is_approved && ($id_member == 0 || $user_info['id'] != $id_member) && ($attachment_type == 0 || $attachment_type == 3))
-			isAllowedTo('approve_posts', $id_board);
+		{
+					isAllowedTo('approve_posts', $id_board);
+		}
 
 		// Update the download counter (unless it's a thumbnail or an avatar).
 		if (!empty($id_attach) && empty($is_avatar) || $attachment_type != 3)
@@ -442,7 +447,9 @@ 
 		{
 			$mime_type = '';
 			if (isset($this->_req->query->image))
-				unset($this->_req->query->image);
+			{
+							unset($this->_req->query->image);
+			}
 		}
 
 		$this->_send_headers($filename, $eTag, $mime_type, $use_compression, $disposition, $real_filename, $do_cache);
@@ -548,7 +555,9 @@ 
 
 				// If it isn't yet approved, do they have permission to view it?
 				if (!$is_approved && ($id_member == 0 || $user_info['id'] != $id_member) && ($attachment_type == 0 || $attachment_type == 3))
-					isAllowedTo('approve_posts');
+				{
+									isAllowedTo('approve_posts');
+				}
 
 				$filename = getAttachmentFilename($real_filename, $id_attach, $id_folder, false, $file_hash);
 			}
@@ -663,7 +672,9 @@ 
 		// Send as UTF-8 if the name requires that
 		$altName = '';
 		if (preg_match('~[\x80-\xFF]~', $filename))
-			$altName = "; filename*=UTF-8''" . rawurlencode($filename);
+		{
+					$altName = "; filename*=UTF-8''" . rawurlencode($filename);
+		}
 
 		header('Content-Disposition: ' . $disposition . '; filename="' . $filename . '"' . $altName);
 

sources/controllers/Mentions.controller.php

Braces +57 added lines, -21 removed lines

@@ -135,7 +135,9 @@ 
 		global $modSettings;
 
 		if (empty($modSettings['enabled_mentions']))
-			return array();
+		{
+					return array();
+		}
 
 		return array_filter(array_unique(explode(',', $modSettings['enabled_mentions'])));
 	}
@@ -150,7 +152,9 @@ 
 
 		// I'm not sure this is needed, though better have it. :P
 		if (empty($modSettings['mentions_enabled']))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		Elk_Autoloader::instance()->register(SUBSDIR . '/MentionType', '\\ElkArte\\sources\\subs\\MentionType');
 
@@ -343,10 +347,12 @@ 
 		);
 
 		if (!empty($this->_type))
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=mentions;type=' . $this->_type,
 				'name' => $txt['mentions_type_' . $this->_type],
 			);
+		}
 	}
 
 	/**
@@ -360,7 +366,9 @@ 
 		global $user_info, $context, $txt, $modSettings, $scripturl;
 
 		if (empty($modSettings['usernotif_favicon_enable']) && empty($modSettings['usernotif_desktop_enable']))
-			die();
+		{
+					die();
+		}
 
 		loadTemplate('Json');
 		$context['sub_template'] = 'send_json';
@@ -438,22 +446,29 @@ 
 			foreach ($possible_mentions as $mention)
 			{
 				if (count($mentions) < $limit)
-					$mentions[] = $mention;
-				else
-					break;
+				{
+									$mentions[] = $mention;
+				}
+				else {
+									break;
+				}
 			}
 			$round++;
 
 			// If nothing has been removed OR there are not enough
 			if (count($mentions) != $count_possible || count($mentions) == $limit || ($totalMentions - $start < $limit))
-				break;
+			{
+							break;
+			}
 
 			// Let's start a bit further into the list
 			$start += $limit;
 		}
 
 		if ($round !== 0)
-			countUserMentions();
+		{
+					countUserMentions();
+		}
 
 		return $mentions;
 	}
@@ -489,13 +504,17 @@ 
 
 		// Common checks to determine if we can go on
 		if (!$this->_isValid())
-			return;
+		{
+					return;
+		}
 
 		// Cleanup, validate and remove the invalid values (0 and $user_info['id'])
 		$id_target = array_diff(array_map('intval', array_unique($this->_validator->uid)), array(0, $user_info['id']));
 
 		if (empty($id_target))
-			return false;
+		{
+					return false;
+		}
 
 		addMentions($user_info['id'], $id_target, $this->_validator->msg, $this->_validator->type, $this->_validator->log_time, $this->_data['status']);
 	}
@@ -510,13 +529,17 @@ 
 
 		// Common checks to determine if we can go on
 		if (!$this->_isValid())
-			return;
+		{
+					return;
+		}
 
 		// Cleanup, validate and remove the invalid values (0 and $user_info['id'])
 		$id_target = array_diff(array_map('intval', array_unique($this->_validator->uid)), array(0, $user_info['id']));
 
 		if (empty($id_target))
-			return false;
+		{
+					return false;
+		}
 
 		rlikeMentions($user_info['id'], $id_target, $this->_validator->msg);
 	}
@@ -539,13 +562,18 @@ 
 			);
 
 			if (isset($data['id_member_from']))
-				$this->_data['id_member_from'] = $data['id_member_from'];
+			{
+							$this->_data['id_member_from'] = $data['id_member_from'];
+			}
 
 			if (isset($data['log_time']))
-				$this->_data['log_time'] = $data['log_time'];
+			{
+							$this->_data['log_time'] = $data['log_time'];
+			}
+		}
+		else {
+					$this->_data = $data;
 		}
-		else
-			$this->_data = $data;
 	}
 
 	/**
@@ -560,7 +588,9 @@ 
 
 		// Common checks to determine if we can go on
 		if (!$this->_isAccessible())
-			return;
+		{
+					return;
+		}
 
 		$this->_buildUrl();
 
@@ -617,7 +647,9 @@ 
 	protected function _markMentionsRead($mention_ids)
 	{
 		if (empty($mention_ids))
-			return;
+		{
+					return;
+		}
 
 		foreach ($mention_ids as $mention)
 		{
@@ -627,7 +659,9 @@ 
 			));
 
 			if ($this->_isAccessible())
-				changeMentionStatus($this->_validator->id_mention, $this->_known_status['read']);
+			{
+							changeMentionStatus($this->_validator->id_mention, $this->_known_status['read']);
+			}
 		}
 	}
 
@@ -700,7 +734,9 @@ 
 		$this->_validator->validation_rules($validation);
 
 		if (!$this->_validator->validate($this->_data))
-			return false;
+		{
+					return false;
+		}
 
 		// If everything is fine, let's include our helper functions and prepare for the fun!
 		require_once(SUBSDIR . '/Mentions.subs.php');

Spacing +3 added lines, -3 removed lines

@@ -230,7 +230,7 @@ 
 						'value' => $txt['mentions_from'],
 					),
 					'data' => array(
-						'function' => function ($row) {
+						'function' => function($row) {
 							global $settings, $scripturl;
 
 							if (isset($settings['mentions']['mentioner_template']))
@@ -290,7 +290,7 @@ 
 						'class' => 'listaction grid8',
 					),
 					'data' => array(
-						'function' => function ($row) {
+						'function' => function($row) {
 							global $txt, $settings, $context, $scripturl;
 
 							$mark = empty($row['status']) ? 'read' : 'unread';
@@ -471,7 +471,7 @@ 
 		}
 		else
 		{
-			$to_register = array_map(function ($name) {
+			$to_register = array_map(function($name) {
 				return '\\ElkArte\\sources\\subs\\MentionType\\' . ucfirst($name) . '_Mention';
 			}, $this->_known_mentions);
 		}