elkarte / Elkarte

sources/controllers/XmlPreview.controller.php

Braces +57 added lines, -23 removed lines

@@ -47,7 +47,9 @@ 
 		$subAction = $action->initialize($subActions, 'invalid', 'item');
 
 		if ($subAction === 'invalid')
-			return;
+		{
+					return;
+		}
 
 		// Set up the template and default sub-template.
 		loadTemplate('Xml');
@@ -72,9 +74,12 @@ 
 		$errors = array();
 		$news = !isset($this->_req->post->news) ? '' : Util::htmlspecialchars($this->_req->post->news, ENT_QUOTES);
 		if (empty($news))
-			$errors[] = array('value' => 'no_news');
-		else
-			preparsecode($news);
+		{
+					$errors[] = array('value' => 'no_news');
+		}
+		else {
+					preparsecode($news);
+		}
 
 		$bbc_parser = \BBC\ParserWrapper::instance();
 
@@ -114,9 +119,13 @@ 
 
 		// Let them know about any mistakes
 		if (empty($this->_req->post->subject))
-			$context['post_error']['errors'][] = $txt['error_no_subject'];
+		{
+					$context['post_error']['errors'][] = $txt['error_no_subject'];
+		}
 		if (empty($this->_req->post->message))
-			$context['post_error']['errors'][] = $txt['error_no_message'];
+		{
+					$context['post_error']['errors'][] = $txt['error_no_message'];
+		}
 
 		prepareMailingForPreview();
 
@@ -159,7 +168,9 @@ 
 
 			// An odd check for errors to be sure
 			if ($validation !== true && $validation !== false)
-				$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+			{
+							$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+			}
 
 			preparsecode($preview_signature);
 			$preview_signature = censor($preview_signature);
@@ -169,12 +180,16 @@ 
 		elseif (!$can_change)
 		{
 			if ($is_owner)
-				$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
-			else
-				$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+			{
+							$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
+			}
+			else {
+							$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+			}
+		}
+		else {
+					$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 		}
-		else
-			$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 
 		// Return the response for the template
 		$context['xml_data']['signatures'] = array(
@@ -183,19 +198,24 @@ 
 		);
 
 		if (isset($member['signature']))
