elkarte / Elkarte

sources/ext/bad-behavior/badbehavior-plugin.php

Braces +57 added lines, -20 removed lines

@@ -92,27 +92,42 @@ 
 	if (strpos($query, 'DATE_SUB') !== false)
 	{
 		if (!empty($modSettings['badbehavior_logging']))
-			$query = 'DELETE FROM {db_prefix}log_badbehavior WHERE date < ' . (bb2_db_date() - 7 * 86400);
-		else
-			return true;
+		{
+					$query = 'DELETE FROM {db_prefix}log_badbehavior WHERE date < ' . (bb2_db_date() - 7 * 86400);
+		}
+		else {
+					return true;
+		}
 	}
 
 	if (strpos($query, 'OPTIMIZE TABLE') !== false)
-		return true;
+	{
+			return true;
+	}
 	elseif (strpos($query, '@@session.wait_timeout') !== false)
-		return true;
+	{
+			return true;
+	}
 	elseif (empty($query))
-		return true;
+	{
+			return true;
+	}
 
 	// Run the query, return success, failure or the actual results
 	$result = $db->query('', $query, array());
 
 	if (!$result)
-		return false;
+	{
+			return false;
+	}
 	elseif ($result === true)
-		return (bb2_db_affected_rows() !== 0);
+	{
+			return (bb2_db_affected_rows() !== 0);
+	}
 	elseif (bb2_db_num_rows($result) === 0)
-		return false;
+	{
+			return false;
+	}
 
 	return bb2_db_rows($result);
 }
@@ -131,7 +146,9 @@ 
 
 	$temp = array();
 	while ($row = $db->fetch_assoc($result))
-		$temp[] = $row;
+	{
+			$temp[] = $row;
+	}
 	$db->free_result($result);
 
 	return $temp;
@@ -164,7 +181,9 @@ 
 
 	// Logging not enabled
 	if (!$settings['logging'])
-		return '';
+	{
+			return '';
+	}
 
 	// Clean the data that bb sent us
 	$ip = bb2_db_escape(substr($package['ip'], 0, 19));
@@ -204,11 +223,15 @@ 
 		foreach ($package['request_entity'] as $h => $v)
 		{
 			if (is_array($v))
-				$v = bb2_multi_implode($v, ' | ', true);
+			{
+							$v = bb2_multi_implode($v, ' | ', true);
+			}
 
 			$v = trim($v);
 			if ($v !== '')
-				$request_entity .= bb2_db_escape("$h: $v\n");
+			{
+							$request_entity .= bb2_db_escape("$h: $v\n");
+			}
 		}
 
 		// Only such much space in this column, so brutally cut it
@@ -221,7 +244,9 @@ 
 	{
 		$$id = trim($$id);
 		while (preg_match('~[\'\\\\]$~', substr($$id, -1)) === 1)
-			$$id = trim(substr($$id, 0, -1));
+		{
+					$$id = trim(substr($$id, 0, -1));
+		}
 
 		$$id = str_replace("'", '_', $$id);
 	}
@@ -247,16 +272,22 @@ 
 function bb2_multi_implode($array, $glue = ',', $trim_all = false)
 {
 	if (!is_array($array))
-		$array = array($array);
+	{
+			$array = array($array);
+	}
 
 	foreach ($array as $key => $value)
 	{
 		if (is_array($value))
-			$array[$key] = bb2_multi_implode($value, $glue, $trim_all);
+		{
+					$array[$key] = bb2_multi_implode($value, $glue, $trim_all);
+		}
 	}
 
 	if ($trim_all)
-		$array = array_map('trim', $array);
+	{
+			$array = array_map('trim', $array);
+	}
 
 	return implode($glue, $array);
 }
@@ -285,7 +316,9 @@ 
 
 	// Nothing in the whitelist
 	if (empty($whitelist['badbehavior_ip_wl']) && empty($whitelist['badbehavior_useragent_wl']) && empty($whitelist['badbehavior_url_wl']))
