SimpleMachines / SMF2.1

Sources/Subs-Boards.php

Braces +247 added lines, -175 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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 = '';
-				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, &$boardUpdates, &$boardUpdateParameters));
 
 	// Do the updates (if any).
-	if (!empty($boardUpdates))
-		$request = $smcFunc['db_query']('', '
+	if (!empty($boardUpdates)) {
+			$request = $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 @@ 
 	);
 	$board_id = $smcFunc['db_insert_id']('{db_prefix}boards', 'id_board');
 
-	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'],
@@ -1345,8 +1412,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'],
@@ -1378,16 +1446,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}',
@@ -1396,6 +1464,7 @@ 
 							'selected_board' => $row['id_board'],
 						)
 					);
+				}
 
 				$boards[$row['id_parent']]['tree']['children'][$row['id_board']] = array(
 					'node' => &$boards[$row['id_board']],
@@ -1426,8 +1495,9 @@ 
  */
 function recursiveBoards(&$_boardList, &$_tree)
 {
-	if (empty($_tree['children']))
-		return;
+	if (empty($_tree['children'])) {
+			return;
+	}
 
 	foreach ($_tree['children'] as $id => $node)
 	{
@@ -1446,11 +1516,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/CacheAPI-xcache.php

Braces +19 added lines, -13 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -46,8 +47,9 @@ 
 
 		$supported = function_exists('xcache_get') && function_exists('xcache_set') && ini_get('xcache.var_size') > 0;
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -68,10 +70,11 @@ 
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if ($value === null)
-			return xcache_unset($key);
-		else
-			return xcache_set($key, $value, $ttl);
+		if ($value === null) {
+					return xcache_unset($key);
+		} else {
+					return xcache_set($key, $value, $ttl);
+		}
 	}
 
 	/**
@@ -90,10 +93,12 @@ 
 		}
 
 		// if passed a type, clear that type out
-		if ($type === '' || $type === 'user')
-			xcache_clear_cache(XC_TYPE_VAR, 0);
-		if ($type === '' || $type === 'data')
-			xcache_clear_cache(XC_TYPE_PHP, 0);
+		if ($type === '' || $type === 'user') {
+					xcache_clear_cache(XC_TYPE_VAR, 0);
+		}
+		if ($type === '' || $type === 'data') {
+					xcache_clear_cache(XC_TYPE_PHP, 0);
+		}
 
 		$this->invalidateCache();
 		return true;
@@ -112,8 +117,9 @@ 
 		// While we could md5 this when saving, this could be tricky to be sure it doesn't get corrupted on additional saves.
 		$config_vars[] = array('xcache_adminpass', $txt['cache_xcache_adminpass'], 'db', 'text', 0);
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/Profile-Actions.php

Braces +117 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Activate an account.
@@ -48,8 +49,9 @@ 
 		logAction('approve_member', array('member' => $memID), 'admin');
 
 		// If we are doing approval, update the stats for the member just in case.
-		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15)))
-			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15))) {
+					updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		}
 
 		// Make sure we update the stats too.
 		updateStats('member', false);
@@ -76,8 +78,9 @@ 
 	$issueErrors = array();
 
 	// Doesn't hurt to be overly cautious.
-	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning'))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the base (errors related) stuff done.
 	loadLanguage('Errors');
@@ -135,16 +138,18 @@ 
 
 		// This cannot be empty!
 		$_POST['warn_reason'] = isset($_POST['warn_reason']) ? trim($_POST['warn_reason']) : '';
-		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner'])
-			$issueErrors[] = 'warning_no_reason';
+		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner']) {
+					$issueErrors[] = 'warning_no_reason';
+		}
 		$_POST['warn_reason'] = $smcFunc['htmlspecialchars']($_POST['warn_reason']);
 
 		$_POST['warning_level'] = (int) $_POST['warning_level'];
 		$_POST['warning_level'] = max(0, min(100, $_POST['warning_level']));
-		if ($_POST['warning_level'] < $context['min_allowed'])
-			$_POST['warning_level'] = $context['min_allowed'];
-		elseif ($_POST['warning_level'] > $context['max_allowed'])
-			$_POST['warning_level'] = $context['max_allowed'];
+		if ($_POST['warning_level'] < $context['min_allowed']) {
+					$_POST['warning_level'] = $context['min_allowed'];
+		} elseif ($_POST['warning_level'] > $context['max_allowed']) {
+					$_POST['warning_level'] = $context['max_allowed'];
+		}
 
 		// Do we actually have to issue them with a PM?
 		$id_notice = 0;
@@ -152,8 +157,9 @@ 
 		{
 			$_POST['warn_sub'] = trim($_POST['warn_sub']);
 			$_POST['warn_body'] = trim($_POST['warn_body']);
-			if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-				$issueErrors[] = 'warning_notify_blank';
+			if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+							$issueErrors[] = 'warning_notify_blank';
+			}
 			// Send the PM?
 			else
 			{
@@ -190,8 +196,8 @@ 
 		if (empty($issueErrors))
 		{
 			// Log what we've done!
-			if (!$context['user']['is_owner'])
-				$smcFunc['db_insert']('',
+			if (!$context['user']['is_owner']) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
 					array(
 						'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'id_recipient' => 'int', 'recipient_name' => 'string-255',
@@ -203,14 +209,14 @@ 
 					),
 					array('id_comment')
 				);
+			}
 
 			// Make the change.
 			updateMemberData($memID, array('warning' => $_POST['warning_level']));
 
 			// Leave a lovely message.
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : $txt['profile_warning_success'];
-		}
-		else
+		} else
 		{
 			// Try to remember some bits.
 			$context['warning_data'] = array(
@@ -229,8 +235,9 @@ 
 	{
 		$warning_body = !empty($_POST['warn_body']) ? trim(censorText($_POST['warn_body'])) : '';
 		$context['preview_subject'] = !empty($_POST['warn_sub']) ? trim($smcFunc['htmlspecialchars']($_POST['warn_sub'])) : '';
-		if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-			$issueErrors[] = 'warning_notify_blank';
+		if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+					$issueErrors[] = 'warning_notify_blank';
+		}
 
 		if (!empty($_POST['warn_body']))
 		{
@@ -254,8 +261,9 @@ 
 	{
 		// Fill in the suite of errors.
 		$context['post_errors'] = array();
-		foreach ($issueErrors as $error)
-			$context['post_errors'][] = $txt[$error];
+		foreach ($issueErrors as $error) {
+					$context['post_errors'][] = $txt[$error];
+		}
 	}
 
 
@@ -272,9 +280,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_mute'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
+	}
 
 	$listOptions = array(
 		'id' => 'view_warnings',
@@ -337,11 +346,12 @@ 
 							' . $warning['reason'] . '
 						</div>';
 
-						if (!empty($warning['id_notice']))
-							$ret .= '
+						if (!empty($warning['id_notice'])) {
+													$ret .= '
 						<div class="floatright">
 							<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" class="new_win" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>
 						</div>';
+						}
 
 						return $ret;
 					},
@@ -413,8 +423,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If we're not warning for a message skip any that are.
-		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false)
-			continue;
+		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false) {
+					continue;
+		}
 
 		$context['notification_templates'][] = array(
 			'title' => $row['template_title'],
@@ -424,16 +435,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Setup the "default" templates.
-	foreach (array('spamming', 'offence', 'insulting') as $type)
-		$context['notification_templates'][] = array(
+	foreach (array('spamming', 'offence', 'insulting') as $type) {
+			$context['notification_templates'][] = array(
 			'title' => $txt['profile_warning_notify_title_' . $type],
 			'body' => sprintf($txt['profile_warning_notify_template_outline' . (!empty($context['warning_for_message']) ? '_post' : '')], $txt['profile_warning_notify_for_' . $type]),
 		);
+	}
 
 	// Replace all the common variables in the templates.
-	foreach ($context['notification_templates'] as $k => $name)
-		$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
-}
+	foreach ($context['notification_templates'] as $k => $name) {
+			$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
+	}
+	}
 
 /**
  * Get the number of warnings a user has. Callback for $listOptions['get_count'] in issueWarning()
@@ -517,10 +530,11 @@ 
 {
 	global $txt, $context, $modSettings, $cur_profile;
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	// Permissions for removing stuff...
 	$context['can_delete_posts'] = !$context['user']['is_owner'] && allowedTo('moderate_forum');
@@ -547,10 +561,11 @@ 
 
 	// @todo Add a way to delete pms as well?
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	checkSession();
 
@@ -576,8 +591,9 @@ 
 		list ($another) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($another))
-			fatal_lang_error('at_least_one_admin', 'critical');
+		if (empty($another)) {
+					fatal_lang_error('at_least_one_admin', 'critical');
+		}
 	}
 
 	// This file is needed for the deleteMembers function.
@@ -656,8 +672,9 @@ 
 					)
 				);
 				$topicIDs = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$topicIDs[] = $row['id_topic'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$topicIDs[] = $row['id_topic'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Actually remove the topics. Ignore recycling if we want to perma-delete things...
@@ -680,8 +697,9 @@ 
 			// This could take a while... but ya know it's gonna be worth it in the end.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				removeMessage($row['id_msg']);
 			}
@@ -689,8 +707,9 @@ 
 		}
 
 		// Only delete this poor members account if they are actually being booted out of camp.
-		if (isset($_POST['deleteAccount']))
-			deleteMembers($memID);
+		if (isset($_POST['deleteAccount'])) {
+					deleteMembers($memID);
+		}
 	}
 	// Do they need approval to delete?
 	elseif (!empty($modSettings['approveAccountDeletion']) && !allowedTo('moderate_forum'))
@@ -741,18 +760,18 @@ 
 		{
 			foreach ($costs as $duration => $cost)
 			{
-				if ($cost != 0)
-					$cost_array[$duration] = $cost;
+				if ($cost != 0) {
+									$cost_array[$duration] = $cost;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$cost_array['fixed'] = $costs['fixed'];
 		}
 
-		if (empty($cost_array))
-			unset($context['subscriptions'][$id]);
-		else
+		if (empty($cost_array)) {
+					unset($context['subscriptions'][$id]);
+		} else
 		{
 			$context['subscriptions'][$id]['member'] = 0;
 			$context['subscriptions'][$id]['subscribed'] = false;
@@ -765,13 +784,15 @@ 
 	foreach ($gateways as $id => $gateway)
 	{
 		$gateways[$id] = new $gateway['display_class']();
-		if (!$gateways[$id]->gatewayEnabled())
-			unset($gateways[$id]);
+		if (!$gateways[$id]->gatewayEnabled()) {
+					unset($gateways[$id]);
+		}
 	}
 
 	// No gateways yet?
-	if (empty($gateways))
-		fatal_error($txt['paid_admin_not_setup_gateway']);
+	if (empty($gateways)) {
+			fatal_error($txt['paid_admin_not_setup_gateway']);
+	}
 
 	// Get the current subscriptions.
 	$request = $smcFunc['db_query']('', '
@@ -786,8 +807,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// The subscription must exist!
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		$context['current'][$row['id_subscribe']] = array(
 			'id' => $row['id_sublog'],
@@ -801,8 +823,9 @@ 
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] ? $txt['paid_pending'] : $txt['paid_finished']) : $txt['paid_active'],
 		);
 
-		if ($row['status'] == 1)
-			$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		if ($row['status'] == 1) {
+					$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -853,21 +876,25 @@ 
 	if (isset($_GET['confirm']) && isset($_POST['sub_id']) && is_array($_POST['sub_id']))
 	{
 		// Hopefully just one.
-		foreach ($_POST['sub_id'] as $k => $v)
-			$ID_SUB = (int) $k;
+		foreach ($_POST['sub_id'] as $k => $v) {
+					$ID_SUB = (int) $k;
+		}
 
-		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0)
-			fatal_lang_error('paid_sub_not_active');
+		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0) {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Simplify...
 		$context['sub'] = $context['subscriptions'][$ID_SUB];
 		$period = 'xx';
-		if ($context['sub']['flexible'])
-			$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		if ($context['sub']['flexible']) {
+					$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		}
 
 		// Check we have a valid cost.
-		if ($context['sub']['flexible'] && $period == 'xx')
-			fatal_lang_error('paid_sub_not_active');
+		if ($context['sub']['flexible'] && $period == 'xx') {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Sort out the cost/currency.
 		$context['currency'] = $modSettings['paid_currency_code'];
@@ -880,8 +907,7 @@ 
 			$context['cost'] = sprintf($modSettings['paid_currency_symbol'], $context['value']) . '/' . $txt[$_POST['cur'][$ID_SUB]];
 			// The period value for paypal.
 			$context['paypal_period'] = strtoupper(substr($_POST['cur'][$ID_SUB], 0, 1));
-		}
-		else
+		} else
 		{
 			// Real cost...
 			$context['value'] = $context['sub']['costs']['fixed'];
@@ -898,13 +924,15 @@ 
 		foreach ($gateways as $id => $gateway)
 		{
 			$fields = $gateways[$id]->fetchGatewayFields($context['sub']['id'] . '+' . $memID, $context['sub'], $context['value'], $period, $scripturl . '?action=profile;u=' . $memID . ';area=subscriptions;sub_id=' . $context['sub']['id'] . ';done');
-			if (!empty($fields['form']))
-				$context['gateways'][] = $fields;
+			if (!empty($fields['form'])) {
+							$context['gateways'][] = $fields;
+			}
 		}
 
 		// Bugger?!
-		if (empty($context['gateways']))
-			fatal_error($txt['paid_admin_not_setup_gateway']);
+		if (empty($context['gateways'])) {
+					fatal_error($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Now we are going to assume they want to take this out ;)
 		$new_data = array($context['sub']['id'], $context['value'], $period, 'prepay');
@@ -912,16 +940,19 @@ 
 		{
 			// What are the details like?
 			$current_pending = array();
-			if ($context['current'][$context['sub']['id']]['pending_details'] != '')
-				$current_pending = smf_json_decode($context['current'][$context['sub']['id']]['pending_details'], true);
+			if ($context['current'][$context['sub']['id']]['pending_details'] != '') {
+							$current_pending = smf_json_decode($context['current'][$context['sub']['id']]['pending_details'], true);
+			}
 			// Don't get silly.
-			if (count($current_pending) > 9)
-				$current_pending = array();
+			if (count($current_pending) > 9) {
+							$current_pending = array();
+			}
 			$pending_count = 0;
 			// Only record real pending payments as will otherwise confuse the admin!
-			foreach ($current_pending as $pending)
-				if ($pending[3] == 'payback')
+			foreach ($current_pending as $pending) {
+							if ($pending[3] == 'payback')
 					$pending_count++;
+			}
 
 			if (!in_array($new_data, $current_pending))
 			{
@@ -966,9 +997,9 @@ 
 
 		// Quit.
 		return;
+	} else {
+			$context['sub_template'] = 'user_subscription';
+	}
 	}
-	else
-		$context['sub_template'] = 'user_subscription';
-}
 
 ?>
\ No newline at end of file

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'http://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// Make sure they know what type of file we are.
 	header('Content-Type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1]);
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -854,8 +873,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -867,8 +887,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -904,8 +925,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -955,9 +977,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/Subs-Compat.php

Braces +27 added lines, -19 removed lines

@@ -16,8 +16,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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;
 }

Themes/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('Location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Themes/default/images/icons/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/images/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/images/post/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