albertlast / SMF2.1

Sources/Poll.php

Braces +163 added lines, -119 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Allow the user to vote.
@@ -51,8 +52,9 @@ 
 			'not_guest' => 0,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('poll_error', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('poll_error', false);
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -60,8 +62,9 @@ 
 	if ($user_info['is_guest'])
 	{
 		// Guest voting disabled?
-		if (!$row['guest_vote'])
-			fatal_lang_error('guest_vote_disabled');
+		if (!$row['guest_vote']) {
+					fatal_lang_error('guest_vote_disabled');
+		}
 		// Guest already voted?
 		elseif (!empty($_COOKIE['guest_poll_vote']) && preg_match('~^[0-9,;]+$~', $_COOKIE['guest_poll_vote']) && strpos($_COOKIE['guest_poll_vote'], ';' . $row['id_poll'] . ',') !== false)
 		{
@@ -71,32 +74,36 @@ 
 			foreach ($guestinfo as $i => $guestvoted)
 			{
 				$guestvoted = explode(',', $guestvoted);
-				if ($guestvoted[0] == $row['id_poll'])
-					break;
+				if ($guestvoted[0] == $row['id_poll']) {
+									break;
+				}
 			}
 			// Has the poll been reset since guest voted?
 			if ($row['reset_poll'] > $guestvoted[1])
 			{
 				// Remove the poll info from the cookie to allow guest to vote again
 				unset($guestinfo[$i]);
-				if (!empty($guestinfo))
-					$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-				else
-					unset($_COOKIE['guest_poll_vote']);
+				if (!empty($guestinfo)) {
+									$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+				} else {
+									unset($_COOKIE['guest_poll_vote']);
+				}
+			} else {
+							fatal_lang_error('poll_error', false);
 			}
-			else
-				fatal_lang_error('poll_error', false);
 			unset($guestinfo, $guestvoted, $i);
 		}
 	}
 
 	// Is voting locked or has it expired?
-	if (!empty($row['voting_locked']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
-		fatal_lang_error('poll_error', false);
+	if (!empty($row['voting_locked']) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
+			fatal_lang_error('poll_error', false);
+	}
 
 	// If they have already voted and aren't allowed to change their vote - hence they are outta here!
-	if (!$user_info['is_guest'] && $row['selected'] != -1 && empty($row['change_vote']))
-		fatal_lang_error('poll_error', false);
+	if (!$user_info['is_guest'] && $row['selected'] != -1 && empty($row['change_vote'])) {
+			fatal_lang_error('poll_error', false);
+	}
 	// Otherwise if they can change their vote yet they haven't sent any options... remove their vote and redirect.
 	elseif (!empty($row['change_vote']) && !$user_info['is_guest'] && empty($_POST['options']))
 	{
@@ -114,8 +121,9 @@ 
 				'id_poll' => $row['id_poll'],
 			)
 		);
-		while ($choice = $smcFunc['db_fetch_row']($request))
-			$pollOptions[] = $choice[0];
+		while ($choice = $smcFunc['db_fetch_row']($request)) {
+					$pollOptions[] = $choice[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Just skip it if they had voted for nothing before.
@@ -148,19 +156,22 @@ 
 		}
 
 		// Redirect back to the topic so the user can vote again!
-		if (empty($_POST['options']))
-			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+		if (empty($_POST['options'])) {
+					redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+		}
 	}
 
 	checkSession('request');
 
 	// Make sure the option(s) are valid.
-	if (empty($_POST['options']))
-		fatal_lang_error('didnt_select_vote', false);
+	if (empty($_POST['options'])) {
+			fatal_lang_error('didnt_select_vote', false);
+	}
 
 	// Too many options checked!
-	if (count($_REQUEST['options']) > $row['max_votes'])
-		fatal_lang_error('poll_too_many_votes', false, array($row['max_votes']));
+	if (count($_REQUEST['options']) > $row['max_votes']) {
+			fatal_lang_error('poll_too_many_votes', false, array($row['max_votes']));
+	}
 
 	$pollOptions = array();
 	$inserts = array();
@@ -250,24 +261,30 @@ 
 	list ($memberID, $pollID, $voting_locked) = $smcFunc['db_fetch_row']($request);
 
 	// If the user _can_ modify the poll....
-	if (!allowedTo('poll_lock_any'))
-		isAllowedTo('poll_lock_' . ($user_info['id'] == $memberID ? 'own' : 'any'));
+	if (!allowedTo('poll_lock_any')) {
+			isAllowedTo('poll_lock_' . ($user_info['id'] == $memberID ? 'own' : 'any'));
+	}
 
 	// It's been locked by a non-moderator.
-	if ($voting_locked == '1')
-		$voting_locked = '0';
+	if ($voting_locked == '1') {
+			$voting_locked = '0';
+	}
 	// Locked by a moderator, and this is a moderator.
-	elseif ($voting_locked == '2' && allowedTo('moderate_board'))
-		$voting_locked = '0';
+	elseif ($voting_locked == '2' && allowedTo('moderate_board')) {
+			$voting_locked = '0';
+	}
 	// Sorry, a moderator locked it.
-	elseif ($voting_locked == '2' && !allowedTo('moderate_board'))
-		fatal_lang_error('locked_by_admin', 'user');
+	elseif ($voting_locked == '2' && !allowedTo('moderate_board')) {
+			fatal_lang_error('locked_by_admin', 'user');
+	}
 	// A moderator *is* locking it.
-	elseif ($voting_locked == '0' && allowedTo('moderate_board'))
-		$voting_locked = '2';
+	elseif ($voting_locked == '0' && allowedTo('moderate_board')) {
+			$voting_locked = '2';
+	}
 	// Well, it's gonna be locked one way or another otherwise...
-	else
-		$voting_locked = '1';
+	else {
+			$voting_locked = '1';
+	}
 
 	// Lock!  *Poof* - no one can vote.
 	$smcFunc['db_query']('', '
@@ -302,8 +319,9 @@ 
 {
 	global $txt, $user_info, $context, $topic, $board, $smcFunc, $sourcedir, $scripturl;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	loadLanguage('Post');
 	loadTemplate('Poll');
@@ -327,24 +345,28 @@ 
 	);
 
 	// Assume the the topic exists, right?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	// Get the poll information.
 	$pollinfo = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// If we are adding a new poll - make sure that there isn't already a poll there.
-	if (!$context['is_edit'] && !empty($pollinfo['id_poll']))
-		fatal_lang_error('poll_already_exists');
+	if (!$context['is_edit'] && !empty($pollinfo['id_poll'])) {
+			fatal_lang_error('poll_already_exists');
+	}
 	// Otherwise, if we're editing it, it does exist I assume?
-	elseif ($context['is_edit'] && empty($pollinfo['id_poll']))
-		fatal_lang_error('poll_not_found');
+	elseif ($context['is_edit'] && empty($pollinfo['id_poll'])) {
+			fatal_lang_error('poll_not_found');
+	}
 
 	// Can you do this?
-	if ($context['is_edit'] && !allowedTo('poll_edit_any'))
-		isAllowedTo('poll_edit_' . ($user_info['id'] == $pollinfo['id_member_started'] || ($pollinfo['poll_starter'] != 0 && $user_info['id'] == $pollinfo['poll_starter']) ? 'own' : 'any'));
-	elseif (!$context['is_edit'] && !allowedTo('poll_add_any'))
-		isAllowedTo('poll_add_' . ($user_info['id'] == $pollinfo['id_member_started'] ? 'own' : 'any'));
+	if ($context['is_edit'] && !allowedTo('poll_edit_any')) {
+			isAllowedTo('poll_edit_' . ($user_info['id'] == $pollinfo['id_member_started'] || ($pollinfo['poll_starter'] != 0 && $user_info['id'] == $pollinfo['poll_starter']) ? 'own' : 'any'));
+	} elseif (!$context['is_edit'] && !allowedTo('poll_add_any')) {
+			isAllowedTo('poll_add_' . ($user_info['id'] == $pollinfo['id_member_started'] ? 'own' : 'any'));
+	}
 	$context['can_moderate_poll'] = isset($_REQUEST['add']) ? true : allowedTo('poll_edit_' . ($user_info['id'] == $pollinfo['id_member_started'] || ($pollinfo['poll_starter'] != 0 && $user_info['id'] == $pollinfo['poll_starter']) ? 'own' : 'any'));
 
 	// Do we enable guest voting?
@@ -386,12 +408,14 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// Get the highest id so we can add more without reusing.
-				if ($row['id_choice'] >= $last_id)
-					$last_id = $row['id_choice'] + 1;
+				if ($row['id_choice'] >= $last_id) {
+									$last_id = $row['id_choice'] + 1;
+				}
 
 				// They cleared this by either omitting it or emptying it.
-				if (!isset($_POST['options'][$row['id_choice']]) || $_POST['options'][$row['id_choice']] == '')
-					continue;
+				if (!isset($_POST['options'][$row['id_choice']]) || $_POST['options'][$row['id_choice']] == '') {
+									continue;
+				}
 
 				censorText($row['label']);
 
@@ -409,9 +433,10 @@ 
 
 		// Work out how many options we have, so we get the 'is_last' field right...
 		$totalPostOptions = 0;
-		foreach ($_POST['options'] as $id => $label)
-			if ($label != '')
+		foreach ($_POST['options'] as $id => $label) {
+					if ($label != '')
 				$totalPostOptions++;
+		}
 
 		$count = 1;
 		// If an option exists, update it.  If it is new, add it - but don't reuse ids!
@@ -420,30 +445,32 @@ 
 			$label = $smcFunc['htmlspecialchars']($label);
 			censorText($label);
 
-			if (isset($context['choices'][$id]))
-				$context['choices'][$id]['label'] = $label;
-			elseif ($label != '')
-				$context['choices'][] = array(
+			if (isset($context['choices'][$id])) {
+							$context['choices'][$id]['label'] = $label;
+			} elseif ($label != '') {
+							$context['choices'][] = array(
 					'id' => $last_id++,
 					'number' => $number++,
 					'label' => $label,
 					'votes' => -1,
 					'is_last' => $count++ == $totalPostOptions && $totalPostOptions > 1 ? true : false,
 				);
+			}
 		}
 
 		// Make sure we have two choices for sure!
 		if ($totalPostOptions < 2)
 		{
 			// Need two?
-			if ($totalPostOptions == 0)
-				$context['choices'][] = array(
+			if ($totalPostOptions == 0) {
+							$context['choices'][] = array(
 					'id' => $last_id++,
 					'number' => $number++,
 					'label' => '',
 					'votes' => -1,
 					'is_last' => false
 				);
+			}
 			$poll_errors[] = 'poll_few';
 		}
 
@@ -458,12 +485,14 @@ 
 
 		$context['last_choice_id'] = $last_id;
 
-		if ($context['can_moderate_poll'])
-			$context['poll']['expiration'] = $_POST['poll_expire'];
+		if ($context['can_moderate_poll']) {
+					$context['poll']['expiration'] = $_POST['poll_expire'];
+		}
 
 		// Check the question/option count for errors.
-		if (trim($_POST['question']) == '' && empty($context['poll_error']))
-			$poll_errors[] = 'no_question';
+		if (trim($_POST['question']) == '' && empty($context['poll_error'])) {
+					$poll_errors[] = 'no_question';
+		}
 
 		// No check is needed, since nothing is really posted.
 		checkSubmitOnce('free');
@@ -480,8 +509,7 @@ 
 				$context['poll_error']['messages'][] = $txt['error_' . $poll_error];
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Basic theme info...
 		$context['poll'] = array(
@@ -596,18 +624,22 @@ 
 	global $user_info, $smcFunc, $sourcedir;
 
 	// Sneaking off, are we?
-	if (empty($_POST))
-		redirectexit('action=editpoll;topic=' . $topic . '.0');
+	if (empty($_POST)) {
+			redirectexit('action=editpoll;topic=' . $topic . '.0');
+	}
 
-	if (checkSession('post', '', false) != '')
-		$poll_errors[] = 'session_timeout';
+	if (checkSession('post', '', false) != '') {
+			$poll_errors[] = 'session_timeout';
+	}
 
-	if (isset($_POST['preview']))
-		return EditPoll();
+	if (isset($_POST['preview'])) {
+			return EditPoll();
+	}
 
 	// HACKERS (!!) can't edit :P.
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Is this a new poll, or editing an existing?
 	$isEdit = isset($_REQUEST['add']) ? 0 : 1;
@@ -623,23 +655,27 @@ 
 			'current_topic' => $topic,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	$bcinfo = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Check their adding/editing is valid.
-	if (!$isEdit && !empty($bcinfo['id_poll']))
-		fatal_lang_error('poll_already_exists');
+	if (!$isEdit && !empty($bcinfo['id_poll'])) {
+			fatal_lang_error('poll_already_exists');
+	}
 	// Are we editing a poll which doesn't exist?
-	elseif ($isEdit && empty($bcinfo['id_poll']))
-		fatal_lang_error('poll_not_found');
+	elseif ($isEdit && empty($bcinfo['id_poll'])) {
+			fatal_lang_error('poll_not_found');
+	}
 
 	// Check if they have the power to add or edit the poll.
-	if ($isEdit && !allowedTo('poll_edit_any'))
-		isAllowedTo('poll_edit_' . ($user_info['id'] == $bcinfo['id_member_started'] || ($bcinfo['poll_starter'] != 0 && $user_info['id'] == $bcinfo['poll_starter']) ? 'own' : 'any'));
-	elseif (!$isEdit && !allowedTo('poll_add_any'))
-		isAllowedTo('poll_add_' . ($user_info['id'] == $bcinfo['id_member_started'] ? 'own' : 'any'));
+	if ($isEdit && !allowedTo('poll_edit_any')) {
+			isAllowedTo('poll_edit_' . ($user_info['id'] == $bcinfo['id_member_started'] || ($bcinfo['poll_starter'] != 0 && $user_info['id'] == $bcinfo['poll_starter']) ? 'own' : 'any'));
+	} elseif (!$isEdit && !allowedTo('poll_add_any')) {
+			isAllowedTo('poll_add_' . ($user_info['id'] == $bcinfo['id_member_started'] ? 'own' : 'any'));
+	}
 
 	$optionCount = 0;
 	$idCount = 0;
@@ -652,14 +688,16 @@ 
 			$idCount = max($idCount, $k);
 		}
 	}
-	if ($optionCount < 2)
-		$poll_errors[] = 'poll_few';
-	elseif ($optionCount > 256 || $idCount > 255)
-		$poll_errors[] = 'poll_many';
+	if ($optionCount < 2) {
+			$poll_errors[] = 'poll_few';
+	} elseif ($optionCount > 256 || $idCount > 255) {
+			$poll_errors[] = 'poll_many';
+	}
 
 	// Also - ensure they are not removing the question.
-	if (trim($_POST['question']) == '')
-		$poll_errors[] = 'no_question';
+	if (trim($_POST['question']) == '') {
+			$poll_errors[] = 'no_question';
+	}
 
 	// Got any errors to report?
 	if (!empty($poll_errors))
@@ -695,8 +733,9 @@ 
 	{
 		require_once($sourcedir . '/Subs-Members.php');
 		$allowedGroups = groupsAllowedTo('poll_vote', $board);
-		if (!in_array(-1, $allowedGroups['allowed']))
-			$_POST['poll_guest_vote'] = 0;
+		if (!in_array(-1, $allowedGroups['allowed'])) {
+					$_POST['poll_guest_vote'] = 0;
+		}
 	}
 
 	// Ensure that the number options allowed makes sense, and the expiration date is valid.
@@ -704,17 +743,19 @@ 
 	{
 		$_POST['poll_expire'] = $_POST['poll_expire'] > 9999 ? 9999 : ($_POST['poll_expire'] < 0 ? 0 : $_POST['poll_expire']);
 
-		if (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2)
-			$_POST['poll_hide'] = 1;
-		elseif (!$isEdit || $_POST['poll_expire'] != ceil($bcinfo['expire_time'] <= time() ? -1 : ($bcinfo['expire_time'] - time()) / (3600 * 24)))
-			$_POST['poll_expire'] = empty($_POST['poll_expire']) ? '0' : time() + $_POST['poll_expire'] * 3600 * 24;
-		else
-			$_POST['poll_expire'] = $bcinfo['expire_time'];
+		if (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2) {
+					$_POST['poll_hide'] = 1;
+		} elseif (!$isEdit || $_POST['poll_expire'] != ceil($bcinfo['expire_time'] <= time() ? -1 : ($bcinfo['expire_time'] - time()) / (3600 * 24))) {
+					$_POST['poll_expire'] = empty($_POST['poll_expire']) ? '0' : time() + $_POST['poll_expire'] * 3600 * 24;
+		} else {
+					$_POST['poll_expire'] = $bcinfo['expire_time'];
+		}
 
-		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0)
-			$_POST['poll_max_votes'] = 1;
-		else
-			$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
+		if (empty($_POST['poll_max_votes']) || $_POST['poll_max_votes'] <= 0) {
+					$_POST['poll_max_votes'] = 1;
+		} else {
+					$_POST['poll_max_votes'] = (int) $_POST['poll_max_votes'];
+		}
 	}
 
 	// If we're editing, let's commit the changes.
@@ -781,8 +822,9 @@ 
 		)
 	);
 	$choices = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$choices[] = $row['id_choice'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$choices[] = $row['id_choice'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$delete_options = array();
@@ -795,8 +837,9 @@ 
 		if (trim($option) == '')
 		{
 			// They want it deleted.  Bye.
-			if (in_array($k, $choices))
-				$delete_options[] = $k;
+			if (in_array($k, $choices)) {
+							$delete_options[] = $k;
+			}
 
 			// Skip the rest...
 			continue;
@@ -806,8 +849,8 @@ 
 		$option = $smcFunc['htmlspecialchars']($option);
 
 		// If it's already there, update it.  If it's not... add it.
-		if (in_array($k, $choices))
-			$smcFunc['db_query']('', '
+		if (in_array($k, $choices)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}poll_choices
 				SET label = {string:option_name}
 				WHERE id_poll = {int:id_poll}
@@ -818,8 +861,8 @@ 
 					'option_name' => $option,
 				)
 			);
-		else
-			$smcFunc['db_insert']('',
+		} else {
+					$smcFunc['db_insert']('',
 				'{db_prefix}poll_choices',
 				array(
 					'id_poll' => 'int', 'id_choice' => 'int', 'label' => 'string-255', 'votes' => 'int',
@@ -829,6 +872,7 @@ 
 				),
 				array()
 			);
+		}
 	}
 
 	// I'm sorry, but... well, no one was choosing you.  Poor options, I'll put you out of your misery.
@@ -894,13 +938,11 @@ 
 	{
 		// Added a poll
 		logAction('add_poll', array('topic' => $topic));
-	}
-	elseif (isset($_REQUEST['deletevotes']))
+	} elseif (isset($_REQUEST['deletevotes']))
 	{
 		// Reset votes
 		logAction('reset_poll', array('topic' => $topic));
-	}
-	else
+	} else
 	{
 		// Something else
 		logAction('editpoll', array('topic' => $topic));
@@ -923,8 +965,9 @@ 
 	global $topic, $user_info, $smcFunc;
 
 	// Make sure the topic is not empty.
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Verify the session.
 	checkSession('get');
@@ -942,8 +985,9 @@ 
 				'current_topic' => $topic,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		list ($topicStarter, $pollStarter) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 

Sources/tasks/index.php

Braces +3 added lines, -2 removed lines

@@ -1,9 +1,10 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
 	include (dirname(dirname(__FILE__)) . '/index.php');
-else
+} else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/tasks/ApprovePost-Notify.php

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

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

