SimpleMachines / SMF2.1

Sources/Subs-BoardIndex.php

Braces +60 added lines, -47 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Fetches a list of boards and (optional) categories including
@@ -37,11 +38,12 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 
 	// For performance, track the latest post while going through the boards.
-	if (!empty($boardIndexOptions['set_latest_post']))
-		$latest_post = array(
+	if (!empty($boardIndexOptions['set_latest_post'])) {
+			$latest_post = array(
 			'timestamp' => 0,
 			'ref' => 0,
 		);
+	}
 
 	// Find all boards and categories, as well as related information.  This will be sorted by the natural order of boards and categories, which we control.
 	$result_boards = $smcFunc['db_query']('boardindex_fetch_boards', '
@@ -74,10 +76,11 @@ 
 	);
 
 	// Start with an empty array.
-	if ($boardIndexOptions['include_categories'])
-		$categories = array();
-	else
-		$this_category = array();
+	if ($boardIndexOptions['include_categories']) {
+			$categories = array();
+	} else {
+			$this_category = array();
+	}
 	$boards = array();
 
 	// Run through the categories and boards (or only boards)....
@@ -88,8 +91,9 @@ 
 		$row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0';
 
 		// Add parent boards to the $boards list later used to fetch moderators
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'])
-			$boards[] = $row_board['id_board'];
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id']) {
+					$boards[] = $row_board['id_board'];
+		}
 
 		if ($boardIndexOptions['include_categories'])
 		{
@@ -111,8 +115,9 @@ 
 			}
 
 			// If this board has new posts in it (and isn't the recycle bin!) then the category is new.
-			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board'])
-				$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != '';
+			if (empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $row_board['id_board']) {
+							$categories[$row_board['id_cat']]['new'] |= empty($row_board['is_read']) && $row_board['poster_name'] != '';
+			}
 
 			// Avoid showing category unread link where it only has redirection boards.
 			$categories[$row_board['id_cat']]['show_unread'] = !empty($categories[$row_board['id_cat']]['show_unread']) ? 1 : !$row_board['is_redirect'];
@@ -160,14 +165,12 @@ 
 				{
 					$this_category[$row_board['id_board']]['board_class'] = 'redirect';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['redirect_board'];
-				}
-				elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
+				} elseif ($this_category[$row_board['id_board']]['new'] || $context['user']['is_guest'])
 				{
 					// If we're showing to guests, we want to give them the idea that something interesting is going on!
 					$this_category[$row_board['id_board']]['board_class'] = 'on';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['new_posts'];
-				}
-				else
+				} else
 				{
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['old_posts'];
 				}
@@ -218,14 +221,16 @@ 
 		// Child of a child... just add it on...
 		elseif (!empty($boardIndexOptions['countChildPosts']))
 		{
-			if (!isset($parent_map))
-				$parent_map = array();
+			if (!isset($parent_map)) {
+							$parent_map = array();
+			}
 
-			if (!isset($parent_map[$row_board['id_parent']]))
-				foreach ($this_category as $id => $board)
+			if (!isset($parent_map[$row_board['id_parent']])) {
+							foreach ($this_category as $id => $board)
 				{
 					if (!isset($board['children'][$row_board['id_parent']]))
 						continue;
+			}
 
 					$parent_map[$row_board['id_parent']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]);
 					$parent_map[$row_board['id_board']] = array(&$this_category[$id], &$this_category[$id]['children'][$row_board['id_parent']]);
@@ -246,8 +251,9 @@ 
 			continue;
 		}
 		// Found a child of a child - skip.
-		else
-			continue;
+		else {
+					continue;
+		}
 
 		// Prepare the subject, and make sure it's not too long.
 		censorText($row_board['subject']);
@@ -268,12 +274,13 @@ 
 			'topic' => $row_board['id_topic']
 		);
 
-		if (!empty($settings['avatars_on_boardIndex']))
-			$this_last_post['member']['avatar'] = set_avatar_data(array(
+		if (!empty($settings['avatars_on_boardIndex'])) {
+					$this_last_post['member']['avatar'] = set_avatar_data(array(
 				'avatar' => $row_board['avatar'],
 				'email' => $row_board['email_address'],
 				'filename' => !empty($row['member_filename']) ? $row_board['member_filename'] : '',
 			));
+		}
 
 		// Provide the href and link.
 		if ($row_board['subject'] != '')
@@ -285,8 +292,7 @@ 
 			link, href, subject, start (where they should go for the first unread post.),
 			and member. (which has id, name, link, href, username in it.) */
 			$this_last_post['last_post_message'] = sprintf($txt['last_post_message'], $this_last_post['member']['link'], $this_last_post['link'], $this_last_post['time']);
-		}
-		else
+		} else
 		{
 			$this_last_post['href'] = '';
 			$this_last_post['link'] = $txt['not_applicable'];
@@ -294,8 +300,9 @@ 
 		}
 
 		// Set the last post in the parent board.
