SimpleMachines / SMF2.1

Sources/CacheAPI-apc.php

Braces +12 added lines, -9 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -27,8 +28,9 @@ 
 	{
 		$supported = function_exists('apc_fetch') && function_exists('apc_store');
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -50,10 +52,11 @@ 
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
-			return apc_delete($key . 'smf');
-		else
-			return apc_store($key . 'smf', $value, $ttl);
+		if ($value === null) {
+					return apc_delete($key . 'smf');
+		} else {
+					return apc_store($key . 'smf', $value, $ttl);
+		}
 	}
 
 	/**
@@ -67,9 +70,9 @@ 
 			// Always returns true.
 			apc_clear_cache('user');
 			apc_clear_cache('system');
+		} elseif ($type === 'user') {
+					apc_clear_cache('user');
 		}
-		elseif ($type === 'user')
-			apc_clear_cache('user');
 
 		$this->invalidateCache();
 		return true;

Sources/PostModeration.php

Braces +100 added lines, -79 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is a handling function for all things post moderation.
@@ -39,8 +40,9 @@ 
 	);
 
 	// Pick something valid...
-	if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
-		$_REQUEST['sa'] = 'replies';
+	if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) {
+			$_REQUEST['sa'] = 'replies';
+	}
 
 	call_integration_hook('integrate_post_moderation', array(&$subActions));
 
@@ -68,13 +70,15 @@ 
 		$approve_boards = $approve_boards == array(0) ? $filter_board : array_intersect($approve_boards, $filter_board);
 	}
 
-	if ($approve_boards == array(0))
-		$approve_query = '';
-	elseif (!empty($approve_boards))
-		$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	if ($approve_boards == array(0)) {
+			$approve_query = '';
+	} elseif (!empty($approve_boards)) {
+			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	}
 	// Nada, zip, etc...
-	else
-		$approve_query = ' AND 1=0';
+	else {
+			$approve_query = ' AND 1=0';
+	}
 
 	// We also need to know where we can delete topics and/or replies to.
 	if ($context['current_view'] == 'topics')
@@ -82,8 +86,7 @@ 
 		$delete_own_boards = boardsAllowedTo('remove_own');
 		$delete_any_boards = boardsAllowedTo('remove_any');
 		$delete_own_replies = array();
-	}
-	else
+	} else
 	{
 		$delete_own_boards = boardsAllowedTo('delete_own');
 		$delete_any_boards = boardsAllowedTo('delete_any');
@@ -92,21 +95,25 @@ 
 
 	$toAction = array();
 	// Check if we have something to do?
-	if (isset($_GET['approve']))
-		$toAction[] = (int) $_GET['approve'];
+	if (isset($_GET['approve'])) {
+			$toAction[] = (int) $_GET['approve'];
+	}
 	// Just a deletion?
-	elseif (isset($_GET['delete']))
-		$toAction[] = (int) $_GET['delete'];
+	elseif (isset($_GET['delete'])) {
+			$toAction[] = (int) $_GET['delete'];
+	}
 	// Lots of approvals?
-	elseif (isset($_POST['item']))
-		foreach ($_POST['item'] as $item)
+	elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item)
 			$toAction[] = (int) $item;
+	}
 
 	// What are we actually doing.
-	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		$curAction = 'approve';
-	elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		$curAction = 'delete';
+	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
+			$curAction = 'approve';
+	} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
+			$curAction = 'delete';
+	}
 
 	// Right, so we have something to do?
 	if (!empty($toAction) && isset($curAction))
@@ -135,8 +142,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If it's not within what our view is ignore it...
-			if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies'))
-				continue;
+			if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies')) {
+							continue;
+			}
 
 			$can_add = false;
 			// If we're approving this is simple.
@@ -148,18 +156,22 @@ 
 			elseif ($curAction == 'delete')
 			{
 				// Own post is easy!
-				if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards)))
-					$can_add = true;
+				if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) {
+									$can_add = true;
+				}
 				// Is it a reply to their own topic?
-				elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies)))
-					$can_add = true;
+				elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) {
+									$can_add = true;
+				}
 				// Someone elses?
-				elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards)))
-					$can_add = true;
+				elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) {
+									$can_add = true;
+				}
 			}
 
-			if ($can_add)
-				$anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg'];
+			if ($can_add) {
+							$anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg'];
+			}
 			$toAction[] = $anItem;
 
 			// All clear. What have we got now, what, what?
@@ -177,8 +189,7 @@ 
 			if ($curAction == 'approve')
 			{
 				approveMessages($toAction, $details, $context['current_view']);
-			}
-			else
+			} else
 			{
 				removeMessages($toAction, $details, $context['current_view']);
 			}
@@ -265,16 +276,19 @@ 
 	for ($i = 1; $row = $smcFunc['db_fetch_assoc']($request); $i++)
 	{
 		// Can delete is complicated, let's solve it first... is it their own post?
-		if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards)))
-			$can_delete = true;
+		if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) {
+					$can_delete = true;
+		}
 		// Is it a reply to their own topic?
-		elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies)))
-			$can_delete = true;
+		elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) {
+					$can_delete = true;
+		}
 		// Someone elses?
-		elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards)))
-			$can_delete = true;
-		else
-			$can_delete = false;
+		elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) {
+					$can_delete = true;
+		} else {
+					$can_delete = false;
+		}
 
 		$context['unapproved_items'][] = array(
 			'id' => $row['id_msg'],
@@ -323,28 +337,31 @@ 
 	// Once again, permissions are king!
 	$approve_boards = boardsAllowedTo('approve_posts');
 
-	if ($approve_boards == array(0))
-		$approve_query = '';
-	elseif (!empty($approve_boards))
-		$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
-	else
-		$approve_query = ' AND 1=0';
+	if ($approve_boards == array(0)) {
+			$approve_query = '';
+	} elseif (!empty($approve_boards)) {
+			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	} else {
+			$approve_query = ' AND 1=0';
+	}
 
 	// Get together the array of things to act on, if any.
 	$attachments = array();
-	if (isset($_GET['approve']))
-		$attachments[] = (int) $_GET['approve'];
-	elseif (isset($_GET['delete']))
-		$attachments[] = (int) $_GET['delete'];
-	elseif (isset($_POST['item']))
-		foreach ($_POST['item'] as $item)
+	if (isset($_GET['approve'])) {
+			$attachments[] = (int) $_GET['approve'];
+	} elseif (isset($_GET['delete'])) {
+			$attachments[] = (int) $_GET['delete'];
+	} elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item)
 			$attachments[] = (int) $item;
+	}
 
 	// Are we approving or deleting?
-	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		$curAction = 'approve';
-	elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		$curAction = 'delete';
+	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
+			$curAction = 'approve';
+	} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
+			$curAction = 'delete';
+	}
 
 	// Something to do, let's do it!
 	if (!empty($attachments) && isset($curAction))
@@ -372,17 +389,19 @@ 
 			)
 		);
 		$attachments = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$attachments[] = $row['id_attach'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$attachments[] = $row['id_attach'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Assuming it wasn't all like, proper illegal, we can do the approving.
 		if (!empty($attachments))
 		{
-			if ($curAction == 'approve')
-				ApproveAttachments($attachments);
-			else
-				removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+			if ($curAction == 'approve') {
+							ApproveAttachments($attachments);
+			} else {
+							removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+			}
 		}
 	}
 
@@ -682,15 +701,16 @@ 
 	{
 		approveTopics($topic, !$approved);
 
-		if ($starter != $user_info['id'])
-			logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
-	}
-	else
+		if ($starter != $user_info['id']) {
+					logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+		}
+	} else
 	{
 		approvePosts($_REQUEST['msg'], !$approved);
 
-		if ($poster != $user_info['id'])
-			logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+		if ($poster != $user_info['id']) {
+					logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+		}
 	}
 
 	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
@@ -716,8 +736,7 @@ 
 		{
 			logAction('approve_topic', array('topic' => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']));
 		}
-	}
-	else
+	} else
 	{
 		approvePosts($messages);
 		// and tell the world about it again
@@ -745,8 +764,9 @@ 
 		)
 	);
 	$msgs = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$msgs[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$msgs[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($msgs))
@@ -765,8 +785,9 @@ 
 		)
 	);
 	$attaches = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$attaches[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$attaches[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($attaches))
@@ -794,12 +815,12 @@ 
 	{
 		removeTopics($messages);
 		// and tell the world about it
-		foreach ($messages as $topic)
-			// Note, only log topic ID in native form if it's not gone forever.
+		foreach ($messages as $topic) {
+					// Note, only log topic ID in native form if it's not gone forever.
 			logAction('remove', array(
 				(empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $messageDetails[$topic]['board'] ? 'topic' : 'old_topic_id') => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']));
-	}
-	else
+		}
+	} else
 	{
 		foreach ($messages as $post)
 		{

Sources/BoardIndex.php

Braces +20 added lines, -13 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function shows the board index.
@@ -34,8 +35,9 @@ 
 	$context['canonical_url'] = $scripturl;
 
 	// Do not let search engines index anything if there is a random thing in $_GET.
-	if (!empty($_GET))
-		$context['robot_no_index'] = true;
+	if (!empty($_GET)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Retrieve the categories and boards.
 	require_once($sourcedir . '/Subs-BoardIndex.php');
@@ -62,11 +64,12 @@ 
 			$context['latest_posts'] = cache_quick_get('boardindex-latest_posts:' . md5($user_info['query_wanna_see_board'] . $user_info['language']), 'Subs-Recent.php', 'cache_getLastPosts', array($latestPostOptions));
 		}
 
-		if (!empty($context['latest_posts']) || !empty($context['latest_post']))
-			$context['info_center'][] = array(
+		if (!empty($context['latest_posts']) || !empty($context['latest_post'])) {
+					$context['info_center'][] = array(
 				'tpl' => 'recent',
 				'txt' => 'recent_posts',
 			);
+		}
 	}
 
 	// Load the calendar?
@@ -87,20 +90,22 @@ 
 		// This is used to show the "how-do-I-edit" help.
 		$context['calendar_can_edit'] = allowedTo('calendar_edit_any');
 
-		if ($context['show_calendar'])
-			$context['info_center'][] = array(
+		if ($context['show_calendar']) {
+					$context['info_center'][] = array(
 				'tpl' => 'calendar',
 				'txt' => $context['calendar_only_today'] ? 'calendar_today' : 'calendar_upcoming',
 			);
+		}
 	}
 
 	// And stats.
 	$context['show_stats'] = allowedTo('view_stats') && !empty($modSettings['trackStats']);
-	if ($settings['show_stats_index'])
-		$context['info_center'][] = array(
+	if ($settings['show_stats_index']) {
+			$context['info_center'][] = array(
 				'tpl' => 'stats',
 				'txt' => 'forum_stats',
 			);
+	}
 
 	// Now the online stuff
 	require_once($sourcedir . '/Subs-MembersOnline.php');
@@ -118,12 +123,14 @@ 
 			);
 
 	// Track most online statistics? (Subs-MembersOnline.php)
-	if (!empty($modSettings['trackStats']))
-		trackStatsUsersOnline($context['num_guests'] + $context['num_spiders'] + $context['num_users_online']);
+	if (!empty($modSettings['trackStats'])) {
+			trackStatsUsersOnline($context['num_guests'] + $context['num_spiders'] + $context['num_users_online']);
+	}
 
 	// Are we showing all membergroups on the board index?
-	if (!empty($settings['show_group_key']))
-		$context['membergroups'] = cache_quick_get('membergroup_list', 'Subs-Membergroups.php', 'cache_getMembergroupList', array());
+	if (!empty($settings['show_group_key'])) {
+			$context['membergroups'] = cache_quick_get('membergroup_list', 'Subs-Membergroups.php', 'cache_getMembergroupList', array());
+	}
 
 	// And back to normality.
 	$context['page_title'] = sprintf($txt['forum_index'], $context['forum_name']);

Sources/Subs-Boards.php

Braces +247 added lines, -175 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Mark a board or multiple boards read.
@@ -28,14 +29,16 @@ 
 	global $user_info, $modSettings, $smcFunc;
 
 	// Force $boards to be an array.
-	if (!is_array($boards))
-		$boards = array($boards);
-	else
-		$boards = array_unique($boards);
+	if (!is_array($boards)) {
+			$boards = array($boards);
+	} else {
+			$boards = array_unique($boards);
+	}
 
 	// No boards, nothing to mark as read.
-	if (empty($boards))
-		return;
+	if (empty($boards)) {
+			return;
+	}
 
 	// Allow the user to mark a board as unread.
 	if ($unread)
@@ -65,8 +68,9 @@ 
 	else
 	{
 		$markRead = array();
-		foreach ($boards as $board)
-			$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		foreach ($boards as $board) {
+					$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $board);
+		}
 
 		// Update log_mark_read and log_boards.
 		$smcFunc['db_insert']('replace',
@@ -99,8 +103,9 @@ 
 	list ($lowest_topic) = $smcFunc['db_fetch_row']($result);
 	$smcFunc['db_free_result']($result);
 
-	if (empty($lowest_topic))
-		return;
+	if (empty($lowest_topic)) {
+			return;
+	}
 
 	// @todo SLOW This query seems to eat it sometimes.
 	$result = $smcFunc['db_query']('', '
@@ -118,12 +123,13 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($result);
 
-	if (!empty($topics))
-		$smcFunc['db_query']('', '
+	if (!empty($topics)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_topics
 			WHERE id_member = {int:current_member}
 				AND id_topic IN ({array_int:topic_list})',
@@ -132,7 +138,8 @@ 
 				'topic_list' => $topics,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Mark one or more boards as read.
@@ -157,23 +164,26 @@ 
 			)
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($result);
 
-		if (!empty($boards))
-			markBoardsRead($boards, isset($_REQUEST['unread']));
+		if (!empty($boards)) {
+					markBoardsRead($boards, isset($_REQUEST['unread']));
+		}
 
 		$_SESSION['id_msg_last_visit'] = $modSettings['maxMsgID'];
-		if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false)
-			redirectexit('action=unread');
+		if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false) {
+					redirectexit('action=unread');
+		}
 
-		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		if (isset($_SESSION['topicseen_cache'])) {
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		redirectexit();
-	}
-	elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
+	} elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
 	{
 		// Make sure all the topics are integers!
 		$topics = array_map('intval', explode('-', $_REQUEST['topics']));
@@ -189,13 +199,15 @@ 
 			)
 		);
 		$logged_topics = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$logged_topics[$row['id_topic']] = $row['unwatched'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$logged_topics[$row['id_topic']] = $row['unwatched'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$markRead = array();
-		foreach ($topics as $id_topic)
-			$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $id_topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		foreach ($topics as $id_topic) {
+					$markRead[] = array($modSettings['maxMsgID'], $user_info['id'], $id_topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -204,8 +216,9 @@ 
 			array('id_member', 'id_topic')
 		);
 
-		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		if (isset($_SESSION['topicseen_cache'])) {
+					$_SESSION['topicseen_cache'] = array();
+		}
 
 		redirectexit('action=unreadreplies');
 	}
@@ -230,11 +243,13 @@ 
 		if (!empty($_GET['t']))
 		{
 			// If they read the whole topic, go back to the beginning.
-			if ($_GET['t'] >= $topicinfo['id_last_msg'])
-				$earlyMsg = 0;
+			if ($_GET['t'] >= $topicinfo['id_last_msg']) {
+							$earlyMsg = 0;
+			}
 			// If they want to mark the whole thing read, same.
-			elseif ($_GET['t'] <= $topicinfo['id_first_msg'])
-				$earlyMsg = 0;
+			elseif ($_GET['t'] <= $topicinfo['id_first_msg']) {
+							$earlyMsg = 0;
+			}
 			// Otherwise, get the latest message before the named one.
 			else
 			{
@@ -255,9 +270,9 @@ 
 			}
 		}
 		// Marking read from first page?  That's the whole topic.
-		elseif ($_REQUEST['start'] == 0)
-			$earlyMsg = 0;
-		else
+		elseif ($_REQUEST['start'] == 0) {
+					$earlyMsg = 0;
+		} else
 		{
 			$result = $smcFunc['db_query']('', '
 				SELECT id_msg
@@ -285,8 +300,7 @@ 
 		);
 
 		redirectexit('board=' . $board . '.0');
-	}
-	else
+	} else
 	{
 		$categories = array();
 		$boards = array();
@@ -294,17 +308,20 @@ 
 		if (isset($_REQUEST['c']))
 		{
 			$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-			foreach ($_REQUEST['c'] as $c)
-				$categories[] = (int) $c;
+			foreach ($_REQUEST['c'] as $c) {
+							$categories[] = (int) $c;
+			}
 		}
 		if (isset($_REQUEST['boards']))
 		{
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $b)
-				$boards[] = (int) $b;
+			foreach ($_REQUEST['boards'] as $b) {
+							$boards[] = (int) $b;
+			}
+		}
+		if (!empty($board)) {
+					$boards[] = (int) $board;
 		}
-		if (!empty($board))
-			$boards[] = (int) $board;
 
 		if (isset($_REQUEST['children']) && !empty($boards))
 		{
@@ -324,9 +341,10 @@ 
 					'board_list' => $boards,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if (in_array($row['id_parent'], $boards))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if (in_array($row['id_parent'], $boards))
 					$boards[] = $row['id_board'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -343,8 +361,9 @@ 
 			$clauseParameters['board_list'] = $boards;
 		}
 
-		if (empty($clauses))
-			redirectexit();
+		if (empty($clauses)) {
+					redirectexit();
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board
@@ -355,19 +374,22 @@ 
 			))
 		);
 		$boards = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($boards))
-			redirectexit();
+		if (empty($boards)) {
+					redirectexit();
+		}
 
 		markBoardsRead($boards, isset($_REQUEST['unread']));
 
 		foreach ($boards as $b)
 		{
-			if (isset($_SESSION['topicseen_cache'][$b]))
-				$_SESSION['topicseen_cache'][$b] = array();
+			if (isset($_SESSION['topicseen_cache'][$b])) {
+							$_SESSION['topicseen_cache'][$b] = array();
+			}
 		}
 
 		if (!isset($_REQUEST['unread']))
@@ -385,8 +407,9 @@ 
 			if ($smcFunc['db_num_rows']($result) > 0)
 			{
 				$logBoardInserts = array();
-				while ($row = $smcFunc['db_fetch_assoc']($result))
-					$logBoardInserts[] = array($modSettings['maxMsgID'], $user_info['id'], $row['id_board']);
+				while ($row = $smcFunc['db_fetch_assoc']($result)) {
+									$logBoardInserts[] = array($modSettings['maxMsgID'], $user_info['id'], $row['id_board']);
+				}
 
 				$smcFunc['db_insert']('replace',
 					'{db_prefix}log_boards',
@@ -397,17 +420,18 @@ 
 			}
 			$smcFunc['db_free_result']($result);
 
-			if (empty($board))
-				redirectexit();
-			else
-				redirectexit('board=' . $board . '.0');
-		}
-		else
+			if (empty($board)) {
+							redirectexit();
+			} else {
+							redirectexit('board=' . $board . '.0');
+			}
+		} else
 		{
-			if (empty($board_info['parent']))
-				redirectexit();
-			else
-				redirectexit('board=' . $board_info['parent'] . '.0');
+			if (empty($board_info['parent'])) {
+							redirectexit();
+			} else {
+							redirectexit('board=' . $board_info['parent'] . '.0');
+			}
 		}
 	}
 }
@@ -432,11 +456,13 @@ 
 			'selected_message' => (int) $messageID,
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) > 0)
-		list ($memberID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) > 0) {
+			list ($memberID) = $smcFunc['db_fetch_row']($result);
+	}
 	// The message doesn't even exist.
-	else
-		$memberID = 0;
+	else {
+			$memberID = 0;
+	}
 	$smcFunc['db_free_result']($result);
 
 	return (int) $memberID;
@@ -457,8 +483,9 @@ 
 	getBoardTree();
 
 	// Make sure given boards and categories exist.
-	if (!isset($boards[$board_id]) || (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) || (isset($boardOptions['target_category']) && !isset($cat_tree[$boardOptions['target_category']])))
-		fatal_lang_error('no_board');
+	if (!isset($boards[$board_id]) || (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) || (isset($boardOptions['target_category']) && !isset($cat_tree[$boardOptions['target_category']]))) {
+			fatal_lang_error('no_board');
+	}
 
 	$id = $board_id;
 	call_integration_hook('integrate_pre_modify_board', array($id, &$boardOptions));
@@ -486,8 +513,9 @@ 
 			$child_level = 0;
 			$id_parent = 0;
 			$after = 0;
-			foreach ($cat_tree[$id_cat]['children'] as $id_board => $dummy)
-				$after = max($after, $boards[$id_board]['order']);
+			foreach ($cat_tree[$id_cat]['children'] as $id_board => $dummy) {
+							$after = max($after, $boards[$id_board]['order']);
+			}
 		}
 
 		// Make the board a child of a given board.
@@ -498,17 +526,19 @@ 
 			$id_parent = $boardOptions['target_board'];
 
 			// People can be creative, in many ways...
-			if (isChildOf($id_parent, $board_id))
-				fatal_lang_error('mboards_parent_own_child_error', false);
-			elseif ($id_parent == $board_id)
-				fatal_lang_error('mboards_board_own_child_error', false);
+			if (isChildOf($id_parent, $board_id)) {
+							fatal_lang_error('mboards_parent_own_child_error', false);
+			} elseif ($id_parent == $board_id) {
+							fatal_lang_error('mboards_board_own_child_error', false);
+			}
 
 			$after = $boards[$boardOptions['target_board']]['order'];
 
 			// Check if there are already children and (if so) get the max board order.
-			if (!empty($boards[$id_parent]['tree']['children']) && empty($boardOptions['move_first_child']))
-				foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
+			if (!empty($boards[$id_parent]['tree']['children']) && empty($boardOptions['move_first_child'])) {
+							foreach ($boards[$id_parent]['tree']['children'] as $childBoard_id => $dummy)
 					$after = max($after, $boards[$childBoard_id]['order']);
+			}
 		}
 
 		// Place a board before or after another board, on the same child level.
@@ -521,8 +551,9 @@ 
 		}
 
 		// Oops...?
-		else
-			trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		else {
+					trigger_error('modifyBoard(): The move_to value \'' . $boardOptions['move_to'] . '\' is incorrect', E_USER_ERROR);
+		}
 
 		// Get a list of children of this board.
 		$childList = array();
@@ -531,14 +562,16 @@ 
 		// See if there are changes that affect children.
 		$childUpdates = array();
 		$levelDiff = $child_level - $boards[$board_id]['level'];
-		if ($levelDiff != 0)
-			$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
-		if ($id_cat != $boards[$board_id]['category'])
-			$childUpdates[] = 'id_cat = {int:category}';
+		if ($levelDiff != 0) {
+					$childUpdates[] = 'child_level = child_level ' . ($levelDiff > 0 ? '+ ' : '') . '{int:level_diff}';
+		}
+		if ($id_cat != $boards[$board_id]['category']) {
+					$childUpdates[] = 'id_cat = {int:category}';
+		}
 
 		// Fix the children of this board.
-		if (!empty($childList) && !empty($childUpdates))
-			$smcFunc['db_query']('', '
+		if (!empty($childList) && !empty($childUpdates)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET ' . implode(',
 					', $childUpdates) . '
@@ -549,6 +582,7 @@ 
 					'level_diff' => $levelDiff,
 				)
 			);
+		}
 
 		// Make some room for this spot.
 		$smcFunc['db_query']('', '
@@ -644,8 +678,8 @@ 
 	call_integration_hook('integrate_modify_board', array($id, $boardOptions, &$boardUpdates, &$boardUpdateParameters));
 
 	// Do the updates (if any).
-	if (!empty($boardUpdates))
-		$smcFunc['db_query']('', '
+	if (!empty($boardUpdates)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET
 				' . implode(',
@@ -655,6 +689,7 @@ 
 				'selected_board' => $board_id,
 			))
 		);
+	}
 
 	// Set moderators of this board.
 	if (isset($boardOptions['moderators']) || isset($boardOptions['moderator_string']) || isset($boardOptions['moderator_groups']) || isset($boardOptions['moderator_group_string']))
@@ -679,13 +714,15 @@ 
 			{
 				$moderators[$k] = trim($moderators[$k]);
 
-				if (strlen($moderators[$k]) == 0)
-					unset($moderators[$k]);
+				if (strlen($moderators[$k]) == 0) {
+									unset($moderators[$k]);
+				}
 			}
 
 			// Find all the id_member's for the member_name's in the list.
-			if (empty($boardOptions['moderators']))
-				$boardOptions['moderators'] = array();
+			if (empty($boardOptions['moderators'])) {
+							$boardOptions['moderators'] = array();
+			}
 			if (!empty($moderators))
 			{
 				$request = $smcFunc['db_query']('', '
@@ -698,8 +735,9 @@ 
 						'limit' => count($moderators),
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$boardOptions['moderators'][] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$boardOptions['moderators'][] = $row['id_member'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
 		}
@@ -708,8 +746,9 @@ 
 		if (!empty($boardOptions['moderators']))
 		{
 			$inserts = array();
-			foreach ($boardOptions['moderators'] as $moderator)
-				$inserts[] = array($board_id, $moderator);
+			foreach ($boardOptions['moderators'] as $moderator) {
+							$inserts[] = array($board_id, $moderator);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}moderators',
@@ -739,14 +778,16 @@ 
 			{
 				$moderator_groups[$k] = trim($moderator_groups[$k]);
 
-				if (strlen($moderator_groups[$k]) == 0)
-					unset($moderator_groups[$k]);
+				if (strlen($moderator_groups[$k]) == 0) {
+									unset($moderator_groups[$k]);
+				}
 			}
 
 			/* 	Find all the id_group's for all the group names in the list
 				But skip any invalid ones (invisible/post groups/Administrator/Moderator) */