-		return false;
+	{
+			return false;
+	}
 
 	// Build up the whitelist array so badbehavior can use it
 	return array_merge(
@@ -309,7 +342,9 @@ 
 
 	// Make sure that the proxy addresses are split into an array, and if it's empty - make sure reverse proxy is disabled
 	if (!empty($modSettings['badbehavior_reverse_proxy_addresses']))
-		$badbehavior_reverse_proxy_addresses = explode('|', trim($modSettings['badbehavior_reverse_proxy_addresses']));
+	{
+			$badbehavior_reverse_proxy_addresses = explode('|', trim($modSettings['badbehavior_reverse_proxy_addresses']));
+	}
 	else
 	{
 		$badbehavior_reverse_proxy_addresses = array();
@@ -377,7 +412,9 @@ 
 		}
 
 		if ($bb2_blocked !== false)
-			return sprintf($txt['badbehavior_blocked'], $bb2_blocked[0]['COUNT(*)']);
+		{
+					return sprintf($txt['badbehavior_blocked'], $bb2_blocked[0]['COUNT(*)']);
+		}
 	}
 }
 

sources/subs/Mail.subs.php

Braces +231 added lines, -88 removed lines

@@ -80,14 +80,18 @@ 
 
 		// Call this function recursively for the hotmail addresses.
 		if (!empty($hotmail_to))
-			$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_type . $message_id, $send_html, $priority, true, $is_private, $from_wrapper, $reference);
+		{
+					$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_type . $message_id, $send_html, $priority, true, $is_private, $from_wrapper, $reference);
+		}
 
 		// The remaining addresses no longer need the fix.
 		$hotmail_fix = false;
 
 		// No other addresses left? Return instantly.
 		if (empty($to_array))
-			return $mail_result;
+		{
+					return $mail_result;
+		}
 	}
 
 	// Get rid of entities.
@@ -111,22 +115,29 @@ 
 		// Be sure there is never an email in the from name if using maillist styles
 		$dmarc_from = $from;
 		if (filter_var($dmarc_from, FILTER_VALIDATE_EMAIL))
-			$dmarc_from = str_replace(strstr($dmarc_from, '@'), '', $dmarc_from);
+		{
+					$dmarc_from = str_replace(strstr($dmarc_from, '@'), '', $dmarc_from);
+		}
 
 		// Add in the 'via' if desired, helps prevent email clients from learning/replacing legit names/emails
 		if (!empty($modSettings['maillist_sitename']) && empty($modSettings['dmarc_spec_standard']))
-			// @memo (2014) "via" is still a draft, and it's not yet clear if it will be localized or not.
+		{
+					// @memo (2014) "via" is still a draft, and it's not yet clear if it will be localized or not.
 			// To play safe, we are keeping it hard-coded, but the string is available for translation.
 			$from = $dmarc_from . ' ' . /* $txt['via'] */ 'via' . ' ' . $modSettings['maillist_sitename'];
-		else
-			$from = $dmarc_from;
+		}
+		else {
+					$from = $dmarc_from;
+		}
 	}
 
 	// Take care of from / subject encodings
 	list (, $from_name, $from_encoding) = mimespecialchars(addcslashes($from !== null ? $from : (!empty($modSettings['maillist_sitename']) ? $modSettings['maillist_sitename'] : $context['forum_name']), '<>()\'\\"'), true, $hotmail_fix, $line_break);
 	list (, $subject) = mimespecialchars($subject, true, $hotmail_fix, $line_break);
 	if ($from_encoding !== 'base64')
-		$from_name = '"' . $from_name . '"';
+	{
+			$from_name = '"' . $from_name . '"';
+	}
 
 	// Construct the from / replyTo mail headers, based on if we showing a users name
 	if ($from_wrapper !== null)
@@ -136,7 +147,9 @@ 
 		// If they reply where is it going to be sent?
 		$headers .= 'Reply-To: "' . (!empty($modSettings['maillist_sitename']) ? $modSettings['maillist_sitename'] : $context['forum_name']) . '" <' . (!empty($modSettings['maillist_sitename_address']) ? $modSettings['maillist_sitename_address'] : (empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'])) . '>' . $line_break;
 		if ($reference !== null)
-			$headers .= 'References: <' . $reference . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>' . $line_break;
+		{
+					$headers .= 'References: <' . $reference . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>' . $line_break;
+		}
 	}
 	else
 	{
@@ -150,7 +163,9 @@ 
 
 	// Return path, date, mailer
 	if ($use_sendmail)
-		$headers .= 'Return-Path: <' . $return_path . '>' . $line_break;
+	{
+			$headers .= 'Return-Path: <' . $return_path . '>' . $line_break;
+	}
 	$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
 	$headers .= 'X-Mailer: ELK' . $line_break;
 
@@ -170,7 +185,9 @@ 
 
 	// Pass this to the integration before we start modifying the output -- it'll make it easier later.
 	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers)), true))
-		return false;
+	{
+			return false;
+	}
 
 	// Save the original message...
 	$orig_message = $message;
