albertlast / SMF2.1

Themes/default/fonts/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

Themes/default/fonts/sound/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

Themes/default/languages/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/CreatePost-Notify.php

Braces +62 added lines, -46 removed lines

@@ -73,8 +73,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;
@@ -82,8 +83,9 @@ 
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($members))
-			return true;
+		if (empty($members)) {
+					return true;
+		}
 
 		$members = array_unique($members);
 		$prefs = getNotifyPrefs($members, '', true);
@@ -105,20 +107,23 @@ 
 			$notify_types = !empty($prefs[$member]['msg_notify_type']) ? $prefs[$member]['msg_notify_type'] : 1;
 
 			// 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 == 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 (!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 == 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]))
@@ -128,10 +133,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';
@@ -144,12 +151,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)
 			{
@@ -212,14 +221,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;
 	}
@@ -230,8 +240,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;
 
@@ -283,32 +294,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']('', '
@@ -326,8 +340,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;
 		}
@@ -341,10 +356,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/Likes-Notify.php

Braces +19 added lines, -14 removed lines

@@ -51,30 +51,33 @@ 
 				$ignored_members = explode(',', $row['pm_ignore_list']);
 
 				// 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;
+		}
 
 		// If the person who sent the notification is on this person's ignore list, do nothing.
 		if (!empty($ignored_members) && in_array($this->_details['sender_id'], $ignored_members)) {
@@ -88,8 +91,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.
@@ -109,8 +113,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/Subs-Compat.php

Braces +27 added lines, -19 removed lines

@@ -16,8 +16,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 
 /**
@@ -28,14 +29,16 @@ 
 function sha1_smf($str)
 {
 	// If we have mhash loaded in, use it instead!
-	if (function_exists('mhash') && defined('MHASH_SHA1'))
-		return bin2hex(mhash(MHASH_SHA1, $str));
+	if (function_exists('mhash') && defined('MHASH_SHA1')) {
+			return bin2hex(mhash(MHASH_SHA1, $str));
+	}
 
 	$nblk = (strlen($str) + 8 >> 6) + 1;
 	$blks = array_pad(array(), $nblk * 16, 0);
 
-	for ($i = 0; $i < strlen($str); $i++)
-		$blks[$i >> 2] |= ord($str{$i}) << (24 - ($i % 4) * 8);
+	for ($i = 0; $i < strlen($str); $i++) {
+			$blks[$i >> 2] |= ord($str{$i}) << (24 - ($i % 4) * 8);
+	}
 
 	$blks[$i >> 2] |= 0x80 << (24 - ($i % 4) * 8);
 
@@ -70,10 +73,11 @@ 
 
 		for ($j = 0; $j < 80; $j++)
 		{
-			if ($j < 16)
-				$w[$j] = isset($x[$i + $j]) ? $x[$i + $j] : 0;
-			else
-				$w[$j] = sha1_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
+			if ($j < 16) {
+							$w[$j] = isset($x[$i + $j]) ? $x[$i + $j] : 0;
+			} else {
+							$w[$j] = sha1_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
+			}
 
 			$t = sha1_rol($a, 5) + sha1_ft($j, $b, $c, $d) + $e + $w[$j] + sha1_kt($j);
 			$e = $d;
@@ -103,12 +107,15 @@ 
  */
 function sha1_ft($t, $b, $c, $d)
 {
-	if ($t < 20)
-		return ($b & $c) | ((~$b) & $d);
-	if ($t < 40)
-		return $b ^ $c ^ $d;
-	if ($t < 60)
-		return ($b & $c) | ($b & $d) | ($c & $d);
+	if ($t < 20) {
+			return ($b & $c) | ((~$b) & $d);
+	}
+	if ($t < 40) {
+			return $b ^ $c ^ $d;
+	}
+	if ($t < 60) {
+			return ($b & $c) | ($b & $d) | ($c & $d);
+	}
 
 	return $b ^ $c ^ $d;
 }
@@ -132,10 +139,11 @@ 
 function sha1_rol($num, $cnt)
 {
 	// Unfortunately, PHP uses unsigned 32-bit longs only.  So we have to kludge it a bit.
-	if ($num & 0x80000000)
-		$a = ($num >> 1 & 0x7fffffff) >> (31 - $cnt);
-	else
-		$a = $num >> (32 - $cnt);
+	if ($num & 0x80000000) {
+			$a = ($num >> 1 & 0x7fffffff) >> (31 - $cnt);
+	} else {
+			$a = $num >> (32 - $cnt);
+	}
 
 	return ($num << $cnt) | $a;
 }

Sources/MoveTopic.php

Braces +101 added lines, -72 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function allows to move a topic, making sure to ask the moderator
@@ -32,8 +33,9 @@ 
 {
 	global $txt, $board, $topic, $user_info, $context, $language, $scripturl, $smcFunc, $modSettings, $sourcedir;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT t.id_member_started, ms.subject, t.approved
@@ -49,8 +51,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it - if not approved?
-	if ($modSettings['postmod_active'] && !$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Permission check!
 	// @todo
@@ -59,9 +62,9 @@ 
 		if ($id_member_started == $user_info['id'])
 		{
 			isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
 		}
-		else
-			isAllowedTo('move_any');
 	}
 
 	$context['move_any'] = $user_info['is_admin'] || $modSettings['topic_move_any'];
@@ -83,11 +86,13 @@ 
 		'not_redirection' => true,
 	);
 
-	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board)
-		$options['selected_board'] = $_SESSION['move_to_topic'];
+	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board) {
+			$options['selected_board'] = $_SESSION['move_to_topic'];
+	}
 
