elkarte / Elkarte

sources/subs/Event.class.php

Braces +12 added lines, -5 removed lines

@@ -73,9 +73,12 @@ 
 	public function add($event, $priority)
 	{
 		if (is_array($event[1]))
-			$name = $event[1][0];
-		else
-			$name = $event[1];
+		{
+					$name = $event[1][0];
+		}
+		else {
+					$name = $event[1];
+		}
 
 		$this->_priority->add($name, $priority);
 		$this->_events[$name] = $event;
@@ -111,10 +114,14 @@ 
 	{
 		$return = array();
 		if ($this->_sorted === false)
-			$this->_doSorting();
+		{
+					$this->_doSorting();
+		}
 
 		foreach ($this->_priority->getSortedEntities() as $value)
-			$return[] = $this->_events[$value];
+		{
+					$return[] = $this->_events[$value];
+		}
 
 		return $return;
 	}

sources/subs/CalendarEvent.class.php

Braces +60 added lines, -21 removed lines

@@ -69,9 +69,13 @@ 
 		{
 			// Make sure it's turned on and not some fool trying to trick it.
 			if (empty($this->_settings['cal_allowspan']))
-				throw new Elk_Exception('no_span', false);
+			{
+							throw new Elk_Exception('no_span', false);
+			}
 			if ($event['span'] < 1 || $event['span'] > $this->_settings['cal_maxspan'])
-				throw new Elk_Exception('invalid_days_numb', false);
+			{
+							throw new Elk_Exception('invalid_days_numb', false);
+			}
 		}
 
 
@@ -80,34 +84,54 @@ 
 		{
 			// No month?  No year?
 			if (!isset($event['month']))
-				throw new Elk_Exception('event_month_missing', false);
+			{
+							throw new Elk_Exception('event_month_missing', false);
+			}
 			if (!isset($event['year']))
-				throw new Elk_Exception('event_year_missing', false);
+			{
+							throw new Elk_Exception('event_year_missing', false);
+			}
 
 			// Check the month and year...
 			if ($event['month'] < 1 || $event['month'] > 12)
-				throw new Elk_Exception('invalid_month', false);
+			{
+							throw new Elk_Exception('invalid_month', false);
+			}
 			if ($event['year'] < $this->_settings['cal_minyear'] || $event['year'] > (int) date('Y') + $this->_settings['cal_limityear'])
-				throw new Elk_Exception('invalid_year', false);
+			{
+							throw new Elk_Exception('invalid_year', false);
+			}
 
 			// No day?
 			if (!isset($event['day']))
-				throw new Elk_Exception('event_day_missing', false);
+			{
+							throw new Elk_Exception('event_day_missing', false);
+			}
 
 			if (!isset($event['evtitle']) && !isset($event['subject']))
-				throw new Elk_Exception('event_title_missing', false);
+			{
+							throw new Elk_Exception('event_title_missing', false);
+			}
 			elseif (!isset($event['evtitle']))
-				$event['evtitle'] = $event['subject'];
+			{
+							$event['evtitle'] = $event['subject'];
+			}
 
 			// Bad day?
 			if (!checkdate($event['month'], $event['day'], $event['year']))
-				throw new Elk_Exception('invalid_date', false);
+			{
+							throw new Elk_Exception('invalid_date', false);
+			}
 
 			// No title?
 			if (Util::htmltrim($event['evtitle']) === '')
-				throw new Elk_Exception('no_event_title', false);
+			{
+							throw new Elk_Exception('no_event_title', false);
+			}
 			if (Util::strlen($event['evtitle']) > 100)
-				$event['evtitle'] = Util::substr($event['evtitle'], 0, 100);
+			{
+							$event['evtitle'] = Util::substr($event['evtitle'], 0, 100);
+			}
 			$event['evtitle'] = str_replace(';', '', $event['evtitle']);
 		}
 
@@ -153,19 +177,28 @@ 
 	{
 		// There could be already a topic you are not allowed to modify
 		if (!allowedTo('post_new') && empty($this->_settings['disableNoPostingCalendarEdits']))
-			$eventProperties = getEventProperties($this->_event_id, true);
+		{
+					$eventProperties = getEventProperties($this->_event_id, true);
+		}
 
 		$id_board = isset($eventProperties['id_board']) ? $eventProperties['id_board'] : (isset($options['id_board']) ? $options['board'] : 0);
 		$id_topic = isset($eventProperties['id_topic']) ? $eventProperties['id_topic'] : (isset($options['id_topic']) ? $options['topic'] : 0);
 
 		if (empty($this->_settings['cal_allowspan']))
-			$span = 0;
+		{
+					$span = 0;
+		}
 		elseif (empty($options['span']) || $options['span'] == 1)
-			$span = 0;
+		{
+					$span = 0;
+		}
 		elseif (empty($this->_settings['cal_maxspan']) || $options['span'] > $this->_settings['cal_maxspan'])
-			$span = 0;
-		else
-			$span = min((int) $this->_settings['cal_maxspan'], (int) $options['span'] - 1);
+		{
+					$span = 0;
+		}
+		else {
+					$span = min((int) $this->_settings['cal_maxspan'], (int) $options['span'] - 1);
+		}
 
 		$eventOptions = array(
 			'title' => Util::substr($options['evtitle'], 0, 100),
@@ -217,7 +250,9 @@ 
 			$event = getEventProperties($this->_event_id);
 
 			if ($event === false)
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// If it has a board, then they should be editing it within the topic.
 			if (!empty($event['topic']['id']) && !empty($event['topic']['first_msg']))
@@ -229,9 +264,13 @@ 
 
 			// Make sure the user is allowed to edit this event.
 			if ($event['member'] != $member_id)
-				isAllowedTo('calendar_edit_any');
+			{
+							isAllowedTo('calendar_edit_any');
+			}
 			elseif (!allowedTo('calendar_edit_any'))
-				isAllowedTo('calendar_edit_own');
+			{
+							isAllowedTo('calendar_edit_own');
+			}
 		}
 
 		return $event;

sources/subs/Subscriptions-twoCheckOut.class.php

Braces +12 added lines, -4 removed lines

@@ -113,11 +113,15 @@ 
 
 		// Is it even on?
 		if (empty($modSettings['2co_id']) || empty($modSettings['2co_password']))
-			return false;
+		{
+					return false;
+		}
 
 		// Is it a 2co hash?
 		if (empty($_POST['x_MD5_Hash']))
-			return false;
+		{
+					return false;
+		}
 
 		// Do we have an invoice number?
 		 return !empty($_POST['x_invoice_num']);
@@ -134,14 +138,18 @@ 
 
 		// Is this the right hash?
 		if (empty($modSettings['2co_password']) || $_POST['x_MD5_Hash'] !== strtoupper(md5($modSettings['2co_password'] . $modSettings['2co_id'] . $_POST['x_trans_id'] . $_POST['x_amount'])))
-			generateSubscriptionError($txt['2co_password_wrong']);
+		{
+					generateSubscriptionError($txt['2co_password_wrong']);
+		}
 
 		// Verify the currency
 		list (, $currency) = explode(':', $_POST['x_invoice_num']);
 
 		// Verify the currency!
 		if (strtolower($currency) != $modSettings['currency_code'])
-			exit;
+		{
+					exit;
+		}
 
 		// Return the ID_SUB/ID_MEMBER
 		return explode('+', $_POST['x_invoice_num']);

sources/subs/Drafts.subs.php

Braces +39 added lines, -15 removed lines

@@ -222,7 +222,9 @@ 
 
 	// No results?
 	if (!$db->num_rows($request))
-		return false;
+	{
+			return false;
+	}
 
 	// Load up the data
 	$draft_info = $db->fetch_assoc($request);
@@ -295,13 +297,17 @@ 
 
 	// Only a single draft.
 	if (!is_array($id_draft))
-		$id_draft = array($id_draft);
+	{
+			$id_draft = array($id_draft);
+	}
 
 	$id_draft = array_map('intval', $id_draft);
 
 	// Can't delete nothing
 	if (empty($id_draft))
-		return false;
+	{
+			return false;
+	}
 
 	$db->query('', '
 		DELETE FROM {db_prefix}user_drafts
@@ -454,13 +460,19 @@ 
 	// The message and subject still need a bit more work
 	preparsecode($draft['body']);
 	if (Util::strlen($draft['subject']) > 100)
-		$draft['subject'] = Util::substr($draft['subject'], 0, 100);
+	{
+			$draft['subject'] = Util::substr($draft['subject'], 0, 100);
+	}
 
 	if (!isset($draft['is_usersaved']))
-		$draft['is_usersaved'] = 0;
+	{
+			$draft['is_usersaved'] = 0;
+	}
 
 	if (isset($draft_info['is_usersaved']) && $draft_info['is_usersaved'] == 1)
-		$draft['is_usersaved'] = 1;
+	{
+			$draft['is_usersaved'] = 1;
+	}
 
 	// Modifying an existing draft, like hitting the save draft button or autosave enabled?
 	if (!empty($id_draft) && !empty($draft_info))
@@ -482,8 +494,9 @@ 
 			$context['draft_saved'] = true;
 			$context['id_draft'] = $id_draft;
 		}
-		else
-			$post_errors->addError('draft_not_saved');
+		else {
+					$post_errors->addError('draft_not_saved');
+		}
 	}
 }
 