-			$context['xml_data']['signatures']['children'][] = array(
+		{
+					$context['xml_data']['signatures']['children'][] = array(
 				'value' => $member['signature'],
 				'attributes' => array('type' => 'current'),
 			);
+		}
 
 		if (isset($preview_signature))
-			$context['xml_data']['signatures']['children'][] = array(
+		{
+					$context['xml_data']['signatures']['children'][] = array(
 				'value' => $preview_signature,
 				'attributes' => array('type' => 'preview'),
 			);
+		}
 
 		if (!empty($errors))
-			$context['xml_data']['errors'] = array(
+		{
+					$context['xml_data']['errors'] = array(
 				'identifier' => 'error',
 				'children' => array_merge(
 						array(
@@ -206,6 +226,7 @@ 
 						), $errors
 				),
 			);
+		}
 	}
 
 	/**
@@ -229,14 +250,20 @@ 
 			if (isset($this->_req->post->issuing))
 			{
 				if (empty($this->_req->post->title) || empty($this->_req->post->body))
-					$context['post_error']['errors'][] = $txt['warning_notify_blank'];
+				{
+									$context['post_error']['errors'][] = $txt['warning_notify_blank'];
+				}
 			}
 			else
 			{
 				if (empty($this->_req->post->title))
-					$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_title'];
+				{
+									$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_title'];
+				}
 				if (empty($this->_req->post->body))
-					$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_body'];
+				{
+									$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_body'];
+				}
 
 				// Add in few replacements.
 				/**
@@ -271,8 +298,9 @@ 
 			}
 			$context['preview_message'] = $warning_body;
 		}
-		else
-			$context['post_error']['errors'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
+		else {
+					$context['post_error']['errors'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
+		}
 
 		$context['sub_template'] = 'generic_preview';
 	}
@@ -299,15 +327,21 @@ 
 			if (isset($this->_req->post->issuing))
 			{
 				if (empty($this->_req->post->title) || empty($this->_req->post->body))
-					$context['post_error']['errors'][] = $txt['warning_notify_blank'];
+				{
+									$context['post_error']['errors'][] = $txt['warning_notify_blank'];
+				}
 			}
 			else
 			{
 				if (empty($this->_req->post->title))
-					$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_title'];
+				{
+									$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_title'];
+				}
 
 				if (empty($this->_req->post->body))
-					$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_body'];
+				{
+									$context['post_error']['errors'][] = $txt['mc_warning_template_error_no_body'];
+				}
 
 				// Add in few replacements.
 				/**

sources/controllers/ProfileOptions.controller.php

Braces +153 added lines, -56 removed lines

@@ -139,7 +139,9 @@ 
 
 		// Do a quick check to ensure people aren't getting here illegally!
 		if (!$context['user']['is_owner'] || empty($modSettings['enable_buddylist']))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		loadTemplate('ProfileOptions');
 
@@ -193,7 +195,9 @@ 
 		foreach ($buddiesArray as $k => $dummy)
 		{
 			if ($dummy === '')
-				unset($buddiesArray[$k]);
+			{
+							unset($buddiesArray[$k]);
+			}
 		}
 
 		// Removing a buddy?
@@ -207,7 +211,9 @@ 
 			foreach ($buddiesArray as $key => $buddy)
 			{
 				if ($buddy == (int) $this->_req->query->remove)
-					unset($buddiesArray[$key]);
+				{
+									unset($buddiesArray[$key]);
+				}
 			}
 
 			// Make the changes.
@@ -233,7 +239,9 @@ 
 				$new_buddies[$k] = strtr(trim($new_buddies[$k]), array('\'' => '''));
 
 				if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array($user_profile[$this->_memID]['member_name'], $user_profile[$this->_memID]['real_name'])))
-					unset($new_buddies[$k]);
+				{
+									unset($new_buddies[$k]);
+				}
 			}
 
 			call_integration_hook('integrate_add_buddies', array($this->_memID, &$new_buddies));
@@ -263,7 +271,9 @@ 
 			require_once(SUBSDIR . '/Members.subs.php');
 			$result = getBasicMemberData($buddiesArray, array('sort' => 'real_name', 'limit' => substr_count($user_profile[$this->_memID]['buddy_list'], ',') + 1));
 			foreach ($result as $row)
-				$buddies[] = $row['id_member'];
+			{
+							$buddies[] = $row['id_member'];
+			}
 		}
 
 		$context['buddy_count'] = count($buddies);
@@ -302,7 +312,9 @@ 
 		foreach ($ignoreArray as $k => $dummy)
 		{
 			if ($dummy === '')
-				unset($ignoreArray[$k]);
+			{
+							unset($ignoreArray[$k]);
+			}
 		}
 
 		// Removing a member from the ignore list?
@@ -314,7 +326,9 @@ 
 			foreach ($ignoreArray as $key => $id_remove)
 			{
 				if ($id_remove == (int) $this->_req->query->remove)
-					unset($ignoreArray[$key]);
+				{
+									unset($ignoreArray[$key]);
+				}
 			}
 
 			// Make the changes.
@@ -339,7 +353,9 @@ 
 				$new_entries[$k] = strtr(trim($new_entries[$k]), array('\'' => '''));
 
 				if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array($user_profile[$this->_memID]['member_name'], $user_profile[$this->_memID]['real_name'])))
-					unset($new_entries[$k]);
+				{
+									unset($new_entries[$k]);
+				}
 			}
 
 			if (!empty($new_entries))
@@ -366,7 +382,9 @@ 
 			require_once(SUBSDIR . '/Members.subs.php');
 			$result = getBasicMemberData($ignoreArray, array('sort' => 'real_name', 'limit' => substr_count($user_profile[$this->_memID]['pm_ignore_list'], ',') + 1));
 			foreach ($result as $row)
-				$ignored[] = $row['id_member'];
+			{
+							$ignored[] = $row['id_member'];
+			}
 		}
 
 		$context['ignore_count'] = count($ignored);
@@ -394,7 +412,9 @@ 
 		$this->loadThemeOptions();
 
 		if (allowedTo(array('profile_identity_own', 'profile_identity_any')))
-			loadCustomFields($this->_memID, 'account');
+		{
+					loadCustomFields($this->_memID, 'account');
+		}
 
 		$context['sub_template'] = 'edit_options';
 		$context['page_desc'] = $txt['account_info'];
@@ -464,7 +484,9 @@ 
 		$this->loadThemeOptions();
 
 		if (allowedTo(array('profile_extra_own', 'profile_extra_any')))
-			loadCustomFields($this->_memID, 'forumprofile');
+		{
+					loadCustomFields($this->_memID, 'forumprofile');
+		}
 
 		$context['sub_template'] = 'edit_options';
 		$context['page_desc'] = replaceBasicActionUrl($txt['forumProfile_info']);
@@ -504,7 +526,9 @@ 
 		$this->loadThemeOptions();
 
 		if (allowedTo(array('profile_extra_own', 'profile_extra_any')))
-			loadCustomFields($this->_memID, 'theme');
+		{
+					loadCustomFields($this->_memID, 'theme');
+		}
 
 		loadTemplate('ProfileOptions');
 
@@ -537,10 +561,14 @@ 
 			{
 				// Didn't enter anything?
 				if ($this->_req->post->passwrd1 === '')
-					$post_errors[] = 'no_password';
+				{
+									$post_errors[] = 'no_password';
+				}
 				// Do the two entries for the password even match?
 				elseif (!isset($this->_req->post->passwrd2) || $this->_req->post->passwrd1 != $this->_req->post->passwrd2)
-					$post_errors[] = 'bad_new_password';
+				{
+									$post_errors[] = 'bad_new_password';
+				}
 				// Is it valid?
 				else
 				{
@@ -549,7 +577,9 @@ 
 
 					// Were there errors?
 					if ($passwordErrors !== null)
-						$post_errors[] = 'password_' . $passwordErrors;
+					{
+											$post_errors[] = 'password_' . $passwordErrors;
+					}
 				}
 
 				if (empty($post_errors))
@@ -570,8 +600,9 @@ 
 						setLoginCookie(60 * $modSettings['cookieTime'], $this->_memID, hash('sha256', $passwd . $cur_profile['password_salt']));
 						redirectexit('action=profile;area=authentication;updated');
 					}
-					else
-						redirectexit('action=profile;u=' . $this->_memID);
+					else {
+											redirectexit('action=profile;u=' . $this->_memID);
+					}
 				}
 
 				return true;
@@ -586,7 +617,9 @@ 
 				$this->_req->post->openid_identifier = $openID->canonize($this->_req->post->openid_identifier);
 
 				if (memberExists($this->_req->post->openid_identifier))
-					$post_errors[] = 'openid_in_use';
+				{
+									$post_errors[] = 'openid_in_use';
+				}
 				elseif (empty($post_errors))
 				{
 					// Authenticate using the new OpenID URI first to make sure they didn't make a mistake.
@@ -595,8 +628,9 @@ 
 						$_SESSION['new_openid_uri'] = $this->_req->post->openid_identifier;
 						$openID->validate($this->_req->post->openid_identifier, false, null, 'change_uri');
 					}
-					else
-						updateMemberData($this->_memID, array('openid_uri' => $this->_req->post->openid_identifier));
+					else {
+											updateMemberData($this->_memID, array('openid_uri' => $this->_req->post->openid_identifier));
+					}
 				}
 			}
 		}
@@ -652,7 +686,9 @@ 
 							$link = $board['link'];
 
 							if ($board['new'])
-								$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+							{
+															$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+							}
 
 							return $link;
 						},
@@ -743,7 +779,9 @@ 
 							$link = $topic['link'];
 
 							if ($topic['new'])
-								$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+							{
+															$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+							}
 
 							$link .= '<br /><span class="smalltext"><em>' . $txt['in'] . ' ' . $topic['board_link'] . '</em></span>';
 
@@ -895,7 +933,9 @@ 
 
 		// Have the admins enabled this option?
 		if (empty($modSettings['allow_ignore_boards']))
-			throw new Elk_Exception('ignoreboards_disallowed', 'user');
+		{
+					throw new Elk_Exception('ignoreboards_disallowed', 'user');
+		}
 
 		loadTemplate('ProfileOptions');
 
@@ -938,7 +978,9 @@ 
 
 		// Ensure the query doesn't croak!
 		if (empty($groups))
-			$groups = array(0);
+		{
+					$groups = array(0);
+		}
 
 		// Just to be sure...
 		$groups = array_map('intval', $groups);
@@ -960,7 +1002,9 @@ 
 
 		// No changing primary one unless you have enough groups!
 		if (count($context['groups']['member']) < 2)
-			$context['can_edit_primary'] = false;
+		{
+					$context['can_edit_primary'] = false;
+		}
 
 		// In the special case that someone is requesting membership of a group, setup some special context vars.
 		if (isset($this->_req->query->request)
@@ -983,12 +1027,16 @@ 
 
 		// Let's be extra cautious...
 		if (!$context['user']['is_owner'] || empty($modSettings['show_group_membership']))
-			isAllowedTo('manage_membergroups');
+		{
+					isAllowedTo('manage_membergroups');
+		}
 
 		$group_id = $this->_req->getPost('gid', 'intval', $this->_req->getQuery('gid', 'intval', null));
 
 		if (!isset($group_id) && !isset($this->_req->post->primary))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// GID may be from a link or a form
 		checkSession(isset($this->_req->query->gid) ? 'get' : 'post');
@@ -1011,14 +1059,18 @@ 
 
 		// Sanity check!!
 		if ($group_id == 1)
-			isAllowedTo('admin_forum');
+		{
+					isAllowedTo('admin_forum');
+		}
 
 		// What ever we are doing, we need to determine if changing primary is possible!
 		$groups_details = membergroupsById(array($group_id, $old_profile['id_group']), 0, true);
 
 		// Protected groups require proper permissions!
 		if ($group_id != 1 && $groups_details[$group_id]['group_type'] == 1)
-			isAllowedTo('admin_forum');
+		{
+					isAllowedTo('admin_forum');
+		}
 
 		foreach ($groups_details as $key => $row)
 		{
@@ -1030,34 +1082,50 @@ 
 
 				// Does the group type match what we're doing - are we trying to request a non-requestable group?
 				if ($changeType === 'request' && $row['group_type'] != 2)
-					throw new Elk_Exception('no_access', false);
+				{
+									throw new Elk_Exception('no_access', false);
+				}
 				// What about leaving a requestable group we are not a member of?
 				elseif ($changeType === 'free' && $row['group_type'] == 2 && $old_profile['id_group'] != $row['id_group'] && !isset($addGroups[$row['id_group']]))
-					throw new Elk_Exception('no_access', false);
+				{
+									throw new Elk_Exception('no_access', false);
+				}
 				elseif ($changeType === 'free' && $row['group_type'] != 3 && $row['group_type'] != 2)
-					throw new Elk_Exception('no_access', false);
+				{
+									throw new Elk_Exception('no_access', false);
+				}
 
 				// We can't change the primary group if this is hidden!
 				if ($row['hidden'] == 2)
-					$canChangePrimary = false;
+				{
+									$canChangePrimary = false;
+				}
 			}
 
 			// If this is their old primary, can we change it?
 			if ($row['id_group'] == $old_profile['id_group'] && ($row['group_type'] > 1 || $context['can_manage_membergroups']) && $canChangePrimary !== false)
-				$canChangePrimary = true;
+			{
+							$canChangePrimary = true;
+			}
 
 			// If we are not doing a force primary move, don't do it automatically if current primary is not 0.
 			if ($changeType != 'primary' && $old_profile['id_group'] != 0)
-				$canChangePrimary = false;
+			{
+							$canChangePrimary = false;
+			}
 
 			// If this is the one we are acting on, can we even act?
 			if ((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0))
-				$canChangePrimary = false;
+			{
+							$canChangePrimary = false;
+			}
 		}
 
 		// Didn't find the target?
 		if (!$foundTarget)
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Final security check, don't allow users to promote themselves to admin.
 		require_once(SUBSDIR . '/ProfileOptions.subs.php');
@@ -1065,14 +1133,18 @@ 
 		{
 			$disallow = checkMembergroupChange($group_id);
 			if ($disallow)
-				isAllowedTo('admin_forum');
+			{
+							isAllowedTo('admin_forum');
+			}
 		}
 
 		// If we're requesting, add the note then return.
 		if ($changeType === 'request')
 		{
 			if (logMembergroupRequest($group_id, $this->_memID))
-				throw new Elk_Exception('profile_error_already_requested_group');
+			{
+							throw new Elk_Exception('profile_error_already_requested_group');
+			}
 
 			// Send an email to all group moderators etc.
 			require_once(SUBSDIR . '/Mail.subs.php');
@@ -1096,14 +1168,18 @@ 
 				foreach ($members as $member)
 				{
 					if ($member['notify_types'] != 4)
-						continue;
+					{
+											continue;
+					}
 
 					// Check whether they are interested.
 					if (!empty($member['mod_prefs']))
 					{
 						list (,, $pref_binary) = explode('|', $member['mod_prefs']);
 						if (!($pref_binary & 4))
-							continue;
+						{
+													continue;
+						}
 					}
 
 					$replacements = array(
@@ -1128,9 +1204,12 @@ 
 			if ($old_profile['id_group'] == $group_id || isset($addGroups[$group_id]))
 			{
 				if ($old_profile['id_group'] == $group_id)
-					$newPrimary = 0;
-				else
-					unset($addGroups[$group_id]);
+				{
+									$newPrimary = 0;
+				}
+				else {
+									unset($addGroups[$group_id]);
+				}
 			}
 			// ... if not, must be joining.
 			else
@@ -1139,21 +1218,28 @@ 
 				if ($canChangePrimary)
 				{
 					if ($old_profile['id_group'] != 0)
-						$addGroups[$old_profile['id_group']] = -1;
+					{
+											$addGroups[$old_profile['id_group']] = -1;
+					}
 					$newPrimary = $group_id;
 				}
 				// Otherwise it's an additional group...
-				else
-					$addGroups[$group_id] = -1;
+				else {
+									$addGroups[$group_id] = -1;
+				}
 			}
 		}
 		// Finally, we must be setting the primary.
 		elseif ($canChangePrimary)
 		{
 			if ($old_profile['id_group'] != 0)
-				$addGroups[$old_profile['id_group']] = -1;
+			{
+							$addGroups[$old_profile['id_group']] = -1;
+			}
 			if (isset($addGroups[$group_id]))
-				unset($addGroups[$group_id]);
+			{
+							unset($addGroups[$group_id]);
+			}
 			$newPrimary = $group_id;
 		}
 
@@ -1161,15 +1247,20 @@ 
 		foreach ($addGroups as $id => $dummy)
 		{
 			if (empty($id))
-				unset($addGroups[$id]);
+			{
+							unset($addGroups[$id]);
+			}
 		}
 		$addGroups = implode(',', array_flip($addGroups));
 
 		// Ensure that we don't cache permissions if the group is changing.
 		if ($context['user']['is_owner'])
-			$_SESSION['mc']['time'] = 0;
-		else
-			updateSettings(array('settings_updated' => time()));
+		{
+					$_SESSION['mc']['time'] = 0;
+		}
+		else {
+					updateSettings(array('settings_updated' => time()));
+		}
 
 		require_once(SUBSDIR . '/Members.subs.php');
 		updateMemberData($this->_memID, array('id_group' => $newPrimary, 'additional_groups' => $addGroups));
@@ -1185,7 +1276,9 @@ 
 		global $context, $options, $cur_profile;
 
 		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;
+		}
 
 		if ($context['user']['is_owner'])
 		{
@@ -1194,7 +1287,9 @@ 
 			if (isset($this->_req->post->options) && is_array($this->_req->post->options))
 			{
 				foreach ($this->_req->post->options as $k => $v)
-					$context['member']['options'][$k] = $v;
+				{
+									$context['member']['options'][$k] = $v;
+				}
 			}
 		}
 		else
@@ -1205,7 +1300,9 @@ 
 			if (isset($this->_req->post->options))
 			{
 				foreach ($this->_req->post->options as $var => $val)
-					$context['member']['options'][$var] = $val;
+				{
+									$context['member']['options'][$var] = $val;
+				}
 			}
 		}
 	}

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 			'forumprofile' => array(
 				'fields' => array(
 					'avatar_choice', 'hr',
-					'bday1', 'usertitle','hr',
+					'bday1', 'usertitle', 'hr',
 					'signature', 'hr',
 					'karma_good', 'hr',
 					'website_title', 'website_url',
@@ -646,7 +646,7 @@ 
 						'class' => 'lefttext',
 					),
 					'data' => array(
-						'function' => function ($board) {
+						'function' => function($board) {
 							global $txt;
 
 							$link = $board['link'];
@@ -737,7 +737,7 @@ 
 						'class' => 'lefttext',
 					),
 					'data' => array(
-						'function' => function ($topic) {
+						'function' => function($topic) {
 							global $txt;
 
 							$link = $topic['link'];

sources/controllers/BoardIndex.controller.php

Braces +18 added lines, -6 removed lines

@@ -67,7 +67,9 @@ 
 
 		// Do not let search engines index anything if there is a random thing in $_GET.
 		if (!empty($this->_req->query))
-			$context['robot_no_index'] = true;
+		{
+					$context['robot_no_index'] = true;
+		}
 
 		// Retrieve the categories and boards.
 		$boardIndexOptions = array(
@@ -97,11 +99,15 @@ 
 
 		// Are we showing all membergroups on the board index?
 		if (!empty($settings['show_group_key']))
-			$context['membergroups'] = cache_quick_get('membergroup_list', 'subs/Membergroups.subs.php', 'cache_getMembergroupList', array());
+		{
+					$context['membergroups'] = cache_quick_get('membergroup_list', 'subs/Membergroups.subs.php', 'cache_getMembergroupList', array());
+		}
 
 		// Track most online statistics? (subs/Members.subs.phpOnline.php)
 		if (!empty($modSettings['trackStats']))
-			trackStatsUsersOnline($context['num_guests'] + $context['num_users_online']);
+		{
+					trackStatsUsersOnline($context['num_guests'] + $context['num_users_online']);
+		}
 
 		// Retrieve the latest posts if the theme settings require it.
 		if (isset($settings['number_recent_posts']) && $settings['number_recent_posts'] > 1)
@@ -130,10 +136,14 @@ 
 
 		$context['info_center_callbacks'] = array();
 		if (!empty($settings['number_recent_posts']) && (!empty($context['latest_posts']) || !empty($context['latest_post'])))
-			$context['info_center_callbacks'][] = 'recent_posts';
+		{
+					$context['info_center_callbacks'][] = 'recent_posts';
+		}
 
 		if (!empty($settings['show_stats_index']))
-			$context['info_center_callbacks'][] = 'show_stats';
+		{
+					$context['info_center_callbacks'][] = 'show_stats';
+		}
 
 		$context['info_center_callbacks'][] = 'show_users';
 
@@ -177,7 +187,9 @@ 
 		checkSession('request');
 
 		if (!isset($this->_req->query->sa))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Check if the input values are correct.
 		if (in_array($this->_req->query->sa, array('expand', 'collapse', 'toggle')) && isset($this->_req->query->c))

sources/controllers/ProfileAccount.controller.php

Braces +30 added lines, -10 removed lines

@@ -132,7 +132,9 @@ 
 			// Fill in the suite of errors.
 			$context['post_errors'] = array();
 			foreach ($this->_issueErrors as $error)
-				$context['post_errors'][] = $txt[$error];
+			{
+							$context['post_errors'][] = $txt[$error];
+			}
 		}
 
 		$context['page_title'] = $txt['profile_issue_warning'];
@@ -157,7 +159,9 @@ 
 		foreach ($context['level_effects'] as $limit => $dummy)
 		{
 			if ($context['member']['warning'] >= $limit)
-				$context['current_level'] = $limit;
+			{
+							$context['current_level'] = $limit;
+			}
 		}
 
 		// Build a listing to view the previous warnings for this user
@@ -173,7 +177,9 @@ 
 			$message = basicMessageInfo($warning_for_message);
 
 			if (!empty($message))
-				$warned_message_subject = $message['subject'];
+			{
+							$warned_message_subject = $message['subject'];
+			}
 		}
 
 		require_once(SUBSDIR . '/Maillist.subs.php');
@@ -186,7 +192,9 @@ 
 		{
 			// If we're not warning for a message skip any that are.
 			if ($warning_for_message === false && strpos($row['body'], '{MESSAGE}') !== false)
-				continue;
+			{
+							continue;
+			}
 
 			$context['notification_templates'][] = array(
 				'title' => $row['title'],
@@ -205,7 +213,8 @@ 
 
 		// Replace all the common variables in the templates.
 		foreach ($context['notification_templates'] as $k => $name)
-			$context['notification_templates'][$k]['body'] = strtr($name['body'],
+		{
+					$context['notification_templates'][$k]['body'] = strtr($name['body'],
 				array(
 					'{MEMBER}' => un_htmlspecialchars($context['member']['name']),
 					'{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $warning_for_message . ']' . un_htmlspecialchars($warned_message_subject) . '[/url]',
@@ -214,6 +223,7 @@ 
 					'{REGARDS}' => replaceBasicActionUrl($txt['regards_team'])
 				)
 			);
+		}
 	}
 
 	/**
@@ -507,9 +517,13 @@ 
 		global $txt, $context, $modSettings, $cur_profile;
 
 		if (!$context['user']['is_owner'])
-			isAllowedTo('profile_remove_any');
+		{
+					isAllowedTo('profile_remove_any');
+		}
 		elseif (!allowedTo('profile_remove_any'))
-			isAllowedTo('profile_remove_own');
+		{
+					isAllowedTo('profile_remove_own');
+		}
 
 		// Permissions for removing stuff...
 		$context['can_delete_posts'] = !$context['user']['is_owner'] && allowedTo('moderate_forum');
@@ -565,7 +579,9 @@ 
 			$another = isAnotherAdmin($this->_memID);
 
 			if (empty($another))
-				throw new Elk_Exception('at_least_one_admin', 'critical');
+			{
+							throw new Elk_Exception('at_least_one_admin', 'critical');
+			}
 		}
 
 		// Do you have permission to delete others profiles, or is that your profile you wanna delete?
@@ -598,7 +614,9 @@ 
 
 			// Only delete this poor member's account if they are actually being booted out of camp.
 			if (isset($this->_req->post->deleteAccount))
-				deleteMembers($this->_memID);
+			{
+							deleteMembers($this->_memID);
+			}
 		}
 		// Do they need approval to delete?
 		elseif (!empty($modSettings['approveAccountDeletion']) && !allowedTo('moderate_forum'))
@@ -654,7 +672,9 @@ 
 
 			// If we are doing approval, update the stats for the member just in case.
 			if (in_array($user_profile[$this->_memID]['is_activated'], array(3, 4, 13, 14)))
-				updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+			{
+							updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+			}
 
 			// Make sure we update the stats too.
 			require_once(SUBSDIR . '/Members.subs.php');

Spacing +2 added lines, -2 removed lines

@@ -243,7 +243,7 @@ 
 						'class' => 'grid20',
 					),
 					'data' => array(
-						'function' => function ($warning)
+						'function' => function($warning)
 						{
 							return $warning['issuer']['link'];
 						},
@@ -271,7 +271,7 @@ 
 						'value' => $txt['profile_warning_previous_reason'],
 					),
 					'data' => array(
-						'function' => function ($warning)
+						'function' => function($warning)
 						{
 							global $scripturl, $txt;
 

sources/controllers/Jslocale.controller.php

Braces +9 added lines, -3 removed lines

@@ -52,7 +52,9 @@ 
 
 		// If we don't have any locale better avoid broken js
 		if (empty($txt['lang_locale']) || empty($editortxt))
-			die();
+		{
+					die();
+		}
 
 		$this->_file_data = '(function ($) {
 		\'use strict\';
@@ -60,8 +62,10 @@ 
 		$.sceditor.locale[' . JavaScriptEscape($txt['lang_locale']) . '] = {';
 
 		foreach ($editortxt as $key => $val)
-			$this->_file_data .= '
+		{
+					$this->_file_data .= '
 			' . JavaScriptEscape($key) . ': ' . JavaScriptEscape($val) . ',';
+		}
 
 		$this->_file_data .= '
 			dateFormat: "day.month.year"
@@ -121,7 +125,9 @@ 
 		global $modSettings;
 
 		if (!empty($language_file))
-			loadLanguage($language_file);
+		{
+					loadLanguage($language_file);
+		}
 
 		Template_Layers::instance()->removeAll();
 

sources/controllers/Members.controller.php

Braces +9 added lines, -3 removed lines

@@ -61,7 +61,9 @@ 
 
 		// You have to give a user
 		if (empty($user))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		call_integration_hook('integrate_add_buddies', array($user_info['id'], &$user));
 
@@ -111,11 +113,15 @@ 
 
 		// You have to give a user
 		if (empty($user))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Remove this user, assuming we can find them
 		if (in_array($user, $user_info['buddies']))
-			$user_info['buddies'] = array_diff($user_info['buddies'], array($user));
+		{
+					$user_info['buddies'] = array_diff($user_info['buddies'], array($user));
+		}
 
 		// Update the settings.
 		require_once(SUBSDIR . '/Members.subs.php');

sources/controllers/Poll.controller.php

Braces +165 added lines, -61 removed lines

@@ -62,14 +62,18 @@ 
 		$row = checkVote($topic);
 
 		if (empty($row))
-			throw new Elk_Exception('poll_error', false);
+		{
+					throw new Elk_Exception('poll_error', false);
+		}
 
 		// If this is a guest can they vote?
 		if ($user_info['is_guest'])
 		{
 			// Guest voting disabled?
 			if (!$row['guest_vote'])
-				throw new Elk_Exception('guest_vote_disabled');
+			{
+							throw new Elk_Exception('guest_vote_disabled');
+			}
 			// Guest already voted?
 			elseif (!empty($this->_req->cookie->guest_poll_vote) && preg_match('~^[0-9,;]+$~', $this->_req->cookie->guest_poll_vote) && strpos($this->_req->cookie->guest_poll_vote, ';' . $row['id_poll'] . ',') !== false)
 			{
@@ -81,7 +85,9 @@ 
 				{
 					$guestvoted = explode(',', $guestvoted);
 					if ($guestvoted[0] == $row['id_poll'])
-						break;
+					{
+											break;
+					}
 				}
 
 				// Has the poll been reset since guest voted?
@@ -90,12 +96,16 @@ 
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
 					if (!empty($guestinfo))
-						$this->_req->cookie->guest_poll_vote = ';' . implode(';', $guestinfo);
-					else
-						unset($this->_req->cookie->guest_poll_vote);
+					{
+											$this->_req->cookie->guest_poll_vote = ';' . implode(';', $guestinfo);
+					}
+					else {
+											unset($this->_req->cookie->guest_poll_vote);
+					}
+				}
+				else {
+									throw new Elk_Exception('poll_error', false);
 				}
-				else
-					throw new Elk_Exception('poll_error', false);
 
 				unset($guestinfo, $guestvoted, $i);
 			}
@@ -103,11 +113,15 @@ 
 
 		// Is voting locked or has it expired?
 		if (!empty($row['voting_locked']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
-			throw new Elk_Exception('poll_error', false);
+		{
+					throw new Elk_Exception('poll_error', false);
+		}
 
 		// If they have already voted and aren't allowed to change their vote - hence they are outta here!
 		if (!$user_info['is_guest'] && $row['selected'] != -1 && empty($row['change_vote']))
-			throw new Elk_Exception('poll_error', false);
+		{
+					throw new Elk_Exception('poll_error', false);
+		}
 		// Otherwise if they can change their vote yet they haven't sent any options... remove their vote and redirect.
 		elseif (!empty($row['change_vote']) && !$user_info['is_guest'] && empty($this->_req->post->options))
 		{
@@ -128,18 +142,24 @@ 
 
 			// Redirect back to the topic so the user can vote again!
 			if (empty($this->_req->post->options))
-				redirectexit('topic=' . $topic . '.' . $this->_req->post->start);
+			{
+							redirectexit('topic=' . $topic . '.' . $this->_req->post->start);
+			}
 		}
 
 		checkSession('request');
 
 		// Make sure the option(s) are valid.
 		if (empty($this->_req->post->options))
-			throw new Elk_Exception('didnt_select_vote', false);
+		{
+					throw new Elk_Exception('didnt_select_vote', false);
+		}
 
 		// Too many options checked!
 		if (count($this->_req->post->options) > $row['max_votes'])
-			throw new Elk_Exception('poll_too_many_votes', false, array($row['max_votes']));
+		{
+					throw new Elk_Exception('poll_too_many_votes', false, array($row['max_votes']));
+		}
 
 		$pollOptions = array();
 		$inserts = array();
@@ -205,23 +225,34 @@ 
 
 		// If the user _can_ modify the poll....
 		if (!allowedTo('poll_lock_any'))
-			isAllowedTo('poll_lock_' . ($user_info['id'] == $poll['id_member'] ? 'own' : 'any'));
+		{
+					isAllowedTo('poll_lock_' . ($user_info['id'] == $poll['id_member'] ? 'own' : 'any'));
+		}
 
 		// It's been locked by a non-moderator.
 		if ($poll['locked'] == '1')
-			$poll['locked'] = '0';
+		{
+					$poll['locked'] = '0';
+		}
 		// Locked by a moderator, and this is a moderator.
 		elseif ($poll['locked'] == '2' && allowedTo('moderate_board'))
-			$poll['locked'] = '0';
+		{
+					$poll['locked'] = '0';
+		}
 		// Sorry, a moderator locked it.
 		elseif ($poll['locked'] == '2' && !allowedTo('moderate_board'))
-			throw new Elk_Exception('locked_by_admin', 'user');
+		{
+					throw new Elk_Exception('locked_by_admin', 'user');
+		}
 		// A moderator *is* locking it.
 		elseif ($poll['locked'] == '0' && allowedTo('moderate_board'))
-			$poll['locked'] = '2';
+		{
+					$poll['locked'] = '2';
+		}
 		// Well, it's gonna be locked one way or another otherwise...
-		else
-			$poll['locked'] = '1';
+		else {
+					$poll['locked'] = '1';
+		}
 
 		// Lock!  *Poof* - no one can vote.
 		lockPoll($poll['id_poll'], $poll['locked']);
@@ -251,7 +282,9 @@ 
 
 		// No topic, means you can't edit the poll
 		if (empty($topic))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// We work hard with polls.
 		require_once(SUBSDIR . '/Poll.subs.php');
@@ -269,20 +302,30 @@ 
 
 		// Assume it all exists, right?
 		if (empty($pollinfo))
-			throw new Elk_Exception('no_board');
+		{
+					throw new Elk_Exception('no_board');
+		}
 
 		// If we are adding a new poll - make sure that there isn't already a poll there.
 		if (!$context['is_edit'] && !empty($pollinfo['id_poll']))
-			throw new Elk_Exception('poll_already_exists');
+		{
+					throw new Elk_Exception('poll_already_exists');
+		}
 		// Otherwise, if we're editing it, it does exist I assume?
 		elseif ($context['is_edit'] && empty($pollinfo['id_poll']))
-			throw new Elk_Exception('poll_not_found');
+		{
+					throw new Elk_Exception('poll_not_found');
+		}
 
 		// Can you do this?
 		if ($context['is_edit'] && !allowedTo('poll_edit_any'))
-			isAllowedTo('poll_edit_' . ($user_info['id'] == $pollinfo['id_member_started'] || ($pollinfo['poll_starter'] != 0 && $user_info['id'] == $pollinfo['poll_starter']) ? 'own' : 'any'));
+		{
+					isAllowedTo('poll_edit_' . ($user_info['id'] == $pollinfo['id_member_started'] || ($pollinfo['poll_starter'] != 0 && $user_info['id'] == $pollinfo['poll_starter']) ? 'own' : 'any'));
+		}
 		elseif (!$context['is_edit'] && !allowedTo('poll_add_any'))
-			isAllowedTo('poll_add_' . ($user_info['id'] == $pollinfo['id_member_started'] ? 'own' : 'any'));
+		{
+					isAllowedTo('poll_add_' . ($user_info['id'] == $pollinfo['id_member_started'] ? 'own' : 'any'));
+		}
 
 		$context['can_moderate_poll'] = isset($this->_req->post->add) ? true : allowedTo('poll_edit_' . ($user_info['id'] == $pollinfo['id_member_started'] || ($pollinfo['poll_starter'] != 0 && $user_info['id'] == $pollinfo['poll_starter']) ? 'own' : 'any'));
 
@@ -322,11 +365,15 @@ 
 				{
 					// Get the highest id so we can add more without reusing.
 					if ($option['id_choice'] >= $last_id)
-						$last_id = $option['id_choice'] + 1;
+					{
+											$last_id = $option['id_choice'] + 1;
+					}
 
 					// They cleared this by either omitting it or emptying it.
 					if (!isset($this->_req->post->options[$option['id_choice']]) || $this->_req->post->options[$option['id_choice']] == '')
-						continue;
+					{
+											continue;
+					}
 
 					// Add the choice!
 					$context['poll']['choices'][$option['id_choice']] = array(
@@ -344,7 +391,9 @@ 
 			foreach ($this->_req->post->options as $id => $label)
 			{
 				if ($label != '')
-					$totalPostOptions++;
+				{
+									$totalPostOptions++;
+				}
 			}
 
 			$count = 1;
@@ -400,12 +449,16 @@ 
 			$context['last_choice_id'] = $last_id;
 
 			if ($context['can_moderate_poll'])
-				$context['poll']['expiration'] = (int) $this->_req->post->poll_expire;
+			{
+							$context['poll']['expiration'] = (int) $this->_req->post->poll_expire;
+			}
 
 			// Check the question/option count for errors.
 			// @todo: why !$poll_errors->hasErrors()?
 			if (trim($this->_req->post->question) === '' && !$poll_errors->hasErrors())
-				$poll_errors->addError('no_question');
+			{
+							$poll_errors->addError('no_question');
+			}
 
 			// No check is needed, since nothing is really posted.
 			checkSubmitOnce('free');
@@ -514,16 +567,22 @@ 
 
 		// Sneaking off, are we?
 		if (empty($this->_req->post))
-			redirectexit('action=editpoll;topic=' . $topic . '.0');
+		{
+					redirectexit('action=editpoll;topic=' . $topic . '.0');
+		}
 
 		$poll_errors = ErrorContext::context('poll');
 
 		if (checkSession('post', '', false) != '')
-			$poll_errors->addError('session_timeout');
+		{
+					$poll_errors->addError('session_timeout');
+		}
 
 		// HACKERS (!!) can't edit :P.
 		if (empty($topic))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Is this a new poll, or editing an existing?
 		$isEdit = isset($this->_req->post->add) ? 0 : 1;
@@ -536,16 +595,24 @@ 
 
 		// Check their adding/editing is valid.
 		if (!$isEdit && !empty($bcinfo['id_poll']))
-			throw new Elk_Exception('poll_already_exists');
+		{
+					throw new Elk_Exception('poll_already_exists');
+		}
 		// Are we editing a poll which doesn't exist?
 		elseif ($isEdit && empty($bcinfo['id_poll']))
-			throw new Elk_Exception('poll_not_found');
+		{
+					throw new Elk_Exception('poll_not_found');
+		}
 
 		// Check if they have the power to add or edit the poll.
 		if ($isEdit && !allowedTo('poll_edit_any'))
-			isAllowedTo('poll_edit_' . ($user_info['id'] == $bcinfo['id_member_started'] || ($bcinfo['poll_starter'] != 0 && $user_info['id'] == $bcinfo['poll_starter']) ? 'own' : 'any'));
+		{
+					isAllowedTo('poll_edit_' . ($user_info['id'] == $bcinfo['id_member_started'] || ($bcinfo['poll_starter'] != 0 && $user_info['id'] == $bcinfo['poll_starter']) ? 'own' : 'any'));
+		}
 		elseif (!$isEdit && !allowedTo('poll_add_any'))
-			isAllowedTo('poll_add_' . ($user_info['id'] == $bcinfo['id_member_started'] ? 'own' : 'any'));
+		{
+					isAllowedTo('poll_add_' . ($user_info['id'] == $bcinfo['id_member_started'] ? 'own' : 'any'));
+		}
 
 		$optionCount = 0;
 		$idCount = 0;
@@ -561,17 +628,25 @@ 
 		}
 
 		if ($optionCount < 2)
-			$poll_errors->addError('poll_few');
+		{
+					$poll_errors->addError('poll_few');
+		}
 		elseif ($optionCount > 256 || $idCount > 255)
-			$poll_errors->addError('poll_many');
+		{
+					$poll_errors->addError('poll_many');
+		}
 
 		// Also - ensure they are not removing the question.
 		if ($this->_req->getPost('question', 'trim') === '')
-			$poll_errors->addError('no_question');
+		{
+					$poll_errors->addError('no_question');
+		}
 
 		// Got any errors to report?
 		if ($poll_errors->hasErrors())
-			$this->action_editpoll();
+		{
+					$this->action_editpoll();
+		}
 
 		// Prevent double submission of this form.
 		checkSubmitOnce('check');
@@ -591,7 +666,9 @@ 
 			require_once(SUBSDIR . '/Members.subs.php');
 			$allowedGroups = groupsAllowedTo('poll_vote', $board);
 			if (!in_array(-1, $allowedGroups['allowed']))
-				$poll_guest_vote = 0;
+			{
+							$poll_guest_vote = 0;
+			}
 		}
 
 		// Ensure that the number options allowed makes sense, and the expiration date is valid.
@@ -600,16 +677,24 @@ 
 			$poll_expire = $poll_expire > 9999 ? 9999 : ($poll_expire < 0 ? 0 : $poll_expire);
 
 			if (empty($poll_expire) && $poll_hide == 2)
-				$poll_hide = 1;
+			{
+							$poll_hide = 1;
+			}
 			elseif (!$isEdit || $poll_expire != ceil($bcinfo['expire_time'] <= time() ? -1 : ($bcinfo['expire_time'] - time()) / (3600 * 24)))
-				$poll_expire = empty($poll_expire) ? 0 : time() + $_POST['poll_expire'] * 3600 * 24;
-			else
-				$poll_expire = $bcinfo['expire_time'];
+			{
+							$poll_expire = empty($poll_expire) ? 0 : time() + $_POST['poll_expire'] * 3600 * 24;
+			}
+			else {
+							$poll_expire = $bcinfo['expire_time'];
+			}
 
 			if (empty($this->_req->post->poll_max_votes) || $this->_req->post->poll_max_votes <= 0)
-				$poll_max_votes = 1;
-			else
-				$poll_max_votes = $this->_req->getPost('poll_max_votes', 'intval', 0);
+			{
+							$poll_max_votes = 1;
+			}
+			else {
+							$poll_max_votes = $this->_req->getPost('poll_max_votes', 'intval', 0);
+			}
 		}
 
 		// If we're editing, let's commit the changes.
@@ -651,7 +736,9 @@ 
 			{
 				// They want it deleted.  Bye.
 				if (in_array($k, $choices))
-					$delete_options[] = $k;
+				{
+									$delete_options[] = $k;
+				}
 
 				// Skip the rest...
 				continue;
@@ -662,24 +749,35 @@ 
 
 			// If it's already there, update it.  If it's not... add it.
 			if (in_array($k, $choices))
-				$update_options[] = array($bcinfo['id_poll'], $k, $option);
-			else
-				$add_options[] = array($bcinfo['id_poll'], $k, $option, 0);
+			{
+							$update_options[] = array($bcinfo['id_poll'], $k, $option);
+			}
+			else {
+							$add_options[] = array($bcinfo['id_poll'], $k, $option, 0);
+			}
 		}
 
 		if (!empty($update_options))
-			modifyPollOption($update_options);
+		{
+					modifyPollOption($update_options);
+		}
 
 		if (!empty($add_options))
-			insertPollOptions($add_options);
+		{
+					insertPollOptions($add_options);
+		}
 
 		// I'm sorry, but... well, no one was choosing you. Poor options, I'll put you out of your misery.
 		if (!empty($delete_options))
-			deletePollOptions($bcinfo['id_poll'], $delete_options);
+		{
+					deletePollOptions($bcinfo['id_poll'], $delete_options);
+		}
 
 		// Shall I reset the vote count, sir?
 		if (isset($this->_req->post->resetVoteCount))
-			resetVotes($bcinfo['id_poll']);
+		{
+					resetVotes($bcinfo['id_poll']);
+		}
 
 		call_integration_hook('integrate_poll_add_edit', array($bcinfo['id_poll'], $isEdit));
 
@@ -704,7 +802,9 @@ 
 
 		// Make sure the topic is not empty.
 		if (empty($topic))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Verify the session.
 		checkSession('get');
@@ -717,11 +817,15 @@ 
 		{
 			$pollStarters = pollStarters($topic);
 			if (empty($pollStarters))
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			list ($topicStarter, $pollStarter) = $pollStarters;
 			if ($topicStarter == $user_info['id'] || ($pollStarter != 0 && $pollStarter == $user_info['id']))
-				isAllowedTo('poll_remove_own');
+			{
+							isAllowedTo('poll_remove_own');
+			}
 		}
 
 		// Retrieve the poll ID.

sources/controllers/MoveTopic.controller.php

Braces +60 added lines, -23 removed lines

@@ -91,7 +91,9 @@ 
 
 		// No boards?
 		if (empty($context['categories']) || $context['num_boards'] == 1)
-			throw new Elk_Exception('moveto_noboards', false);
+		{
+					throw new Elk_Exception('moveto_noboards', false);
+		}
 
 		// Already used the function, let's set the selected board back to the last
 		$last_moved_to = isset($_SESSION['move_to_topic']['move_to']) && $_SESSION['move_to_topic']['move_to'] != $context['current_board'] ? (int) $_SESSION['move_to_topic']['move_to'] : 0;
@@ -140,7 +142,9 @@ 
 		// Make sure they can see the board they are trying to move to (and get whether posts count in the target board).
 		$this->_board_info = boardInfo($this->_toboard, $this->_topic);
 		if (empty($this->_board_info))
-			throw new Elk_Exception('no_board');
+		{
+					throw new Elk_Exception('no_board');
+		}
 
 		// Remember this for later.
 		$_SESSION['move_to_topic'] = array(
@@ -161,7 +165,9 @@ 
 
 		// Log that they moved this topic.
 		if (!allowedTo('move_own') || $this->_topic_info['id_member_started'] != $user_info['id'])
-			logAction('move', array('topic' => $this->_topic, 'board_from' => $board, 'board_to' => $this->_toboard));
+		{
+					logAction('move', array('topic' => $this->_topic, 'board_from' => $board, 'board_to' => $this->_toboard));
+		}
 
 		// Notify people that this topic has been moved?
 		require_once(SUBSDIR . '/Notification.subs.php');
@@ -169,9 +175,12 @@ 
 
 		// Why not go back to the original board in case they want to keep moving?
 		if (!isset($this->_req->post->goback))
-			redirectexit('board=' . $board . '.0');
-		else
-			redirectexit('topic=' . $this->_topic . '.0');
+		{
+					redirectexit('board=' . $board . '.0');
+		}
+		else {
+					redirectexit('topic=' . $this->_topic . '.0');
+		}
 	}
 
 	/**
@@ -211,7 +220,9 @@ 
 
 		// We will need this
 		if (isset($this->_req->query->current_board))
-			moveTopicConcurrence((int) $this->_req->query->current_board);
+		{
+					moveTopicConcurrence((int) $this->_req->query->current_board);
+		}
 
 		// Register this form and get a sequence number in $context.
 		checkSubmitOnce('register');
@@ -232,22 +243,30 @@ 
 		global $modSettings, $user_info;
 
 		if (empty($this->_topic))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Retrieve the basic topic information for whats being moved
 		require_once(SUBSDIR . '/Topic.subs.php');
 		$this->_topic_info = getTopicInfo($this->_topic, 'message');
 
 		if (empty($this->_topic_info))
-			throw new Elk_Exception('topic_gone', false);
+		{
+					throw new Elk_Exception('topic_gone', false);
+		}
 
 		// Can they see it - if not approved?
 		if ($modSettings['postmod_active'] && !$this->_topic_info['approved'])
-			isAllowedTo('approve_posts');
+		{
+					isAllowedTo('approve_posts');
+		}
 
 		// Are they allowed to actually move any topics or even their own?
 		if (!allowedTo('move_any') && ($this->_topic_info['id_member_started'] == $user_info['id'] && !allowedTo('move_own')))
-			throw new Elk_Exception('cannot_move_any', false);
+		{
+					throw new Elk_Exception('cannot_move_any', false);
+		}
 	}
 
 	/**
@@ -268,20 +287,28 @@ 
 		global $user_info;
 
 		if (empty($this->_topic))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// You can't choose to have a redirection topic and not provide a reason.
 		if (isset($this->_req->post->postRedirect) && $this->_req->getPost('reason', 'trim', '') === '')
-			throw new Elk_Exception('movetopic_no_reason', false);
+		{
+					throw new Elk_Exception('movetopic_no_reason', false);
+		}
 
 		// You have to tell us were you are moving to
 		if (!isset($this->_req->post->toboard))
-			throw new Elk_Exception('movetopic_no_board', false);
+		{
+					throw new Elk_Exception('movetopic_no_board', false);
+		}
 
 		// We will need this
 		require_once(SUBSDIR . '/Topic.subs.php');
 		if (isset($this->_req->query->current_board))
-			moveTopicConcurrence((int) $this->_req->query->current_board);
+		{
+					moveTopicConcurrence((int) $this->_req->query->current_board);
+		}
 
 		// Make sure this form hasn't been submitted before.
 		checkSubmitOnce('check');
@@ -291,7 +318,9 @@ 
 
 		// Not approved then you need approval permissions to move it as well
 		if (!$this->_topic_info['approved'])
-			isAllowedTo('approve_posts');
+		{
+					isAllowedTo('approve_posts');
+		}
 
 		// Can they move topics on this board?
 		if (!allowedTo('move_any'))
@@ -328,7 +357,9 @@ 
 
 			// Keep checking the length.
 			if (Util::strlen($custom_subject) > 100)
-				$custom_subject = Util::substr($custom_subject, 0, 100);
+			{
+							$custom_subject = Util::substr($custom_subject, 0, 100);
+			}
 
 			// If it's still valid move onwards and upwards.
 			if ($custom_subject != '')
@@ -341,8 +372,9 @@ 
 
 					topicSubject($this->_topic_info, $custom_subject, $context['response_prefix'], $all_messages);
 				}
-				else
-					topicSubject($this->_topic_info, $custom_subject);
+				else {
+									topicSubject($this->_topic_info, $custom_subject);
+				}
 
 				// Fix the subject cache.
 				require_once(SUBSDIR . '/Messages.subs.php');
@@ -368,7 +400,9 @@ 
 		{
 			// Should be in the boardwide language.
 			if ($user_info['language'] != $language)
-				loadLanguage('index', $language);
+			{
+							loadLanguage('index', $language);
+			}
 
 			$reason = Util::htmlspecialchars($this->_req->post->reason, ENT_QUOTES);
 			preparsecode($reason);
@@ -433,10 +467,13 @@ 
 			{
 				// The board we're moving from counted posts, but not to.
 				if (empty($board_from['count_posts']))
-					updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+				{
+									updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+				}
 				// The reverse: from didn't, to did.
-				else
-					updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+				else {
+									updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+				}
 			}
 		}
 	}

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');