-		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time'])))
-			$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		if ($row_board['id_parent'] == $boardIndexOptions['parent_id'] || ($isChild && !empty($row_board['poster_time']) && $this_category[$row_board['id_parent']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time']))) {
+					$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'] = $this_last_post;
+		}
 		// Just in the child...?
 		if ($isChild)
 		{
@@ -305,15 +312,17 @@ 
 			$this_category[$row_board['id_parent']]['children'][$row_board['id_board']]['new'] &= $row_board['poster_name'] != '';
 		}
 		// No last post for this board?  It's not new then, is it..?
-		elseif ($row_board['poster_name'] == '')
-			$this_category[$row_board['id_board']]['new'] = false;
+		elseif ($row_board['poster_name'] == '') {
+					$this_category[$row_board['id_board']]['new'] = false;
+		}
 
 		// Determine a global most recent topic.
-		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard)
-			$latest_post = array(
+		if (!empty($boardIndexOptions['set_latest_post']) && !empty($row_board['poster_time']) && $row_board['poster_time'] > $latest_post['timestamp'] && !$ignoreThisBoard) {
+					$latest_post = array(
 				'timestamp' => $row_board['poster_time'],
 				'ref' => &$this_category[$isChild ? $row_board['id_parent'] : $row_board['id_board']]['last_post'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($result_boards);
 
@@ -330,8 +339,9 @@ 
 				if (!empty($moderators[$board['id']]))
 				{
 					$categories[$k]['boards'][$j]['moderators'] = $moderators[$board['id']];
-					foreach ($moderators[$board['id']] as $moderator)
-						$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					foreach ($moderators[$board['id']] as $moderator) {
+											$categories[$k]['boards'][$j]['link_moderators'][] = $moderator['link'];
+					}
 				}
 				if (!empty($groups[$board['id']]))
 				{
@@ -344,16 +354,16 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		foreach ($this_category as $k => $board)
 		{
 			if (!empty($moderators[$board['id']]))
 			{
 				$this_category[$k]['moderators'] = $moderators[$board['id']];
-				foreach ($moderators[$board['id']] as $moderator)
-					$this_category[$k]['link_moderators'][] = $moderator['link'];
+				foreach ($moderators[$board['id']] as $moderator) {
+									$this_category[$k]['link_moderators'][] = $moderator['link'];
+				}
 			}
 			if (!empty($groups[$board['id']]))
 			{
@@ -367,20 +377,23 @@ 
 		}
 	}
 
-	if ($boardIndexOptions['include_categories'])
-		sortCategories($categories);
-	else
-		sortBoards($this_category);
+	if ($boardIndexOptions['include_categories']) {
+			sortCategories($categories);
+	} else {
+			sortBoards($this_category);
+	}
 
 	// By now we should know the most recent post...if we wanna know it that is.
-	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref']))
-		$context['latest_post'] = $latest_post['ref'];
+	if (!empty($boardIndexOptions['set_latest_post']) && !empty($latest_post['ref'])) {
+			$context['latest_post'] = $latest_post['ref'];
+	}
 
 	// I can't remember why but trying to make a ternary to get this all in one line is actually a Very Bad Idea.
-	if ($boardIndexOptions['include_categories'])
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
-	else
-		call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	if ($boardIndexOptions['include_categories']) {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$categories));
+	} else {
+			call_integration_hook('integrate_getboardtree', array($boardIndexOptions, &$this_category));
+	}
 
 	return $boardIndexOptions['include_categories'] ? $categories : $this_category;
 }

Sources/tasks/GroupAct-Notify.php

Indentation +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@
  */
 class GroupAct_Notify_Background extends SMF_BackgroundTask
 {
-    /**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
-     * @return bool Always returns true
-     */
+	/**
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * @return bool Always returns true
+	 */
 	public function execute()
 	{
 		global $sourcedir, $smcFunc, $language, $modSettings;

Braces +6 added lines, -4 removed lines

@@ -132,8 +132,9 @@ 
 						'GROUPNAME' => $user['group_name'],
 					);
 
-					if (!empty($custom_reason))
-						$replacements['REASON'] = $custom_reason;
+					if (!empty($custom_reason)) {
+											$replacements['REASON'] = $custom_reason;
+					}
 
 					$emaildata = loadEmailTemplate($email_template_name, $replacements, $user['language']);
 
@@ -142,8 +143,8 @@ 
 			}
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
-				$smcFunc['db_insert']('',
+			if (!empty($alert_rows)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}user_alerts',
 					array(
 						'alert_time' => 'int', 'id_member' => 'int', 'content_type' => 'string',
@@ -152,6 +153,7 @@ 
 					$alert_rows,
 					array()
 				);
+			}
 		}
 
 		return true;

Sources/tasks/MsgReportReply-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 class MsgReportReply_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +21 added lines, -14 removed lines

@@ -40,8 +40,9 @@ 
 				'last_comment' => $this->_details['comment_id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$possible_members[] = $row[0];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$possible_members[] = $row[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Presumably, there are some people?
@@ -50,8 +51,9 @@ 
 			$possible_members = array_flip(array_flip($possible_members));
 			$possible_members = array_diff($possible_members, array($this->_details['sender_id']));
 		}
-		if (empty($possible_members))
-			return true;
+		if (empty($possible_members)) {
+					return true;
+		}
 
 		// We need to know who can moderate this board - and therefore who can see this report.
 		// First up, people who have moderate_board in the board this topic was in.
@@ -67,8 +69,9 @@ 
 				'current_board' => $this->_details['board_id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Thirdly, anyone assigned to be a moderator of this group as a group->board moderator.
@@ -85,8 +88,9 @@ 
 			)
 		);
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// So now we have two lists: the people who replied to a report in the past,
@@ -108,8 +112,9 @@ 
 		{
 			foreach ($alert_bits as $type => $bitvalue)
 			{
-				if ($pref_option['msg_report_reply'] & $bitvalue)
-					$notifies[$type][] = $member;
+				if ($pref_option['msg_report_reply'] & $bitvalue) {
+									$notifies[$type][] = $member;
+				}
 			}
 		}
 
@@ -170,8 +175,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -203,8 +209,9 @@ 
 				$emaildata = loadEmailTemplate('reply_to_moderator', $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'rptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'rptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				}
 			}
 		}
 

