elkarte / Elkarte

sources/ext/PasswordHash.php

Braces +82 added lines, -32 removed lines

@@ -25,7 +25,8 @@ 
 # requirements (there can be none), but merely suggestions.
 #
 
-class PasswordHash {
+class PasswordHash
+{
 	var $itoa64;
 	var $iteration_count_log2;
 	var $portable_hashes;
@@ -36,7 +37,9 @@ 
 		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
 		if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
-			$iteration_count_log2 = 8;
+		{
+					$iteration_count_log2 = 8;
+		}
 		$this->iteration_count_log2 = $iteration_count_log2;
 
 		$this->portable_hashes = $portable_hashes;
@@ -49,25 +52,30 @@ 
 		$output = '';
 
 		// PHP >= 7
-		if (is_callable('random_bytes')) {
+		if (is_callable('random_bytes'))
+		{
 			$output = random_bytes($count);
 		}
 		// *nix
 		elseif (@is_readable('/dev/urandom') &&
-			($fh = @fopen('/dev/urandom', 'rb'))) {
+			($fh = @fopen('/dev/urandom', 'rb')))
+		{
 			$output = fread($fh, $count);
 			fclose($fh);
 		}
 		// This is much to slow on windows php < 5.3.4
 		elseif (function_exists('openssl_random_pseudo_bytes') &&
-			(substr(PHP_OS, 0, 3) !== 'WIN' || version_compare(PHP_VERSION, '5.3.4', '>='))) {
+			(substr(PHP_OS, 0, 3) !== 'WIN' || version_compare(PHP_VERSION, '5.3.4', '>=')))
+		{
 			$output = openssl_random_pseudo_bytes($count);
 		}
 
 		// Do it ourselves then
-		if (strlen($output) < $count) {
+		if (strlen($output) < $count)
+		{
 			$output = '';
-			for ($i = 0; $i < $count; $i += 16) {
+			for ($i = 0; $i < $count; $i += 16)
+			{
 				$this->random_state =
 					md5(microtime() . $this->random_state);
 				$output .=
@@ -83,19 +91,28 @@ 
 	{
 		$output = '';
 		$i = 0;
-		do {
+		do
+		{
 			$value = ord($input[$i++]);
 			$output .= $this->itoa64[$value & 0x3f];
 			if ($i < $count)
-				$value |= ord($input[$i]) << 8;
+			{
+							$value |= ord($input[$i]) << 8;
+			}
 			$output .= $this->itoa64[($value >> 6) & 0x3f];
 			if ($i++ >= $count)
-				break;
+			{
+							break;
+			}
 			if ($i < $count)
-				$value |= ord($input[$i]) << 16;
+			{
+							$value |= ord($input[$i]) << 16;
+			}
 			$output .= $this->itoa64[($value >> 12) & 0x3f];
 			if ($i++ >= $count)
-				break;
+			{
+							break;
+			}
 			$output .= $this->itoa64[($value >> 18) & 0x3f];
 		} while ($i < $count);
 
@@ -116,22 +133,30 @@ 
 	{
 		$output = '*0';
 		if (substr($setting, 0, 2) == $output)
-			$output = '*1';
+		{
+					$output = '*1';
+		}
 
 		$id = substr($setting, 0, 3);
 		# We use "$P$", phpBB3 uses "$H$" for the same thing
 		if ($id != '$P$' && $id != '$H$')
-			return $output;
+		{
+					return $output;
+		}
 
 		$count_log2 = strpos($this->itoa64, $setting[3]);
 		if ($count_log2 < 7 || $count_log2 > 30)
-			return $output;
+		{
+					return $output;
+		}
 
 		$count = 1 << $count_log2;
 
 		$salt = substr($setting, 4, 8);
 		if (strlen($salt) != 8)
-			return $output;
+		{
+					return $output;
+		}
 
 		# We're kind of forced to use MD5 here since it's the only
 		# cryptographic primitive available in all versions of PHP
@@ -139,14 +164,19 @@ 
 		# in PHP would result in much worse performance and
 		# consequently in lower iteration counts and hashes that are
 		# quicker to crack (by non-PHP code).
-		if (PHP_VERSION >= '5') {
+		if (PHP_VERSION >= '5')
+		{
 			$hash = md5($salt . $password, TRUE);
-			do {
+			do
+			{
 				$hash = md5($hash . $password, TRUE);
 			} while (--$count);
-		} else {
+		}
+		else
+		{
 			$hash = pack('H*', md5($salt . $password));
-			do {
+			do
+			{
 				$hash = pack('H*', md5($hash . $password));
 			} while (--$count);
 		}
@@ -193,11 +223,13 @@ 
 		$output .= '$';
 
 		$i = 0;
-		do {
+		do
+		{
 			$c1 = ord($input[$i++]);
 			$output .= $itoa64[$c1 >> 2];
 			$c1 = ($c1 & 0x03) << 4;
-			if ($i >= 16) {
+			if ($i >= 16)
+			{
 				$output .= $itoa64[$c1];
 				break;
 			}
@@ -219,34 +251,48 @@ 
 	public function HashPassword($password)
 	{
 		if ( strlen( $password ) > 4096 )
-			return '*';
+		{
+					return '*';
+		}
 
 		$random = '';
 
-		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
+		if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes)
+		{
 			$random = $this->get_random_bytes(16);
 			$hash =
 				crypt($password, $this->gensalt_blowfish($random));
 			if (strlen($hash) == 60)
-				return $hash;
+			{
+							return $hash;
+			}
 		}
 
-		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
+		if (CRYPT_EXT_DES == 1 && !$this->portable_hashes)
+		{
 			if (strlen($random) < 3)
-				$random = $this->get_random_bytes(3);
+			{
+							$random = $this->get_random_bytes(3);
+			}
 			$hash =
 				crypt($password, $this->gensalt_extended($random));
 			if (strlen($hash) == 20)
-				return $hash;
+			{
+							return $hash;
+			}
 		}
 
 		if (strlen($random) < 6)
-			$random = $this->get_random_bytes(6);
+		{
+					$random = $this->get_random_bytes(6);
+		}
 		$hash =
 			$this->crypt_private($password,
 				$this->gensalt_private($random));
 		if (strlen($hash) == 34)
-			return $hash;
+		{
+					return $hash;
+		}
 
 		# Returning '*' on error is safe here, but would _not_ be safe
 		# in a crypt(3)-like function used _both_ for generating new
@@ -257,11 +303,15 @@ 
 	public function CheckPassword($password, $stored_hash)
 	{
 		if ( strlen( $password ) > 4096 )
-			return false;
+		{
+					return false;
+		}
 
 		$hash = $this->crypt_private($password, $stored_hash);
 		if ($hash[0] == '*')
-			$hash = crypt($password, $stored_hash);
+		{
+					$hash = crypt($password, $stored_hash);
+		}
 
 		return $this->_hash_equals($hash, $stored_hash);
 	}

sources/admin/ManagePaid.controller.php

Braces +63 added lines, -22 removed lines

@@ -154,7 +154,9 @@ 
 				$validator->text_replacements(array('paid_email_to' => $txt['paid_email_to']));
 
 				if ($validator->validate($this->_req->post))
-					$this->_req->post->paid_email_to = $validator->validation_data('paid_email_to');
+				{
+									$this->_req->post->paid_email_to = $validator->validation_data('paid_email_to');
+				}
 				else
 				{
 					// That's not an email, lets set it back in the form to be fixed and let them know its wrong
@@ -162,7 +164,9 @@ 
 					$context['error_type'] = 'minor';
 					$context['settings_message'] = array();
 					foreach ($validator->validation_errors() as $id => $error)
-						$context['settings_message'][] = $error;
+					{
+											$context['settings_message'][] = $error;
+					}
 				}
 			}
 
@@ -201,7 +205,9 @@ 
 		// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 		$modSettings['paid_currency'] = !empty($modSettings['paid_currency_code']) ? $modSettings['paid_currency_code'] : '';
 		if (!empty($modSettings['paid_currency_code']) && !in_array($modSettings['paid_currency_code'], array('usd', 'eur', 'gbp')))
-			$modSettings['paid_currency'] = 'other';
+		{
+					$modSettings['paid_currency'] = 'other';
+		}
 
 		// These are all the default settings.
 		$config_vars = array(
@@ -257,7 +263,9 @@ 
 
 		// Not made the settings yet?
 		if (empty($modSettings['paid_currency_symbol']))
-			throw new Elk_Exception('paid_not_set_currency', false, array($scripturl . '?action=admin;area=paidsubscribe;sa=settings'));
+		{
+					throw new Elk_Exception('paid_not_set_currency', false, array($scripturl . '?action=admin;area=paidsubscribe;sa=settings'));
+		}
 
 		// Some basic stuff.
 		$context['page_title'] = $txt['paid_subs_view'];
@@ -460,7 +468,9 @@ 
 
 				// There needs to be something.
 				if (empty($this->_req->post->span_value) || empty($this->_req->post->cost))
-					throw new Elk_Exception('paid_no_cost_value');
+				{
+									throw new Elk_Exception('paid_no_cost_value');
+				}
 			}
 			// Flexible is harder but more fun ;)
 			else
@@ -475,7 +485,9 @@ 
 				);
 
 				if (empty($this->_req->post->cost_day) && empty($this->_req->post->cost_week) && empty($this->_req->post->cost_month) && empty($this->_req->post->cost_year))
-					throw new Elk_Exception('paid_all_freq_blank');
+				{
+									throw new Elk_Exception('paid_all_freq_blank');
+				}
 			}
 
 			$cost = serialize($cost);
@@ -485,7 +497,9 @@ 
 			if (!empty($this->_req->post->addgroup))
 			{
 				foreach ($this->_req->post->addgroup as $id => $dummy)
-					$addGroups[] = (int) $id;
+				{
+									$addGroups[] = (int) $id;
+				}
 			}
 			$addGroups = implode(',', $addGroups);
 
@@ -813,16 +827,22 @@ 
 
 		// If we haven't been passed the subscription ID get it.
 		if ($context['log_id'] && !$context['sub_id'])
-			$context['sub_id'] = validateSubscriptionID($context['log_id']);
+		{
+					$context['sub_id'] = validateSubscriptionID($context['log_id']);
+		}
 
 		if (!isset($context['subscriptions'][$context['sub_id']]))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		$context['current_subscription'] = $context['subscriptions'][$context['sub_id']];
 
 		// Searching?
 		if (isset($this->_req->post->ssearch))
-			return $this->action_viewsub();
+		{
+					return $this->action_viewsub();
+		}
 		// Saving?
 		elseif (isset($this->_req->post->save_sub))
 		{
@@ -843,14 +863,20 @@ 
 				$member = getMemberByName($this->_req->post->name);
 
 				if (empty($member))
-					throw new Elk_Exception('error_member_not_found');
+				{
+									throw new Elk_Exception('error_member_not_found');
+				}
 
 				if (alreadySubscribed($context['sub_id'], $member['id_member']))
-					throw new Elk_Exception('member_already_subscribed');
+				{
+									throw new Elk_Exception('member_already_subscribed');
+				}
 
 				// Actually put the subscription in place.
 				if ($status == 1)
-					addSubscription($context['sub_id'], $member['id_member'], 0, $starttime, $endtime);
+				{
+									addSubscription($context['sub_id'], $member['id_member'], 0, $starttime, $endtime);
+				}
 				else
 				{
 					$details = array(
@@ -872,10 +898,14 @@ 
 
 				// Pick the right permission stuff depending on what the status is changing from/to.
 				if ($subscription_status['old_status'] == 1 && $status != 1)
-					removeSubscription($context['sub_id'], $subscription_status['id_member']);
+				{
+									removeSubscription($context['sub_id'], $subscription_status['id_member']);
+				}
 
 				elseif ($status == 1 && $subscription_status['old_status'] != 1)
-					addSubscription($context['sub_id'], $subscription_status['id_member'], 0, $starttime, $endtime);
+				{
+									addSubscription($context['sub_id'], $subscription_status['id_member'], 0, $starttime, $endtime);
+				}
 
 				else
 				{
@@ -902,12 +932,16 @@ 
 			{
 				$toDelete = array();
 				foreach ($this->_req->post->delsub as $id => $dummy)
-					$toDelete[] = (int) $id;
+				{
+									$toDelete[] = (int) $id;
+				}
 
 				$deletes = prepareDeleteSubscriptions($toDelete);
 
 				foreach ($deletes as $id_subscribe => $id_member)
-					removeSubscription($id_subscribe, $id_member, isset($this->_req->post->delete));
+				{
+									removeSubscription($id_subscribe, $id_member, isset($this->_req->post->delete));
+				}
 			}
 			redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . $context['sub_id']);
 		}
@@ -946,15 +980,18 @@ 
 				$result = getBasicMemberData((int) $this->_req->query->uid);
 				$context['sub']['username'] = $result['real_name'];
 			}
-			else
-				$context['sub']['username'] = '';
+			else {
+							$context['sub']['username'] = '';
+			}
 		}
 		// Otherwise load the existing info.
 		else
 		{
 			$row = getPendingSubscriptions($context['log_id']);
 			if (empty($row))
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// Any pending payments?
 			$context['pending_payments'] = array();
@@ -974,9 +1011,11 @@ 
 							foreach ($costs as $duration => $cost)
 							{
 								if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
-									$context['pending_payments'][$id] = array(
+								{
+																	$context['pending_payments'][$id] = array(
 										'desc' => sprintf($modSettings['paid_currency_symbol'], $cost . '/' . $txt[$duration]),
 									);
+								}
 							}
 						}
 						elseif ($costs['fixed'] == $pending[1])
@@ -998,7 +1037,9 @@ 
 						{
 							// Flexible?
 							if (isset($this->_req->query->accept))
-								addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] === 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+							{
+															addSubscription($context['current_subscription']['id'], $row['id_member'], $context['current_subscription']['real_length'] === 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
+							}
 							unset($pending_details[$id]);
 
 							$new_details = serialize($pending_details);

sources/admin/ManageFeatures.controller.php

Braces +80 added lines, -28 removed lines

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

sources/admin/ManageBoards.controller.php

Braces +126 added lines, -49 removed lines

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

sources/admin/ManageCalendarModule.controller.php

Braces +15 added lines, -7 removed lines

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

sources/admin/PackageServers.controller.php

Braces +111 added lines, -44 removed lines

@@ -113,7 +113,9 @@ 
 		$context['package_download_broken'] = !is_writable(BOARDDIR . '/packages') || !is_writable(BOARDDIR . '/packages/installed.list');
 
 		if ($context['package_download_broken'])
-			$this->ftp_connect();
+		{
+					$this->ftp_connect();
+		}
 	}
 
 	/**
@@ -130,11 +132,14 @@ 
 
 		// Browsing the packages from a server
 		if (isset($this->_req->query->server))
-			list($name, $url, $server) = $this->_package_server();
+		{
+					list($name, $url, $server) = $this->_package_server();
+		}
 
 		// Minimum required parameter did not exist so dump out.
-		else
-			throw new Elk_Exception('couldnt_connect', false);
+		else {
+					throw new Elk_Exception('couldnt_connect', false);
+		}
 
 		// Might take some time.
 		detectServer()->setTimeLimit(60);
@@ -159,11 +164,15 @@ 
 			// Look through the list of installed mods and get version information for the compare
 			$installed_adds = array();
 			foreach ($instadds as $installed_add)
-				$installed_adds[$installed_add['package_id']] = $installed_add['version'];
+			{
+							$installed_adds[$installed_add['package_id']] = $installed_add['version'];
+			}
 
 			$the_version = strtr(FORUM_VERSION, array('ElkArte ' => ''));
 			if (!empty($_SESSION['version_emulate']))
-				$the_version = $_SESSION['version_emulate'];
+			{
+							$the_version = $_SESSION['version_emulate'];
+			}
 
 			// Parse the json file, each section contains a category of addons
 			$packageNum = 0;
@@ -352,12 +361,15 @@ 
 			// not always accurate, especially when dealing with repos.  So for now just put in in no conflict mode
 			// and do the save.
 			if ($this->_req->getQuery('area') === 'packageservers' && $this->_req->getQuery('sa') === 'download')
-				$this->_req->query->auto = true;
+			{
+							$this->_req->query->auto = true;
+			}
 
 			return str_replace($invalid, '_', $newname) . $matches[6];
 		}
-		else
-			return basename($name);
+		else {
+					return basename($name);
+		}
 	}
 
 	/**
@@ -384,13 +396,18 @@ 
 
 		// Security is good...
 		if (isset($this->_req->query->server))
-			checkSession('get');
-		else
-			checkSession();
+		{
+					checkSession('get');
+		}
+		else {
+					checkSession();
+		}
 
 		// To download something, we need either a valid server or url.
 		if (empty($this->_req->query->server) && (!empty($this->_req->query->get) && !empty($this->_req->post->package)))
-			throw new Elk_Exception('package_get_error_is_zero', false);
+		{
+					throw new Elk_Exception('package_get_error_is_zero', false);
+		}
 
 		// Start off with nothing
 		$server = '';
@@ -418,8 +435,9 @@ 
 				$url = isset($path_url['dirname']) ? $path_url['dirname'] . '/' : '';
 			}
 			// Not found or some monkey business
-			else
-				throw new Elk_Exception('package_cant_download', false);
+			else {
+							throw new Elk_Exception('package_cant_download', false);
+			}
 		}
 		// Entered a url and optional filename
 		elseif (isset($this->_req->post->byurl) && !empty($this->_req->post->filename))
@@ -443,13 +461,16 @@ 
 				$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 				$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
 			}
-			else
-				$ext = '';
+			else {
+							$ext = '';
+			}
 
 			// Find the first available free name
 			$i = 1;
 			while (file_exists(BOARDDIR . '/packages/' . $package_name . $i . $ext))
-				$i++;
+			{
+							$i++;
+			}
 
 			$package_name = $package_name . $i . $ext;
 		}
@@ -458,7 +479,9 @@ 
 		$packageInfo = getPackageInfo($url . $package_id);
 
 		if (!is_array($packageInfo))
-			throw new Elk_Exception($packageInfo);
+		{
+					throw new Elk_Exception($packageInfo);
+		}
 
 		// Save the package to disk, use FTP if necessary
 		create_chmod_control(
@@ -473,7 +496,9 @@ 
 
 		// Done!  Did we get this package automatically?
 		if (preg_match('~^http://[\w_\-]+\.elkarte\.net/~', $package_id) == 1 && strpos($package_id, 'dlattach') === false && isset($this->_req->query->auto))
-			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+		{
+					redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+		}
 
 		// You just downloaded a addon from SERVER_NAME_GOES_HERE.
 		$context['package_server'] = $server;
@@ -482,16 +507,25 @@ 
 		$context['package'] = getPackageInfo($package_name);
 
 		if (!is_array($context['package']))
-			throw new Elk_Exception('package_cant_download', false);
+		{
+					throw new Elk_Exception('package_cant_download', false);
+		}
 
 		if ($context['package']['type'] === 'modification' || $context['package']['type'] === 'addon')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'avatar')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'language')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
-		else
-			$context['package']['install']['link'] = '';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
+		}
+		else {
+					$context['package']['install']['link'] = '';
+		}
 
 		$context['package']['list_files']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $context['package']['filename'] . '">' . $txt['list_files'] . '</a>';
 
@@ -519,7 +553,9 @@ 
 		if (isset($this->_req->query->server))
 		{
 			if ($this->_req->query->server == '')
-				redirectexit('action=admin;area=packageservers');
+			{
+							redirectexit('action=admin;area=packageservers');
+			}
 
 			$server = $this->_req->getQuery('server', 'intval');
 
@@ -530,7 +566,9 @@ 
 
 			// If server does not exist then dump out.
 			if (empty($url))
-				throw new Elk_Exception('couldnt_connect', false);
+			{
+							throw new Elk_Exception('couldnt_connect', false);
+			}
 		}
 
 		return array($name, $url, $server);
@@ -551,15 +589,21 @@ 
 		// @todo Use FTP if the packages directory is not writable.
 		// Check the file was even sent!
 		if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-			throw new Elk_Exception('package_upload_error_nofile');
+		{
+					throw new Elk_Exception('package_upload_error_nofile');
+		}
 		elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-			throw new Elk_Exception('package_upload_error_failed');
+		{
+					throw new Elk_Exception('package_upload_error_failed');
+		}
 
 		// Make sure it has a sane filename.
 		$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 
 		if (strtolower(substr($_FILES['package']['name'], -4)) !== '.zip' && strtolower(substr($_FILES['package']['name'], -4)) !== '.tgz' && strtolower(substr($_FILES['package']['name'], -7)) !== '.tar.gz')
-			throw new Elk_Exception('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+		{
+					throw new Elk_Exception('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+		}
 
 		// We only need the filename...
 		$packageName = basename($_FILES['package']['name']);
@@ -569,7 +613,9 @@ 
 
 		// @todo Maybe just roll it like we do for downloads?
 		if (file_exists($destination))
-			throw new Elk_Exception('package_upload_error_exists');
+		{
+					throw new Elk_Exception('package_upload_error_exists');
+		}
 
 		// Now move the file.
 		move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -601,12 +647,16 @@ 
 				{
 					// No need to check these
 					if ($package->getFilename() == $packageName)
-						continue;
+					{
+											continue;
+					}
 
 					// Read package info for the archive we found
 					$packageInfo = getPackageInfo($package->getFilename());
 					if (!is_array($packageInfo))
-						continue;
+					{
+											continue;
+					}
 
 					// If it was already uploaded under another name don't upload it again.
 					if ($packageInfo['id'] == $context['package']['id'] && compareVersions($packageInfo['version'], $context['package']['version']) == 0)
@@ -624,13 +674,20 @@ 
 		}
 
 		if ($context['package']['type'] === 'modification' || $context['package']['type'] === 'addon')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'avatar')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		}
 		elseif ($context['package']['type'] === 'language')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
-		else
-			$context['package']['install']['link'] = '';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
+		}
+		else {
+					$context['package']['install']['link'] = '';
+		}
 
 		$context['package']['list_files']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $context['package']['filename'] . '">' . $txt['list_files'] . '</a>';
 
@@ -654,7 +711,9 @@ 
 
 		// If they put a slash on the end, get rid of it.
 		if (substr($this->_req->post->serverurl, -1) === '/')
-			$this->_req->post->serverurl = substr($this->_req->post->serverurl, 0, -1);
+		{
+					$this->_req->post->serverurl = substr($this->_req->post->serverurl, 0, -1);
+		}
 
 		// Are they both nice and clean?
 		$servername = trim(Util::htmlspecialchars($this->_req->post->servername));
@@ -712,7 +771,9 @@ 
 
 		// Give FTP a chance...
 		if ($context['package_download_broken'])
-			$this->ftp_connect();
+		{
+					$this->ftp_connect();
+		}
 	}
 
 	/**
@@ -769,15 +830,21 @@ 
 				}
 				// ...or we failed
 				elseif ($ftp->error !== false && !isset($ftp_error))
-					$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				{
+									$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				}
 
 				list ($username, $detect_path, $found_path) = $ftp->detect_path(BOARDDIR);
 
 				if ($found_path || !isset($this->_req->post->ftp_path))
-					$this->_req->post->ftp_path = $detect_path;
+				{
+									$this->_req->post->ftp_path = $detect_path;
+				}
 
 				if (!isset($this->_req->post->ftp_username))
-					$this->_req->post->ftp_username = $username;
+				{
+									$this->_req->post->ftp_username = $username;
+				}
 
 				// Fill the boxes for a FTP connection with data from the previous attempt too, if any
 				$context['package_ftp'] = array(

sources/admin/Admin.controller.php

Braces +21 added lines, -8 removed lines

@@ -82,7 +82,9 @@ 
 
 		// Now - finally - call the right place!
 		if (isset($admin_include_data['file']))
-			require_once($admin_include_data['file']);
+		{
+					require_once($admin_include_data['file']);
+		}
 
 		callMenu($admin_include_data);
 	}
@@ -612,16 +614,20 @@ 
 		);
 
 		if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'name' => $admin_include_data['label'],
 			);
+		}
 
 		if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-			$context['linktree'][] = array(
+		{
+					$context['linktree'][] = array(
 				'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 			);
+		}
 	}
 
 	/**
@@ -779,9 +785,12 @@ 
 
 		// You did remember to enter something to search for, otherwise its easy
 		if ($context['search_term'] === '')
-			$context['search_results'] = array();
-		else
-			$action->dispatch($subAction);
+		{
+					$context['search_results'] = array();
+		}
+		else {
+					$action->dispatch($subAction);
+		}
 	}
 
 	/**
@@ -925,7 +934,9 @@ 
 
 		// Encode the search data.
 		foreach ($postVars as $k => $v)
-			$postVars[$k] = urlencode($v);
+		{
+					$postVars[$k] = urlencode($v);
+		}
 
 		// This is what we will send.
 		$postVars = implode('+', $postVars);
@@ -938,7 +949,9 @@ 
 
 		// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
 		if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) !== 1)
-			throw new Elk_Exception('cannot_connect_doc_site');
+		{
+					throw new Elk_Exception('cannot_connect_doc_site');
+		}
 
 		$search_results = !empty($matches[1]) ? $matches[1] : '';
 

sources/admin/ManageAvatars.controller.php

Braces +3 added lines, -1 removed lines

@@ -85,7 +85,9 @@
 
 			// Disable if invalid values would result
 			if (isset($this->_req->post->custom_avatar_enabled) && $this->_req->post->custom_avatar_enabled == 1 && (empty($this->_req->post->custom_avatar_dir) || empty($this->_req->post->custom_avatar_url)))
-				$this->_req->post->custom_avatar_enabled = 0;
+			{
+							$this->_req->post->custom_avatar_enabled = 0;
+			}
 
 			$settingsForm->setConfigValues((array) $this->_req->post);
 			$settingsForm->save();

sources/admin/ManageSmileys.controller.php

Braces +282 added lines, -97 removed lines

@@ -97,7 +97,9 @@ 
 
 		// Some settings may not be enabled, disallow these from the tabs as appropriate.
 		if (empty($modSettings['messageIcons_enable']))
-			$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+		{
+					$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+		}
 
 		if (empty($modSettings['smiley_enable']))
 		{
@@ -141,7 +143,9 @@ 
 
 			// Make sure that the smileys are in the right order after enabling them.
 			if (isset($this->_req->post->smiley_enable))
-				sortSmileyTable();
+			{
+							sortSmileyTable();
+			}
 
 			call_integration_hook('integrate_save_smiley_settings');
 
@@ -220,12 +224,14 @@ 
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
 		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		{
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 				'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		// Importing any smileys from an existing set?
 		$this->_subActionImport();
@@ -362,7 +368,9 @@ 
 				foreach ($this->_req->post->smiley_set as $id => $val)
 				{
 					if (isset($set_paths[$id], $set_names[$id]) && !empty($id))
-						unset($set_paths[$id], $set_names[$id]);
+					{
+											unset($set_paths[$id], $set_names[$id]);
+					}
 				}
 
 				// Update the modsettings with the new values
@@ -374,7 +382,9 @@ 
 			}
 			// Add a new smiley set.
 			elseif (!empty($this->_req->post->add))
-				$context['sub_action'] = 'modifyset';
+			{
+							$context['sub_action'] = 'modifyset';
+			}
 			// Create or modify a smiley set.
 			elseif (isset($this->_req->post->set))
 			{
@@ -387,7 +397,9 @@ 
 				if ($set == -1 && isset($this->_req->post->smiley_sets_path))
 				{
 					if (in_array($this->_req->post->smiley_sets_path, $set_paths))
-						throw new Elk_Exception('smiley_set_already_exists');
+					{
+											throw new Elk_Exception('smiley_set_already_exists');
+					}
 
 					updateSettings(array(
 						'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . $this->_req->post->smiley_sets_path,
@@ -400,11 +412,15 @@ 
 				{
 					// Make sure the smiley set exists.
 					if (!isset($set_paths[$set]) || !isset($set_names[$set]))
-						throw new Elk_Exception('smiley_set_not_found');
+					{
+											throw new Elk_Exception('smiley_set_not_found');
+					}
 
 					// Make sure the path is not yet used by another smileyset.
 					if (in_array($this->_req->post->smiley_sets_path, $set_paths) && $this->_req->post->smiley_sets_path != $set_paths[$set])
-						throw new Elk_Exception('smiley_set_path_already_used');
+					{
+											throw new Elk_Exception('smiley_set_path_already_used');
+					}
 
 					$set_paths[$set] = $this->_req->post->smiley_sets_path;
 					$set_names[$set] = $this->_req->post->smiley_sets_name;
@@ -417,7 +433,9 @@ 
 
 				// The user might have checked to also import smileys.
 				if (!empty($this->_req->post->smiley_sets_import))
-					$this->importSmileys($this->_req->post->smiley_sets_path);
+				{
+									$this->importSmileys($this->_req->post->smiley_sets_path);
+				}
 			}
 
 			// No matter what, reset the cache
@@ -437,13 +455,15 @@ 
 		{
 			$set = $this->_req->getQuery('set', 'intval', -1);
 			if ($set == -1 || !isset($context['smiley_sets'][$set]))
-				$context['current_set'] = array(
+			{
+							$context['current_set'] = array(
 					'id' => '-1',
 					'path' => '',
 					'name' => '',
 					'selected' => false,
 					'is_new' => true,
 				);
+			}
 			else
 			{
 				$context['current_set'] = &$context['smiley_sets'][$set];
@@ -457,19 +477,25 @@ 
 					while ($entry = $dir->read())
 					{
 						if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-							$smileys[strtolower($entry)] = $entry;
+						{
+													$smileys[strtolower($entry)] = $entry;
+						}
 					}
 					$dir->close();
 
 					if (empty($smileys))
-						throw new Elk_Exception('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+					{
+											throw new Elk_Exception('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+					}
 
 					// Exclude the smileys that are already in the database.
 					$found = smileyExists($smileys);
 					foreach ($found as $smiley)
 					{
 						if (isset($smileys[$smiley]))
-							unset($smileys[$smiley]);
+						{
+													unset($smileys[$smiley]);
+						}
 					}
 
 					$context['current_set']['can_import'] = count($smileys);
@@ -487,12 +513,14 @@ 
 				while ($entry = $dir->read())
 				{
 					if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry))
-						$context['smiley_set_dirs'][] = array(
+					{
+											$context['smiley_set_dirs'][] = array(
 							'id' => $entry,
 							'path' => $modSettings['smileys_dir'] . '/' . $entry,
 							'selectable' => $entry == $context['current_set']['path'] || !in_array($entry, explode(',', $modSettings['smiley_sets_known'])),
 							'current' => $entry == $context['current_set']['path'],
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -516,7 +544,9 @@ 
 
 			// Sanity check - then import.
 			if (isset($context['smiley_sets'][$set]))
-				$this->importSmileys(un_htmlspecialchars($context['smiley_sets'][$set]['path']));
+			{
+							$this->importSmileys(un_htmlspecialchars($context['smiley_sets'][$set]['path']));
+			}
 
 			// Force the process to continue.
 			$context['sub_action'] = 'modifyset';
@@ -541,12 +571,14 @@ 
 
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
 		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		{
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 				'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		// Submitting a form?
 		if (isset($this->_req->post->{$context['session_var']}, $this->_req->post->smiley_code))
@@ -563,11 +595,15 @@ 
 
 			// Make sure some code was entered.
 			if (empty($this->_req->post->smiley_code))
-				throw new Elk_Exception('smiley_has_no_code');
+			{
+							throw new Elk_Exception('smiley_has_no_code');
+			}
 
 			// Check whether the new code has duplicates. It should be unique.
 			if (validateDuplicateSmiley($this->_req->post->smiley_code))
-				throw new Elk_Exception('smiley_not_unique');
+			{
+							throw new Elk_Exception('smiley_not_unique');
+			}
 
 			// If we are uploading - check all the smiley sets are writable!
 			if ($this->_req->post->method !== 'existing')
@@ -576,39 +612,51 @@ 
 				foreach ($context['smiley_sets'] as $set)
 				{
 					if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path'])))
-						$writeErrors[] = $set['path'];
+					{
+											$writeErrors[] = $set['path'];
+					}
 				}
 
 				if (!empty($writeErrors))
-					throw new Elk_Exception('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
+				{
+									throw new Elk_Exception('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
+				}
 			}
 
 			// Uploading just one smiley for all of them?
 			if (isset($this->_req->post->sameall) && isset($_FILES['uploadSmiley']['name']) && $_FILES['uploadSmiley']['name'] != '')
 			{
 				if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name'])))
-					throw new Elk_Exception('smileys_upload_error');
+				{
+									throw new Elk_Exception('smileys_upload_error');
+				}
 
 				// Sorry, no spaces, dots, or anything else but letters allowed.
 				$_FILES['uploadSmiley']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['uploadSmiley']['name']);
 
 				// We only allow image files - it's THAT simple - no messing around here...
 				if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes))
-					throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				{
+									throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				}
 
 				// We only need the filename...
 				$destName = basename($_FILES['uploadSmiley']['name']);
 
 				// Make sure they aren't trying to upload a nasty file - for their own good here!
 				if (in_array(strtolower($destName), $disabledFiles))
-					throw new Elk_Exception('smileys_upload_error_illegal');
+				{
+									throw new Elk_Exception('smileys_upload_error_illegal');
+				}
 
 				// Check if the file already exists... and if not move it to EVERY smiley set directory.
 				$i = 0;
 
 				// Keep going until we find a set the file doesn't exist in. (or maybe it exists in all of them?)
 				while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName))
-					$i++;
+				{
+									$i++;
+				}
 
 				// Okay, we're going to put the smiley right here, since it's not there yet!
 				if (isset($context['smiley_sets'][$i]['path']))
@@ -624,7 +672,9 @@ 
 
 						// The file is already there!  Don't overwrite it!
 						if (file_exists($currentPath))
-							continue;
+						{
+													continue;
+						}
 
 						// Okay, so copy the first one we made to here.
 						copy($smileyLocation, $currentPath);
@@ -642,12 +692,18 @@ 
 				foreach ($_FILES as $name => $dummy)
 				{
 					if ($_FILES[$name]['name'] == '')
-						throw new Elk_Exception('smileys_upload_error_blank');
+					{
+											throw new Elk_Exception('smileys_upload_error_blank');
+					}
 
 					if (empty($newName))
-						$newName = basename($_FILES[$name]['name']);
+					{
+											$newName = basename($_FILES[$name]['name']);
+					}
 					elseif (basename($_FILES[$name]['name']) != $newName)
-						throw new Elk_Exception('smileys_upload_error_name');
+					{
+											throw new Elk_Exception('smileys_upload_error_name');
+					}
 				}
 
 				foreach ($context['smiley_sets'] as $i => $set)
@@ -656,30 +712,40 @@ 
 					$set['path'] = un_htmlspecialchars($set['path']);
 
 					if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '')
-						continue;
+					{
+											continue;
+					}
 
 					// Got one...
 					if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name'])))
-						throw new Elk_Exception('smileys_upload_error');
+					{
+											throw new Elk_Exception('smileys_upload_error');
+					}
 
 					// Sorry, no spaces, dots, or anything else but letters allowed.
 					$_FILES['individual_' . $set['name']]['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['individual_' . $set['name']]['name']);
 
 					// We only allow image files - it's THAT simple - no messing around here...
 					if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes))
-						throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+					{
+											throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+					}
 
 					// We only need the filename...
 					$destName = basename($_FILES['individual_' . $set['name']]['name']);
 
 					// Make sure they aren't trying to upload a nasty file - for their own good here!
 					if (in_array(strtolower($destName), $disabledFiles))
-						throw new Elk_Exception('smileys_upload_error_illegal');
+					{
+											throw new Elk_Exception('smileys_upload_error_illegal');
+					}
 
 					// If the file exists - ignore it.
 					$smileyLocation = $context['smileys_dir'] . '/' . $set['path'] . '/' . $destName;
 					if (file_exists($smileyLocation))
-						continue;
+					{
+											continue;
+					}
 
 					// Finally - move the image!
 					move_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name'], $smileyLocation);
@@ -692,7 +758,9 @@ 
 
 			// Also make sure a filename was given.
 			if (empty($this->_req->post->smiley_filename))
-				throw new Elk_Exception('smiley_has_no_filename');
+			{
+							throw new Elk_Exception('smiley_has_no_filename');
+			}
 
 			// Find the position on the right.
 			$smiley_order = '0';
@@ -702,7 +770,9 @@ 
 				$smiley_order = nextSmileyLocation($this->_req->post->smiley_location);
 
 				if (empty($smiley_order))
-					$smiley_order = '0';
+				{
+									$smiley_order = '0';
+				}
 			}
 			$param = array(
 				$this->_req->post->smiley_code,
@@ -728,16 +798,20 @@ 
 			foreach ($context['smiley_sets'] as $smiley_set)
 			{
 				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-					continue;
+				{
+									continue;
+				}
 
 				$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 				while ($entry = $dir->read())
 				{
 					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-						$context['filenames'][strtolower($entry)] = array(
+					{
+											$context['filenames'][strtolower($entry)] = array(
 							'id' => htmlspecialchars($entry, ENT_COMPAT, 'UTF-8'),
 							'selected' => false,
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -780,10 +854,14 @@ 
 			if (isset($this->_req->post->smiley_action) && !empty($this->_req->post->checked_smileys))
 			{
 				foreach ($this->_req->post->checked_smileys as $id => $smiley_id)
-					$this->_req->post->checked_smileys[$id] = (int) $smiley_id;
+				{
+									$this->_req->post->checked_smileys[$id] = (int) $smiley_id;
+				}
 
 				if ($this->_req->post->smiley_action == 'delete')
-					deleteSmileys($this->_req->post->checked_smileys);
+				{
+									deleteSmileys($this->_req->post->checked_smileys);
+				}
 				// Changing the status of the smiley?
 				else
 				{
@@ -794,7 +872,9 @@ 
 						'popup' => 2
 					);
 					if (isset($displayTypes[$this->_req->post->smiley_action]))
-						updateSmileyDisplayType($this->_req->post->checked_smileys, $displayTypes[$this->_req->post->smiley_action]);
+					{
+											updateSmileyDisplayType($this->_req->post->checked_smileys, $displayTypes[$this->_req->post->smiley_action]);
+					}
 				}
 			}
 			// Create/modify a smiley.
@@ -804,7 +884,9 @@ 
 
 				// Is it a delete?
 				if (!empty($this->_req->post->deletesmiley))
-					deleteSmileys(array($this->_req->post->smiley));
+				{
+									deleteSmileys(array($this->_req->post->smiley));
+				}
 				// Otherwise an edit.
 				else
 				{
@@ -814,15 +896,21 @@ 
 
 					// Make sure some code was entered.
 					if (empty($this->_req->post->smiley_code))
-						throw new Elk_Exception('smiley_has_no_code');
+					{
+											throw new Elk_Exception('smiley_has_no_code');
+					}
 
 					// Also make sure a filename was given.
 					if (empty($this->_req->post->smiley_filename))
-						throw new Elk_Exception('smiley_has_no_filename');
+					{
+											throw new Elk_Exception('smiley_has_no_filename');
+					}
 
 					// Check whether the new code has duplicates. It should be unique.
 					if (validateDuplicateSmiley($this->_req->post->smiley_code, $this->_req->post->smiley))
-						throw new Elk_Exception('smiley_not_unique');
+					{
+											throw new Elk_Exception('smiley_not_unique');
+					}
 
 					$param = array(
 						'smiley_location' => $this->_req->post->smiley_location,
@@ -845,12 +933,14 @@ 
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
 		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		{
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 				'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		// Prepare overview of all (custom) smileys.
 		if ($context['sub_action'] == 'editsmileys')
@@ -867,8 +957,10 @@ 
 			$smileyset_option_list = '
 				<select name="set" onchange="changeSet(this.options[this.selectedIndex].value);">';
 			foreach ($context['smiley_sets'] as $smiley_set)
-				$smileyset_option_list .= '
+			{
+							$smileyset_option_list .= '
 					<option value="' . $smiley_set['path'] . '"' . ($modSettings['smiley_sets_default'] == $smiley_set['path'] ? ' selected="selected"' : '') . '>' . $smiley_set['name'] . '</option>';
+			}
 			$smileyset_option_list .= '
 				</select>';
 
@@ -932,11 +1024,16 @@ 
 								global $txt;
 
 								if (empty($rowData['hidden']))
-									return $txt['smileys_location_form'];
+								{
+																	return $txt['smileys_location_form'];
+								}
 								elseif ($rowData['hidden'] == 1)
-									return $txt['smileys_location_hidden'];
-								else
-									return $txt['smileys_location_popup'];
+								{
+																	return $txt['smileys_location_hidden'];
+								}
+								else {
+																	return $txt['smileys_location_popup'];
+								}
 							},
 						),
 						'sort' => array(
@@ -953,18 +1050,24 @@ 
 								global $context, $txt, $modSettings;
 
 								if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
-									return htmlspecialchars($rowData['description'], ENT_COMPAT, 'UTF-8');
+								{
+																	return htmlspecialchars($rowData['description'], ENT_COMPAT, 'UTF-8');
+								}
 
 								// Check if there are smileys missing in some sets.
 								$missing_sets = array();
 								foreach ($context['smiley_sets'] as $smiley_set)
-									if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
+								{
+																	if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
 										$missing_sets[] = $smiley_set['path'];
+								}
 
 								$description = htmlspecialchars($rowData['description'], ENT_COMPAT, 'UTF-8');
 
 								if (!empty($missing_sets))
-									$description .= sprintf('<br /><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+								{
+																	$description .= sprintf('<br /><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+								}
 
 								return $description;
 							},
@@ -1080,12 +1183,14 @@ 
 			$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 			$set_names = explode("\n", $modSettings['smiley_sets_names']);
 			foreach ($context['smiley_sets'] as $i => $set)
-				$context['smiley_sets'][$i] = array(
+			{
+							$context['smiley_sets'][$i] = array(
 					'id' => $i,
 					'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 					'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 					'selected' => $set == $modSettings['smiley_sets_default']
 				);
+			}
 
 			$context['selected_set'] = $modSettings['smiley_sets_default'];
 
@@ -1096,16 +1201,20 @@ 
 				foreach ($context['smiley_sets'] as $smiley_set)
 				{
 					if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-						continue;
+					{
+											continue;
+					}
 
 					$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 					while ($entry = $dir->read())
 					{
 						if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-							$context['filenames'][strtolower($entry)] = array(
+						{
+													$context['filenames'][strtolower($entry)] = array(
 								'id' => htmlspecialchars($entry, ENT_COMPAT, 'UTF-8'),
 								'selected' => false,
 							);
+						}
 					}
 					$dir->close();
 				}
@@ -1119,7 +1228,9 @@ 
 			$context['current_smiley']['description'] = htmlspecialchars($context['current_smiley']['description'], ENT_COMPAT, 'UTF-8');
 
 			if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])]))
-				$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+			{
+							$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+			}
 		}
 	}
 
@@ -1147,7 +1258,9 @@ 
 			{
 				$deleteIcons = array();
 				foreach ($this->_req->post->checked_icons as $icon)
-					$deleteIcons[] = (int) $icon;
+				{
+									$deleteIcons[] = (int) $icon;
+				}
 
 				// Do the actual delete!
 				deleteMessageIcons($deleteIcons);
@@ -1159,36 +1272,50 @@ 
 
 				// Do some preparation with the data... like check the icon exists *somewhere*
 				if (strpos($this->_req->post->icon_filename, '.png') !== false)
-					$this->_req->post->icon_filename = substr($this->_req->post->icon_filename, 0, -4);
+				{
+									$this->_req->post->icon_filename = substr($this->_req->post->icon_filename, 0, -4);
+				}
 
 				if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $this->_req->post->icon_filename . '.png'))
-					throw new Elk_Exception('icon_not_found');
+				{
+									throw new Elk_Exception('icon_not_found');
+				}
 				// There is a 16 character limit on message icons...
 				elseif (strlen($this->_req->post->icon_filename) > 16)
-					throw new Elk_Exception('icon_name_too_long');
+				{
+									throw new Elk_Exception('icon_name_too_long');
+				}
 				elseif ($this->_req->post->icon_location == $this->_req->query->icon && !empty($this->_req->query->icon))
-					throw new Elk_Exception('icon_after_itself');
+				{
+									throw new Elk_Exception('icon_after_itself');
+				}
 
 				// First do the sorting... if this is an edit reduce the order of everything after it by one ;)
 				if ($this->_req->query->icon != 0)
 				{
 					$oldOrder = $context['icons'][$this->_req->query->icon]['true_order'];
 					foreach ($context['icons'] as $id => $data)
-						if ($data['true_order'] > $oldOrder)
+					{
+											if ($data['true_order'] > $oldOrder)
 							$context['icons'][$id]['true_order']--;
+					}
 				}
 
 				// If there are no existing icons and this is a new one, set the id to 1 (mainly for non-mysql)
 				if (empty($this->_req->query->icon) && empty($context['icons']))
-					$this->_req->query->icon = 1;
+				{
+									$this->_req->query->icon = 1;
+				}
 
 				// Get the new order.
 				$newOrder = $this->_req->post->icon_location == 0 ? 0 : $context['icons'][$this->_req->post->icon_location]['true_order'] + 1;
 
 				// Do the same, but with the one that used to be after this icon, done to avoid conflict.
 				foreach ($context['icons'] as $id => $data)
-					if ($data['true_order'] >= $newOrder)
+				{
+									if ($data['true_order'] >= $newOrder)
 						$context['icons'][$id]['true_order']++;
+				}
 
 				// Finally set the current icon's position!
 				$context['icons'][$this->_req->query->icon]['true_order'] = $newOrder;
@@ -1204,15 +1331,20 @@ 
 				foreach ($context['icons'] as $id => $icon)
 				{
 					if ($id != 0)
-						$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
-					else
-						$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
+					{
+											$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
+					}
+					else {
+											$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
+					}
 				}
 
 				updateMessageIcon($iconInsert);
 
 				if (!empty($iconInsert_new))
-					addMessageIcon($iconInsert_new);
+				{
+									addMessageIcon($iconInsert_new);
+				}
 
 				// Flush the cache so the changes are reflected
 				Cache::instance()->remove('posting_icons-' . (int) $this->_req->post->icon_board);
@@ -1223,7 +1355,9 @@ 
 
 			// Unless we're adding a new thing, we'll escape
 			if (!isset($this->_req->post->add))
-				redirectexit('action=admin;area=smileys;sa=editicons');
+			{
+							redirectexit('action=admin;area=smileys;sa=editicons');
+			}
 		}
 
 		$context[$context['admin_menu_name']]['current_subsection'] = 'editicons';
@@ -1350,7 +1484,9 @@ 
 
 			// Get the properties of the current icon from the icon list.
 			if (!$context['new_icon'])
-				$context['icon'] = $context['icons'][$this->_req->query->icon];
+			{
+							$context['icon'] = $context['icons'][$this->_req->query->icon];
+			}
 
 			// Get a list of boards needed for assigning this icon to a specific board.
 			$boardListOptions = array(
@@ -1380,7 +1516,9 @@ 
 			$this->_req->query->source = empty($this->_req->query->source) ? 0 : (int) $this->_req->query->source;
 
 			if (empty($this->_req->query->source))
-				throw new Elk_Exception('smiley_not_found');
+			{
+							throw new Elk_Exception('smiley_not_found');
+			}
 
 			$smiley = array();
 
@@ -1390,7 +1528,9 @@ 
 
 				$smiley = getSmileyPosition($this->_req->query->location, $this->_req->query->after);
 				if (empty($smiley))
-					throw new Elk_Exception('smiley_not_found');
+				{
+									throw new Elk_Exception('smiley_not_found');
+				}
 			}
 			else
 			{
@@ -1407,13 +1547,15 @@ 
 
 		// Make sure all rows are sequential.
 		foreach (array_keys($context['smileys']) as $location)
-			$context['smileys'][$location] = array(
+		{
+					$context['smileys'][$location] = array(
 				'id' => $location,
 				'title' => $location === 'postform' ? $txt['smileys_location_form'] : $txt['smileys_location_popup'],
 				'description' => $location === 'postform' ? $txt['smileys_location_form_description'] : $txt['smileys_location_popup_description'],
 				'last_row' => count($context['smileys'][$location]['rows']),
 				'rows' => array_values($context['smileys'][$location]['rows']),
 			);
+		}
 
 		// Check & fix smileys that are not ordered properly in the database.
 		foreach (array_keys($context['smileys']) as $location)
@@ -1430,8 +1572,10 @@ 
 
 				// Make sure the smiley order is always sequential.
 				foreach ($smiley_row as $order_id => $smiley)
-					if ($order_id != $smiley['order'])
+				{
+									if ($order_id != $smiley['order'])
 						updateSmileyOrder($smiley['id'], $order_id);
+				}
 			}
 		}
 
@@ -1471,12 +1615,16 @@ 
 
 			// Check that the smiley is from simplemachines.org, for now... maybe add mirroring later.
 			if (!isAuthorizedServer($this->_req->query->set_gz) == 0)
-				throw new Elk_Exception('not_valid_server');
+			{
+							throw new Elk_Exception('not_valid_server');
+			}
 
 			$destination = BOARDDIR . '/packages/' . $base_name;
 
 			if (file_exists($destination))
-				throw new Elk_Exception('package_upload_error_exists');
+			{
+							throw new Elk_Exception('package_upload_error_exists');
+			}
 
 			// Let's copy it to the packages directory
 			file_put_contents($destination, fetch_web_data($this->_req->query->set_gz));
@@ -1492,11 +1640,15 @@ 
 		}
 
 		if (!file_exists($destination))
-			throw new Elk_Exception('package_no_file', false);
+		{
+					throw new Elk_Exception('package_no_file', false);
+		}
 
 		// Make sure temp directory exists and is empty.
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp', false);
+		{
+					deltree(BOARDDIR . '/packages/temp', false);
+		}
 
 		if (!mktree(BOARDDIR . '/packages/temp', 0755))
 		{
@@ -1509,7 +1661,9 @@ 
 
 				deltree(BOARDDIR . '/packages/temp', false);
 				if (!mktree(BOARDDIR . '/packages/temp', 0777))
-					throw new Elk_Exception('package_cant_download', false);
+				{
+									throw new Elk_Exception('package_cant_download', false);
+				}
 			}
 		}
 
@@ -1517,7 +1671,9 @@ 
 
 		// @todo needs to change the URL in the next line ;)
 		if (!$extracted)
-			throw new Elk_Exception('packageget_unable', false, array('http://custom.elkarte.net/index.php?action=search;type=12;basic_search=' . $name));
+		{
+					throw new Elk_Exception('packageget_unable', false, array('http://custom.elkarte.net/index.php?action=search;type=12;basic_search=' . $name));
+		}
 
 		if ($extracted && !file_exists(BOARDDIR . '/packages/temp/package-info.xml'))
 		{
@@ -1532,18 +1688,26 @@ 
 		}
 
 		if (!isset($base_path))
-			$base_path = '';
+		{
+					$base_path = '';
+		}
 
 		if (!file_exists(BOARDDIR . '/packages/temp/' . $base_path . 'package-info.xml'))
-			throw new Elk_Exception('package_get_error_missing_xml', false);
+		{
+					throw new Elk_Exception('package_get_error_missing_xml', false);
+		}
 
 		$smileyInfo = getPackageInfo($context['filename']);
 		if (!is_array($smileyInfo))
-			throw new Elk_Exception($smileyInfo);
+		{
+					throw new Elk_Exception($smileyInfo);
+		}
 
 		// See if it is installed?
 		if (isSmileySetInstalled($smileyInfo['id']))
-			\Errors::instance()->fatal_lang_error('package_installed_warning1');
+		{
+					\Errors::instance()->fatal_lang_error('package_installed_warning1');
+		}
 
 		// Everything is fine, now it's time to do something, first we test
 		$actions = parsePackageInfo($smileyInfo['xml'], true, 'install');
@@ -1561,9 +1725,13 @@ 
 			{
 				$type = 'package_' . $action['type'];
 				if (file_exists(BOARDDIR . '/packages/temp/' . $base_path . $action['filename']))
-					$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $base_path . $action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				{
+									$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $base_path . $action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				}
 				elseif (file_exists($action['filename']))
-					$context[$type] = htmlspecialchars(trim(file_get_contents($action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				{
+									$context[$type] = htmlspecialchars(trim(file_get_contents($action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				}
 
 				if (!empty($action['parse_bbc']))
 				{
@@ -1571,8 +1739,9 @@ 
 					preparsecode($context[$type]);
 					$context[$type] = $bbc_parser->parsePackage($context[$type]);
 				}
-				else
-					$context[$type] = nl2br($context[$type]);
+				else {
+									$context[$type] = nl2br($context[$type]);
+				}
 
 				continue;
 			}
@@ -1597,7 +1766,9 @@ 
 
 				// Show a description for the action if one is provided
 				if (empty($thisAction['description']))
-					$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+				{
+									$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+				}
 
 				$context['actions'][] = $thisAction;
 			}
@@ -1656,10 +1827,14 @@ 
 		}
 
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp');
+		{
+					deltree(BOARDDIR . '/packages/temp');
+		}
 
 		if (!$testing)
-			redirectexit('action=admin;area=smileys');
+		{
+					redirectexit('action=admin;area=smileys');
+		}
 	}
 
 	/**
@@ -1675,7 +1850,9 @@ 
 		$smiley_context = array();
 
 		foreach ($smiley_sets as $i => $set)
-			$smiley_context[$set] = stripslashes($set_names[$i]);
+		{
+					$smiley_context[$set] = stripslashes($set_names[$i]);
+		}
 
 		$this->_smiley_context = $smiley_context;
 	}
@@ -1694,14 +1871,18 @@ 
 		require_once(SUBSDIR . '/Smileys.subs.php');
 
 		if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath))
-			throw new Elk_Exception('smiley_set_unable_to_import');
+		{
+					throw new Elk_Exception('smiley_set_unable_to_import');
+		}
 
 		$smileys = array();
 		$dir = dir($modSettings['smileys_dir'] . '/' . $smileyPath);
 		while ($entry = $dir->read())
 		{
 			if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-				$smileys[strtolower($entry)] = $entry;
+			{
+							$smileys[strtolower($entry)] = $entry;
+			}
 		}
 		$dir->close();
 
@@ -1711,15 +1892,19 @@ 
 		foreach ($duplicates as $duplicate)
 		{
 			if (isset($smileys[strtolower($duplicate)]))
-				unset($smileys[strtolower($duplicate)]);
+			{
+							unset($smileys[strtolower($duplicate)]);
+			}
 		}
 
 		$smiley_order = getMaxSmileyOrder();
 
 		$new_smileys = array();
 		foreach ($smileys as $smiley)
-			if (strlen($smiley) <= 48)
+		{
+					if (strlen($smiley) <= 48)
 				$new_smileys[] = array(':' . strtok($smiley, '.') . ':', $smiley, strtok($smiley, '.'), 0, ++$smiley_order);
+		}
 
 		if (!empty($new_smileys))
 		{