@@ -526,18 +539,26 @@ 
 
 	// Determine who this is being sent to
 	if (!$check_last_save && !empty($draft_info['to_list']) && empty($recipientList))
-		$recipientList = Util::unserialize($draft_info['to_list']);
+	{
+			$recipientList = Util::unserialize($draft_info['to_list']);
+	}
 
 	// message and subject always need a bit more work
 	preparsecode($draft['body']);
 	if (Util::strlen($draft['subject']) > 100)
-		$draft['subject'] = Util::substr($draft['subject'], 0, 100);
+	{
+			$draft['subject'] = Util::substr($draft['subject'], 0, 100);
+	}
 
 	if (!isset($draft['is_usersaved']))
-		$draft['is_usersaved'] = 0;
+	{
+			$draft['is_usersaved'] = 0;
+	}
 
 	if (isset($draft_info['is_usersaved']) && $draft_info['is_usersaved'] == 1)
-		$draft['is_usersaved'] = 1;
+	{
+			$draft['is_usersaved'] = 1;
+	}
 
 	// Modifying an existing PM draft?
 	if (!empty($id_pm_draft) && !empty($draft_info))
@@ -559,8 +580,9 @@ 
 			$context['draft_saved'] = true;
 			$context['id_pm_draft'] = $id_pm_draft;
 		}