Sources/tasks/Buddy-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class Buddy_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the info, sets the alerts and loads up the email queue.
+	 * This executes the task - loads up the info, sets the alerts and loads up the email queue.
 	 * @return bool Always returns true
 	 */
 	public function execute()

Sources/tasks/Birthday-Notify.php

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
  */
 class Birthday_Notify_Background extends SMF_BackgroundTask
 {
-    /**
-     * This executes the task. It loads up the birthdays, figures out the greeting, etc.
-     * @return bool Always returns true
-     */
+	/**
+	 * This executes the task. It loads up the birthdays, figures out the greeting, etc.
+	 * @return bool Always returns true
+	 */
 	public function execute()
  	{
 		global $txt, $smcFunc, $txtBirthdayEmails, $language, $modSettings, $sourcedir;

Braces +6 added lines, -4 removed lines

@@ -51,8 +51,9 @@ 
 		$birthdays = array();
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
-			if (!isset($birthdays[$row['lngfile']]))
-				$birthdays[$row['lngfile']] = array();
+			if (!isset($birthdays[$row['lngfile']])) {
+							$birthdays[$row['lngfile']] = array();
+			}
 			$birthdays[$row['lngfile']][$row['id_member']] = array(
 				'name' => $row['real_name'],
 				'email' => $row['email_address']
@@ -117,8 +118,8 @@ 
 			AddMailQueue(true);
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
-				$smcFunc['db_insert']('',
+			if (!empty($alert_rows)) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}user_alerts',
 					array(
 						'alert_time' => 'int', 'id_member' => 'int', 'content_type' => 'string',
@@ -127,6 +128,7 @@ 
 					$alert_rows,
 					array()
 				);
+			}
 		}
 
 		return true;

Sources/tasks/MemberReport-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class MemberReport_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +9 added lines, -6 removed lines

@@ -46,9 +46,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['member_report'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['member_report'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
@@ -109,8 +110,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -129,8 +131,9 @@ 
 				$emaildata = loadEmailTemplate('report_member_profile', $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'ureport' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'ureport' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				}
 			}
 		}
 

Sources/tasks/CreatePost-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 class CreatePost_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This handles notifications when a new post is created - new topic, reply, quotes and mentions.
+	 * This handles notifications when a new post is created - new topic, reply, quotes and mentions.
 	 * @return bool Always returns true
 	 */
 	public function execute()

Braces +59 added lines, -44 removed lines

@@ -72,8 +72,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			$groups = array_merge(array($row['id_group'], $row['id_post_group']), (empty($row['additional_groups']) ? array() : explode(',', $row['additional_groups'])));
-			if (!in_array(1, $groups) && count(array_intersect($groups, explode(',', $row['member_groups']))) == 0)
-				continue;
+			if (!in_array(1, $groups) && count(array_intersect($groups, explode(',', $row['member_groups']))) == 0) {
+							continue;
+			}
 
 			$members[] = $row['id_member'];
 			$watched[$row['id_member']] = $row;
@@ -81,8 +82,9 @@ 
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($members))
-			return true;
+		if (empty($members)) {
+					return true;
+		}
 
 		$members = array_unique($members);
 		$prefs = getNotifyPrefs($members, '', true);