-	if (!$context['move_any'])
-		$options['included_boards'] = $boards;
+	if (!$context['move_any']) {
+			$options['included_boards'] = $boards;
+	}
 
 	require_once($sourcedir . '/Subs-MessageIndex.php');
 	$context['categories'] = getBoardList($options);
@@ -138,12 +143,14 @@ 
 	global $txt, $topic, $scripturl, $sourcedir, $context;
 	global $board, $language, $user_info, $smcFunc;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// You can't choose to have a redirection topic and use an empty reason.
-	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == ''))
-		fatal_lang_error('movetopic_no_reason', false);
+	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == '')) {
+			fatal_lang_error('movetopic_no_reason', false);
+	}
 
 	moveTopicConcurrence();
 
@@ -163,16 +170,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it?
-	if (!$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if (!$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Can they move topics on this board?
 	if (!allowedTo('move_any'))
 	{
-		if ($id_member_started == $user_info['id'])
-			isAllowedTo('move_own');
-		else
-			isAllowedTo('move_any');
+		if ($id_member_started == $user_info['id']) {
+					isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
+		}
 	}
 
 	checkSession();
@@ -197,8 +206,9 @@ 
 			'blank_redirect' => '',
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	list ($pcounter, $board_name, $subject) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -210,8 +220,9 @@ 
 	{
 		$_POST['custom_subject'] = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
 		// Keep checking the length.
-		if ($smcFunc['strlen']($_POST['custom_subject']) > 100)
-			$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		if ($smcFunc['strlen']($_POST['custom_subject']) > 100) {
+					$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		}
 
 		// If it's still valid move onwards and upwards.
 		if ($_POST['custom_subject'] != '')
@@ -221,9 +232,9 @@ 
 				// Get a response prefix, but in the forum's default language.
 				if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 				{
-					if ($language === $user_info['language'])
-						$context['response_prefix'] = $txt['response_prefix'];
-					else
+					if ($language === $user_info['language']) {
+											$context['response_prefix'] = $txt['response_prefix'];
+					} else
 					{
 						loadLanguage('index', $language, false);
 						$context['response_prefix'] = $txt['response_prefix'];
@@ -263,8 +274,9 @@ 
 	if (isset($_POST['postRedirect']))
 	{
 		// Should be in the boardwide language.
-		if ($user_info['language'] != $language)
-			loadLanguage('index', $language);
+		if ($user_info['language'] != $language) {
+					loadLanguage('index', $language);
+		}
 
 		$_POST['reason'] = $smcFunc['htmlspecialchars']($_POST['reason'], ENT_QUOTES);
 		preparsecode($_POST['reason']);
@@ -328,8 +340,9 @@ 
 		$posters = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($posters[$row['id_member']]))
-				$posters[$row['id_member']] = 0;
+			if (!isset($posters[$row['id_member']])) {
+							$posters[$row['id_member']] = 0;
+			}
 
 			$posters[$row['id_member']]++;
 		}
@@ -338,11 +351,13 @@ 
 		foreach ($posters as $id_member => $posts)
 		{
 			// The board we're moving from counted posts, but not to.
-			if (empty($pcounter_from))
-				updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			if (empty($pcounter_from)) {
+							updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			}
 			// The reverse: from didn't, to did.
-			else
-				updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			else {
+							updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			}
 		}
 	}
 
@@ -350,17 +365,19 @@ 
 	moveTopics($topic, $_POST['toboard']);
 
 	// Log that they moved this topic.
-	if (!allowedTo('move_own') || $id_member_started != $user_info['id'])
-		logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	if (!allowedTo('move_own') || $id_member_started != $user_info['id']) {
+			logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	}
 	// Notify people that this topic has been moved?
 	sendNotifications($topic, 'move');
 
 	// Why not go back to the original board in case they want to keep moving?
-	if (!isset($_REQUEST['goback']))
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.0');
-}
+	if (!isset($_REQUEST['goback'])) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.0');
+	}
+	}
 
 /**
  * Moves one or more topics to a specific board. (doesn't check permissions.)
@@ -376,18 +393,21 @@ 
 	global $sourcedir, $user_info, $modSettings, $smcFunc;
 
 	// Empty array?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$fromBoards = array();
 
 	// Destination board empty or equal to 0?
-	if (empty($toBoard))
-		return;
+	if (empty($toBoard)) {
+			return;
+	}
 
 	// Are we moving to the recycle board?
 	$isRecycleDest = !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $toBoard;
@@ -395,8 +415,9 @@ 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsMoved'))
-		$searchAPI->topicsMoved($topics, $toBoard);
+	if ($searchAPI->supportsMethod('topicsMoved')) {
+			$searchAPI->topicsMoved($topics, $toBoard);
+	}
 
 	// Determine the source boards...
 	$request = $smcFunc['db_query']('', '
@@ -410,8 +431,9 @@ 
 		)
 	);
 	// Num of rows = 0 -> no topics found. Num of rows > 1 -> topics are on multiple boards.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return;
+	}
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		if (!isset($fromBoards[$row['id_board']]['num_posts']))
@@ -429,10 +451,11 @@ 
 		$fromBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// Add the topics to the right type.
-		if ($row['approved'])
-			$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		if ($row['approved']) {
+					$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -558,13 +581,14 @@ 
 			)
 		);
 		$approval_msgs = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$approval_msgs[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$approval_msgs[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Empty the approval queue for these, as we're going to approve them next.
-		if (!empty($approval_msgs))
-			$smcFunc['db_query']('', '
+		if (!empty($approval_msgs)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg IN ({array_int:message_list})
 					AND id_attach = {int:id_attach}',
@@ -573,6 +597,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 
 		// Get all the current max and mins.
 		$request = $smcFunc['db_query']('', '
@@ -606,8 +631,8 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If not, update.
-			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max'])
-				$smcFunc['db_query']('', '
+			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET id_first_msg = {int:first_msg}, id_last_msg = {int:last_msg}
 					WHERE id_topic = {int:selected_topic}',
@@ -617,6 +642,7 @@ 
 						'selected_topic' => $row['id_topic'],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -675,9 +701,10 @@ 
 	}
 
 	// Update the cache?
-	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
-		foreach ($topics as $topic_id)
+	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3) {
+			foreach ($topics as $topic_id)
 			cache_put_data('topic_board-' . $topic_id, null, 120);
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -701,15 +728,17 @@ 
 {
 	global $board, $topic, $smcFunc, $scripturl;
 
-	if (isset($_GET['current_board']))
-		$move_from = (int) $_GET['current_board'];
+	if (isset($_GET['current_board'])) {
+			$move_from = (int) $_GET['current_board'];
+	}
 
-	if (empty($move_from) || empty($board) || empty($topic))
-		return true;
+	if (empty($move_from) || empty($board) || empty($topic)) {
+			return true;
+	}
 
-	if ($move_from == $board)
-		return true;
-	else
+	if ($move_from == $board) {
+			return true;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT m.subject, b.name

Sources/ManageErrors.php

Braces +49 added lines, -38 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * View the forum's error log.
@@ -30,8 +31,9 @@ 
 	global $scripturl, $txt, $context, $modSettings, $user_profile, $filter, $smcFunc;
 
 	// Viewing contents of a file?
-	if (isset($_GET['file']))
-		return ViewFile();
+	if (isset($_GET['file'])) {
+			return ViewFile();
+	}
 
 	// Check for the administrative permission to do this.
 	isAllowedTo('admin_forum');
@@ -85,8 +87,8 @@ 
 	);
 
 	// Set up the filtering...
-	if (isset($_GET['value'], $_GET['filter']) && isset($filters[$_GET['filter']]))
-		$filter = array(
+	if (isset($_GET['value'], $_GET['filter']) && isset($filters[$_GET['filter']])) {
+			$filter = array(
 			'variable' => $_GET['filter'],
 			'value' => array(
 				'sql' => in_array($_GET['filter'], array('message', 'url', 'file')) ? base64_decode(strtr($_GET['value'], array(' ' => '+'))) : $smcFunc['db_escape_wildcard_string']($_GET['value']),
@@ -94,10 +96,12 @@ 
 			'href' => ';filter=' . $_GET['filter'] . ';value=' . $_GET['value'],
 			'entity' => $filters[$_GET['filter']]['txt']
 		);
+	}
 
 	// Deleting, are we?
-	if (isset($_POST['delall']) || isset($_POST['delete']))
-		deleteErrors();
+	if (isset($_POST['delall']) || isset($_POST['delete'])) {
+			deleteErrors();
+	}
 
 	// Just how many errors are there?
 	$result = $smcFunc['db_query']('', '
@@ -112,12 +116,14 @@ 
 	$smcFunc['db_free_result']($result);
 
 	// If this filter is empty...
-	if ($num_errors == 0 && isset($filter))
-		redirectexit('action=admin;area=logs;sa=errorlog' . (isset($_REQUEST['desc']) ? ';desc' : ''));
+	if ($num_errors == 0 && isset($filter)) {
+			redirectexit('action=admin;area=logs;sa=errorlog' . (isset($_REQUEST['desc']) ? ';desc' : ''));
+	}
 
 	// Clean up start.
-	if (!isset($_GET['start']) || $_GET['start'] < 0)
-		$_GET['start'] = 0;
+	if (!isset($_GET['start']) || $_GET['start'] < 0) {
+			$_GET['start'] = 0;
+	}
 
 	// Do we want to reverse error listing?
 	$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
@@ -127,9 +133,9 @@ 
 	$context['start'] = $_GET['start'];
 
 	// Update the error count
-	if (!isset($filter))
-		$context['num_errors'] = $num_errors;
-	else
+	if (!isset($filter)) {
+			$context['num_errors'] = $num_errors;
+	} else
 	{
 		// We want all errors, not just the number of filtered messages...
 		$query = $smcFunc['db_query']('', '
@@ -161,8 +167,9 @@ 
 	for ($i = 0; $row = $smcFunc['db_fetch_assoc']($request); $i++)
 	{
 		$search_message = preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '%', $smcFunc['db_escape_wildcard_string']($row['message']));
-		if ($search_message == $filter['value']['sql'])
-			$search_message = $smcFunc['db_escape_wildcard_string']($row['message']);
+		if ($search_message == $filter['value']['sql']) {
+					$search_message = $smcFunc['db_escape_wildcard_string']($row['message']);
+		}
 		$show_message = strtr(strtr(preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '$1', $row['message']), array("\r" => '', '<br>' => "\n", '<' => '&lt;', '>' => '&gt;', '"' => '&quot;')), array("\n" => '<br>'));
 
 		$context['errors'][$row['id_error']] = array(
@@ -221,8 +228,9 @@ 
 				'members' => count($members),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 
 		// This is a guest...
@@ -254,20 +262,18 @@ 
 			$id = $filter['value']['sql'];
 			loadMemberData($id, false, 'minimal');
 			$context['filter']['value']['html'] = '<a href="' . $scripturl . '?action=profile;u=' . $id . '">' . $user_profile[$id]['real_name'] . '</a>';
-		}
-		elseif ($filter['variable'] == 'url')
-			$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']((substr($filter['value']['sql'], 0, 1) == '?' ? $scripturl : '') . $filter['value']['sql']), array('\_' => '_')) . '\'';
-		elseif ($filter['variable'] == 'message')
+		} elseif ($filter['variable'] == 'url') {
+					$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']((substr($filter['value']['sql'], 0, 1) == '?' ? $scripturl : '') . $filter['value']['sql']), array('\_' => '_')) . '\'';
+		} elseif ($filter['variable'] == 'message')
 		{
 			$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']($filter['value']['sql']), array("\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\_' => '_', '\\%' => '%', '\\\\' => '\\')) . '\'';
 			$context['filter']['value']['html'] = preg_replace('~&amp;lt;span class=&amp;quot;remove&amp;quot;&amp;gt;(.+?)&amp;lt;/span&amp;gt;~', '$1', $context['filter']['value']['html']);
-		}
-		elseif ($filter['variable'] == 'error_type')
+		} elseif ($filter['variable'] == 'error_type')
 		{
 			$context['filter']['value']['html'] = '\'' . strtr($smcFunc['htmlspecialchars']($filter['value']['sql']), array("\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\_' => '_', '\\%' => '%', '\\\\' => '\\')) . '\'';
+		} else {
+					$context['filter']['value']['html'] = &$filter['value']['sql'];
 		}
-		else
-			$context['filter']['value']['html'] = &$filter['value']['sql'];
 	}
 
 	$context['error_types'] = array();
@@ -308,10 +314,11 @@ 
 	$context['error_types']['all']['label'] .= ' (' . $sum . ')';
 
 	// Finally, work out what is the last tab!
-	if (isset($context['error_types'][$sum]))
-		$context['error_types'][$sum]['is_last'] = true;
-	else
-		$context['error_types']['all']['is_last'] = true;
+	if (isset($context['error_types'][$sum])) {
+			$context['error_types'][$sum]['is_last'] = true;
+	} else {
+			$context['error_types']['all']['is_last'] = true;
+	}
 
 	// And this is pretty basic ;).
 	$context['page_title'] = $txt['errlog'];
@@ -337,21 +344,23 @@ 
 	validateToken('admin-el');
 
 	// Delete all or just some?
-	if (isset($_POST['delall']) && !isset($filter))
-		$smcFunc['db_query']('truncate_table', '
+	if (isset($_POST['delall']) && !isset($filter)) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_errors',
 			array(
 			)
 		);
+	}
 	// Deleting all with a filter?
-	elseif (isset($_POST['delall']) && isset($filter))
-		$smcFunc['db_query']('', '
+	elseif (isset($_POST['delall']) && isset($filter)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_errors
 			WHERE ' . $filter['variable'] . ' LIKE {string:filter}',
 			array(
 				'filter' => $filter['value']['sql'],
 			)
 		);
+	}
 	// Just specific errors?
 	elseif (!empty($_POST['delete']))
 	{
@@ -397,15 +406,17 @@ 
 	$line = isset($_REQUEST['line']) ? (int) $_REQUEST['line'] : 0;
 
 	// Make sure the file we are looking for is one they are allowed to look at
-	if ($ext != '.php' || (strpos($file, $real_board) === false && strpos($file, $real_source) === false) || ($basename == 'settings.php' || $basename == 'settings_bak.php') || strpos($file, $real_cache) !== false || !is_readable($file))
-		fatal_lang_error('error_bad_file', true, array($smcFunc['htmlspecialchars']($file)));
+	if ($ext != '.php' || (strpos($file, $real_board) === false && strpos($file, $real_source) === false) || ($basename == 'settings.php' || $basename == 'settings_bak.php') || strpos($file, $real_cache) !== false || !is_readable($file)) {
+			fatal_lang_error('error_bad_file', true, array($smcFunc['htmlspecialchars']($file)));
+	}
 
 	// get the min and max lines
 	$min = $line - 20 <= 0 ? 1 : $line - 20;
 	$max = $line + 21; // One additional line to make everything work out correctly
 
-	if ($max <= 0 || $min >= $max)
-		fatal_lang_error('error_bad_line');
+	if ($max <= 0 || $min >= $max) {
+			fatal_lang_error('error_bad_line');
+	}
 
 	$file_data = explode('<br />', highlight_php_code($smcFunc['htmlspecialchars'](implode('', file($file)))));
 

Sources/SearchAPI-Standard.php

Braces +2 added lines, -1 removed lines

@@ -11,8 +11,9 @@
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Standard non full index, non custom index search