-		else
-			$post_errors->addError('draft_not_saved');
+		else {
+					$post_errors->addError('draft_not_saved');
+		}
 	}
 
 	// if we were called from the autosave function, send something back
@@ -599,7 +621,9 @@ 
 
 	// Nothing to read, nothing to do
 	if (empty($id_draft))
-		return false;
+	{
+			return false;
+	}
 
 	// Load in this draft from the DB
 	$drafts_keep_days = !empty($modSettings['drafts_keep_days']) ? (time() - ($modSettings['drafts_keep_days'] * 86400)) : 0;

Spacing +1 added lines, -1 removed lines

@@ -404,7 +404,7 @@
 		array(
 			'poster_time_old' => time() - (86400 * $days),
 		),
-		function ($row)
+		function($row)
 		{
 			return (int) $row['id_draft'];
 		}

sources/subs/Maintenance.subs.php

Braces +43 added lines, -18 removed lines

@@ -100,8 +100,10 @@ 
 
 	$colData = $table->db_list_columns('{db_prefix}messages', true);
 	foreach ($colData as $column)
-		if ($column['name'] == 'body')
+	{
+			if ($column['name'] == 'body')
 			$body_type = $column['type'];
+	}
 
 	return $body_type;
 }
@@ -197,7 +199,9 @@ 
 	// Get a list of tables, as well as how many there are.
 	$temp_tables = $db->db_list_tables(false, $real_prefix . '%');
 	foreach ($temp_tables as $table)
-			$tables[] = array('table_name' => $table);
+	{
+				$tables[] = array('table_name' => $table);
+	}
 
 	return $tables;
 }
@@ -319,7 +323,9 @@ 
 	$allowed_columns = array('num_posts', 'num_topics', 'unapproved_posts', 'unapproved_topics');
 
 	if (!in_array($column, $allowed_columns))
-			return false;
+	{
+				return false;
+	}
 
 	$db->query('', '
 		UPDATE {db_prefix}boards
@@ -536,11 +542,14 @@ 
 	);
 	$boards = array();
 	while ($row = $db->fetch_assoc($request))
-		$boards[$row['id_board']][] = $row['id_msg'];
+	{
+			$boards[$row['id_board']][] = $row['id_msg'];
+	}
 	$db->free_result($request);
 
 	foreach ($boards as $board_id => $messages)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}messages
 			SET id_board = {int:id_board}
 			WHERE id_msg IN ({array_int:id_msg_array})',
@@ -549,7 +558,8 @@ 
 				'id_board' => $board_id,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Updates the latest message of each board.
@@ -572,7 +582,9 @@ 
 	);
 	$realBoardCounts = array();
 	while ($row = $db->fetch_assoc($request))
-		$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	{
+			$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	}
 	$db->free_result($request);
 
 	$request = $db->query('', '
@@ -593,16 +605,20 @@ 
 
 	$lastModifiedMsg = array();
 	foreach ($resort_me as $rows)
-		foreach ($rows as $row)
+	{
+			foreach ($rows as $row)
 		{
 			// The latest message is the latest of the current board and its children.
 			if (isset($lastModifiedMsg[$row['id_board']]))
 				$curLastModifiedMsg = max($row['local_last_msg'], $lastModifiedMsg[$row['id_board']]);
-			else
-				$curLastModifiedMsg = $row['local_last_msg'];
+	}
+			else {
+							$curLastModifiedMsg = $row['local_last_msg'];
+			}
 				// If what is and what should be the latest message differ, an update is necessary.
 			if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated'])
-				$db->query('', '
+			{
+							$db->query('', '
 					UPDATE {db_prefix}boards
 					SET id_last_msg = {int:id_last_msg}, id_msg_updated = {int:id_msg_updated}
 					WHERE id_board = {int:id_board}',
@@ -612,12 +628,16 @@ 
 						'id_board' => $row['id_board'],
 					)
 				);
+			}
 
 			// Parent boards inherit the latest modified message of their children.
 			if (isset($lastModifiedMsg[$row['id_parent']]))
-				$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
-			else
-				$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			{
+							$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
+			}
+			else {
+							$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			}
 		}
 }
 
@@ -736,7 +756,9 @@ 
 	// Update the post count for this group
 	require_once(SUBSDIR . '/Members.subs.php');
 	while ($row = $db->fetch_assoc($request))
-		updateMemberData($row['id_member'], array('posts' => $row['posts']));
+	{
+			updateMemberData($row['id_member'], array('posts' => $row['posts']));
+	}
 	$db->free_result($request);
 
 	return $total_rows;
@@ -825,8 +847,9 @@ 
 		$where = 'mem.date_registered < {int:time_limit} AND mem.is_activated = {int:is_activated}';
 		$where_vars['is_activated'] = 0;
 	}
-	else
-		$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
+	else {
+			$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
+	}
 
 	// Need to get *all* groups then work out which (if any) we avoid.
 	$request = $db->query('', '
@@ -874,7 +897,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!$row['is_mod'] || !in_array(3, $groups))
-			$members[] = $row['id_member'];
+		{
+					$members[] = $row['id_member'];
+		}
 	}
 	$db->free_result($request);
 