@@ -103,18 +105,20 @@ 
 			$frequency = !empty($prefs[$member]['msg_notify_pref']) ? $prefs[$member]['msg_notify_pref'] : 1;
 			$notify_types = !empty($prefs[$member]['msg_notify_type']) ? $prefs[$member]['msg_notify_type'] : 1;
 
-			if (!in_array($type, array('reply', 'topic')) && $notify_types == 2 && $member != $data['id_member_started'])
-				continue;
-			elseif (in_array($type, array('reply', 'topic')) && $member == $posterOptions['id'])
-				continue;
-			elseif (!in_array($type, array('reply', 'topic')) && $notify_types == 3)
-				continue;
-			elseif ($notify_types == 4)
-				continue;
+			if (!in_array($type, array('reply', 'topic')) && $notify_types == 2 && $member != $data['id_member_started']) {
+							continue;
+			} elseif (in_array($type, array('reply', 'topic')) && $member == $posterOptions['id']) {
+							continue;
+			} elseif (!in_array($type, array('reply', 'topic')) && $notify_types == 3) {
+							continue;
+			} elseif ($notify_types == 4) {
+							continue;
+			}
 
 			if ($frequency > 2 || (!empty($frequency) && $data['sent']) || in_array($member, $done_members)
-				|| (!empty($this->_details['members_only']) && !in_array($member, $this->_details['members_only'])))
-				continue;
+				|| (!empty($this->_details['members_only']) && !in_array($member, $this->_details['members_only']))) {
+							continue;
+			}
 
 			// Watched topic?
 			if (!empty($data['id_topic']) && $type != 'topic' && !empty($prefs[$member]))
@@ -124,10 +128,12 @@ 
 
 				if ($type == 'reply')
 				{
-					if (!empty($prefs[$member]['msg_receive_body']))
-						$message_type .= '_body';
-					if (!empty($frequency))
-						$message_type .= '_once';
+					if (!empty($prefs[$member]['msg_receive_body'])) {
+											$message_type .= '_body';
+					}
+					if (!empty($frequency)) {
+											$message_type .= '_once';
+					}
 				}
 
 				$content_type = 'topic';
@@ -140,12 +146,14 @@ 
 				$content_type = 'board';
 
 				$message_type = !empty($frequency) ? 'notify_boards_once' : 'notify_boards';
-				if (!empty($prefs[$member]['msg_receive_body']))
-					$message_type .= '_body';
+				if (!empty($prefs[$member]['msg_receive_body'])) {
+									$message_type .= '_body';
+				}
 			}
 			// If neither of the above, this might be a redundent row due to the OR clause in our SQL query, skip
-			else
-				continue;
+			else {
+							continue;
+			}
 
 			if ($pref & 0x02)
 			{
@@ -208,14 +216,15 @@ 
 		);
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
-			$smcFunc['db_insert']('',
+		if (!empty($alert_rows)) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}user_alerts',
 				array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 					'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 				$alert_rows,
 				array()
 			);
+		}
 
 		return true;
 	}
