albertlast / SMF2.1

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/MsgReportReply-Notify.php

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);
+				}
 			}
 		}
 

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class Likes_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()

Sources/tasks/ApproveReply-Notify.php

Indentation +1 added lines, -1 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -96,14 +96,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/MsgReport-Notify.php

Braces +15 added lines, -10 removed lines

@@ -40,8 +40,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.
@@ -58,8 +59,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);
 
 		// And now weed out the duplicates.
@@ -81,9 +83,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['msg_report'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['msg_report'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
@@ -143,8 +146,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);
@@ -177,8 +181,9 @@ 
 				$emaildata = loadEmailTemplate('report_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, 'report' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'report' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				}
 			}
 		}
 

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class Likes_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()

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/GroupReq-Notify.php

Indentation +1 added lines, -1 removed lines

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

Braces +9 added lines, -6 removed lines

@@ -37,8 +37,9 @@ 
 			)
 		);
 		$moderators = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$moderators[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$moderators[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		require_once($sourcedir . '/Subs-Members.php');
@@ -59,11 +60,13 @@ 
 			{
 				if (!empty($prefs[$mod]['request_group']))
 				{
-					if ($prefs[$mod]['request_group'] & 0x01)
-						$data['alert'][] = $mod;
+					if ($prefs[$mod]['request_group'] & 0x01) {
+											$data['alert'][] = $mod;
+					}
 
-					if ($prefs[$mod]['request_group'] & 0x02)
-						$data['email'][] = $mod;
+					if ($prefs[$mod]['request_group'] & 0x02) {
+											$data['email'][] = $mod;
+					}
 				}
 			}
 

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/Likes-Notify.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 class Likes_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 +19 added lines, -14 removed lines

@@ -49,30 +49,33 @@ 
 				$allowed = explode(',', $row['member_groups']);
 
 				// If the user is in group 1 anywhere, they can see everything anyway.
-				if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0)
-					$author = $row['id_member'];
+				if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0) {
+									$author = $row['id_member'];
+				}
 			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			// This isn't something we know natively how to support. Call the hooks, if they're dealing with it, return false, otherwise return the user id.
 			$hook_results = call_integration_hook('integrate_find_like_author', array($this->_details['content_type'], $this->_details['content_id']));
-			foreach ($hook_results as $result)
-				if (!empty($result))
+			foreach ($hook_results as $result) {
+							if (!empty($result))
 				{
 					$author = $result;
+			}
 					break;
 				}
 		}
 
 		// If we didn't have a member... leave.
-		if (empty($author))
-			return true;
+		if (empty($author)) {
+					return true;
+		}
 
 		// If the person who sent the notification is the person whose content it is, do nothing.
-		if ($author == $this->_details['sender_id'])
-			return true;
+		if ($author == $this->_details['sender_id']) {
+					return true;
+		}
 
 		require_once($sourcedir . '/Subs-Notify.php');
 		$prefs = getNotifyPrefs($author, $this->_details['content_type'] . '_like', true);
@@ -81,8 +84,9 @@ 
 		// As a result, the value should really just be non empty.
 
 		// Check the value. If no value or it's empty, they didn't want alerts, oh well.
-		if (empty($prefs[$author][$this->_details['content_type'] . '_like']))
-			return true;
+		if (empty($prefs[$author][$this->_details['content_type'] . '_like'])) {
+					return true;
+		}
 
 		// Don't spam the alerts: if there is an existing unread alert of the
 		// requested type for the target user from the sender, don't make a new one.
@@ -102,8 +106,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) > 0)
-			return true;
+		if ($smcFunc['db_num_rows']($request) > 0) {
+					return true;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Issue, update, move on.

Sources/Topic.php

Braces +31 added lines, -21 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Locks a topic... either by way of a moderator or the topic starter.
@@ -32,8 +33,9 @@ 
 	global $topic, $user_info, $sourcedir, $board, $smcFunc;
 
 	// Just quit if there's no topic to lock.
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -55,23 +57,28 @@ 
 
 	// Can you lock topics here, mister?
 	$user_lock = !allowedTo('lock_any');
-	if ($user_lock && $starter == $user_info['id'])
-		isAllowedTo('lock_own');
-	else
-		isAllowedTo('lock_any');
+	if ($user_lock && $starter == $user_info['id']) {
+			isAllowedTo('lock_own');
+	} else {
+			isAllowedTo('lock_any');
+	}
 
 	// Locking with high privileges.
-	if ($locked == '0' && !$user_lock)
-		$locked = '1';
+	if ($locked == '0' && !$user_lock) {
+			$locked = '1';
+	}
 	// Locking with low privileges.
-	elseif ($locked == '0')
-		$locked = '2';
+	elseif ($locked == '0') {
+			$locked = '2';
+	}
 	// Unlocking - make sure you don't unlock what you can't.
-	elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-		$locked = '0';
+	elseif ($locked == '2' || ($locked == '1' && !$user_lock)) {
+			$locked = '0';
+	}
 	// You cannot unlock this!
-	else
-		fatal_lang_error('locked_by_admin', 'user');
+	else {
+			fatal_lang_error('locked_by_admin', 'user');
+	}
 
 	// Actually lock the topic in the database with the new value.
 	$smcFunc['db_query']('', '
@@ -85,8 +92,9 @@ 
 	);
 
 	// If they are allowed a "moderator" permission, log it in the moderator log.
-	if (!$user_lock)
-		logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	if (!$user_lock) {
+			logAction($locked ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $board));
+	}
 	// Notify people that this topic has been locked?
 	sendNotifications($topic, empty($locked) ? 'unlock' : 'lock');
 
@@ -112,8 +120,9 @@ 
 	isAllowedTo('make_sticky');
 
 	// You can't sticky a board or something!
-	if (empty($topic))
-		fatal_lang_error('not_a_topic', false);
+	if (empty($topic)) {
+			fatal_lang_error('not_a_topic', false);
+	}
 
 	checkSession('get');
 
@@ -147,8 +156,9 @@ 
 	// Log this sticky action - always a moderator thing.
 	logAction(empty($is_sticky) ? 'sticky' : 'unsticky', array('topic' => $topic, 'board' => $board));
 	// Notify people that this topic has been stickied?
-	if (empty($is_sticky))
-		sendNotifications($topic, 'sticky');
+	if (empty($is_sticky)) {
+			sendNotifications($topic, 'sticky');
+	}
 
 	// Take them back to the now stickied topic.
 	redirectexit('topic=' . $topic . '.' . $_REQUEST['start'] . ';moderate');