Spacing +8 added lines, -8 removed lines

@@ -138,7 +138,7 @@ 
 			'start' => $start,
 			'increment' => $increment - 1,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_msg'];
 		}
@@ -168,7 +168,7 @@ 
 		array(
 			'messages' => $msg,
 		),
-		function ($row) use ($scripturl)
+		function($row) use ($scripturl)
 		{
 			return '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
 		}
@@ -263,7 +263,7 @@ 
 			'start' => $start,
 			'max_id' => $start + $increment,
 		),
-		function ($row)
+		function($row)
 		{
 			setTopicAttribute($row['id_topic'], array('num_replies' => $row['real_num_replies']));
 		}
@@ -296,7 +296,7 @@ 
 			'start' => $start,
 			'max_id' => $start + $increment,
 		),
-		function ($row)
+		function($row)
 		{
 			setTopicAttribute($row['id_topic'], array('unapproved_posts' => $row['real_unapproved_posts']));
 		}
@@ -488,7 +488,7 @@ 
 		array(
 			'is_not_deleted' => 0,
 		),
-		function ($row)
+		function($row)
 		{
 			updateMemberData($row['id_member'], array('personal_messages' => $row['real_num']));
 		}
@@ -505,7 +505,7 @@ 
 			'is_not_deleted' => 0,
 			'is_not_read' => 0,
 		),
-		function ($row)
+		function($row)
 		{
 			updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
 		}
@@ -667,7 +667,7 @@ 
 		array(
 			'id_board' => $id_board,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_topic'];
 		}
@@ -789,7 +789,7 @@ 
 			array(
 				'zero' => 0,
 			),
-			function ($row)
+			function($row)
 			{
 				// Set the post count to zero for any delinquents we may have found
 				return $row['id_member'];

sources/subs/Stats.subs.php

Braces +87 added lines, -35 removed lines

@@ -127,10 +127,13 @@ 
 
 	// If there is a default setting, let's not retrieve something bigger
 	if (isset($modSettings['stats_limit']))
-		$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	{
+			$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	}
 	// Otherwise, fingers crossed and let's grab what is asked
-	else
-		$limit = empty($limit) ? 10 : $limit;
+	else {
+			$limit = empty($limit) ? 10 : $limit;
+	}
 
 	// Make the query to the the x number of top posters
 	$members_result = $db->query('', '
@@ -157,7 +160,9 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 		if ($max_num_posts < $row_members['posts'])
-			$max_num_posts = $row_members['posts'];
+		{
+					$max_num_posts = $row_members['posts'];
+		}
 	}
 	$db->free_result($members_result);
 
@@ -188,10 +193,13 @@ 
 
 	// If there is a default setting, let's not retrieve something bigger
 	if (isset($modSettings['stats_limit']))
-		$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	{
+			$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	}
 	// Otherwise, fingers crossed and let's grab what is asked
-	else
-		$limit = empty($limit) ? 10 : $limit;
+	else {
+			$limit = empty($limit) ? 10 : $limit;
+	}
 
 	$boards_result = $db->query('', '
 		SELECT b.id_board, b.name, b.num_posts, b.num_topics' . ($read_status ? ',' . (!$user_info['is_guest'] ? ' 1 AS is_read' : '
@@ -224,10 +232,14 @@ 
 			'link' => '<a href="' . $scripturl . '?board=' . $row_board['id_board'] . '.0">' . $row_board['name'] . '</a>'
 		);
 		if ($read_status)
-			$top_boards[$row_board['id_board']]['is_read'] = !empty($row_board['is_read']);
+		{
+					$top_boards[$row_board['id_board']]['is_read'] = !empty($row_board['is_read']);
+		}
 
 		if ($max_num_posts < $row_board['num_posts'])
-			$max_num_posts = $row_board['num_posts'];
+		{
+					$max_num_posts = $row_board['num_posts'];
+		}
 	}
 	$db->free_result($boards_result);
 
@@ -258,10 +270,13 @@ 
 
 	// If there is a default setting, let's not retrieve something bigger
 	if (isset($modSettings['stats_limit']))
-		$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	{
+			$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	}
 	// Otherwise, fingers crossed and let's grab what is asked
-	else
-		$limit = empty($limit) ? 10 : $limit;
+	else {
+			$limit = empty($limit) ? 10 : $limit;
+	}
 
 	// Are you on a larger forum?  If so, let's try to limit the number of topics we search through.
 	if ($modSettings['totalMessages'] > 100000)
@@ -280,11 +295,14 @@ 
 		);
 		$topic_ids = array();
 		while ($row = $db->fetch_assoc($request))
-			$topic_ids[] = $row['id_topic'];
+		{
+					$topic_ids[] = $row['id_topic'];
+		}
 		$db->free_result($request);
 	}
-	else
-		$topic_ids = array();
+	else {
+			$topic_ids = array();
+	}
 
 	// Find the top x topics by number of replys
 	$topic_reply_result = $db->query('', '
@@ -327,7 +345,9 @@ 
 		);
 
 		if ($max_num_replies < $row_topic_reply['num_replies'])
