elkarte / Elkarte

ssi_examples.php

Braces +4 added lines, -2 removed lines

@@ -134,7 +134,7 @@ 
 			</li>
 		</ul>
 		<?php if ($user_info['is_admin'])
-		{
+{
 			?>
 			<h3>Advanced Functions <i class="helpicon i-help" title="Functions that require additional tweaking, not just copy and paste."></i></h3>
 			<ul>
@@ -950,10 +950,12 @@ 
 	$topics = ssi_recentTopics(8, null, null, 'array');
 
 	foreach ($topics as $topic)
-		echo '
+	{
+			echo '
 			<li>
 				<a href="', $topic['href'], '">', $topic['subject'], '</a> ', $txt['by'], ' ', $topic['poster']['link'], '
 			</li>';
+	}
 
 	unset($topics);
 

emailtopic.php

Braces +2 added lines

@@ -21,7 +21,9 @@
 
 // Only work for a pipe and direct calling
 if (!defined('STDIN'))
+{
 	return;
+}
 
 // Any output here is not good, it will be bounced as email
 error_reporting(0);

subscriptions.php

Braces +37 added lines, -9 removed lines

@@ -18,7 +18,9 @@ 
 
 // Start things rolling by getting the forum alive...
 if (!file_exists(dirname(__FILE__) . '/bootstrap.php'))
+{
 	die('Unable to initialize');
+}
 
 global $ssi_guest_access;
 
@@ -44,19 +46,23 @@ 
 
 // I assume we're even active?
 if (empty($modSettings['paid_enabled']))
+{
 	exit;
+}
 
 // If we have some custom people who find out about problems load them here.
 $notify_users = array();
 if (!empty($modSettings['paid_email_to']))
 {
 	foreach (explode(',', $modSettings['paid_email_to']) as $email)
-		$notify_users[] = array(
+	{
+			$notify_users[] = array(
 			'email' => $email,
 			'name' => $txt['who_member'],
 			'id' => 0,
 		);
-}
+	}
+	}
 
 $db = database();
 
@@ -75,7 +81,9 @@ 
 }
 
 if (empty($txnType))
+{
 	generateSubscriptionError($txt['paid_unknown_transaction_type']);
+}
 
 // Get the subscription and member ID amongst others...
 @list($subscription_id, $member_id) = $gatewayClass->precheck();
@@ -86,14 +94,18 @@ 
 
 // This would be bad...
 if (empty($member_id))
+{
 	generateSubscriptionError($txt['paid_empty_member']);
+}
 
 // Verify the member.
 $member_info = getBasicMemberData($member_id);
 
 // Didn't find them?
 if (empty($member_info))
+{
 	generateSubscriptionError(sprintf($txt['paid_could_not_find_member'], $member_id));
+}
 
 // Get the subscription details.
 $request = $db->query('', '
@@ -107,7 +119,9 @@ 
 
 // Didn't find it?
 if ($db->num_rows($request) === 0)
+{
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription'], $member_id, $subscription_id));
+}
 
 $subscription_info = $db->fetch_assoc($request);
 $db->free_result($request);
@@ -125,7 +139,9 @@ 
 	)
 );
 if ($db->num_rows($request) == 0)
+{
 	generateSubscriptionError(sprintf($txt['paid_count_not_find_subscription_log'], $member_id, $subscription_id));
+}
 $subscription_info += $db->fetch_assoc($request);
 $db->free_result($request);
 