@@ -223,15 +240,20 @@ 
 
 	// Are we using the mail queue, if so this is where we butt in...
 	if (!empty($modSettings['mail_queue']) && $priority != 0)
-		return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private, $message_type . $message_id);
+	{
+			return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private, $message_type . $message_id);
+	}
 	// If it's a priority mail, send it now - note though that this should NOT be used for sending many at once.
 	elseif (!empty($modSettings['mail_queue']) && !empty($modSettings['mail_period_limit']))
 	{
 		list ($last_mail_time, $mails_this_minute) = @explode('|', $modSettings['mail_recent']);
 		if (empty($mails_this_minute) || time() > (int) $last_mail_time + 60)
-			$new_queue_stat = time() . '|' . 1;
-		else
-			$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		{
+					$new_queue_stat = time() . '|' . 1;
+		}
+		else {
+					$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		}
 
 		updateSettings(array('mail_recent' => $new_queue_stat));
 	}
@@ -265,7 +287,9 @@ 
 				$message = mail_insert_key($message, $unq_head, $line_break);
 			}
 			elseif (empty($modSettings['mail_no_message_id']))
-				$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($boardurl . microtime()) . '-' . $message_id . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			{
+							$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($boardurl . microtime()) . '-' . $message_id . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			}
 
 			// This is frequently not set, or not set according to the needs of PBE and bounce detection
 			// We have to use ini_set, since "-f <address>" doesn't work on windows systems, so we need both
@@ -287,7 +311,9 @@ 
 
 				// Track total emails sent
 				if (!empty($modSettings['trackStats']))
-					trackStats(array('email' => '+'));
+				{
+									trackStats(array('email' => '+'));
+				}
 			}
 
 			// Put it back
@@ -304,9 +330,10 @@ 
 			log_email($sent);
 		}
 	}
-	else
-		// SMTP protocol it is
+	else {
+			// SMTP protocol it is
 		$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers, $priority, $message_type . $message_id);
+	}
 
 	// Clear out the stat cache.
 	trackStats();
@@ -340,7 +367,9 @@ 
 	static $cur_insert_len = 0;
 
 	if ($cur_insert_len == 0)
-		$cur_insert = array();
+	{
+			$cur_insert = array();
+	}
 
 	// If we're flushing, make the final inserts - also if we're near the MySQL length limit!
 	if (($flush || $cur_insert_len > 800000) && !empty($cur_insert))
@@ -417,7 +446,9 @@ 
 
 	// If they are using SSI there is a good chance obExit will never be called.  So lets be nice and flush it for them.
 	if (ELK === 'SSI')
-		return AddMailQueue(true);
+	{
+			return AddMailQueue(true);
+	}
 
 	return true;
 }
@@ -451,12 +482,16 @@ 
 		$simple = true;
 
 		foreach ($matches[1] as $entity)
-			if ($entity > 128)
+		{
+					if ($entity > 128)
 				$simple = false;
+		}
 		unset($matches);
 
 		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,7});~', 'mimespecialchars_callback', $string);
+		{
+					$string = preg_replace_callback('~&#(\d{3,7});~', 'mimespecialchars_callback', $string);
+		}
 		else
 		{
 			$string = preg_replace_callback('~&#(\d{3,7});~', 'fixchar__callback', $string);
@@ -484,17 +519,21 @@ 
 
 		// Show the characterset and the transfer-encoding for header strings.
 		if ($with_charset)
-			$string = '=?' . $charset . '?B?' . $string . '?=';
+		{
+					$string = '=?' . $charset . '?B?' . $string . '?=';
+		}
 
 		// Break it up in lines (mail body).
-		else
-			$string = chunk_split($string, 76, $line_break);
+		else {
+					$string = chunk_split($string, 76, $line_break);
+		}
 
 		return array($charset, $string, 'base64');
 	}