-			$max_num_replies = $row_topic_reply['num_replies'];
+		{
+					$max_num_replies = $row_topic_reply['num_replies'];
+		}
 	}
 	$db->free_result($topic_reply_result);
 
@@ -357,10 +377,13 @@ 
 
 	// If there is a default setting, let's not retrieve something bigger
 	if (isset($modSettings['stats_limit']))
-		$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	{
+			$limit = empty($limit) ? $modSettings['stats_limit'] : ($limit < $modSettings['stats_limit'] ? $limit : $modSettings['stats_limit']);
+	}
 	// Otherwise, fingers crossed and let's grab what is asked
-	else
-		$limit = empty($limit) ? 10 : $limit;
+	else {
+			$limit = empty($limit) ? 10 : $limit;
+	}
 
 	// Large forums may need a bit more prodding...
 	if ($modSettings['totalMessages'] > 100000)
@@ -377,11 +400,14 @@ 
 		);
 		$topic_ids = array();
 		while ($row = $db->fetch_assoc($request))
-			$topic_ids[] = $row['id_topic'];
+		{
+					$topic_ids[] = $row['id_topic'];
+		}
 		$db->free_result($request);
 	}
-	else
-		$topic_ids = array();
+	else {
+			$topic_ids = array();
+	}
 
 	$topic_view_result = $db->query('', '
 		SELECT m.subject, t.num_views, t.num_replies, t.id_board, t.id_topic, b.name
@@ -423,7 +449,9 @@ 
 		);
 
 		if ($max_num_views < $row_topic_views['num_views'])
-			$max_num_views = $row_topic_views['num_views'];
+		{
+					$max_num_views = $row_topic_views['num_views'];
+		}
 	}
 	$db->free_result($topic_view_result);
 
@@ -467,14 +495,18 @@ 
 		);
 		$members = array();
 		while ($row = $db->fetch_assoc($request))
-			$members[$row['id_member_started']] = $row['hits'];
+		{
+					$members[$row['id_member_started']] = $row['hits'];
+		}
 		$db->free_result($request);
 
 		Cache::instance()->put('stats_top_starters', $members, 360);
 	}
 
 	if (empty($members))
-		$members = array(0 => 0);
+	{
+			$members = array(0 => 0);
+	}
 
 	// Find the top starters of topics
 	$members_result = $db->query('top_topic_starters', '
@@ -503,7 +535,9 @@ 
 		);
 
 		if ($max_num_topics < $members[$row_members['id_member']])
-			$max_num_topics = $members[$row_members['id_member']];
+		{
+					$max_num_topics = $members[$row_members['id_member']];
+		}
 	}
 	$db->free_result($members_result);
 
@@ -554,7 +588,9 @@ 
 	{
 		$temp2[] = (int) $row_members['id_member'];
 		if (count($top_time_online) >= $max_members)
-			continue;
+		{
+					continue;
+		}
 
 		// Figure out the days, hours and minutes.
 		$timeDays = floor($row_members['total_time_logged_in'] / 86400);
@@ -563,10 +599,14 @@ 
 		// Figure out which things to show... (days, hours, minutes, etc.)
 		$timelogged = '';
 		if ($timeDays > 0)
-			$timelogged .= $timeDays . $txt['totalTimeLogged5'];
+		{
+					$timelogged .= $timeDays . $txt['totalTimeLogged5'];
+		}
 
 		if ($timeHours > 0)
-			$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		{
+					$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		}
 
 		$timelogged .= floor(($row_members['total_time_logged_in'] % 3600) / 60) . $txt['totalTimeLogged7'];
 
@@ -581,17 +621,23 @@ 
 		);
 
 		if ($max_time_online < $row_members['total_time_logged_in'])
-			$max_time_online = $row_members['total_time_logged_in'];
+		{
+					$max_time_online = $row_members['total_time_logged_in'];
+		}
 	}
 	$db->free_result($members_result);
 
 	// As always percentages are next
 	foreach ($top_time_online as $i => $member)
-		$top_time_online[$i]['time_percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	{
+			$top_time_online[$i]['time_percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	}
 
 	// Cache the ones we found for a bit, just so we don't have to look again.
 	if ($temp !== $temp2)
-		Cache::instance()->put('stats_total_time_members', $temp2, 600);
+	{
+			Cache::instance()->put('stats_total_time_members', $temp2, 600);
+	}
 
 	return $top_time_online;
 }
@@ -621,7 +667,8 @@ 
 		$expanded = !empty($_SESSION['expanded_stats'][$row_months['stats_year']]) && in_array($row_months['stats_month'], $_SESSION['expanded_stats'][$row_months['stats_year']]);
 
 		if (!isset($context['yearly'][$row_months['stats_year']]))
-			$context['yearly'][$row_months['stats_year']] = array(
+		{
+					$context['yearly'][$row_months['stats_year']] = array(
 				'year' => $row_months['stats_year'],
 				'new_topics' => 0,
 				'new_posts' => 0,
@@ -633,6 +680,7 @@ 
 				'expanded' => false,
 				'current_year' => $row_months['stats_year'] == date('Y'),
 			);
+		}
 
 		$context['yearly'][$row_months['stats_year']]['months'][(int) $row_months['stats_month']] = array(
 			'id' => $id_month,
@@ -689,7 +737,8 @@ 
 		$condition_parameters
 	);
 	while ($row_days = $db->fetch_assoc($days_result))
-		$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
+	{
+			$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
 			'day' => sprintf('%02d', $row_days['stats_day']),
 			'month' => sprintf('%02d', $row_days['stats_month']),
 			'year' => $row_days['stats_year'],
@@ -699,6 +748,7 @@ 
 			'most_members_online' => comma_format($row_days['most_on']),
 			'hits' => comma_format($row_days['hits'])
 		);
+	}
 	$db->free_result($days_result);
 }
 