Sources/tasks/EventNew-Notify.php

Braces +11 added lines, -8 removed lines

@@ -32,8 +32,9 @@ 
 		$members = membersAllowedTo('calendar_view');
 
 		// Don't alert the event creator
-		if (!empty($this->_details['sender_id']))
-			$members = array_diff($members, array($this->_details['sender_id']));
+		if (!empty($this->_details['sender_id'])) {
+					$members = array_diff($members, array($this->_details['sender_id']));
+		}
 
 		// Having successfully figured this out, now let's get the preferences of everyone.
 		require_once($sourcedir . '/Subs-Notify.php');
@@ -44,10 +45,11 @@ 
 		if (!empty($this->_details['sender_id']) && empty($this->_details['sender_name']))
 		{
 			loadMemberData($this->_details['sender_id'], 'minimal');
-			if (!empty($user_profile[$this->_details['sender_id']]))
-				$this->_details['sender_name'] = $user_profile[$this->_details['sender_id']]['real_name'];
-			else
-				$this->_details['sender_id'] = 0;
+			if (!empty($user_profile[$this->_details['sender_id']])) {
+							$this->_details['sender_name'] = $user_profile[$this->_details['sender_id']]['real_name'];
+			} else {
+							$this->_details['sender_id'] = 0;
+			}
 		}
 
 		// So now we find out who wants what.
@@ -59,9 +61,10 @@ 
 
 		foreach ($prefs as $member => $pref_option)
 		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['event_new'] & $bitvalue)
+			foreach ($alert_bits as $type => $bitvalue) {
+							if ($pref_option['event_new'] & $bitvalue)
 					$notifies[$type][] = $member;
+			}
 		}
 
 		// Firstly, anyone who wants alerts.

Sources/tasks/MemberReportReply-Notify.php

Braces +15 added lines, -10 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.
@@ -73,8 +75,9 @@ 
 		{
 			foreach ($alert_bits as $type => $bitvalue)
 			{
-				if ($pref_option['member_report_reply'] & $bitvalue)
-					$notifies[$type][] = $member;
+				if ($pref_option['member_report_reply'] & $bitvalue) {
+									$notifies[$type][] = $member;
+				}
 			}
 		}
 
@@ -136,8 +139,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);
@@ -155,8 +159,9 @@ 
 				$emaildata = loadEmailTemplate('reply_to_user_reports', $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, 'urptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				foreach ($recipients as $id_member => $email_address) {
+									sendmail($email_address, $emaildata['subject'], $emaildata['body'], null, 'urptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				}
 			}
 		}
 

Sources/tasks/MemberReport-Notify.php

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

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

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;