elkarte / Elkarte

sources/QueryString.php

Braces +53 added lines, -22 removed lines

@@ -68,14 +68,18 @@ 
 
 	// Check if we have done this already.
 	if (isset($expanded[$ip]))
-		return $expanded[$ip];
+	{
+			return $expanded[$ip];
+	}
 
 	// Expand the IP out.
 	$expanded_ip = explode(':', expandIPv6($ip));
 
 	$new_ip = array();
 	foreach ($expanded_ip as $int)
-		$new_ip[] = hexdec($int);
+	{
+			$new_ip[] = hexdec($int);
+	}
 
 	// Save this in case of repeated use.
 	$expanded[$ip] = $new_ip;
@@ -97,7 +101,9 @@ 
 
 	// Check if we have done this already.
 	if (isset($converted[$addr]))
-		return $converted[$addr];
+	{
+			return $converted[$addr];
+	}
 
 	// Check if there are segments missing, insert if necessary.
 	if (strpos($addr, '::') !== false)
@@ -123,17 +129,22 @@ 
 
 		$limit = count($part[0]) + count($part[1]);
 		for ($i = 0; $i < (8 - $limit); $i++)
-			array_push($missing, '0000');
+		{
+					array_push($missing, '0000');
+		}
 
 		$part = array_merge($part[0], $missing, $part[1]);
 	}
-	else
-		$part = explode(':', $addr);
+	else {
+			$part = explode(':', $addr);
+	}
 
 	// Pad each segment until it has 4 digits.
 	foreach ($part as &$p)
-		while (strlen($p) < 4)
+	{
+			while (strlen($p) < 4)
 			$p = '0' . $p;
+	}
 
 	unset($p);
 
@@ -145,10 +156,13 @@ 
 
 	// Quick check to make sure the length is as expected.
 	if (!$strict_check || strlen($result) == 39)