-			if (empty($boardOptions['moderator_groups']))
-				$boardOptions['moderator_groups'] = array();
+			if (empty($boardOptions['moderator_groups'])) {
+							$boardOptions['moderator_groups'] = array();
+			}
 			if (!empty($moderator_groups))
 			{
 				$request = $smcFunc['db_query']('', '
@@ -777,8 +818,9 @@ 
 		if (!empty($boardOptions['moderator_groups']))
 		{
 			$inserts = array();
-			foreach ($boardOptions['moderator_groups'] as $moderator_group)
-				$inserts[] = array($board_id, $moderator_group);
+			foreach ($boardOptions['moderator_groups'] as $moderator_group) {
+							$inserts[] = array($board_id, $moderator_group);
+			}
 
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}moderator_groups',
@@ -792,14 +834,16 @@ 
 		updateSettings(array('settings_updated' => time()));
 	}
 
-	if (isset($boardOptions['move_to']))
-		reorderBoards();
+	if (isset($boardOptions['move_to'])) {
+			reorderBoards();
+	}
 
 	clean_cache('data');
 
-	if (empty($boardOptions['dont_log']))
-		logAction('edit_board', array('board' => $board_id), 'admin');
-}
+	if (empty($boardOptions['dont_log'])) {
+			logAction('edit_board', array('board' => $board_id), 'admin');
+	}
+	}
 
 /**
  * Create a new board and set its properties and position.
@@ -815,11 +859,13 @@ 
 	global $boards, $smcFunc;
 
 	// Trigger an error if one of the required values is not set.
-	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category']))
-		trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category'])) {
+			trigger_error('createBoard(): One or more of the required options is not set', E_USER_ERROR);
+	}
 
-	if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board']))
-		trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board'])) {
+			trigger_error('createBoard(): Target board is not set', E_USER_ERROR);
+	}
 
 	// Set every optional value to its default value.
 	$boardOptions += array(
@@ -853,8 +899,9 @@ 
 		1
 	);
 
-	if (empty($board_id))
-		return 0;
+	if (empty($board_id)) {
+			return 0;
+	}
 
 	// Change the board according to the given specifications.
 	modifyBoard($board_id, $boardOptions);
@@ -917,8 +964,9 @@ 
 	global $sourcedir, $boards, $smcFunc;
 
 	// No boards to delete? Return!
-	if (empty($boards_to_remove))
-		return;
+	if (empty($boards_to_remove)) {
+			return;
+	}
 
 	getBoardTree();
 
@@ -929,12 +977,14 @@ 
 	{
 		// Get a list of the child boards that will also be removed.
 		$child_boards_to_remove = array();
-		foreach ($boards_to_remove as $board_to_remove)
-			recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		foreach ($boards_to_remove as $board_to_remove) {
+					recursiveBoards($child_boards_to_remove, $boards[$board_to_remove]['tree']);
+		}
 
 		// Merge the children with their parents.
-		if (!empty($child_boards_to_remove))
-			$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		if (!empty($child_boards_to_remove)) {
+					$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
+		}
 	}
 	// Move the children to a safe home.
 	else
@@ -942,10 +992,11 @@ 
 		foreach ($boards_to_remove as $id_board)
 		{
 			// @todo Separate category?
-			if ($moveChildrenTo === 0)
-				fixChildren($id_board, 0, 0);
-			else
-				fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			if ($moveChildrenTo === 0) {
+							fixChildren($id_board, 0, 0);
+			} else {
+							fixChildren($id_board, $boards[$moveChildrenTo]['level'] + 1, $moveChildrenTo);
+			}
 		}
 	}
 
@@ -959,8 +1010,9 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/RemoveTopic.php');
@@ -1048,8 +1100,9 @@ 
 	clean_cache('data');
 
 	// Let's do some serious logging.
-	foreach ($boards_to_remove as $id_board)
-		logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	foreach ($boards_to_remove as $id_board) {
+			logAction('delete_board', array('boardname' => $boards[$id_board]['name']), 'admin');
+	}
 
 	reorderBoards();
 }
@@ -1068,8 +1121,8 @@ 
 	$board_order = 0;
 	foreach ($cat_tree as $catID => $dummy)
 	{
-		foreach ($boardList[$catID] as $boardID)
-			if ($boards[$boardID]['order'] != ++$board_order)
+		foreach ($boardList[$catID] as $boardID) {
+					if ($boards[$boardID]['order'] != ++$board_order)
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET board_order = {int:new_order}
@@ -1079,6 +1132,7 @@ 
 						'selected_board' => $boardID,
 					)
 				);
+		}
 	}
 
 	// Empty the board order cache
@@ -1107,8 +1161,9 @@ 
 		)
 	);
 	$children = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$children[] = $row['id_board'];
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$children[] = $row['id_board'];
+	}
 	$smcFunc['db_free_result']($result);
 
 	// ...and set it to a new parent and child_level.
@@ -1124,9 +1179,10 @@ 
 	);
 
 	// Recursively fix the children of the children.
-	foreach ($children as $child)
-		fixChildren($child, $newLevel + 1, $child);
-}
+	foreach ($children as $child) {
+			fixChildren($child, $newLevel + 1, $child);
+	}
+	}
 
 /**
  * Tries to load up the entire board order and category very very quickly
@@ -1143,8 +1199,9 @@ 
 		'boards' => array(),
 	);
 
-	if (!empty($tree_order['boards']))
-		return $tree_order;
+	if (!empty($tree_order['boards'])) {
+			return $tree_order;
+	}
 
 	if (($cached = cache_get_data('board_order', 86400)) !== null)
 	{
@@ -1160,8 +1217,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!in_array($row['id_cat'], $tree_order['cats']))
-			$tree_order['cats'][] = $row['id_cat'];
+		if (!in_array($row['id_cat'], $tree_order['cats'])) {
+					$tree_order['cats'][] = $row['id_cat'];
+		}
 		$tree_order['boards'][] = $row['id_board'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -1181,16 +1239,19 @@ 
 	$tree = getTreeOrder();
 
 	$ordered = array();
-	foreach ($tree['boards'] as $board)
-		if (!empty($boards[$board]))
+	foreach ($tree['boards'] as $board) {
+			if (!empty($boards[$board]))
 		{
 			$ordered[$board] = $boards[$board];
+	}
 
-			if (is_array($ordered[$board]) && !empty($ordered[$board]['boards']))
-				sortBoards($ordered[$board]['boards']);
+			if (is_array($ordered[$board]) && !empty($ordered[$board]['boards'])) {
+							sortBoards($ordered[$board]['boards']);
+			}
 
-			if (is_array($ordered[$board]) && !empty($ordered[$board]['children']))
-				sortBoards($ordered[$board]['children']);
+			if (is_array($ordered[$board]) && !empty($ordered[$board]['children'])) {
+							sortBoards($ordered[$board]['children']);
+			}
 		}
 
 	$boards = $ordered;
@@ -1206,12 +1267,14 @@ 
 	$tree = getTreeOrder();
 
 	$ordered = array();
-	foreach ($tree['cats'] as $cat)
-		if (!empty($categories[$cat]))
+	foreach ($tree['cats'] as $cat) {
+			if (!empty($categories[$cat]))
 		{
 			$ordered[$cat] = $categories[$cat];
-			if (!empty($ordered[$cat]['boards']))
-				sortBoards($ordered[$cat]['boards']);
+	}
+			if (!empty($ordered[$cat]['boards'])) {
+							sortBoards($ordered[$cat]['boards']);
+			}
 		}
 
 	$categories = $ordered;
@@ -1227,8 +1290,9 @@ 
 {
 	global $smcFunc, $scripturl, $txt;
 
-	if (empty($boards))
-		return array();
+	if (empty($boards)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mem.id_member, mem.real_name, mo.id_board
@@ -1242,8 +1306,9 @@ 
 	$moderators = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($moderators[$row['id_board']]))
-			$moderators[$row['id_board']] = array();
+		if (empty($moderators[$row['id_board']])) {
+					$moderators[$row['id_board']] = array();
+		}
 
 		$moderators[$row['id_board']][] = array(
 			'id' => $row['id_member'],
@@ -1267,8 +1332,9 @@ 
 {
 	global $smcFunc, $scripturl, $txt;
 
-	if (empty($boards))
-		return array();
+	if (empty($boards)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mg.id_group, mg.group_name, bg.id_board
@@ -1282,8 +1348,9 @@ 
 	$groups = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($groups[$row['id_board']]))
-			$groups[$row['id_board']] = array();
+		if (empty($groups[$row['id_board']])) {
+					$groups[$row['id_board']] = array();
+		}
 
 		$groups[$row['id_board']][] = array(
 			'id' => $row['id_group'],
@@ -1358,8 +1425,9 @@ 
 
 		if (!empty($row['id_board']))
 		{
-			if ($row['child_level'] != $curLevel)
-				$prevBoard = 0;
+			if ($row['child_level'] != $curLevel) {
+							$prevBoard = 0;
+			}
 
 			$boards[$row['id_board']] = array(
 				'id' => $row['id_board'],
@@ -1391,16 +1459,16 @@ 
 					'children' => array()
 				);
 				$boards[$row['id_board']]['tree'] = &$cat_tree[$row['id_cat']]['children'][$row['id_board']];
-			}
-			else
+			} else
 			{
 				// Parent doesn't exist!
-				if (!isset($boards[$row['id_parent']]['tree']))
-					fatal_lang_error('no_valid_parent', false, array($row['board_name']));
+				if (!isset($boards[$row['id_parent']]['tree'])) {
+									fatal_lang_error('no_valid_parent', false, array($row['board_name']));
+				}
 
 				// Wrong childlevel...we can silently fix this...
-				if ($boards[$row['id_parent']]['tree']['node']['level'] != $row['child_level'] - 1)
-					$smcFunc['db_query']('', '
+				if ($boards[$row['id_parent']]['tree']['node']['level'] != $row['child_level'] - 1) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET child_level = {int:new_child_level}
 						WHERE id_board = {int:selected_board}',
@@ -1409,6 +1477,7 @@ 
 							'selected_board' => $row['id_board'],
 						)
 					);
+				}
 
 				$boards[$row['id_parent']]['tree']['children'][$row['id_board']] = array(
 					'node' => &$boards[$row['id_board']],
@@ -1442,8 +1511,9 @@ 
  */
 function recursiveBoards(&$_boardList, &$_tree)
 {
-	if (empty($_tree['children']))
-		return;
+	if (empty($_tree['children'])) {
+			return;
+	}
 
 	foreach ($_tree['children'] as $id => $node)
 	{
@@ -1462,11 +1532,13 @@ 
 {
 	global $boards;
 
-	if (empty($boards[$child]['parent']))
-		return false;
+	if (empty($boards[$child]['parent'])) {
+			return false;
+	}
 
-	if ($boards[$child]['parent'] == $parent)
-		return true;
+	if ($boards[$child]['parent'] == $parent) {
+			return true;
+	}
 
 	return isChildOf($boards[$child]['parent'], $parent);
 }

Sources/Modlog.php

Braces +97 added lines, -73 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Prepares the information from the moderation log for viewing.
@@ -32,14 +33,16 @@ 
 
 	// Are we looking at the moderation log or the administration log.
 	$context['log_type'] = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 3 : 1;
-	if ($context['log_type'] == 3)
-		isAllowedTo('admin_forum');
+	if ($context['log_type'] == 3) {
+			isAllowedTo('admin_forum');
+	}
 
 	// These change dependant on whether we are viewing the moderation or admin log.
-	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin')
-		$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
-	else
-		$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin') {
+			$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
+	} else {
+			$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	}
 
 	$context['can_delete'] = allowedTo('admin_forum');
 
@@ -67,8 +70,7 @@ 
 		$log_type = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 'admin' : 'moderate';
 		logAction('clearlog_' . $log_type, array(), $log_type);
 
-	}
-	elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
+	} elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
 	{
 		checkSession();
 		validateToken('mod-ml');
@@ -114,15 +116,17 @@ 
 		'ip' => array('sql' => 'lm.ip', 'label' => $txt['modlog_ip'])
 	);
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params_column = $searchTypes[$search_params_type]['sql'];
 	$search_params = array(
@@ -297,13 +301,14 @@ 
 	$context['sub_template'] = 'show_list';
 	$context['default_list'] = 'moderation_log_list';
 
-	if (isset($context['moderation_menu_name']))
-		$context[$context['moderation_menu_name']]['tab_data'] = array(
+	if (isset($context['moderation_menu_name'])) {
+			$context[$context['moderation_menu_name']]['tab_data'] = array(
 			'title' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log'],
 			'help' => $context['log_type'] == 3 ? 'adminlog' : 'modlog',
 			'description' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log_desc']
 		);
-}
+	}
+	}
 
 /**
  * Get the number of mod log entries.
@@ -407,30 +412,35 @@ 
 		// Add on some of the column stuff info
 		if (!empty($row['id_board']))
 		{
-			if ($row['action'] == 'move')
-				$row['extra']['board_to'] = $row['id_board'];
-			else
-				$row['extra']['board'] = $row['id_board'];
+			if ($row['action'] == 'move') {
+							$row['extra']['board_to'] = $row['id_board'];
+			} else {
+							$row['extra']['board'] = $row['id_board'];
+			}
 		}
 
-		if (!empty($row['id_topic']))
-			$row['extra']['topic'] = $row['id_topic'];
-		if (!empty($row['id_msg']))
-			$row['extra']['message'] = $row['id_msg'];
+		if (!empty($row['id_topic'])) {
+					$row['extra']['topic'] = $row['id_topic'];
+		}
+		if (!empty($row['id_msg'])) {
+					$row['extra']['message'] = $row['id_msg'];
+		}
 
 		// Is this associated with a topic?
-		if (isset($row['extra']['topic']))
-			$topics[(int) $row['extra']['topic']][] = $row['id_action'];
-		if (isset($row['extra']['new_topic']))
-			$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		if (isset($row['extra']['topic'])) {
+					$topics[(int) $row['extra']['topic']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['new_topic'])) {
+					$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		}
 
 		// How about a member?
 		if (isset($row['extra']['member']))
 		{
 			// Guests don't have names!
-			if (empty($row['extra']['member']))
-				$row['extra']['member'] = $txt['modlog_parameter_guest'];
-			else
+			if (empty($row['extra']['member'])) {
+							$row['extra']['member'] = $txt['modlog_parameter_guest'];
+			} else
 			{
 				// Try to find it...
 				$members[(int) $row['extra']['member']][] = $row['id_action'];
@@ -438,35 +448,42 @@ 
 		}
 
 		// Associated with a board?
-		if (isset($row['extra']['board_to']))
-			$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
-		if (isset($row['extra']['board_from']))
-			$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
-		if (isset($row['extra']['board']))
-			$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		if (isset($row['extra']['board_to'])) {
+					$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board_from'])) {
+					$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board'])) {
+					$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		}
 
 		// A message?
-		if (isset($row['extra']['message']))
-			$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		if (isset($row['extra']['message'])) {
+					$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		}
 
 		// IP Info?
-		if (isset($row['extra']['ip_range']))
-			if ($seeIP)
+		if (isset($row['extra']['ip_range'])) {
+					if ($seeIP)
 				$row['extra']['ip_range'] = '<a href="' . $scripturl . '?action=trackip;searchip=' . $row['extra']['ip_range'] . '">' . $row['extra']['ip_range'] . '</a>';
-			else
-				$row['extra']['ip_range'] = $txt['logged'];
+		} else {
+							$row['extra']['ip_range'] = $txt['logged'];
+			}
 
 		// Email?
-		if (isset($row['extra']['email']))
-			$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		if (isset($row['extra']['email'])) {
+					$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		}
 
 		// Bans are complex.
 		if ($row['action'] == 'ban' || $row['action'] == 'banremove')
 		{
 			$row['action_text'] = $txt['modlog_ac_ban' . ($row['action'] == 'banremove' ? '_remove' : '')];
-			foreach (array('member', 'email', 'ip_range', 'hostname') as $type)
-				if (isset($row['extra'][$type]))
+			foreach (array('member', 'email', 'ip_range', 'hostname') as $type) {
+							if (isset($row['extra'][$type]))
 					$row['action_text'] .= $txt['modlog_ac_ban_trigger_' . $type];
+			}
 		}
 
 		// The array to go to the template. Note here that action is set to a "default" value of the action doesn't match anything in the descriptions. Allows easy adding of logging events with basic details.
@@ -502,12 +519,13 @@ 
 			foreach ($boards[$row['id_board']] as $action)
 			{
 				// Make the board number into a link - dealing with moving too.
-				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board'])
-					$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board'])
-					$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board'])
-					$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board']) {
+									$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board']) {
+									$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board']) {
+									$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -541,10 +559,11 @@ 
 				);
 
 				// Make the topic number into a link - dealing with splitting too.
-				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic'])
-					$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
-				elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic'])
-					$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic']) {
+									$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				} elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic']) {
+									$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -577,8 +596,9 @@ 
 				);
 
 				// Make the message number into a link.
-				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg'])
-					$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg']) {
+									$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -618,25 +638,29 @@ 
 	foreach ($entries as $k => $entry)
 	{
 		// Make any message info links so its easier to go find that message.
-		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id'])))
-			$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id']))) {
+					$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		}
 
 		// Mark up any deleted members, topics and boards.
-		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type)
-			if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
+		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type) {
+					if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
 				$entries[$k]['extra'][$type] = sprintf($txt['modlog_id'], $entry['extra'][$type]);
+		}
 
 		if (isset($entry['extra']['report']))
 		{
 			// Member profile reports go in a different area
-			if (stristr($entry['action'], 'user_report'))
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
-			else
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			if (stristr($entry['action'], 'user_report')) {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			} else {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			}
 		}
 
-		if (empty($entries[$k]['action_text']))
-			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		if (empty($entries[$k]['action_text'])) {
+					$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		}
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
 			function ($matches) use ($entries, $k)
 			{

Sources/RepairBoards.php

Braces +119 added lines, -85 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Finds or repairs errors in the database to fix possible problems.
@@ -50,8 +51,9 @@ 
 	);
 
 	// Start displaying errors without fixing them.
-	if (isset($_GET['fixErrors']))
-		checkSession('get');
+	if (isset($_GET['fixErrors'])) {
+			checkSession('get');
+	}
 
 	// Will want this.
 	loadForumTests();
@@ -69,11 +71,11 @@ 
 			$_SESSION['repairboards_to_fix'] = $context['to_fix'];
 			$_SESSION['repairboards_to_fix2'] = null;
 
-			if (empty($context['repair_errors']))
-				$context['repair_errors'][] = '???';
+			if (empty($context['repair_errors'])) {
+							$context['repair_errors'][] = '???';
+			}
 		}
-	}
-	else
+	} else
 	{
 		$context['error_search'] = false;
 		$context['to_fix'] = isset($_SESSION['repairboards_to_fix']) ? $_SESSION['repairboards_to_fix'] : array();
@@ -120,16 +122,19 @@ 
 
 	// More time, I need more time!
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Errr, wait.  How much time has this taken already?
-	if (!$force && time() - array_sum(explode(' ', $time_start)) < 3)
-		return;
+	if (!$force && time() - array_sum(explode(' ', $time_start)) < 3) {
+			return;
+	}
 
 	// Restore the query cache if interested.
-	if (!empty($db_temp_cache))
-		$db_cache = $db_temp_cache;
+	if (!empty($db_temp_cache)) {
+			$db_cache = $db_temp_cache;
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=repairboards' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -138,10 +143,11 @@ 
 	$context['sub_template'] = 'not_done';
 
 	// Change these two if more steps are added!
-	if (empty($max_substep))
-		$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
-	else
-		$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	if (empty($max_substep)) {
+			$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
+	} else {
+			$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	}
 
 	// Never more than 100%!
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -612,8 +618,9 @@ 
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
 
 				// Not really a problem?
-				if ($row['myid_first_msg'] == $row['myid_first_msg'] && $row['myid_first_msg'] == $row['myid_first_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['myid_first_msg'] == $row['myid_first_msg'] && $row['myid_first_msg'] == $row['myid_first_msg'] && $row['approved'] == $row['firstmsg_approved']) {
+									return false;
+				}
 
 				$memberStartedID = (int) getMsgMemberID($row['myid_first_msg']);
 				$memberUpdatedID = (int) getMsgMemberID($row['myid_last_msg']);
@@ -637,15 +644,19 @@ 
 			'message_function' => function ($row) use ($txt, &$context)
 			{
 				// A pretend error?
-				if ($row['myid_first_msg'] == $row['myid_first_msg'] && $row['myid_first_msg'] == $row['myid_first_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				if ($row['myid_first_msg'] == $row['myid_first_msg'] && $row['myid_first_msg'] == $row['myid_first_msg'] && $row['approved'] == $row['firstmsg_approved']) {
+									return false;
+				}
 
-				if ($row['id_first_msg'] != $row['myid_first_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
-				if ($row['id_last_msg'] != $row['myid_last_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
-				if ($row['approved'] != $row['firstmsg_approved'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				if ($row['id_first_msg'] != $row['myid_first_msg']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
+				}
+				if ($row['id_last_msg'] != $row['myid_last_msg']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
+				}
+				if ($row['approved'] != $row['firstmsg_approved']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				}
 
 				return true;
 			},
@@ -675,8 +686,9 @@ 
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
 
 				// Not really a problem?
-				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				if ($row['my_num_replies'] == $row['num_replies']) {
+									return false;
+				}
 
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
@@ -695,11 +707,13 @@ 
 				global $txt, $context;
 
 				// Just joking?
-				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				if ($row['my_num_replies'] == $row['num_replies']) {
+									return false;
+				}
 
-				if ($row['num_replies'] != $row['my_num_replies'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				if ($row['num_replies'] != $row['my_num_replies']) {
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				}
 
 				return true;
 
@@ -1290,8 +1304,9 @@ 
 				$inserts = array();
 				while ($row = $smcFunc['db_fetch_assoc']($result))
 				{
-					foreach (text2words($row['subject']) as $word)
-						$inserts[] = array($word, $row['id_topic']);
+					foreach (text2words($row['subject']) as $word) {
+											$inserts[] = array($word, $row['id_topic']);
+					}
 					if (count($inserts) > 500)
 					{
 						$smcFunc['db_insert']('ignore',
@@ -1305,13 +1320,14 @@ 
 
 				}
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_subjects',
 						array('word' => 'string', 'id_topic' => 'int'),
 						$inserts,
 						array('word', 'id_topic')
 					);
+				}
 
 		},
 			'message_function' => function ($row)
@@ -1581,8 +1597,9 @@ 
 		$current_step++;
 
 		// Already done this?
-		if ($_GET['step'] > $current_step)
-			continue;
+		if ($_GET['step'] > $current_step) {
+					continue;
+		}
 
 		// If we're fixing it but it ain't broke why try?
 		if ($do_fix && !in_array($error_type, $to_fix))
@@ -1611,14 +1628,16 @@ 
 		while (!$done)
 		{
 			// Make sure there's at least one ID to test.
-			if (isset($test['substeps']) && empty($step_max))
-				break;
+			if (isset($test['substeps']) && empty($step_max)) {
+							break;
+			}
 
 			// What is the testing query (Changes if we are testing or fixing)
-			if (!$do_fix)
-				$test_query = 'check_query';
-			else
-				$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			if (!$do_fix) {
+							$test_query = 'check_query';
+			} else {
+							$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			}
 
 			// Do the test...
 			$request = $smcFunc['db_query']('',
@@ -1628,10 +1647,11 @@ 
 			);
 
 			// Does it need a fix?
-			if (!empty($test['check_type']) && $test['check_type'] == 'count')
-				list ($needs_fix) = $smcFunc['db_fetch_row']($request);
-			else
-				$needs_fix = $smcFunc['db_num_rows']($request);
+			if (!empty($test['check_type']) && $test['check_type'] == 'count') {
+							list ($needs_fix) = $smcFunc['db_fetch_row']($request);
+			} else {
+							$needs_fix = $smcFunc['db_num_rows']($request);
+			}
 
 			$total_queries++;
 
@@ -1643,8 +1663,9 @@ 
 					// Assume need to fix.
 					$found_errors = true;
 
-					if (isset($test['message']))
-						$context['repair_errors'][] = $txt[$test['message']];
+					if (isset($test['message'])) {
+											$context['repair_errors'][] = $txt[$test['message']];
+					}
 
 					// One per row!
 					elseif (isset($test['messages']))
@@ -1654,10 +1675,11 @@ 
 							$variables = $test['messages'];
 							foreach ($variables as $k => $v)
 							{
-								if ($k == 0 && isset($txt[$v]))
-									$variables[$k] = $txt[$v];
-								elseif ($k > 0 && isset($row[$v]))
-									$variables[$k] = $row[$v];
+								if ($k == 0 && isset($txt[$v])) {
+																	$variables[$k] = $txt[$v];
+								} elseif ($k > 0 && isset($row[$v])) {
+																	$variables[$k] = $row[$v];
+								}
 							}
 							$context['repair_errors'][] = call_user_func_array('sprintf', $variables);
 						}
@@ -1668,13 +1690,15 @@ 
 					{
 						// Find out if there are actually errors.
 						$found_errors = false;
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$found_errors |= $test['message_function']($row);
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$found_errors |= $test['message_function']($row);
+						}
 					}
 
 					// Actually have something to fix?
-					if ($found_errors)
-						$to_fix[] = $error_type;
+					if ($found_errors) {
+											$to_fix[] = $error_type;
+					}
 				}
 
 				// We want to fix, we need to fix - so work out what exactly to do!
@@ -1684,8 +1708,9 @@ 
 					if (isset($test['fix_collect']))
 					{
 						$ids = array();
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$ids[] = $row[$test['fix_collect']['index']];
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$ids[] = $row[$test['fix_collect']['index']];
+						}
 						if (!empty($ids))
 						{
 							// Fix it!
@@ -1694,30 +1719,34 @@ 
 					}
 
 					// Simply executing a fix it query?
-					elseif (isset($test['fix_it_query']))
-						$smcFunc['db_query']('',
+					elseif (isset($test['fix_it_query'])) {
+											$smcFunc['db_query']('',
 							$test['fix_it_query'],
 							array(
 							)
 						);
+					}
 
 					// Do we have some processing to do?
 					elseif (isset($test['fix_processing']))
 					{
-						while ($row = $smcFunc['db_fetch_assoc']($request))
-							$test['fix_processing']($row);
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
+													$test['fix_processing']($row);
+						}
 					}
 
 					// What about the full set of processing?
-					elseif (isset($test['fix_full_processing']))
-						$test['fix_full_processing']($request);
+					elseif (isset($test['fix_full_processing'])) {
+											$test['fix_full_processing']($request);
+					}
 
 					// Do we have other things we need to fix as a result?
 					if (!empty($test['force_fix']))
 					{
-						foreach ($test['force_fix'] as $item)
-							if (!in_array($item, $to_fix))
+						foreach ($test['force_fix'] as $item) {
+													if (!in_array($item, $to_fix))
 								$to_fix[] = $item;
+						}
 					}
 				}
 			}
@@ -1735,16 +1764,17 @@ 
 				if ($_GET['substep'] <= $step_max)
 				{
 					pauseRepairProcess($to_fix, $error_type, $step_max);
+				} else {
+									$done = true;
 				}
-				else
-					$done = true;
+			} else {
+							$done = true;
 			}
-			else
-				$done = true;
 
 			// Don't allow more than 1000 queries at a time.
-			if ($total_queries >= 1000)
-				pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			if ($total_queries >= 1000) {
+							pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			}
 		}
 
 		// Keep going.
@@ -1757,8 +1787,9 @@ 
 		if ($do_fix)
 		{
 			$key = array_search($error_type, $to_fix);
-			if ($key !== false && isset($to_fix[$key]))
-				unset($to_fix[$key]);
+			if ($key !== false && isset($to_fix[$key])) {
+							unset($to_fix[$key]);
+			}
 		}
 
 		// Are we done?
@@ -1781,10 +1812,11 @@ 
 	static $createOnce = false;
 
 	// Have we already created it?
-	if ($createOnce)
-		return;
-	else
-		$createOnce = true;
+	if ($createOnce) {
+			return;
+	} else {
+			$createOnce = true;
+	}
 
 	// Back to the forum's default language.
 	loadLanguage('Admin', $language);
@@ -1799,8 +1831,9 @@ 
 			'cat_name' => $txt['salvaged_category_name'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
 	if (empty($salvageCatID))
@@ -1832,8 +1865,9 @@ 
 			'board_name' => $txt['salvaged_board_name'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
 	if (empty($salvageBoardID))

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/ManagePosts.php

Braces +39 added lines, -29 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main entrance point for the 'Posts and topics' screen.
@@ -98,23 +99,23 @@ 
 		{
 			$_POST['censortext'] = explode("\n", strtr($_POST['censortext'], array("\r" => '')));
 
-			foreach ($_POST['censortext'] as $c)
-				list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
-		}
-		elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
+			foreach ($_POST['censortext'] as $c) {
+							list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
+			}
+		} elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
 		{
 			if (is_array($_POST['censor_vulgar']))
 			{
 				foreach ($_POST['censor_vulgar'] as $i => $value)
 				{
-					if (trim(strtr($value, '*', ' ')) == '')
-						unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					if (trim(strtr($value, '*', ' ')) == '') {
+											unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+					}
 				}
 
 				$censored_vulgar = $_POST['censor_vulgar'];
 				$censored_proper = $_POST['censor_proper'];
-			}
-			else
+			} else
 			{
 				$censored_vulgar = explode("\n", strtr($_POST['censor_vulgar'], array("\r" => '')));
 				$censored_proper = explode("\n", strtr($_POST['censor_proper'], array("\r" => '')));
@@ -151,12 +152,14 @@ 
 	$context['censored_words'] = array();
 	for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++)
 	{
-		if (empty($censor_vulgar[$i]))
-			continue;
+		if (empty($censor_vulgar[$i])) {
+					continue;
+		}
 
 		// Skip it, it's either spaces or stars only.
-		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '')
-			continue;
+		if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '') {
+					continue;
+		}
 
 		$context['censored_words'][$smcFunc['htmlspecialchars'](trim($censor_vulgar[$i]))] = isset($censor_proper[$i]) ? $smcFunc['htmlspecialchars']($censor_proper[$i]) : '';
 	}
@@ -187,10 +190,11 @@ 
 
 	// Make an inline conditional a little shorter...
 	$can_spell_check = false;
-	if (function_exists('pspell_new'))
-		$can_spell_check = true;
-	elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv')))
-		$can_spell_check = true;
+	if (function_exists('pspell_new')) {
+			$can_spell_check = true;
+	} elseif (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))) {
+			$can_spell_check = true;
+	}
 
 	// All the settings...
 	$config_vars = array(
@@ -221,8 +225,9 @@ 
 
 	call_integration_hook('integrate_modify_post_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// We'll want this for our easy save.
 	require_once($sourcedir . '/ManageServer.php');
@@ -242,17 +247,20 @@ 
 			db_extend('packages');
 
 			$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-			foreach ($colData as $column)
-				if ($column['name'] == 'body')
+			foreach ($colData as $column) {
+							if ($column['name'] == 'body')
 					$body_type = $column['type'];
+			}
 
-			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text')
-				fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text') {
+							fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+			}
 		}
 
 		// If we're changing the post preview length let's check its valid
-		if (!empty($_POST['preview_characters']))
-			$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		if (!empty($_POST['preview_characters'])) {
+					$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+		}
 
 		call_integration_hook('integrate_save_post_settings');
 
@@ -313,8 +321,9 @@ 
 
 	call_integration_hook('integrate_modify_topic_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');
@@ -367,8 +376,9 @@ 
 		array('int', 'drafts_autosave_frequency', 'postinput' => $txt['manageposts_seconds'], 'subtext' => $txt['drafts_autosave_frequency_subnote']),
 	);
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template ready.
 	require_once($sourcedir . '/ManageServer.php');

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