-	else
-		return array($charset, $string, '7bit');
-}
+	else {
+			return array($charset, $string, '7bit');
+	}
+	}
 
 /**
  * Converts out of ascii range characters in to HTML entities
@@ -512,16 +551,25 @@ 
 	$c_ord = ord($c[0]);
 
 	if ($c_strlen === 1 && $c_ord <= 0x7F)
-		return $c;
+	{
+			return $c;
+	}
 	elseif ($c_strlen === 2 && $c_ord >= 0xC0 && $c_ord <= 0xDF)
-		return '&#' . ((($c_ord ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ';';
+	{
+			return '&#' . ((($c_ord ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ';';
+	}
 	elseif ($c_strlen === 3 && $c_ord >= 0xE0 && $c_ord <= 0xEF)
-		return '&#' . ((($c_ord ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ';';
+	{
+			return '&#' . ((($c_ord ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ';';
+	}
 	elseif ($c_strlen === 4 && $c_ord >= 0xF0 && $c_ord <= 0xF7)
-		return '&#' . ((($c_ord ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ';';
-	else
-		return '';
-}
+	{
+			return '&#' . ((($c_ord ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ';';
+	}
+	else {
+			return '';
+	}
+	}
 
 /**
  * Callback for the preg_replace in mimespecialchars
@@ -571,7 +619,9 @@ 
 	{
 		$socket = fsockopen($modSettings['smtp_host'], 110, $errno, $errstr, 2);
 		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.'))
-			$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		{
+					$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		}
 
 		if ($socket)
 		{
@@ -593,7 +643,9 @@ 
 		if (substr($modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty($modSettings['smtp_port']) || $modSettings['smtp_port'] == 25))
 		{
 			if ($socket = @fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3))
-				Errors::instance()->log_error($txt['smtp_port_ssl']);
+			{
+							Errors::instance()->log_error($txt['smtp_port_ssl']);
+			}
 		}
 
 		// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
@@ -606,7 +658,9 @@ 
 
 	// Wait for a response of 220, without "-" continue.
 	if (!server_parse(null, $socket, '220'))
-		return false;
+	{
+			return false;
+	}
 
 	// This should be set in the ACP
 	if (empty($modSettings['smtp_client']))
@@ -628,22 +682,32 @@ 
 			}
 
 			if (!server_parse('AUTH LOGIN', $socket, '334'))
-				return false;
+			{
+							return false;
+			}
 			// Send the username and password, encoded.
 			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334'))
-				return false;
+			{
+							return false;
+			}
 			// The password is already encoded ;)
 			if (!server_parse($modSettings['smtp_password'], $socket, '235'))
-				return false;
+			{
+							return false;
+			}
 		}
 		elseif (!server_parse('HELO ' . $modSettings['smtp_client'], $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 	}
 	else
 	{
 		// Just say "helo".
 		if (!server_parse('HELO ' . $modSettings['smtp_client'], $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 	}
 
 	// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
@@ -683,30 +747,44 @@ 
 		if ($i != 0)
 		{
 			if (!server_parse('RSET', $socket, '250'))
-				return false;
+			{
+							return false;
+			}
 		}
 
 		// From, to, and then start the data...
 		if (!server_parse('MAIL FROM: <' . $return_path . '>', $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 		if (!server_parse('DATA', $socket, '354'))
-			return false;
+		{
+					return false;
+		}
 
 		fputs($socket, 'Subject: ' . $subject . $line_break);
 		if (strlen($mail_to) > 0)
-			fputs($socket, 'To: <' . $mail_to . '>' . $line_break);
+		{
+					fputs($socket, 'To: <' . $mail_to . '>' . $line_break);
+		}
 		fputs($socket, $headers . $line_break . $line_break);
 		fputs($socket, $message . $line_break);
 
 		// Send a ., or in other words "end of data".
 		if (!server_parse('.', $socket, '250'))
-			return false;
+		{
+					return false;
+		}
 
 		// track the number of emails sent
 		if (!empty($modSettings['trackStats']))
-			trackStats(array('email' => '+'));
+		{
+					trackStats(array('email' => '+'));
+		}
 
 		// Keep our post via email log
 		if (!empty($unq_head))
@@ -751,21 +829,27 @@ 
 	global $txt;
 
 	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+	{
+			fputs($socket, $message . "\r\n");
+	}
 
 	// No response yet.
 	$server_response = '';
 
 	while (substr($server_response, 3, 1) != ' ')
-		if (!($server_response = fgets($socket, 256)))
+	{
+			if (!($server_response = fgets($socket, 256)))
 		{
 			// @todo Change this message to reflect that it may mean bad user/password/server issues/etc.
 			Errors::instance()->log_error($txt['smtp_bad_response']);
+	}
 			return false;
 		}
 
 	if ($response === null)
-		return substr($server_response, 0, 3);
+	{
+			return substr($server_response, 0, 3);
+	}
 
 	if (substr($server_response, 0, 3) != $response)
 	{
@@ -833,17 +917,23 @@ 
 	{
 		loadLanguage('EmailTemplates', $lang);
 		if (!empty($modSettings['maillist_enabled']))
-			loadLanguage('MaillistTemplates', $lang);
+		{
+					loadLanguage('MaillistTemplates', $lang);
+		}
 
 		if (!empty($additional_files))
 		{
 			foreach ($additional_files as $file)
-				loadLanguage($file, $lang);
+			{
+							loadLanguage($file, $lang);
+			}
 		}
 	}
 
 	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body']))
-		throw new Elk_Exception('email_no_template', 'template', array($template));
+	{
+			throw new Elk_Exception('email_no_template', 'template', array($template));
+	}
 
 	$ret = array(
 		'subject' => $txt[$template . '_subject'],
@@ -852,7 +942,9 @@ 
 	if (!empty($suffixes))
 	{
 		foreach ($suffixes as $key)
-			$ret[$key] = $txt[$template . '_' . $key];
+		{
+					$ret[$key] = $txt[$template . '_' . $key];
+		}
 	}
 
 	// Add in the default replacements.
@@ -932,9 +1024,13 @@ 
 		$context[$key] = !empty($_REQUEST[$post]) ? $_REQUEST[$post] : '';
 
 		if (empty($context[$key]) && empty($_REQUEST['xml']))
-			$context['post_error']['messages'][] = $txt['error_no_' . $post];
+		{
+					$context['post_error']['messages'][] = $txt['error_no_' . $post];
+		}
 		elseif (!empty($_REQUEST['xml']))
-			continue;
+		{
+					continue;
+		}
 
 		preparsecode($context[$key]);
 
@@ -972,7 +1068,9 @@ 
 	global $user_info;
 
 	if (empty($matches[1]))
-		return '';
+	{
+			return '';
+	}
 
 	$use_ref = true;
 	$ref = &$user_info;
@@ -980,7 +1078,9 @@ 
 	foreach (explode('.', $matches[1]) as $index)
 	{
 		if ($use_ref && isset($ref[$index]))
-			$ref = &$ref[$index];
+		{
+					$ref = &$ref[$index];
+		}
 		else
 		{
 			$use_ref = false;
@@ -1021,7 +1121,9 @@ 
 		{
 			// Private PM/email subjects and similar shouldn't be shown in the mailbox area.
 			if (!empty($row['private']))
-				$row['subject'] = $txt['personal_message'];
+			{
+							$row['subject'] = $txt['personal_message'];
+			}
 
 			return $row;
 		}
@@ -1118,7 +1220,8 @@ 
 
 	// If we have failed to many times, tell mail to wait a bit and try again.
 	if ($modSettings['mail_failed_attempts'] > 5)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}settings
 			SET value = {string:next_mail_send}
 			WHERE variable = {string:mail_next_send}
@@ -1129,6 +1232,7 @@ 
 				'last_send' => $modSettings['mail_next_send'],
 			)
 		);
+	}
 
 	// Add our email back to the queue, manually.
 	$db->insert('insert',
@@ -1215,7 +1319,9 @@ 
 		)
 	);
 	if ($db->affected_rows() == 0)
-		return false;
+	{
+			return false;
+	}
 
 	return $delay;
 }
@@ -1280,17 +1386,23 @@ 
 
 	// Do we have another script to send out the queue?
 	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send))
-		return false;
+	{
+			return false;
+	}
 
 	// How many emails can we send each time we are called in a period
 	if (!$batch_size)
 	{
 		// Batch size has been set in the ACP, use it
 		if (!empty($modSettings['mail_batch_size']))
-			$batch_size = $modSettings['mail_batch_size'];
+		{
+					$batch_size = $modSettings['mail_batch_size'];
+		}
 		// No per period setting or batch size, set to send 5 every 5 seconds, or 60 per minute
 		elseif (empty($modSettings['mail_period_limit']))
-			$batch_size = 5;
+		{
+					$batch_size = 5;
+		}
 		// A per period limit but no defined batch size, set a batch size
 		else
 		{
@@ -1303,7 +1415,9 @@ 
 
 	// If we came with a timestamp, and that doesn't match the next event, then someone else has beaten us.
 	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send))
-		return false;
+	{
+			return false;
+	}
 
 	// Prepare to send each email, and log that for future proof.
 	require_once(SUBSDIR . '/Maillist.subs.php');
@@ -1315,7 +1429,9 @@ 
 		// Update next send time for our mail queue, if there was something to update. Otherwise bail out :P
 		$delay = updateNextSendTime();
 		if ($delay === false)
-			return false;
+		{
+					return false;
+		}
 
 		$modSettings['mail_next_send'] = time() + $delay;
 	}
@@ -1337,16 +1453,21 @@ 
 		{
 			// If this is likely one of the last cycles for this period, then send any remaining quota
 			if (($mail_time - (time() - 60)) < $delay * 2)
-				$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			{
+							$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			}
 			// Some batch sizes may need to be adjusted to fit as we approach the end
 			elseif ($mail_number + $batch_size > $modSettings['mail_period_limit'])
-				$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			{
+							$batch_size = $modSettings['mail_period_limit'] - $mail_number;
+			}
 
 			$mail_number += $batch_size;
 		}
 		// No more I'm afraid, return!
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		// Reflect that we're about to send some, do it now to be safe.
 		updateSettings(array('mail_recent' => $mail_time . '|' . $mail_number));
@@ -1357,14 +1478,20 @@ 
 
 	// Delete, delete, delete!!!
 	if (!empty($ids))
-		deleteMailQueueItems($ids);
+	{
+			deleteMailQueueItems($ids);
+	}
 
 	// Don't believe we have any left after this batch?
 	if (count($ids) < $batch_size)
-		resetNextSendTime();
+	{
+			resetNextSendTime();
+	}
 
 	if (empty($ids))
-		return false;
+	{
+			return false;
+	}
 
 	// We have some to send, lets send them!
 	$sent = array();
@@ -1420,28 +1547,37 @@ 
 				$email['body'] = mail_insert_key($email['body'], $unq_head, $line_break);
 			}
 			elseif ($email['message_id'] !== null && empty($modSettings['mail_no_message_id']))
-				$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $email['message_id'] . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			{
+							$unq_id = ($need_break ? $line_break : '') . 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $email['message_id'] . strstr(empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'], '@') . '>';
+			}
 
 			// No point logging a specific error here, as we have no language. PHP error is helpful anyway...
 			$result = mail(strtr($email['to'], array("\r" => '', "\n" => '')), $email['subject'], $email['body'], $email['headers'] . $unq_id);
 
 			// If it sent, keep a record so we can save it in our allowed to reply log
 			if (!empty($unq_head) && $result)
-				$sent[] = array_merge($unq_head_array, array(time(),$email['to']));
+			{
+							$sent[] = array_merge($unq_head_array, array(time(),$email['to']));
+			}
 
 			// Track total emails sent
 			if ($result && !empty($modSettings['trackStats']))
-				trackStats(array('email' => '+'));
+			{
+							trackStats(array('email' => '+'));
+			}
 
 			// Try to stop a timeout, this would be bad...
 			detectServer()->setTimeLimit(300);
 		}
-		else
-			$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers'], $email['priority'], $email['message_type'] . $email['message_id']);
+		else {
+					$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers'], $email['priority'], $email['message_type'] . $email['message_id']);
+		}
 
 		// Hopefully it sent?
 		if (!$result)
-			$failed_emails[] = array(time(), $email['to'], $email['body_fail'], $email['subject'], $email['headers'], $email['send_html'], $email['priority'], $email['private'], $email['message_id']);
+		{
+					$failed_emails[] = array(time(), $email['to'], $email['body_fail'], $email['subject'], $email['headers'], $email['send_html'], $email['priority'], $email['private'], $email['message_id']);
+		}
 	}
 
 	// Clear out the stat cache.
@@ -1449,7 +1585,9 @@ 
 
 	// Log each of the sent emails.
 	if (!empty($sent))
-		log_email($sent);
+	{
+			log_email($sent);
+	}
 
 	// Any emails that didn't send?
 	if (!empty($failed_emails))
@@ -1460,7 +1598,9 @@ 
 	}
 	// We were able to send the email, clear our failed attempts.
 	elseif (!empty($modSettings['mail_failed_attempts']))
-		updateSuccessQueue();
+	{
+			updateSuccessQueue();
+	}
 
 	// Had something to send...
 	return true;
@@ -1511,7 +1651,9 @@ 
 	global $txt;
 
 	if ($time_diff < 0)
-		$time_diff = 0;
+	{
+			$time_diff = 0;
+	}
 
 	// Just do a bit of an if fest...
 	if ($time_diff > 86400)
@@ -1532,6 +1674,7 @@ 
 		return sprintf($minutes == 1 ? $txt['mq_minute'] : $txt['mq_minutes'], $minutes);
 	}
 	// Otherwise must be second
-	else
-		return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
-}
+	else {
+			return sprintf($time_diff == 1 ? $txt['mq_second'] : $txt['mq_seconds'], $time_diff);
+	}
+	}