SimpleMachines / SMF2.1

Sources/tasks/CreatePost-Notify.php

Braces +74 added lines, -54 removed lines

@@ -96,8 +96,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;
@@ -105,8 +106,9 @@ 
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($members))
-			return true;
+		if (empty($members)) {
+					return true;
+		}
 
 		$members = array_unique($members);
 		$prefs = getNotifyPrefs($members, '', true);
@@ -122,8 +124,9 @@ 
 		self::handleQuoteNotifications($msgOptions, $posterOptions, $quotedMembers, $prefs, $done_members, $alert_rows);
 
 		// Save ourselves a bit of work in the big loop below
-		foreach ($done_members as $done_member)
-			unset($watched[$done_member]);
+		foreach ($done_members as $done_member) {
+					unset($watched[$done_member]);
+		}
 
 		// Handle rest of the notifications for watched topics and boards
 		foreach ($watched as $member => $data)
@@ -132,26 +135,31 @@ 
 			$notify_types = !empty($prefs[$member]['msg_notify_type']) ? $prefs[$member]['msg_notify_type'] : self::NOTIFY_TYPE_REPLY_AND_MODIFY;
 
 			// Don't send a notification if the watching member ignored the member who made the action.
-			if (!empty($data['pm_ignore_list']) && in_array($data['id_member_updated'], explode(',', $data['pm_ignore_list'])))
-				continue;
-			if (!in_array($type, array('reply', 'topic')) && $notify_types == self::NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING && $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 == self::NOTIFY_TYPE_ONLY_REPLIES)
-				continue;
-			elseif ($notify_types == self::NOTIFY_TYPE_NOTHING)
-				continue;
+			if (!empty($data['pm_ignore_list']) && in_array($data['id_member_updated'], explode(',', $data['pm_ignore_list']))) {
+							continue;
+			}
+			if (!in_array($type, array('reply', 'topic')) && $notify_types == self::NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING && $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 == self::NOTIFY_TYPE_ONLY_REPLIES) {
+							continue;
+			} elseif ($notify_types == self::NOTIFY_TYPE_NOTHING) {
+							continue;
+			}
 
 			// Don't send a notification if they don't want any...
-			if (in_array($frequency, array(self::FREQUENCY_NOTHING, self::FREQUENCY_DAILY_DIGEST, self::FREQUENCY_WEEKLY_DIGEST)))
-				continue;
+			if (in_array($frequency, array(self::FREQUENCY_NOTHING, self::FREQUENCY_DAILY_DIGEST, self::FREQUENCY_WEEKLY_DIGEST))) {
+							continue;
+			}
 			// ... or if we already sent one and they don't want more...
-			elseif ($frequency === self::FREQUENCY_FIRST_UNREAD_MSG && $data['sent'])
-				continue;
+			elseif ($frequency === self::FREQUENCY_FIRST_UNREAD_MSG && $data['sent']) {
+							continue;
+			}
 			// ... or if they aren't on the bouncer's list.
-			elseif (!empty($this->_details['members_only']) && !in_array($member, $this->_details['members_only']))
-				continue;
+			elseif (!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]))
@@ -161,10 +169,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';
@@ -177,12 +187,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;
+			}
 
 			// Bitwise check: Receiving a email notification?
 			if ($pref & self::RECEIVE_NOTIFY_EMAIL)
@@ -199,8 +211,9 @@ 
 				$mail_result = sendmail($data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $topicOptions['id'], $emaildata['is_html']);
 
 				// We failed, don't trigger a alert as we don't have a way to attempt to resend just the email currently.
-				if ($mail_result === false)
-					continue;
+				if ($mail_result === false) {
+									continue;
+				}
 			}
 
 			// Bitwise check: Receiving a alert?
@@ -251,14 +264,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;
 	}
@@ -269,8 +283,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;
 
@@ -324,32 +339,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']('', '
@@ -367,8 +385,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;
 		}
@@ -382,10 +401,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'] & self::RECEIVE_NOTIFY_EMAIL)