@@ -948,7 +998,8 @@ 
 		for ($hour = 0; $hour < 24; $hour++)
 		{
 			if (!isset($posts_by_time[$hour]))
-				$posts_by_time[$hour] = array(
+			{
+							$posts_by_time[$hour] = array(
 					'hour' => $hour,
 					'hour_format' => stripos($user_info['time_format'], '%p') === false ? $hour : date('g a', mktime($hour)),
 					'posts' => 0,
@@ -956,6 +1007,7 @@ 
 					'relative_percent' => 0,
 					'is_last' => $hour == 23,
 				);
+			}
 			else
 			{
 				$posts_by_time[$hour]['posts_percent'] = round(($posts_by_time[$hour]['posts'] * 100) / $realPosts);

sources/controllers/Recent.controller.php

Braces +27 added lines, -10 removed lines

@@ -187,19 +187,28 @@ 
 
 		// Recent posts by category id's
 		if (!empty($this->_req->query->c) && empty($board))
-			$categories = $this->_recentPostsCategory();
+		{
+					$categories = $this->_recentPostsCategory();
+		}
 		// Or recent posts by board id's?
 		elseif (!empty($this->_req->query->boards))
-			$this->_recentPostsBoards();
+		{
+					$this->_recentPostsBoards();
+		}
 		// Or just the recent posts for a specific board
 		elseif (!empty($board))
-			$this->_recentPostsBoard();
+		{
+					$this->_recentPostsBoard();
+		}
 		// All the recent posts across boards and categories it is then
-		else
-			$this->_recentPostsAll();
+		else {
+					$this->_recentPostsAll();
+		}
 
 		if (!empty($this->_maxMsgID))
-			$this->_grabber->setEarliestMsg(max(0, $modSettings['maxMsgID'] - $this->_maxMsgID[0] - $this->_start * $this->_maxMsgID[1]));
+		{
+					$this->_grabber->setEarliestMsg(max(0, $modSettings['maxMsgID'] - $this->_maxMsgID[0] - $this->_start * $this->_maxMsgID[1]));
+		}
 
 		// Set up the pageindex
 		$context['page_index'] = constructPageIndex($this->_base_url, $this->_start, min(100, $this->_total_posts), $this->_num_per_page, !empty($this->_flex_start));
@@ -335,7 +344,9 @@ 
 			$name = categoryName($categories[0]);
 
 			if (empty($name))
-				throw new Elk_Exception('no_access', false);
+			{
+							throw new Elk_Exception('no_access', false);
+			}
 
 			$context['linktree'][] = array(
 				'url' => $scripturl . $modSettings['default_forum_action'] . '#c' . $categories[0],
@@ -349,14 +360,18 @@ 
 		$boards = array_keys($boards_posts);
 
 		if (empty($boards))
-			throw new Elk_Exception('error_no_boards_selected');
+		{
+					throw new Elk_Exception('error_no_boards_selected');
+		}
 
 		// The query for getting the messages
 		$this->_grabber->setBoards($boards);
 
 		// If this category has a significant number of posts in it...
 		if ($this->_total_posts > 100 && $this->_total_posts > $modSettings['totalMessages'] / 15)
-			$this->_maxMsgID = array(400, 7);
+		{
+					$this->_maxMsgID = array(400, 7);
+		}
 
 		$this->_base_url = $scripturl . '?action=recent;c=' . implode(',', $categories);
 
@@ -409,7 +424,9 @@ 
 
 		// If this board has a significant number of posts in it...
 		if ($this->_total_posts > 80 && $this->_total_posts > $modSettings['totalMessages'] / $this->_num_per_page)
-			$this->_maxMsgID = array(600, 10);
+		{
+					$this->_maxMsgID = array(600, 10);
+		}
 
 		$this->_base_url = $scripturl . '?action=recent;board=' . $board . '.%1$d';
 		$this->_flex_start = true;

Spacing +1 added lines, -1 removed lines

@@ -445,7 +445,7 @@
 		if (!empty($modSettings['likes_enabled']))
 		{
 			// Just the message id please
-			$messages = array_map(function ($element) {
+			$messages = array_map(function($element) {
 				return (int) $element['id'];
 			}, $messages);
 

sources/controllers/Karma.controller.php

Braces +24 added lines, -8 removed lines

@@ -76,7 +76,9 @@ 
 
 		// Sometimes the community needs to chill
 		if (!empty($modSettings['karmaDisableSmite']))
-			$this->_redirect_karma();
+		{
+					$this->_redirect_karma();
+		}
 
 		// The user ID _must_ be a number, no matter what.
 		$id_target = $this->_req->getQuery('uid', 'intval', 0);
@@ -105,12 +107,16 @@ 
 
 		// They haven't, not before now, anyhow.
 		if (empty($action) || empty($modSettings['karmaWaitTime']))
-			addKarma($id_executor, $id_target, $dir);
+		{
+					addKarma($id_executor, $id_target, $dir);
+		}
 		else
 		{
 			// If you are gonna try to repeat.... don't allow it.
 			if ($action == $dir)
-				throw new Elk_Exception('karma_wait_time', false, array($modSettings['karmaWaitTime'], ($modSettings['karmaWaitTime'] == 1 ? strtolower($txt['hour']) : $txt['hours'])));
+			{
+							throw new Elk_Exception('karma_wait_time', false, array($modSettings['karmaWaitTime'], ($modSettings['karmaWaitTime'] == 1 ? strtolower($txt['hour']) : $txt['hours'])));
+			}
 
 			updateKarma($id_executor, $id_target, $dir);
 		}
@@ -130,7 +136,9 @@ 
 
 		// If the mod is disabled, show an error.
 		if (empty($modSettings['karmaMode']))
-			throw new Elk_Exception('feature_disabled', true);
+		{
+					throw new Elk_Exception('feature_disabled', true);
+		}
 
 		// If you're a guest or can't do this, blow you off...
 		is_not_guest();
@@ -145,11 +153,15 @@ 
 		// @todo Should this be dropped in favor of post group permissions?
 		// Should this apply to the member you are smiting/applauding?
 		if (!$user_info['is_admin'] && $user_info['posts'] < $modSettings['karmaMinPosts'])
-			throw new Elk_Exception('not_enough_posts_karma', true, array($modSettings['karmaMinPosts']));
+		{
+					throw new Elk_Exception('not_enough_posts_karma', true, array($modSettings['karmaMinPosts']));
+		}
 
 		// And you can't modify your own, punk! (use the profile if you need to.)
 		if (empty($id_target) || $id_target == $user_info['id'])
-			throw new Elk_Exception('cant_change_own_karma', false);
+		{
+					throw new Elk_Exception('cant_change_own_karma', false);
+		}
 
 		// Delete any older items from the log so we can get the go ahead or not
 		clearKarma($modSettings['karmaWaitTime']);
@@ -175,10 +187,14 @@ 
 
 		// Figure out where to go back to.... the topic?
 		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.' . $this->_req->start . '#msg' . $this->_req->get('m', 'intval'));
+		{
+					redirectexit('topic=' . $topic . '.' . $this->_req->start . '#msg' . $this->_req->get('m', 'intval'));
+		}
 		// Hrm... maybe a personal message?
 		elseif (isset($_REQUEST['f']))
-			redirectexit('action=pm;f=' . $_REQUEST['f'] . ';start=' . $this->_req->start . (isset($_REQUEST['l']) ? ';l=' . $this->_req->get('l', 'intval') : '') . (isset($_REQUEST['pm']) ? '#' . $this->_req->get('pm', 'intval') : ''));
+		{
+					redirectexit('action=pm;f=' . $_REQUEST['f'] . ';start=' . $this->_req->start . (isset($_REQUEST['l']) ? ';l=' . $this->_req->get('l', 'intval') : '') . (isset($_REQUEST['pm']) ? '#' . $this->_req->get('pm', 'intval') : ''));
+		}
 		// JavaScript as a last resort.
 		else
 		{

sources/controllers/Xml.controller.php

Braces +90 added lines, -39 removed lines

@@ -54,7 +54,9 @@ 
 
 		// Act a bit special for XML, probably never see it anyway :P
 		if (empty($subAction))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Off we go then, (it will check permissions)
 		$action->dispatch($subAction);
@@ -118,7 +120,9 @@ 
 		foreach ($files as $file)
 		{
 			if ($file->getFilename() === 'blank.png')
-				continue;
+			{
+							continue;
+			}
 
 			if (in_array(strtolower($file->getExtension()), $allowedTypes))
 			{
@@ -191,16 +195,19 @@ 
 						),
 					);
 				}
-				else
-					$errors[] = array('value' => $txt['feature_no_exists']);
+				else {
+									$errors[] = array('value' => $txt['feature_no_exists']);
+				}
 			}
 			// Some problem loading in the core feature set
-			else
-				$errors[] = array('value' => $txt[$result]);
+			else {
+							$errors[] = array('value' => $txt[$result]);
+			}
 		}
 		// Failed session validation I'm afraid
-		else
-			$errors[] = array('value' => isset($txt[$validation]) ? $txt[$validation] : $txt['error_occurred']);
+		else {
+					$errors[] = array('value' => isset($txt[$validation]) ? $txt[$validation] : $txt['error_occurred']);
+		}
 
 		// Return the response to the calling program
 		$context['sub_template'] = 'generic_xml';
@@ -268,9 +275,12 @@ 
 
 				// With the replace set
 				if (!empty($replace))
-					updateProfileFieldOrder($replace);
-				else
-					$errors[] = array('value' => $txt['no_sortable_items']);
+				{
+									updateProfileFieldOrder($replace);
+				}
+				else {
+									$errors[] = array('value' => $txt['no_sortable_items']);
+				}
 			}
 
 			$order[] = array(
@@ -281,10 +291,14 @@ 
 		else
 		{
 			if ($validation_session !== true)
-				$errors[] = array('value' => $txt['session_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['session_verify_fail']);
+			}
 
 			if ($validation_token === false)
-				$errors[] = array('value' => $txt['token_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['token_verify_fail']);
+			}
 		}
 
 		// New generic token for use
@@ -360,7 +374,9 @@ 
 					list ($category, $board, $childof) = explode(',', $id);
 
 					if ($board == -1)
-						continue;
+					{
+											continue;
+					}
 
 					$board_tree[] = array(
 						'category' => $category,
@@ -371,7 +387,9 @@ 
 
 					// Keep track of where the moved board is in the sort stack
 					if ($board == $board_moved)
-						$moved_key = $list_order;
+					{
+											$moved_key = $list_order;
+					}
 
 					$list_order++;
 				}
@@ -391,11 +409,14 @@ 
 						}
 						// Don't go to another parent tree
 						elseif ($board_tree[$i]['parent'] == 0)
-							break;
+						{
+													break;
+						}
 					}
 					// Don't go to another category
-					else
-						break;
+					else {
+											break;
+					}
 				}
 
 				// Retrieve the current saved state, returned in global $boards
@@ -436,19 +457,26 @@ 
 
 				// If we have figured out what to do
 				if (!empty($boardOptions))
-					modifyBoard($board_moved, $boardOptions);
-				else
-					$errors[] = array('value' => $txt['mboards_board_error']);
+				{
+									modifyBoard($board_moved, $boardOptions);
+				}
+				else {
+									$errors[] = array('value' => $txt['mboards_board_error']);
+				}
 			}
 		}
 		// Failed validation, extra work for you I'm afraid
 		else
 		{
 			if ($validation_session !== true)
-				$errors[] = array('value' => $txt['session_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['session_verify_fail']);
+			}
 
 			if ($validation_token === false)
-				$errors[] = array('value' => $txt['token_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['token_verify_fail']);
+			}
 		}
 
 		// New generic token for use
@@ -545,7 +573,9 @@ 
 
 						// Keep track of where the moved smiley is in the sort stack
 						if ($smile_id == $smile_moved)
-							$moved_key = $list_order;
+						{
+													$moved_key = $list_order;
+						}
 
 						$list_order++;
 					}
@@ -561,7 +591,9 @@ 
 					{
 						$possible_after = getSmiley($smiley_tree[$moved_key - 1]);
 						if ($possible_after['row'] == $smiley['row'] && $possible_after['location'] == $smiley['location'])
-							$smiley = getSmileyPosition($smiley['location'], $smiley_tree[$moved_key - 1]);
+						{
+													$smiley = getSmileyPosition($smiley['location'], $smiley_tree[$moved_key - 1]);
+						}
 					}
 
 					// Empty means getSmileyPosition failed and so do we
@@ -586,8 +618,10 @@ 
 
 								// Make sure the smiley order is always sequential.
 								foreach ($smiley_row as $order_id => $smiley)
-									if ($order_id != $smiley['order'])
+								{
+																	if ($order_id != $smiley['order'])
 										updateSmileyOrder($smiley['id'], $order_id);
+								}
 							}
 						}
 
@@ -598,17 +632,22 @@ 
 					}
 				}
 			}