@@ -160,7 +176,9 @@ 
 	{
 		$real_details = Util::unserialize($subscription_info['pending_details']);
 		if (empty($real_details))
-			generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		{
+					generateSubscriptionError(sprintf($txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		}
 
 		// Now we just try to find anything pending.
 		// We don't really care which it is as security happens later.
@@ -168,7 +186,9 @@ 
 		{
 			unset($real_details[$id]);
 			if ($detail[3] == 'payback' && $subscription_info['payments_pending'])
-				$subscription_info['payments_pending']--;
+			{
+							$subscription_info['payments_pending']--;
+			}
 			break;
 		}
 
@@ -186,9 +206,13 @@ 
 		foreach ($cost as $duration => $value)
 		{
 			if ($duration == 'fixed')
-				continue;
+			{
+							continue;
+			}
 			elseif ((float) $value == (float) $total_cost)
-				$found_duration = strtoupper(substr($duration, 0, 1));
+			{
+							$found_duration = strtoupper(substr($duration, 0, 1));
+			}
 		}
 
 		// If we have the duration then we're done.
@@ -231,8 +255,10 @@ 
 elseif ($gatewayClass->isCancellation())
 {
 	if (method_exists($gatewayClass, 'processCancelation'))
-		$gatewayClass->processCancelation($subscription_id, $member_id, $subscription_info);
-}
+	{
+			$gatewayClass->processCancelation($subscription_id, $member_id, $subscription_info);
+	}
+	}
 else
 {
 	// Some other "valid" transaction such as:
@@ -271,7 +297,9 @@ 
 	if (!empty($_POST))
 	{
 		foreach ($_POST as $key => $val)
-			$text .= '<br />' . Util::htmlspecialchars($key) . ': ' . Util::htmlspecialchars($val);
+		{
+					$text .= '<br />' . Util::htmlspecialchars($key) . ': ' . Util::htmlspecialchars($val);
+		}
 	}
 
 	// Then just log and die.

emailpost.php

Braces +2 added lines

@@ -21,7 +21,9 @@
 
 // Only do something for a pipe and direct calling
 if (!defined('STDIN'))
+{
 	return;
+}
 
 // Any output here is not good
 error_reporting(0);

index.php

Braces +11 added lines, -3 removed lines

@@ -23,14 +23,18 @@ 
 
 // Turn on output buffering if it isn't already on (via php.ini for example)
 if (!ob_get_level())
+{
 	ob_start();
+}
 
 // Before we get carried away, are we doing a scheduled task? If so save CPU cycles by jumping out!
 if (isset($_GET['scheduled']))
 {
 	// Don't make people wait on us if we can help it.
 	if (function_exists('fastcgi_finish_request'))
-		fastcgi_finish_request();
+	{
+			fastcgi_finish_request();
+	}
 
 	$controller = new ScheduledTasks_Controller();
 	$controller->action_autotask();
@@ -41,7 +45,9 @@ 
 {
 	// If zlib is being used, turn off output compression.
 	if (detectServer()->outPutCompressionEnabled())
-		$modSettings['enableCompressedOutput'] = 0;
+	{
+			$modSettings['enableCompressedOutput'] = 0;
+	}
 	else
 	{
 		@ob_end_clean();
@@ -126,7 +132,9 @@ 
 
 			// Track forum statistics and hits...?
 			if (!empty($modSettings['hitStats']))
-				trackStats(array('hits' => '+'));
+			{
+							trackStats(array('hits' => '+'));
+			}
 		}
 
 		// Show where we came from, and go

sources/subs/EmailFormat.class.php

Braces +81 added lines, -32 removed lines

@@ -162,7 +162,9 @@ 
 	{
 		// Un-wordwrap the email, create a line by line array broken on the newlines
 		if ($bbc_br === true)
-			$data = str_replace('[br]', "\n", $data);
+		{
+					$data = str_replace('[br]', "\n", $data);
+		}
 		$temp = explode("\n", $data);
 
 		// Remove any 'stuck' whitespace using the trim value function on all lines
@@ -219,19 +221,24 @@ 
 					$this->_body_array[$i - 1]['content'] = $this->_body_array[$i - 1]['content'] . "\n";
 					$this->_in_list = 0;
 				}
-				else
-					$this->_body_array[$i]['content'] = ' ' . trim($this->_body_array[$i]['content']);
+				else {
+									$this->_body_array[$i]['content'] = ' ' . trim($this->_body_array[$i]['content']);
+				}
 			}
 
 			// Long line in a sig ... but not a link then lets bail out might be a ps or something
 			if ($this->_found_sig && ($this->_body_array[$i]['length'] > $this->_sig_longline) && (substr($this->_body_array[$i]['content'], 0, 4) !== 'www.'))
-				$this->_found_sig = false;
+			{
+							$this->_found_sig = false;
+			}
 
 			// Blank line, if its not two in a row and not the start of a bbc code then insert a newline
 			if ($this->_body_array[$i]['content'] == '')
 			{
 				if ((isset($this->_body_array[$i - 1])) && ($this->_body_array[$i - 1]['content'] !== "\n") && (substr($this->_body_array[$i - 1]['content'], 0, 1) !== '[') && ($this->_body_array[$i - 1]['length'] > $this->_maillist_short_line))
-					$this->_body_array[$i]['content'] = "\n\n";
+				{
+									$this->_body_array[$i]['content'] = "\n\n";
+				}
 			}
 			// Lists like a. a) 1. 1)
 			elseif ($this->_body_array[$i]['list_item'])
@@ -249,9 +256,12 @@ 
 			elseif (!empty($this->_maillist_leftover_remove) && preg_match('~^((\[b\]){0,2}(' . $this->_maillist_leftover_remove . ')(\[\/b\]){0,2})~', $this->_body_array[$i]['content']))
 			{
 				if ($this->_in_quote)
-					$this->_body_array[$i]['content'] = "\n";
-				else
-					$this->_body_array[$i]['content'] = $this->_body_array[$i]['content'] . "\n";
+				{
+									$this->_body_array[$i]['content'] = "\n";
+				}
+				else {
+									$this->_body_array[$i]['content'] = $this->_body_array[$i]['content'] . "\n";
+				}
 			}
 			// Line starts with a link .....
 			elseif (in_array(substr($this->_body_array[$i]['content'], 0, 4), array('www.', 'WWW.', 'http', 'HTTP')))
@@ -270,9 +280,12 @@ 
 			{
 				// Its a wrap ... maybe
 				if ($i > 0)
-					$para_check = $this->_body_array[$i]['length'] - $this->_body_array[$i - 1]['length'];
-				else
-					$para_check = 1;
+				{
+									$para_check = $this->_body_array[$i]['length'] - $this->_body_array[$i - 1]['length'];
+				}
+				else {
+									$para_check = 1;
+				}
 
 				// If this line is longer than the line above it we need to do some extra checks
 				if (($i > 0) && ($this->_body_array[$i - 1]['length'] > $this->_maillist_short_line) && !$this->_found_sig && !$this->_in_code && !$this->_in_bbclist)
@@ -280,28 +293,40 @@ 
 					// If the previous short line did not end in a period or it did and the next line does not start
 					// with a capital and passes para check then it wraps
 					if ((substr($this->_body_array[$i - 1]['content'], -1) !== '.') || (substr($this->_body_array[$i - 1]['content'], -1) === '.' && $para_check < $this->_para_check && ($this->_body_array[$i]['content'][0] !== strtoupper($this->_body_array[$i]['content'][0]))))
-						$this->_body_array[$i]['content'] .= '';
-					else
-						$this->_body_array[$i]['content'] = "\n" . $this->_body_array[$i]['content'];
+					{
+											$this->_body_array[$i]['content'] .= '';
+					}
+					else {
+											$this->_body_array[$i]['content'] = "\n" . $this->_body_array[$i]['content'];
+					}
 				}
 				elseif ($para_check < 5)
-					$this->_body_array[$i]['content'] = "\n" . $this->_body_array[$i]['content'];
+				{
+									$this->_body_array[$i]['content'] = "\n" . $this->_body_array[$i]['content'];
+				}
 				// A very short line (but not a empty one) followed by a very long line
 				elseif (isset($this->_body_array[$i - 1]) && !empty($this->_body_array[$i - 1]['content']) && $para_check > $this->_sig_longline && $this->_body_array[$i - 1]['length'] < 3)
-					$this->_body_array[$i]['content'] .= '';
-				else
-					$this->_body_array[$i]['content'] = "\n\n" . $this->_body_array[$i]['content'];
+				{
+									$this->_body_array[$i]['content'] .= '';
+				}
+				else {
+									$this->_body_array[$i]['content'] = "\n\n" . $this->_body_array[$i]['content'];
+				}
 			}
 		}
 
 		// Close any open quotes we may have left behind
 		for ($quotes = 1; $quotes <= $this->_in_quote; $quotes++)
-			$this->_body_array[$i + $quotes]['content'] = '[/quote]';
+		{
+					$this->_body_array[$i + $quotes]['content'] = '[/quote]';
+		}
 
 		// Join the message back together while dropping null index's
 		$temp = array();
 		foreach ($this->_body_array as $key => $values)
-			$temp[] = $values['content'];
+		{
+					$temp[] = $values['content'];
+		}
 		$this->_body = trim(implode(' ', array_values($temp)));
 	}
 
@@ -354,7 +379,9 @@ 
 
 		// Any htmlenties that we want to remove, like ms smart ones?
 		if (preg_match('~&#8220;|&#8221;|&#8211;|&#8212;|&#8216|&#8217;~', $this->_body))
-			$this->_body = html_entity_decode($this->_body, ENT_QUOTES, 'UTF-8');
+		{
+					$this->_body = html_entity_decode($this->_body, ENT_QUOTES, 'UTF-8');
+		}
 
 		// Avoid double encoding later on
 		$this->_body = htmlspecialchars_decode($this->_body, ENT_QUOTES);
@@ -364,7 +391,9 @@ 
 
 		// And its 1252 variants
 		if (strcasecmp($charset, 'UTF-8') !== 0)
-			$this->_body = strtr($this->_body, array(chr(145) => "'", chr(146) => "'", chr(147) => '"', chr(148) => '"', chr(150) => '-', chr(151) => '--', chr(133) => '...'));
+		{
+					$this->_body = strtr($this->_body, array(chr(145) => "'", chr(146) => "'", chr(147) => '"', chr(148) => '"', chr(150) => '-', chr(151) => '--', chr(133) => '...'));
+		}
 	}
 
 	/**
@@ -381,10 +410,14 @@ 
 		{
 			// Make sure it is not a single line quote
 			if (!preg_match('~\[/quote\]?~', $var))
-				$this->_in_quote++;
+			{
+							$this->_in_quote++;
+			}
 		}
 		elseif (preg_match('~\[/quote\]?~', $var))
-			$this->_in_quote--;
+		{
+					$this->_in_quote--;
+		}
 	}
 
 	/**
@@ -396,13 +429,19 @@ 
 	{
 		// Not in a sig yet, the line starts with a sig key as defined by the ACP, and its a short line of text
 		if (!$this->_found_sig && !empty($this->_maillist_sig_keys) && (preg_match('~^(' . $this->_maillist_sig_keys . ')~i', $this->_body_array[$i]['content']) && ($this->_body_array[$i]['length'] < $this->_maillist_short_line)))
-			return true;
+		{
+					return true;
+		}
 		// The line is simply just their name
 		elseif (($this->_body_array[$i]['content'] === $this->_real_name) && !$this->_found_sig)
-			return true;
+		{
+					return true;
+		}
 		// check for universal sig dashes
 		elseif (!$this->_found_sig && preg_match('~^-- \n~m', $this->_body_array[$i]['content']))
-			return true;
+		{
+					return true;
+		}
 
 		return false;
 	}
@@ -421,10 +460,14 @@ 
 		{
 			// Make sure it is not a single line code
 			if (!preg_match('~\[/code\]?~', $var))
-				$this->_in_code++;
+			{
+							$this->_in_code++;
+			}
 		}
 		elseif (preg_match('~\[/code\]?~', $var))
-			$this->_in_code--;
+		{
+					$this->_in_code--;
+		}
 	}
 
 	/**
@@ -438,10 +481,14 @@ 
 	{
 		// Starting a bbc list
 		if (preg_match('~\[list\]?~', $var))
-			$this->_in_bbclist++;
+		{
+					$this->_in_bbclist++;
+		}
 		// Ending a bbc list
 		elseif (preg_match('~\[\/list\]?~', $var))
-			$this->_in_bbclist--;
+		{
+					$this->_in_bbclist--;
+		}
 	}
 
 	/**
@@ -460,7 +507,9 @@ 
 			|| preg_match('~' . chr(187) . '~', $var)
 			|| preg_match('~^[ \t]?\* ?~m', $var)
 		)
-			$this->_in_plainlist++;
+		{
+					$this->_in_plainlist++;
+		}
 
 		return $this->_in_plainlist !== $temp;
 	}

sources/subs/EmailParse.class.php

Braces +3 added lines, -1 removed lines

@@ -1383,7 +1383,9 @@
 		{
 			$string = base64_decode($string);
 			if (isset($this->headers['content-type']) && strpos($this->headers['content-type'], 'text/') === false)
-				return $string;
+			{
+							return $string;
+			}
 		}
 
 		// Convert this to utf-8 if needed.

sources/controllers/Emailpost.controller.php

Braces +150 added lines, -54 removed lines

@@ -54,7 +54,9 @@ 
 
 		// The function is not even on ...
 		if (empty($modSettings['maillist_enabled']))
-			return false;
+		{
+					return false;
+		}
 
 		// Our mail parser and our main subs
 		require_once(SUBSDIR . '/Emailpost.subs.php');
@@ -67,7 +69,9 @@ 
 		$email_message = new Email_Parse();
 		$email_message->read_data($data, BOARDDIR);
 		if (!$email_message->raw_message)
-			return false;
+		{
+					return false;
+		}
 
 		// Ask for an html version (if available) and some needed details
 		$email_message->read_email(true, $email_message->raw_message);
@@ -101,11 +105,15 @@ 
 
 		// If the feature is on but the post/pm function is not enabled, just log the message.
 		if (empty($modSettings['pbe_post_enabled']) && empty($modSettings['pbe_pm_enabled']))
-			return pbe_emailError('error_email_notenabled', $email_message);
+		{
+					return pbe_emailError('error_email_notenabled', $email_message);
+		}
 
 		// Spam I am?
 		if ($email_message->load_spam() && !$force)
-			return pbe_emailError('error_found_spam', $email_message);
+		{
+					return pbe_emailError('error_found_spam', $email_message);
+		}
 
 		// Load the user from the database based on the sending email address
 		$email_message->email['from'] = !empty($email_message->email['from']) ? strtolower($email_message->email['from']) : '';
@@ -113,11 +121,15 @@ 
 
 		// Can't find this email in our database, a non-user, a spammer, a looser, a poser or even worse?
 		if (empty($pbe))
-			return pbe_emailError('error_not_find_member', $email_message);
+		{
+					return pbe_emailError('error_not_find_member', $email_message);
+		}
 
 		// Find the message security key, without it we are not going anywhere ever
 		if (empty($email_message->message_key_id))
-			return pbe_emailError('error_missing_key', $email_message);
+		{
+					return pbe_emailError('error_missing_key', $email_message);
+		}
 
 		require_once(SUBSDIR . '/Emailpost.subs.php');
 		// Good we have a key, who was it sent to?
@@ -126,15 +138,21 @@ 
 		// Can't find this key in the database, either
 		// a) spam attempt or b) replying with an expired/consumed key
 		if (empty($key_owner) && !$force)
-			return pbe_emailError('error_' . ($email_message->message_type === 'p' ? 'pm_' : '') . 'not_find_entry', $email_message);
+		{
+					return pbe_emailError('error_' . ($email_message->message_type === 'p' ? 'pm_' : '') . 'not_find_entry', $email_message);
+		}
 
 		// The key received was not sent to this member ... how we love those email aggregators
 		if (strtolower($key_owner) !== $email_message->email['from'] && !$force)
-			return pbe_emailError('error_key_sender_match', $email_message);
+		{
+					return pbe_emailError('error_key_sender_match', $email_message);
+		}
 
 		// In maintenance mode, just log it for now
 		if (!empty($maintenance) && $maintenance !== 2 && !$pbe['user_info']['is_admin'] && !$user_info['is_admin'])
-			return pbe_emailError('error_in_maintenance_mode', $email_message);
+		{
+					return pbe_emailError('error_in_maintenance_mode', $email_message);
+		}
 
 		// The email looks valid, now on to check the actual user trying to make the post/pm
 		// lets load the topic/message info and any additional permissions we need
@@ -145,7 +163,9 @@ 
 			// Load the message/topic details
 			$topic_info = query_load_message($email_message->message_type, $email_message->message_id, $pbe);
 			if (empty($topic_info))
-				return pbe_emailError('error_topic_gone', $email_message);
+			{
+							return pbe_emailError('error_topic_gone', $email_message);
+			}
 
 			// Load board permissions
 			query_load_permissions('board', $pbe, $topic_info);
@@ -170,7 +190,9 @@ 
 
 		// Load in the correct Re: for the language
 		if ($language === $pbe['user_info']['language'])
-			$pbe['response_prefix'] = $txt['response_prefix'];
+		{
+					$pbe['response_prefix'] = $txt['response_prefix'];
+		}
 		else
 		{
 			loadLanguage('index', $language, false);
@@ -194,10 +216,14 @@ 
 
 		// Time to make a Post or a PM, first up topic and message replies
 		if ($email_message->message_type === 't' || $email_message->message_type === 'm')
-			$result = pbe_create_post($pbe, $email_message, $topic_info);
+		{
+					$result = pbe_create_post($pbe, $email_message, $topic_info);
+		}
 		// Must be a PM then
 		elseif ($email_message->message_type === 'p')
-			$result = pbe_create_pm($pbe, $email_message, $pm_info);
+		{
+					$result = pbe_create_pm($pbe, $email_message, $pm_info);
+		}
 
 		if (!empty($result))
 		{
@@ -230,7 +256,9 @@ 
 
 		// The function is not even on ...
 		if (empty($modSettings['maillist_enabled']))
-			return false;
+		{
+					return false;
+		}
 
 		// Our mail parser and our main subs
 		require_once(SUBSDIR . '/Emailpost.subs.php');
@@ -243,7 +271,9 @@ 
 		$email_message = new Email_Parse();
 		$email_message->read_data($data, BOARDDIR);
 		if (!$email_message->raw_message)
-			return false;
+		{
+					return false;
+		}
 
 		// Parse the header and some needed details
 		$email_message->read_email(true, $email_message->raw_message);
@@ -284,7 +314,9 @@ 
 
 		// If the feature is on but the post/pm function is not enabled, just log the message.
 		if (empty($modSettings['pbe_post_enabled']))
-			return pbe_emailError('error_email_notenabled', $email_message);
+		{
+					return pbe_emailError('error_email_notenabled', $email_message);
+		}
 
 		// Load the user from the database based on the sending email address
 		$email_message->email['from'] = !empty($email_message->email['from']) ? strtolower($email_message->email['from']) : '';
@@ -292,20 +324,28 @@ 
 
 		// Can't find this email as one of our users?
 		if (empty($pbe))
-			return pbe_emailError('error_not_find_member', $email_message);
+		{
+					return pbe_emailError('error_not_find_member', $email_message);
+		}
 
 		// Getting hammy with it?
 		if ($email_message->load_spam())
-			return pbe_emailError('error_found_spam', $email_message);
+		{
+					return pbe_emailError('error_found_spam', $email_message);
+		}
 
 		// The board that this email address corresponds to
 		$board_number = pbe_find_board_number($email_message);
 		if (empty($board_number))
-			return pbe_emailError('error_not_find_board', $email_message);
+		{
+					return pbe_emailError('error_not_find_board', $email_message);
+		}
 
 		// In maintenance mode so just save it for the moderators to deal with
 		if (!empty($maintenance) && $maintenance !== 2 && !$pbe['user_info']['is_admin'] && !$user_info['is_admin'])
-			return pbe_emailError('error_in_maintenance_mode', $email_message);
+		{
+					return pbe_emailError('error_in_maintenance_mode', $email_message);
+		}
 
 		// Any additional spam / security checking
 		call_integration_hook('integrate_mailist_checks_before', array($email_message, $pbe));
@@ -313,7 +353,9 @@ 
 		// To post a NEW topic, we need some board details for where it goes
 		$board_info = query_load_board_details($board_number, $pbe);
 		if (empty($board_info))
-			return pbe_emailError('error_board_gone', $email_message);
+		{
+					return pbe_emailError('error_board_gone', $email_message);
+		}
 
 		// Load up this users permissions for that board
 		query_load_permissions('board', $pbe, $board_info);
@@ -353,7 +395,9 @@ 
 		$email_message = new Email_Parse();
 		$email_message->read_data($data, BOARDDIR);
 		if (!$email_message->raw_message)
-			return false;
+		{
+					return false;
+		}
 
 		// Ask for an html version (if available) and some needed details
 		$email_message->read_email(true, $email_message->raw_message);
@@ -369,13 +413,18 @@ 
 		if (!empty($email_message->attachments) && !empty($modSettings['maillist_allow_attachments']) && !empty($modSettings['attachmentEnable']) && $modSettings['attachmentEnable'] == 1)
 		{
 			if ($email_message->message_type === 'p')
-				$text .= "\n\n" . $txt['error_no_pm_attach'] . "\n";
-			else
-				$attachment_count = count($email_message->attachments);
+			{
+							$text .= "\n\n" . $txt['error_no_pm_attach'] . "\n";
+			}
+			else {
+							$attachment_count = count($email_message->attachments);
+			}
 		}
 
 		if ($attachment_count)
-			$text .= "\n\n" . sprintf($txt['email_attachments'], $attachment_count);
+		{
+					$text .= "\n\n" . sprintf($txt['email_attachments'], $attachment_count);
+		}
 
 		// Return the parsed and formatted body and who it was sent to for the template
 		return array('body' => $text, 'to' => implode(' & ', $email_message->email['to']) . (!empty($email_message->email['cc']) ? ', ' . implode(' & ', $email_message->email['cc']) : ''));
@@ -404,37 +453,54 @@ 
 	// Validate they have permission to reply
 	$becomesApproved = true;
 	if (!in_array('postby_email', $pbe['user_info']['permissions']) && !$pbe['user_info']['is_admin'])
-		return pbe_emailError('error_permission', $email_message);
+	{
+			return pbe_emailError('error_permission', $email_message);
+	}
 	elseif ($topic_info['locked'] && !$pbe['user_info']['is_admin'] && !in_array('moderate_forum', $pbe['user_info']['permissions']))
-		return pbe_emailError('error_locked', $email_message);
+	{
+			return pbe_emailError('error_locked', $email_message);
+	}
 	elseif ($topic_info['id_member_started'] === $pbe['profile']['id_member'] && !$pbe['user_info']['is_admin'])
 	{
 		if ($modSettings['postmod_active'] && in_array('post_unapproved_replies_any', $pbe['user_info']['permissions']) && (!in_array('post_reply_any', $pbe['user_info']['permissions'])))
-			$becomesApproved = false;
+		{
+					$becomesApproved = false;
+		}
 		elseif (!in_array('post_reply_own', $pbe['user_info']['permissions']))
-			return pbe_emailError('error_cant_reply', $email_message);
+		{
+					return pbe_emailError('error_cant_reply', $email_message);
+		}
 	}
 	elseif (!$pbe['user_info']['is_admin'])
 	{
 		if ($modSettings['postmod_active'] && in_array('post_unapproved_replies_any', $pbe['user_info']['permissions']) && (!in_array('post_reply_any', $pbe['user_info']['permissions'])))
-			$becomesApproved = false;
+		{
+					$becomesApproved = false;
+		}
 		elseif (!in_array('post_reply_any', $pbe['user_info']['permissions']))
-			return pbe_emailError('error_cant_reply', $email_message);
+		{
+					return pbe_emailError('error_cant_reply', $email_message);
+		}
 	}
 
 	// Convert to BBC and Format the message
 	$html = $email_message->html_found;
 	$text = pbe_load_text($html, $email_message, $pbe);
 	if (empty($text))
-		return pbe_emailError('error_no_message', $email_message);
+	{
+			return pbe_emailError('error_no_message', $email_message);
+	}
 
 	// Seriously? Attachments?
 	if (!empty($email_message->attachments) && !empty($modSettings['maillist_allow_attachments']) && !empty($modSettings['attachmentEnable']) && $modSettings['attachmentEnable'] == 1)
 	{
 		if (($modSettings['postmod_active'] && in_array('post_unapproved_attachments', $pbe['user_info']['permissions'])) || in_array('post_attachment', $pbe['user_info']['permissions']))
-			$attachIDs = pbe_email_attachments($pbe, $email_message);
-		else
-			$text .= "\n\n" . $txt['error_no_attach'] . "\n";
+		{
+					$attachIDs = pbe_email_attachments($pbe, $email_message);
+		}
+		else {
+					$text .= "\n\n" . $txt['error_no_attach'] . "\n";
+		}
 	}
 
 	// Setup the post variables.
@@ -511,17 +577,23 @@ 
 
 	// Can they send?
 	if (!$pbe['user_info']['is_admin'] && !in_array('pm_send', $pbe['user_info']['permissions']))
-		return pbe_emailError('error_pm_not_allowed', $email_message);
+	{
+			return pbe_emailError('error_pm_not_allowed', $email_message);
+	}
 
 	// Convert the PM to BBC and Format the message
 	$html = $email_message->html_found;
 	$text = pbe_load_text($html, $email_message, $pbe);
 	if (empty($text))
-		return pbe_emailError('error_no_message', $email_message);
+	{
+			return pbe_emailError('error_no_message', $email_message);
+	}
 
 	// If they tried to attach a file, just say sorry
 	if (!empty($email_message->attachments) && !empty($modSettings['maillist_allow_attachments']) && !empty($modSettings['attachmentEnable']) && $modSettings['attachmentEnable'] == 1)
-		$text .= "\n\n" . $txt['error_no_pm_attach'] . "\n";
+	{
+			$text .= "\n\n" . $txt['error_no_pm_attach'] . "\n";
+	}
 
 	// For sending the message...
 	$from = array(
@@ -538,7 +610,9 @@ 
 
 	// Assuming all went well, mark this as read, replied to and update the unread counter
 	if (!empty($pm_result))
-		query_mark_pms($email_message, $pbe);
+	{
+			query_mark_pms($email_message, $pbe);
+	}
 
 	return !empty($pm_result);
 }
@@ -568,23 +642,33 @@ 
 
 	// It does not work like that
 	if (empty($pbe) || empty($email_message))
-		return false;
+	{
+			return false;
+	}
 
 	// We have the board info, and their permissions - do they have a right to start a new topic?
 	$becomesApproved = true;
 	if (!$pbe['user_info']['is_admin'])
 	{
 		if (!in_array('postby_email', $pbe['user_info']['permissions']))
-			return pbe_emailError('error_permission', $email_message);
+		{
+					return pbe_emailError('error_permission', $email_message);
+		}
 		elseif ($modSettings['postmod_active'] && in_array('post_unapproved_topics', $pbe['user_info']['permissions']) && (!in_array('post_new', $pbe['user_info']['permissions'])))
-			$becomesApproved = false;
+		{
+					$becomesApproved = false;
+		}
 		elseif (!in_array('post_new', $pbe['user_info']['permissions']))
-			return pbe_emailError('error_cant_start', $email_message);
+		{
+					return pbe_emailError('error_cant_start', $email_message);
+		}
 	}
 
 	// Approving all new topics by email anyway, smart admin this one is ;)
 	if (!empty($modSettings['maillist_newtopic_needsapproval']))
-		$becomesApproved = false;
+	{
+			$becomesApproved = false;
+	}
 
 	// First on the agenda the subject
 	$subject = pbe_clean_email_subject($email_message->subject);
@@ -592,23 +676,32 @@ 
 
 	// Not to long not to short
 	if (Util::strlen($subject) > 100)
-		$subject = Util::substr($subject, 0, 100);
+	{
+			$subject = Util::substr($subject, 0, 100);
+	}
 	elseif ($subject == '')
-		return pbe_emailError('error_no_subject', $email_message);
+	{
+			return pbe_emailError('error_no_subject', $email_message);
+	}
 
 	// The message itself will need a bit of work
 	$html = $email_message->html_found;
 	$text = pbe_load_text($html, $email_message, $pbe);
 	if (empty($text))
-		return pbe_emailError('error_no_message', $email_message);
+	{
+			return pbe_emailError('error_no_message', $email_message);
+	}
 
 	// Build the attachment array if needed
 	if (!empty($email_message->attachments) && !empty($modSettings['maillist_allow_attachments']) && !empty($modSettings['attachmentEnable']) && $modSettings['attachmentEnable'] == 1)
 	{
 		if (($modSettings['postmod_active'] && in_array('post_unapproved_attachments', $pbe['user_info']['permissions'])) || in_array('post_attachment', $pbe['user_info']['permissions']))
-			$attachIDs = pbe_email_attachments($pbe, $email_message);
-		else
-			$text .= "\n\n" . $txt['error_no_attach'] . "\n";
+		{
+					$attachIDs = pbe_email_attachments($pbe, $email_message);
+		}
+		else {
+					$text .= "\n\n" . $txt['error_no_attach'] . "\n";
+		}
 	}
 
 	// If we get to this point ... then its time to play, lets start a topic !
@@ -688,8 +781,9 @@ 
 		$text = $email_message->plain_body;
 		$html = false;
 	}
-	else
-		$text = un_htmlspecialchars($email_message->body);
+	else {
+			$text = un_htmlspecialchars($email_message->body);
+	}
 
 	// Run filters now, before the data is manipulated
 	$text = pbe_filter_email_message($text);
@@ -703,7 +797,9 @@ 
 	// Do we even have a message left to post?
 	$text = Util::htmltrim($text);
 	if (empty($text))
-		return '';
+	{
+			return '';
+	}
 
 	// This will be taken care of by sendpm
 	if ($email_message->message_type !== 'p')

sources/controllers/ProfileHistory.controller.php

Braces +24 added lines, -9 removed lines

@@ -95,7 +95,9 @@ 
 		$context['last_ip'] = $user_profile[$this->_memID]['member_ip'];
 
 		if ($context['last_ip'] != $user_profile[$this->_memID]['member_ip2'])
-			$context['last_ip2'] = $user_profile[$this->_memID]['member_ip2'];
+		{
+					$context['last_ip2'] = $user_profile[$this->_memID]['member_ip2'];
+		}
 
 		$context['member']['name'] = $user_profile[$this->_memID]['real_name'];
 
@@ -184,10 +186,14 @@ 
 		$context['error_ips'] = array();
 
 		foreach ($ips['message_ips'] as $ip)
-			$context['ips'][] = '<a href="' . $scripturl . '?action=profile;area=history;sa=ip;searchip=' . $ip . ';u=' . $this->_memID . '">' . $ip . '</a>';
+		{
+					$context['ips'][] = '<a href="' . $scripturl . '?action=profile;area=history;sa=ip;searchip=' . $ip . ';u=' . $this->_memID . '">' . $ip . '</a>';
+		}
 
 		foreach ($ips['error_ips'] as $ip)
-			$context['error_ips'][] = '<a href="' . $scripturl . '?action=profile;area=history;sa=ip;searchip=' . $ip . ';u=' . $this->_memID . '">' . $ip . '</a>';
+		{
+					$context['error_ips'][] = '<a href="' . $scripturl . '?action=profile;area=history;sa=ip;searchip=' . $ip . ';u=' . $this->_memID . '">' . $ip . '</a>';
+		}
 
 		// Find other users that might use the same IP.
 		$context['members_in_range'] = array();
@@ -197,7 +203,9 @@ 
 		{
 			$members_in_range = getMembersInRange($all_ips, $this->_memID);
 			foreach ($members_in_range as $row)
-				$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			{
+							$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 		}
 
 		loadTemplate('ProfileHistory');
@@ -234,7 +242,9 @@ 
 
 		// Searching?
 		if (isset($this->_req->query->searchip))
-			$context['ip'] = trim($this->_req->query->searchip);
+		{
+					$context['ip'] = trim($this->_req->query->searchip);
+		}
 
 		if (preg_match('/^\d{1,3}\.(\d{1,3}|\*)\.(\d{1,3}|\*)\.(\d{1,3}|\*)$/', $context['ip']) == 0
 			&& isValidIPv6($context['ip']) === false)
@@ -246,7 +256,9 @@ 
 		$ip_string = strpos($ip_var, '%') === false ? '= {string:ip_address}' : 'LIKE {string:ip_address}';
 
 		if (empty($context['history_area']))
-			$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+		{
+					$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+		}
 
 		// Fetch the members that are associated with the ip's
 		require_once(SUBSDIR . '/Members.subs.php');
@@ -471,9 +483,12 @@ 
 		global $scripturl, $txt, $context;
 
 		if ($this->_memID == 0)
-			$context['base_url'] = $scripturl . '?action=trackip';
-		else
-			$context['base_url'] = $scripturl . '?action=profile;area=history;sa=ip;u=' . $this->_memID;
+		{
+					$context['base_url'] = $scripturl . '?action=trackip';
+		}
+		else {
+					$context['base_url'] = $scripturl . '?action=profile;area=history;sa=ip;u=' . $this->_memID;
+		}
 
 		// Start with the user messages.
 		$listOptions = array(