-		return $result;
-	else
-		return false;
-}
+	{
+			return $result;
+	}
+	else {
+			return false;
+	}
+	}
 
 /**
  * Adds html entities to the array/variable.  Uses two underscores to guard against overloading.
@@ -168,11 +182,15 @@ 
 function htmlspecialchars__recursive($var, $level = 0)
 {
 	if (!is_array($var))
-		return Util::htmlspecialchars($var, ENT_QUOTES);
+	{
+			return Util::htmlspecialchars($var, ENT_QUOTES);
+	}
 
 	// Add the htmlspecialchars to every element.
 	foreach ($var as $k => $v)
-		$var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1);
+	{
+			$var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1);
+	}
 
 	return $var;
 }
@@ -197,11 +215,15 @@ 
 {
 	// Remove spaces (32), tabs (9), returns (13, 10, and 11), nulls (0), and hard spaces. (160)
 	if (!is_array($var))
-		return Util::htmltrim($var);
+	{
+			return Util::htmltrim($var);
+	}
 
 	// Go through all the elements and remove the whitespace.
 	foreach ($var as $k => $v)
-		$var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1);
+	{
+			$var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1);
+	}
 
 	return $var;
 }
@@ -270,15 +292,21 @@ 
 
 	// If $scripturl is set to nothing, or the SID is not defined (SSI?) just quit.
 	if ($scripturl == '' || !defined('SID'))
-		return $buffer;
+	{
+			return $buffer;
+	}
 
 	// Do nothing if the session is cookied, or they are a crawler - guests are caught by redirectexit().
 	if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot'))
-		$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&amp;', $buffer);
+	{
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&amp;', $buffer);
+	}
 
 	// Debugging templates, are we?
 	elseif (isset($_GET['debug']))
-		$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer);
+	{
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer);
+	}
 
 	// This should work even in 4.2.x, just not CGI without cgi.fix_pathinfo.
 	if (!empty($modSettings['queryless_urls']) && detectServer()->supportRewrite())
@@ -301,7 +329,10 @@ 
 	global $scripturl;
 
 	if (!isBrowser('possibly_robot') && empty($_COOKIE) && defined('SID') && SID != '')
-		return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html?' . SID . (isset($matches[2]) ? $matches[2] : '') . '"';
-	else
-		return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html' . (isset($matches[2]) ? $matches[2] : '') . '"';
-}
+	{
+			return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html?' . SID . (isset($matches[2]) ? $matches[2] : '') . '"';
+	}
+	else {
+			return '"' . $scripturl . '/' . strtr($matches[1], '&;=', '//,') . '.html' . (isset($matches[2]) ? $matches[2] : '') . '"';
+	}
+	}

sources/ValuesContainer.php

Braces +6 added lines, -3 removed lines

@@ -62,9 +62,12 @@
 	public function __get($key)
 	{
 		if (isset($this->data[$key]))
-			return $this->data[$key];
-		else
-			return null;
+		{
+					return $this->data[$key];
+		}
+		else {
+					return null;
+		}
 	}
 
 	/**

sources/modules/Calendar/CalendarPostModule.class.php

Braces +48 added lines, -20 removed lines

@@ -48,14 +48,17 @@ 
 		$context['cal_maxyear'] = (int) date('Y') + (int) $modSettings['cal_limityear'];
 
 		if (self::$_make_event)
-			return array(
+		{
+					return array(
 				array('prepare_post', array('Calendar_Post_Module', 'prepare_post'), array()),
 				array('prepare_context', array('Calendar_Post_Module', 'prepare_context'), array()),
 				array('before_save_post', array('Calendar_Post_Module', 'before_save_post'), array()),
 				array('after_save_post', array('Calendar_Post_Module', 'after_save_post'), array()),
 			);
-		else
-			return array();
+		}
+		else {
+					return array();
+		}
 	}
 
 	/**
@@ -74,7 +77,9 @@ 
 	public function before_save_post($post_errors)
 	{
 		if (!isset($_REQUEST['deleteevent']) && Util::htmltrim($_POST['evtitle']) === '')
-			$post_errors->addError('no_event');
+		{
+					$post_errors->addError('no_event');
+		}
 	}
 
 	/**
@@ -124,7 +129,9 @@ 
 
 			// Delete it?
 			if (isset($_REQUEST['deleteevent']))
-				$event->remove();
+			{
+							$event->remove();
+			}
 			// ... or just update it?
 			else
 			{
@@ -175,7 +182,9 @@ 
 
 		// They might want to pick a board.
 		if (!isset($context['current_board']))
-			$context['current_board'] = 0;
+		{
+					$context['current_board'] = 0;
+		}
 
 		// Start loading up the event info.
 		$context['event'] = array();
@@ -195,9 +204,13 @@ 
 
 			// Make sure the user is allowed to edit this event.
 			if ($event_info['member'] != $user_info['id'])
-				isAllowedTo('calendar_edit_any');
+			{
+							isAllowedTo('calendar_edit_any');
+			}
 			elseif (!allowedTo('calendar_edit_any'))
-				isAllowedTo('calendar_edit_own');
+			{
+							isAllowedTo('calendar_edit_own');
+			}
 
 			$context['event']['month'] = $event_info['month'];
 			$context['event']['day'] = $event_info['day'];
@@ -212,35 +225,50 @@ 
 
 			// You must have a month and year specified!
 			if (isset($_REQUEST['month']))
-				$context['event']['month'] = (int) $_REQUEST['month'];
-			else
-				$context['event']['month'] = $today['mon'];
+			{
+							$context['event']['month'] = (int) $_REQUEST['month'];
+			}
+			else {
+							$context['event']['month'] = $today['mon'];
+			}
 
 			if (isset($_REQUEST['year']))
-				$context['event']['year'] = (int) $_REQUEST['year'];
-			else
-				$context['event']['year'] = $today['year'];
+			{
+							$context['event']['year'] = (int) $_REQUEST['year'];
+			}
+			else {
+							$context['event']['year'] = $today['year'];
+			}
 
 			if (isset($_REQUEST['day']))
-				$context['event']['day'] = (int) $_REQUEST['day'];
-			else
-				$context['event']['day'] = $context['event']['month'] == $today['mon'] ? $today['mday'] : 0;
+			{
+							$context['event']['day'] = (int) $_REQUEST['day'];
+			}
+			else {
+							$context['event']['day'] = $context['event']['month'] == $today['mon'] ? $today['mday'] : 0;
+			}
 
 			$context['event']['span'] = isset($_REQUEST['span']) ? $_REQUEST['span'] : 1;
 
 			// Make sure the year and month are in the valid range.
 			if ($context['event']['month'] < 1 || $context['event']['month'] > 12)
-				throw new Elk_Exception('invalid_month', false);
+			{
+							throw new Elk_Exception('invalid_month', false);
+			}
 
 			if ($context['event']['year'] < $modSettings['cal_minyear'] || $context['event']['year'] > (int) date('Y') + (int) $modSettings['cal_limityear'])
-				throw new Elk_Exception('invalid_year', false);
+			{
+							throw new Elk_Exception('invalid_year', false);
+			}
 
 			// Get a list of boards they can post in.
 			require_once(SUBSDIR . '/Boards.subs.php');
 
 			$boards = boardsAllowedTo('post_new');
 			if (empty($boards))
-				throw new Elk_Exception('cannot_post_new', 'user');
+			{
+							throw new Elk_Exception('cannot_post_new', 'user');
+			}
 
 			// Load a list of boards for this event in the context.
 			$boardListOptions = array(

sources/modules/Attachments/AttachmentsPostModule.class.php

Braces +75 added lines, -30 removed lines

@@ -68,8 +68,9 @@ 
 				array('after_save_post', array('Attachments_Post_Module', 'after_save_post'), array('msgOptions')),
 			);
 		}
-		else
-			return array();
+		else {
+					return array();
+		}
 	}
 
 	/**
@@ -106,7 +107,9 @@ 
 		$context['attachments']['current'] = array();
 
 		if ($this->_attach_errors->hasErrors())
-			$post_errors->addError(array('attachments_errors' => $this->_attach_errors));
+		{
+					$post_errors->addError(array('attachments_errors' => $this->_attach_errors));
+		}
 	}
 
 	/**
@@ -143,12 +146,16 @@ 
 			{
 				$attachments['quantity'] = count($context['attachments']['current']);
 				foreach ($context['attachments']['current'] as $attachment)
-					$attachments['total_size'] += $attachment['size'];
+				{
+									$attachments['total_size'] += $attachment['size'];
+				}
 			}
 
 			// A bit of house keeping first.
 			if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-				unset($_SESSION['temp_attachments']);
+			{
+							unset($_SESSION['temp_attachments']);
+			}
 
 			if (!empty($_SESSION['temp_attachments']))
 			{
@@ -175,7 +182,9 @@ 
 						foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 						{
 							if (strpos($attachID, 'post_tmp_' . $user_info['id'] . '_') === false)
-								continue;
+							{
+															continue;
+							}
 
 							if (file_exists($attachment['tmp_name']))
 							{
@@ -190,9 +199,12 @@ 
 					{
 						// Since, they don't belong here. Let's inform the user that they exist..
 						if (!empty($topic))
-							$delete_url = $scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
-						else
-							$delete_url = $scripturl . '?action=post;board=' . $board . ';delete_temp';
+						{
+													$delete_url = $scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . $topic . ';delete_temp';
+						}
+						else {
+													$delete_url = $scripturl . '?action=post;board=' . $board . ';delete_temp';
+						}
 
 						// Compile a list of the files to show the user.
 						$file_list = array();
@@ -227,11 +239,15 @@ 
 				{
 					// Skipping over these
 					if (isset($context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files']))
-						break;
+					{
+											break;
+					}
 
 					// Initial errors (such as missing directory), we can recover
 					if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id'] . '_') === false)
-						continue;
+					{
+											continue;
+					}
 
 					if ($attachID === 'initial_error')
 					{
@@ -252,7 +268,9 @@ 
 							$txt['error_attach_errors'] = empty($txt['error_attach_errors']) ? '<br />' : '';
 							$txt['error_attach_errors'] .= sprintf($txt['attach_warning'], $attachment['name']) . '<div class="attachmenterrors">';
 							foreach ($attachment['errors'] as $error)
-								$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br  />';
+							{
+															$txt['error_attach_errors'] .= (is_array($error) ? vsprintf($txt[$error[0]], $error[1]) : $txt[$error]) . '<br  />';
+							}
 							$txt['error_attach_errors'] .= '</div>';
 							$this->_attach_errors->addError('attach_errors');
 						}
@@ -275,7 +293,9 @@ 
 					$attachments['total_size'] += $attachment['size'];
 
 					if (!isset($context['files_in_session_warning']))
-						$context['files_in_session_warning'] = $txt['attached_files_in_session'];
+					{
+											$context['files_in_session_warning'] = $txt['attached_files_in_session'];
+					}
 
 					$context['attachments']['current'][] = array(
 						'name' => '<span class="underline">' . htmlspecialchars($attachment['name'], ENT_COMPAT, 'UTF-8') . '</span>',
@@ -312,9 +332,12 @@ 
 			$context['attachments']['quantity'] = $attachments['quantity'];
 			$context['attachments']['restrictions'] = array();
 			if (!empty($modSettings['attachmentCheckExtensions']))
-				$context['attachments']['allowed_extensions'] = strtr(strtolower($modSettings['attachmentExtensions']), array(',' => ', '));
-			else
-				$context['attachments']['allowed_extensions'] = '';
+			{
+							$context['attachments']['allowed_extensions'] = strtr(strtolower($modSettings['attachmentExtensions']), array(',' => ', '));
+			}
+			else {
+							$context['attachments']['allowed_extensions'] = '';
+			}
 			$context['attachments']['template'] = 'template_add_new_attachments';
 
 			$attachmentRestrictionTypes = array('attachmentNumPerPostLimit', 'attachmentPostLimit', 'attachmentSizeLimit');
@@ -328,9 +351,13 @@ 
 
 					// Show some numbers.
 					if ($type === 'attachmentNumPerPostLimit')
-						$context['attachments']['restrictions'][] = sprintf($txt['attach_remaining'], '<span id="' . $type . '">' . ($modSettings['attachmentNumPerPostLimit'] - $attachments['quantity']) . '</span>');
+					{
+											$context['attachments']['restrictions'][] = sprintf($txt['attach_remaining'], '<span id="' . $type . '">' . ($modSettings['attachmentNumPerPostLimit'] - $attachments['quantity']) . '</span>');
+					}
 					elseif ($type === 'attachmentPostLimit')
-						$context['attachments']['restrictions'][] = sprintf($txt['attach_available'], '<span id="' . $type . '">' . byte_format(max(($modSettings['attachmentPostLimit'] * 1024) - $attachments['total_size'], 0)) . '</span>');
+					{
+											$context['attachments']['restrictions'][] = sprintf($txt['attach_available'], '<span id="' . $type . '">' . byte_format(max(($modSettings['attachmentPostLimit'] * 1024) - $attachments['total_size'], 0)) . '</span>');
+					}
 				}
 			}
 		}
@@ -352,7 +379,9 @@ 
 		$this->saveAttachments($msg);
 
 		if ($this->_attach_errors->hasErrors())
-			$post_errors->addError(array('attachments_errors' => $this->_attach_errors));
+		{
+					$post_errors->addError(array('attachments_errors' => $this->_attach_errors));
+		}
 	}
 
 	/**
@@ -377,9 +406,12 @@ 
 				$attachID = getAttachmentIdFromPublic($dummy);
 
 				if (strpos($attachID, 'post_tmp_' . $user_info['id'] . '_') !== false)
-					$keep_temp[] = $attachID;
-				else
-					$keep_ids[] = (int) $attachID;
+				{
+									$keep_temp[] = $attachID;
+				}
+				else {
+									$keep_ids[] = (int) $attachID;
+				}
 			}
 
 			if (isset($_SESSION['temp_attachments']))
@@ -387,7 +419,9 @@ 
 				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 				{
 					if ((isset($_SESSION['temp_attachments']['post']['files'], $attachment['name']) && in_array($attachment['name'], $_SESSION['temp_attachments']['post']['files'])) || in_array($attachID, $keep_temp) || strpos($attachID, 'post_tmp_' . $user_info['id'] . '_') === false)
-						continue;
+					{
+											continue;
+					}
 
 					unset($_SESSION['temp_attachments'][$attachID]);
 					@unlink($attachment['tmp_name']);
@@ -412,9 +446,12 @@ 
 		{
 			require_once(SUBSDIR . '/Attachments.subs.php');
 			if (!empty($msg))
-				processAttachments((int) $msg);
-			else
-				processAttachments();
+			{
+							processAttachments((int) $msg);
+			}
+			else {
+							processAttachments();
+			}
 		}
 	}
 
@@ -437,7 +474,9 @@ 
 			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
 			{
 				if ($attachID !== 'initial_error' && strpos($attachID, 'post_tmp_' . $user_info['id'] . '_') === false)
-					continue;
+				{
+									continue;
+				}
 
 				// If there was an initial error just show that message.
 				if ($attachID === 'initial_error')
@@ -466,7 +505,9 @@ 
 					{
 						$this->_saved_attach_id[] = $attachmentOptions['id'];
 						if (!empty($attachmentOptions['thumb']))
-							$this->_saved_attach_id[] = $attachmentOptions['thumb'];
+						{
+													$this->_saved_attach_id[] = $attachmentOptions['thumb'];
+						}
 
 						$msgOptions['body'] = preg_replace('~\[attachurl(?:.*?)\]' . $attachment['public_attachid'] . '\[\/attachurl\]~', '[attachurl]' . $attachmentOptions['id'] . '[/attachurl]', $msgOptions['body']);
 						$msgOptions['body'] = preg_replace('~\[attach(.*?)\]' . $attachment['public_attachid'] . '\[\/attach\]~', '[attach$1]' . $attachmentOptions['id'] . '[/attach]', $msgOptions['body']);
@@ -482,7 +523,9 @@ 
 		}
 
 		if (!empty($this->_saved_attach_id) && $msgOptions['icon'] === 'xx')
-			$msgOptions['icon'] = 'clip';
+		{
+					$msgOptions['icon'] = 'clip';
+		}
 	}
 
 	/**
@@ -493,6 +536,8 @@ 
 	public function after_save_post($msgOptions)
 	{
 		if ($this->_is_new_message && !empty($this->_saved_attach_id))
-			bindMessageAttachments($msgOptions['id'], $this->_saved_attach_id);
+		{
+					bindMessageAttachments($msgOptions['id'], $this->_saved_attach_id);
+		}
 	}
 }

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(

sources/Logging.php

Braces +81 added lines, -34 removed lines

@@ -34,7 +34,9 @@ 
 		if ($topic)
 		{
 			if (isset($_SESSION['last_topic_id']) && $_SESSION['last_topic_id'] == $topic)
-				$force = false;
+			{
+							$force = false;
+			}
 			$_SESSION['last_topic_id'] = $topic;
 		}
 	}
@@ -48,7 +50,9 @@ 
 
 	// Don't mark them as online more than every so often.
 	if (!empty($_SESSION['log_time']) && $_SESSION['log_time'] >= (time() - 8) && !$force)
-		return;
+	{
+			return;
+	}
 
 	if (!empty($modSettings['who_enabled']))
 	{
@@ -56,13 +60,16 @@ 
 
 		// In the case of a dlattach action, session_var may not be set.
 		if (!isset($context['session_var']))
-			$context['session_var'] = $_SESSION['session_var'];
+		{
+					$context['session_var'] = $_SESSION['session_var'];
+		}
 
 		unset($serialized['sesc'], $serialized[$context['session_var']]);
 		$serialized = serialize($serialized);
 	}
-	else
-		$serialized = '';
+	else {
+			$serialized = '';
+	}
 
 	// Guests use 0, members use their session ID.
 	$session_id = $user_info['is_guest'] ? 'ip' . $user_info['ip'] : session_id();
@@ -87,19 +94,24 @@ 
 
 		updateLogOnline($session_id, $serialized);
 	}
-	else
-		$_SESSION['log_time'] = 0;
+	else {
+			$_SESSION['log_time'] = 0;
+	}
 
 	// Otherwise, we have to delete and insert.
 	if (empty($_SESSION['log_time']))
-		insertdeleteLogOnline($session_id, $serialized, $do_delete);
+	{
+			insertdeleteLogOnline($session_id, $serialized, $do_delete);
+	}
 
 	// Mark your session as being logged.
 	$_SESSION['log_time'] = time();
 
 	// Well, they are online now.
 	if (empty($_SESSION['timeOnlineUpdated']))
-		$_SESSION['timeOnlineUpdated'] = time();
+	{
+			$_SESSION['timeOnlineUpdated'] = time();
+	}
 
 	// Set their login time, if not already done within the last minute.
 	if (ELK != 'SSI' && !empty($user_info['last_login']) && $user_info['last_login'] < time() - 60)
@@ -109,14 +121,18 @@ 
 
 		// Don't count longer than 15 minutes.
 		if (time() - $_SESSION['timeOnlineUpdated'] > 60 * 15)
-			$_SESSION['timeOnlineUpdated'] = time();
+		{
+					$_SESSION['timeOnlineUpdated'] = time();
+		}
 
 		$user_settings['total_time_logged_in'] += time() - $_SESSION['timeOnlineUpdated'];
 		require_once(SUBSDIR . '/Members.subs.php');
 		updateMemberData($user_info['id'], array('last_login' => time(), 'member_ip' => $user_info['ip'], 'member_ip2' => $req->ban_ip(), 'total_time_logged_in' => $user_settings['total_time_logged_in']));
 
 		if ($cache->levelHigherThan(1))
-			$cache->put('user_settings-' . $user_info['id'], $user_settings, 60);
+		{
+					$cache->put('user_settings-' . $user_info['id'], $user_settings, 60);
+		}
 
 		$user_info['total_time_logged_in'] += time() - $_SESSION['timeOnlineUpdated'];
 		$_SESSION['timeOnlineUpdated'] = time();
@@ -182,12 +198,18 @@ 
 	static $cache_stats = array();
 
 	if (empty($modSettings['trackStats']))
-		return false;
+	{
+			return false;
+	}
 
 	if (!empty($stats))
-		return $cache_stats = array_merge($cache_stats, $stats);
+	{
+			return $cache_stats = array_merge($cache_stats, $stats);
+	}
 	elseif (empty($cache_stats))
-		return false;
+	{
+			return false;
+	}
 
 	$setStringUpdate = array();
 	$insert_keys = array();
@@ -202,9 +224,12 @@ 
 		$setStringUpdate[] = $field . ' = ' . ($change === '+' ? $field . ' + 1' : '{int:' . $field . '}');
 
 		if ($change === '+')
-			$cache_stats[$field] = 1;
-		else
-			$update_parameters[$field] = $change;
+		{
+					$cache_stats[$field] = 1;
+		}
+		else {
+					$update_parameters[$field] = $change;
+		}
 
 		$insert_keys[$field] = 'int';
 	}
@@ -271,38 +296,50 @@ 
 
 	// No point in doing anything, if the log isn't even enabled.
 	if (empty($modSettings['modlog_enabled']))
-		return false;
+	{
+			return false;
+	}
 
 	foreach ($logs as $log)
 	{
 		if (!isset($log_types[$log['log_type']]))
-			continue;
+		{
+					continue;
+		}
 
 		// Do we have something to log here, after all?
 		if (!is_array($log['extra']))
-			trigger_error('logActions(): data is not an array with action \'' . $log['action'] . '\'', E_USER_NOTICE);
+		{
+					trigger_error('logActions(): data is not an array with action \'' . $log['action'] . '\'', E_USER_NOTICE);
+		}
 
 		// Pull out the parts we want to store separately, but also make sure that the data is proper
 		if (isset($log['extra']['topic']))
 		{
 			if (!is_numeric($log['extra']['topic']))
-				trigger_error('logActions(): data\'s topic is not a number', E_USER_NOTICE);
+			{
+							trigger_error('logActions(): data\'s topic is not a number', E_USER_NOTICE);
+			}
 
 			$topic_id = empty($log['extra']['topic']) ? 0 : (int) $log['extra']['topic'];
 			unset($log['extra']['topic']);
 		}
-		else
-			$topic_id = 0;
+		else {
+					$topic_id = 0;
+		}
 
 		if (isset($log['extra']['message']))
 		{
 			if (!is_numeric($log['extra']['message']))
-				trigger_error('logActions(): data\'s message is not a number', E_USER_NOTICE);
+			{
+							trigger_error('logActions(): data\'s message is not a number', E_USER_NOTICE);
+			}
 			$msg_id = empty($log['extra']['message']) ? 0 : (int) $log['extra']['message'];
 			unset($log['extra']['message']);
 		}
-		else
-			$msg_id = 0;
+		else {
+					$msg_id = 0;
+		}
 
 		// @todo cache this?
 		// Is there an associated report on this?
@@ -318,23 +355,30 @@ 
 		}
 
 		if (isset($log['extra']['member']) && !is_numeric($log['extra']['member']))
-			trigger_error('logActions(): data\'s member is not a number', E_USER_NOTICE);
+		{
+					trigger_error('logActions(): data\'s member is not a number', E_USER_NOTICE);
+		}
 
 		if (isset($log['extra']['board']))
 		{
 			if (!is_numeric($log['extra']['board']))
-				trigger_error('logActions(): data\'s board is not a number', E_USER_NOTICE);
+			{
+							trigger_error('logActions(): data\'s board is not a number', E_USER_NOTICE);
+			}
 
 			$board_id = empty($log['extra']['board']) ? 0 : (int) $log['extra']['board'];
 			unset($log['extra']['board']);
 		}
-		else
-			$board_id = 0;
+		else {
+					$board_id = 0;
+		}
 
 		if (isset($log['extra']['board_to']))
 		{
 			if (!is_numeric($log['extra']['board_to']))
-				trigger_error('logActions(): data\'s board_to is not a number', E_USER_NOTICE);
+			{
+							trigger_error('logActions(): data\'s board_to is not a number', E_USER_NOTICE);
+			}
 
 			if (empty($board_id))
 			{
@@ -344,9 +388,12 @@ 
 		}
 
 		if (isset($log['extra']['member_affected']))
-			$memID = $log['extra']['member_affected'];
-		else
-			$memID = $user_info['id'];
+		{
+					$memID = $log['extra']['member_affected'];
+		}
+		else {
+					$memID = $user_info['id'];
+		}
 
 		$inserts[] = array(
 			time(), $log_types[$log['log_type']], $memID, $user_info['ip'], $log['action'],