-			else
-				$errors[] = array('value' => $txt['smileys_moved_fail']);
+			else {
+							$errors[] = array('value' => $txt['smileys_moved_fail']);
+			}
 		}
 		// Failed validation :'(
 		else
 		{
 			if ($validation_session !== true)
-				$errors[] = array('value' => $txt['session_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['session_verify_fail']);
+			}
 
 			if ($validation_token === false)
-				$errors[] = array('value' => $txt['token_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['token_verify_fail']);
+			}
 		}
 
 		// New generic token for use
@@ -682,9 +721,12 @@ 
 
 				// With the replace set
 				if (!empty($replace))
-					updateParserFilterOrder($replace, $filters);
-				else
-					$errors[] = array('value' => $txt['no_sortable_items']);
+				{
+									updateParserFilterOrder($replace, $filters);
+				}
+				else {
+									$errors[] = array('value' => $txt['no_sortable_items']);
+				}
 			}
 
 			$order[] = array(
@@ -695,10 +737,14 @@ 
 		else
 		{
 			if ($validation_session !== true)
-				$errors[] = array('value' => $txt['session_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['session_verify_fail']);
+			}
 
 			if ($validation_token === false)
-				$errors[] = array('value' => $txt['token_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['token_verify_fail']);
+			}
 		}
 
 		// New generic token for use
@@ -777,8 +823,9 @@ 
 					updateMessageIcon($iconInsert);
 					sortMessageIconTable();
 				}
-				else
-					$errors[] = array('value' => $txt['no_sortable_items']);
+				else {
+									$errors[] = array('value' => $txt['no_sortable_items']);
+				}
 			}
 
 			$order[] = array(
@@ -789,10 +836,14 @@ 
 		else
 		{
 			if ($validation_session !== true)
-				$errors[] = array('value' => $txt['session_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['session_verify_fail']);
+			}
 
 			if ($validation_token === false)
-				$errors[] = array('value' => $txt['token_verify_fail']);
+			{
+							$errors[] = array('value' => $txt['token_verify_fail']);
+			}
 		}
 
 		// New generic token for use