@@ -226,8 +235,9 @@ 
 
 		foreach ($quotedMembers as $id => $member)
 		{
-			if (!isset($prefs[$id]) || $id == $posterOptions['id'] || empty($prefs[$id]['msg_quote']))
-				continue;
+			if (!isset($prefs[$id]) || $id == $posterOptions['id'] || empty($prefs[$id]['msg_quote'])) {
+							continue;
+			}
 
 			$done_members[] = $id;
 
@@ -279,32 +289,35 @@ 
 		{
 			if (preg_match('/\[quote(.*)?\]/i', $block, $matches))
 			{
-				if ($quote_level == 0)
-					$message .= '[quote' . $matches[1] . ']';
+				if ($quote_level == 0) {
+									$message .= '[quote' . $matches[1] . ']';
+				}
 				$quote_level++;
-			}
-			elseif (preg_match('/\[\/quote\]/i', $block))
+			} elseif (preg_match('/\[\/quote\]/i', $block))
 			{
-				if ($quote_level <= 1)
-					$message .= '[/quote]';
+				if ($quote_level <= 1) {
+									$message .= '[/quote]';
+				}
 				if ($quote_level >= 1)
 				{
 					$quote_level--;
 					$message .= "\n";
 				}
+			} elseif ($quote_level <= 1) {
+							$message .= $block;
 			}
-			elseif ($quote_level <= 1)
-				$message .= $block;
 		}
 
 		preg_match_all('/\[quote.*?link=msg=([0-9]+).*?\]/i', $message, $matches);
 
 		$id_msgs = $matches[1];
-		foreach ($id_msgs as $k => $id_msg)
-			$id_msgs[$k] = (int) $id_msg;
+		foreach ($id_msgs as $k => $id_msg) {
+					$id_msgs[$k] = (int) $id_msg;
+		}
 
-		if (empty($id_msgs))
-			return array();
+		if (empty($id_msgs)) {
+					return array();
+		}
 
 		// Get the messages
 		$request = $smcFunc['db_query']('', '
@@ -322,8 +335,9 @@ 
 		$members = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($posterOptions['id'] == $row['id_member'])
-				continue;
+			if ($posterOptions['id'] == $row['id_member']) {
+							continue;
+			}
 
 			$members[$row['id_member']] = $row;
 		}
@@ -337,10 +351,11 @@ 
 
 		foreach ($members as $id => $member)
 		{
-			if (!empty($prefs[$id]['msg_mention']))
-				$done_members[] = $id;
-			else
-				continue;
+			if (!empty($prefs[$id]['msg_mention'])) {
+							$done_members[] = $id;
+			} else {
+							continue;
+			}
 
 			// Alerts' emails are always instant
 			if ($prefs[$id]['msg_mention'] & 0x02)

Sources/tasks/ApprovePost-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 class ApprovePost_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the info, puts the email in the queue and inserts any alerts as needed.
+	 * This executes the task - loads up the info, puts the email in the queue and inserts any alerts as needed.
 	 * @return bool Always returns true
 	 */
 	public function execute()

Braces +6 added lines, -4 removed lines

@@ -54,8 +54,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($members))
-			return true;
+		if (empty($members)) {
+					return true;
+		}
 
 		require_once($sourcedir . '/Subs-Notify.php');
 		$members = array_unique($members);
@@ -103,14 +104,15 @@ 
 		}
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
-			$smcFunc['db_insert']('',
+		if (!empty($alert_rows)) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}user_alerts',
 				array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 					'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 				$alert_rows,
 				array()
 			);
+		}
 
 		return true;
 	}

Sources/tasks/Register-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class Register_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
+	 * This executes the task - loads up the information, puts the email in the queue and inserts alerts as needed.
 	 * @return bool Always returns true.
 	 */
 	public function execute()

Braces +9 added lines, -6 removed lines

@@ -43,9 +43,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['member_register'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['member_register'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
@@ -101,8 +102,9 @@ 
 			);
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($row['lngfile']))
-					$row['lngfile'] = $language;
+				if (empty($row['lngfile'])) {
+									$row['lngfile'] = $language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -126,8 +128,9 @@ 
 				$emaildata = loadEmailTemplate($emailtype, $replacements, empty($modSettings['userLanguage']) ? $language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
-					sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'newmember' . $this->_details['new_member_id'], $emaildata['is_html'], 0);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'newmember' . $this->_details['new_member_id'], $emaildata['is_html'], 0);
+				}
 			}
 		}