SimpleMachines / SMF2.1

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

Braces +197 added lines, -154 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Browse the list of package servers, add servers...
@@ -43,13 +44,15 @@ 
 	);
 
 	// Now let's decide where we are taking this...
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	}
 	// We need to support possible old javascript links...
-	elseif (isset($_GET['pgdownload']))
-		$context['sub_action'] = 'download';
-	else
-		$context['sub_action'] = 'servers';
+	elseif (isset($_GET['pgdownload'])) {
+			$context['sub_action'] = 'download';
+	} else {
+			$context['sub_action'] = 'servers';
+	}
 
 	// We need to force the "Download" tab as selected.
 	$context['menu_data_' . $context['admin_menu_id']]['current_subsection'] = 'packageget';
@@ -141,17 +144,19 @@ 
 			{
 				require_once($sourcedir . '/Class-Package.php');
 				$ftp = new ftp_connection(null);
+			} elseif ($ftp->error !== false && !isset($ftp_error)) {
+							$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 			}
-			elseif ($ftp->error !== false && !isset($ftp_error))
-				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path($packagesdir);
 
-			if ($found_path || !isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = $detect_path;
+			if ($found_path || !isset($_POST['ftp_path'])) {
+							$_POST['ftp_path'] = $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 
 			$context['package_ftp'] = array(
 				'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset($modSettings['package_server']) ? $modSettings['package_server'] : 'localhost'),
@@ -160,8 +165,7 @@ 
 				'path' => $_POST['ftp_path'],
 				'error' => empty($ftp_error) ? null : $ftp_error,
 			);
-		}
-		else
+		} else
 		{
 			$context['package_download_broken'] = false;
 
@@ -203,8 +207,9 @@ 
 
 	if (isset($_GET['server']))
 	{
-		if ($_GET['server'] == '')
-			redirectexit('action=admin;area=packages;get');
+		if ($_GET['server'] == '') {
+					redirectexit('action=admin;area=packages;get');
+		}
 
 		$server = (int) $_GET['server'];
 
@@ -222,17 +227,18 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If the server does not exist, dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		// If there is a relative link, append to the stored server url.
-		if (isset($_GET['relative']))
-			$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		if (isset($_GET['relative'])) {
+					$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		}
 
 		// Clear any "absolute" URL.  Since "server" is present, "absolute" is garbage.
 		unset($_GET['absolute']);
-	}
-	elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
+	} elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
 	{
 		// Initialize the requried variables.
 		$server = '';
@@ -256,16 +262,19 @@ 
 		}
 	}
 	// Minimum required parameter did not exist so dump out.
-	else
-		fatal_lang_error('couldnt_connect', false);
+	else {
+			fatal_lang_error('couldnt_connect', false);
+	}
 
 	// Attempt to connect.  If unsuccessful... try the URL.
-	if (!isset($_GET['package']) || file_exists($_GET['package']))
-		$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	if (!isset($_GET['package']) || file_exists($_GET['package'])) {
+			$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	}
 
 	// Check to be sure the packages.xml file actually exists where it is should be... or dump out.
-	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package']))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package'])) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// Might take some time.
 	@set_time_limit(600);
@@ -275,8 +284,9 @@ 
 	$listing = new xmlArray(fetch_web_data($_GET['package']), true);
 
 	// Errm.... empty file?  Try the URL....
-	if (!$listing->exists('package-list'))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if (!$listing->exists('package-list')) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// List out the packages...
 	$context['package_list'] = array();
@@ -284,8 +294,9 @@ 
 	$listing = $listing->path('package-list[0]');
 
 	// Use the package list's name if it exists.
-	if ($listing->exists('list-title'))
-		$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	if ($listing->exists('list-title')) {
+			$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	}
 
 	// Pick the correct template.
 	$context['sub_template'] = 'package_list';
@@ -300,28 +311,32 @@ 
 
 	$installed_mods = array();
 	// Look through the list of installed mods...
-	foreach ($instmods as $installed_mod)
-		$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	foreach ($instmods as $installed_mod) {
+			$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	}
 
 	// Get default author and email if they exist.
 	if ($listing->exists('default-author'))
 	{
 		$default_author = $smcFunc['htmlspecialchars']($listing->fetch('default-author'));
-		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL))
-			$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL)) {
+					$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		}
 	}
 
 	// Get default web site if it exists.
 	if ($listing->exists('default-website'))
 	{
 		$default_website = $smcFunc['htmlspecialchars']($listing->fetch('default-website'));
-		if ($listing->exists('default-website/@title'))
-			$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		if ($listing->exists('default-website/@title')) {
+					$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		}
 	}
 
 	$the_version = strtr($forum_version, array('SMF ' => ''));
-	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	if (!empty($_SESSION['version_emulate'])) {
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	$packageNum = 0;
 	$packageSection = 0;
@@ -342,11 +357,13 @@ 
 				'type' => $thisPackage->name(),
 			);
 
-			if (in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			if (in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Title, Heading, Rule or Text.
-			elseif (in_array($package['type'], array('heading', 'rule')))
-				$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			elseif (in_array($package['type'], array('heading', 'rule'))) {
+							$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Remote link.
 			elseif ($package['type'] == 'remote')
 			{
@@ -354,20 +371,21 @@ 
 
 				if ($remote_type == 'relative' && substr($thisPackage->fetch('@href'), 0, 7) != 'http://' && substr($thisPackage->fetch('@href'), 0, 8) != 'https://')
 				{
-					if (isset($_GET['absolute']))
-						$current_url = $_GET['absolute'] . '/';
-					elseif (isset($_GET['relative']))
-						$current_url = $_GET['relative'] . '/';
-					else
-						$current_url = '';
+					if (isset($_GET['absolute'])) {
+											$current_url = $_GET['absolute'] . '/';
+					} elseif (isset($_GET['relative'])) {
+											$current_url = $_GET['relative'] . '/';
+					} else {
+											$current_url = '';
+					}
 
 					$current_url .= $thisPackage->fetch('@href');
-					if (isset($_GET['absolute']))
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
-					else
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
-				}
-				else
+					if (isset($_GET['absolute'])) {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
+					} else {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
+					}
+				} else
 				{
 					$current_url = $thisPackage->fetch('@href');
 					$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
@@ -379,25 +397,28 @@ 
 			// It's a package...
 			else
 			{
-				if (isset($_GET['absolute']))
-					$current_url = $_GET['absolute'] . '/';
-				elseif (isset($_GET['relative']))
-					$current_url = $_GET['relative'] . '/';
-				else
-					$current_url = '';
+				if (isset($_GET['absolute'])) {
+									$current_url = $_GET['absolute'] . '/';
+				} elseif (isset($_GET['relative'])) {
+									$current_url = $_GET['relative'] . '/';
+				} else {
+									$current_url = '';
+				}
 
 				$server_att = $server != '' ? ';server=' . $server : '';
 
 				$package += $thisPackage->to_array();
 
-				if (isset($package['website']))
-					unset($package['website']);
+				if (isset($package['website'])) {
+									unset($package['website']);
+				}
 				$package['author'] = array();
 
-				if ($package['description'] == '')
-					$package['description'] = $txt['package_no_description'];
-				else
-					$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				if ($package['description'] == '') {
+									$package['description'] = $txt['package_no_description'];
+				} else {
+									$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				}
 
 				$package['is_installed'] = isset($installed_mods[$package['id']]);
 				$package['is_current'] = $package['is_installed'] && ($installed_mods[$package['id']] == $package['version']);
@@ -406,12 +427,14 @@ 
 				// This package is either not installed, or installed but old.  Is it supported on this version of SMF?
 				if (!$package['is_installed'] || (!$package['is_current'] && !$package['is_newer']))
 				{
-					if ($thisPackage->exists('version/@for'))
-						$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					if ($thisPackage->exists('version/@for')) {
+											$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					}
 				}
 				// Okay, it's already installed AND up to date.
-				else
-					$package['can_install'] = false;
+				else {
+									$package['can_install'] = false;
+				}
 
 				$already_exists = getPackageInfo(basename($package['filename']));
 				$package['download_conflict'] = is_array($already_exists) && $already_exists['id'] == $package['id'] && $already_exists['version'] != $package['version'];
@@ -423,40 +446,44 @@ 
 
 				if ($thisPackage->exists('author') || isset($default_author))
 				{
-					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL))
-						$package['author']['email'] = $thisPackage->fetch('author/@email');
-					elseif (isset($default_email))
-						$package['author']['email'] = $default_email;
-
-					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '')
-						$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
-					else
-						$package['author']['name'] = $default_author;
-
-					if (!empty($package['author']['email']))
-						$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL)) {
+											$package['author']['email'] = $thisPackage->fetch('author/@email');
+					} elseif (isset($default_email)) {
+											$package['author']['email'] = $default_email;
+					}
+
+					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '') {
+											$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
+					} else {
+											$package['author']['name'] = $default_author;
+					}
+
+					if (!empty($package['author']['email'])) {
+											$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					}
 				}
 
 				if ($thisPackage->exists('website') || isset($default_website))
 				{
-					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
-					elseif (isset($default_title))
-						$package['author']['website']['name'] = $default_title;
-					elseif ($thisPackage->exists('website'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$package['author']['website']['name'] = $default_website;
-
-					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '')
-						$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$authorhompage = $default_website;
+					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
+					} elseif (isset($default_title)) {
+											$package['author']['website']['name'] = $default_title;
+					} elseif ($thisPackage->exists('website')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$package['author']['website']['name'] = $default_website;
+					}
+
+					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '') {
+											$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$authorhompage = $default_website;
+					}
 
 					$package['author']['website']['href'] = $authorhompage;
 					$package['author']['website']['link'] = '<a href="' . $authorhompage . '">' . $package['author']['website']['name'] . '</a>';
-				}
-				else
+				} else
 				{
 					$package['author']['website']['href'] = '';
 					$package['author']['website']['link'] = '';
@@ -472,11 +499,13 @@ 
 			$packageNum = in_array($package['type'], array('title', 'heading', 'text', 'remote', 'rule')) ? 0 : $packageNum + 1;
 			$package['count'] = $packageNum;
 
-			if (!in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection]['items'][] = $package;
+			if (!in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection]['items'][] = $package;
+			}
 
-			if ($package['count'] > 1)
-				$context['list_type'] = 'ol';
+			if ($package['count'] > 1) {
+							$context['list_type'] = 'ol';
+			}
 		}
 
 		$packageSection++;
@@ -489,8 +518,9 @@ 
 	{
 		foreach ($packageSection['items'] as $i => $package)
 		{
-			if ($package['count'] == 0 || isset($package['can_install']))
-				continue;
+			if ($package['count'] == 0 || isset($package['can_install'])) {
+							continue;
+			}
 
 			$context['package_list'][$ps_id]['items'][$i]['can_install'] = false;
 
@@ -539,8 +569,9 @@ 
 	checkSession('get');
 
 	// To download something, we need a valid server or url.
-	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package'])))
-		fatal_lang_error('package_get_error_is_zero', false);
+	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package']))) {
+			fatal_lang_error('package_get_error_is_zero', false);
+	}
 
 	if (isset($_GET['server']))
 	{
@@ -560,22 +591,23 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If server does not exist then dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		$url = $url . '/';
-	}
-	else
+	} else
 	{
 		// Initialize the requried variables.
 		$server = '';
 		$url = '';
 	}
 
-	if (isset($_REQUEST['byurl']) && !empty($_POST['filename']))
-		$package_name = basename($_REQUEST['filename']);
-	else
-		$package_name = basename($_REQUEST['package']);
+	if (isset($_REQUEST['byurl']) && !empty($_POST['filename'])) {
+			$package_name = basename($_REQUEST['filename']);
+	} else {
+			$package_name = basename($_REQUEST['package']);
+	}
 
 	if (isset($_REQUEST['conflict']) || (isset($_REQUEST['auto']) && file_exists($packagesdir . '/' . $package_name)))
 	{
@@ -584,14 +616,15 @@ 
 		{
 			$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 			$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
+		} else {
+					$ext = '';
 		}
-		else
-			$ext = '';
 
 		// Find the first available.
 		$i = 1;
-		while (file_exists($packagesdir . '/' . $package_name . $i . $ext))
-			$i++;
+		while (file_exists($packagesdir . '/' . $package_name . $i . $ext)) {
+					$i++;
+		}
 
 		$package_name = $package_name . $i . $ext;
 	}
@@ -602,25 +635,28 @@ 
 
 	// Done!  Did we get this package automatically?
 	// @ TODO: These are usually update packages.  Allowing both for now until more testing has been done.
-	if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto']))
-		redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto'])) {
+			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	}
 
 	// You just downloaded a mod from SERVER_NAME_GOES_HERE.
 	$context['package_server'] = $server;
 
 	$context['package'] = getPackageInfo($package_name);
 
-	if (!is_array($context['package']))
-		fatal_lang_error('package_cant_download', false);
+	if (!is_array($context['package'])) {
+			fatal_lang_error('package_cant_download', false);
+	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_download');
@@ -646,10 +682,11 @@ 
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
-	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-		fatal_lang_error('package_upload_error_nofile');
-	elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-		fatal_lang_error('package_upload_error_failed');
+	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '') {
+			fatal_lang_error('package_upload_error_nofile');
+	} elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name']))) {
+			fatal_lang_error('package_upload_error_failed');
+	}
 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
@@ -666,8 +703,9 @@ 
 	// Setup the destination and throw an error if the file is already there!
 	$destination = $packagesdir . '/' . $packageName;
 	// @todo Maybe just roll it like we do for downloads?
-	if (file_exists($destination))
-		fatal_lang_error('package_upload_error_exists');
+	if (file_exists($destination)) {
+			fatal_lang_error('package_upload_error_exists');
+	}
 
 	// Now move the file.
 	move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -690,12 +728,14 @@ 
 	{
 		while ($package = readdir($dir))
 		{
-			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
-				continue;
+			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
+							continue;
+			}
 
 			$packageInfo = getPackageInfo($package);
-			if (!is_array($packageInfo))
-				continue;
+			if (!is_array($packageInfo)) {
+							continue;
+			}
 
 			if ($packageInfo['id'] == $context['package']['id'] && $packageInfo['version'] == $context['package']['version'])
 			{
@@ -707,14 +747,15 @@ 
 		closedir($dir);
 	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_upload');
@@ -737,16 +778,18 @@ 
 	checkSession();
 
 	// If they put a slash on the end, get rid of it.
-	if (substr($_POST['serverurl'], -1) == '/')
-		$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	if (substr($_POST['serverurl'], -1) == '/') {
+			$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	}
 
 	// Are they both nice and clean?
 	$servername = trim($smcFunc['htmlspecialchars']($_POST['servername']));
 	$serverurl = trim($smcFunc['htmlspecialchars']($_POST['serverurl']));
 
 	// Make sure the URL has the correct prefix.
-	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0)
-		$serverurl = 'http://' . $serverurl;
+	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0) {
+			$serverurl = 'http://' . $serverurl;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}package_servers',

Spacing +5 added lines, -5 removed lines

@@ -181,14 +181,14 @@ 
 		{
 			collapsedDiv.show(\'slow\');
 			icon.removeClass(\'toggle_down\').addClass(\'toggle_up\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . ');
 		}
 
 		else
 		{
 			collapsedDiv.hide(\'slow\');
 			icon.removeClass(\'toggle_up\').addClass(\'toggle_down\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . ');
 		}
 	});', true);
 }
@@ -641,7 +641,7 @@ 
 
 	// Setup the correct template, even though I'll admit we ain't downloading ;)
 	$context['sub_template'] = 'downloaded';
-	$allowext = array('.zip','.tgz','.gz');
+	$allowext = array('.zip', '.tgz', '.gz');
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
@@ -653,13 +653,13 @@ 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 	$extension = substr(strrchr(strtolower($_FILES['package']['name']), '.'), 0);
-	if(!in_array($extension, $allowext))
+	if (!in_array($extension, $allowext))
 	{
 		fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
 	}
 
 	// We only need the filename...
-	$extension = ($extension == '.gz') ? '.tar.gz' : $extension ;
+	$extension = ($extension == '.gz') ? '.tar.gz' : $extension;
 	$packageName = time() . $extension;
 
 	// Setup the destination and throw an error if the file is already there!

Sources/ReportToMod.php

Braces +71 added lines, -51 removed lines

@@ -12,8 +12,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Report a post or profile to the moderator... ask for a comment.
@@ -35,10 +36,11 @@ 
 
 	// You can't use this if it's off or you are not allowed to do it.
 	// If we don't have the ID of something to report, we'll die with a no_access error below
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	elseif (isset($_REQUEST['u']))
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} elseif (isset($_REQUEST['u'])) {
+			isAllowedTo('report_user');
+	}
 
 	// Previewing or modifying?
 	if (isset($_POST['preview']) && !isset($_POST['save']))
@@ -56,19 +58,23 @@ 
 	}
 
 	// If they're posting, it should be processed by ReportToModerator2.
-	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview']))
-		ReportToModerator2();
+	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview'])) {
+			ReportToModerator2();
+	}
 
 	// We need a message ID or user ID to check!
-	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// For compatibility, accept mid, but we should be using msg. (not the flavor kind!)
-	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid']))
-		$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid'])) {
+			$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	}
 	// msg and mid empty - assume we're reporting a user
-	elseif (!empty($_REQUEST['u']))
-		$_REQUEST['u'] = (int) $_REQUEST['u'];
+	elseif (!empty($_REQUEST['u'])) {
+			$_REQUEST['u'] = (int) $_REQUEST['u'];
+	}
 
 	// Set up some form values
 	$context['report_type'] = isset($_REQUEST['msg']) ? 'msg' : 'u';
@@ -89,8 +95,9 @@ 
 				'id_msg' => $_REQUEST['msg'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_board', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_board', false);
+		}
 		list ($_REQUEST['msg'], $member, $starter) = $smcFunc['db_fetch_row']($result);
 		$smcFunc['db_free_result']($result);
 
@@ -101,8 +108,7 @@ 
 
 		// The submit URL is different for users than it is for posts
 		$context['submit_url'] = $scripturl . '?action=reporttm;msg=' . $_REQUEST['msg'] . ';topic=' . $topic;
-	}
-	else
+	} else
 	{
 		// Check the user's ID
 		$result = $smcFunc['db_query']('', '
@@ -114,8 +120,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_user', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_user', false);
+		}
 		list($_REQUEST['u'], $display_name, $username) = $smcFunc['db_fetch_row']($result);
 
 		$context['current_user'] = $_REQUEST['u'];
@@ -170,10 +177,11 @@ 
 	is_not_guest();
 
 	// You must have the proper permissions!
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	else
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} else {
+			isAllowedTo('report_user');
+	}
 
 	// Make sure they aren't spamming.
 	spamProtection('reporttm');
@@ -187,17 +195,20 @@ 
 	$post_errors = array();
 
 	// Check their session.
-	if (checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	// Make sure we have a comment and it's clean.
-	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '')
-		$post_errors[] = 'no_comment';
+	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '') {
+			$post_errors[] = 'no_comment';
+	}
 
 	$poster_comment = strtr($smcFunc['htmlspecialchars']($_POST['comment']), array("\r" => '', "\t" => ''));
 
-	if ($smcFunc['strlen']($poster_comment) > 254)
-		$post_errors[] = 'post_too_long';
+	if ($smcFunc['strlen']($poster_comment) > 254) {
+			$post_errors[] = 'post_too_long';
+	}
 
 	// Any errors?
 	if (!empty($post_errors))
@@ -205,8 +216,9 @@ 
 		loadLanguage('Errors');
 
 		$context['post_errors'] = array();
-		foreach ($post_errors as $post_error)
-			$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		foreach ($post_errors as $post_error) {
+					$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		}
 
 		return ReportToModerator();
 	}
@@ -215,8 +227,7 @@ 
 	{
 		// Handle this elsewhere to keep things from getting too long
 		reportPost($_POST['msg'], $poster_comment);
-	}
-	else
+	} else
 	{
 		reportUser($_POST['u'], $poster_comment);
 	}
@@ -247,8 +258,9 @@ 
 			'id_msg' => $_POST['msg'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board', false);
+	}
 	$message = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -264,18 +276,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	if (!empty($ignore)) {
+			redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -284,11 +298,13 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{
-		if (empty($message['real_name']))
-			$message['real_name'] = $message['poster_name'];
+		if (empty($message['real_name'])) {
+					$message['real_name'] = $message['poster_name'];
+		}
 
 		$id_report = $smcFunc['db_insert']('',
 			'{db_prefix}log_reported',
@@ -367,8 +383,9 @@ 
 			'id_member' => $_POST['u']
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_user', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_user', false);
+	}
 	$user = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -388,18 +405,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('action=profile;u=' . $_POST['u']);
+	if (!empty($ignore)) {
+			redirectexit('action=profile;u=' . $_POST['u']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -408,6 +427,7 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{

Sources/Subs-List.php

Braces +85 added lines, -59 removed lines

@@ -12,8 +12,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Create a new list
@@ -41,21 +42,21 @@ 
 	{
 		$list_context['sort'] = array();
 		$sort = '1=1';
-	}
-	else
+	} else
 	{
 		$request_var_sort = isset($listOptions['request_vars']['sort']) ? $listOptions['request_vars']['sort'] : 'sort';
 		$request_var_desc = isset($listOptions['request_vars']['desc']) ? $listOptions['request_vars']['desc'] : 'desc';
-		if (isset($_REQUEST[$request_var_sort], $listOptions['columns'][$_REQUEST[$request_var_sort]], $listOptions['columns'][$_REQUEST[$request_var_sort]]['sort']))
-			$list_context['sort'] = array(
+		if (isset($_REQUEST[$request_var_sort], $listOptions['columns'][$_REQUEST[$request_var_sort]], $listOptions['columns'][$_REQUEST[$request_var_sort]]['sort'])) {
+					$list_context['sort'] = array(
 				'id' => $_REQUEST[$request_var_sort],
 				'desc' => isset($_REQUEST[$request_var_desc]) && isset($listOptions['columns'][$_REQUEST[$request_var_sort]]['sort']['reverse']),
 			);
-		else
-			$list_context['sort'] = array(
+		} else {
+					$list_context['sort'] = array(
 				'id' => $listOptions['default_sort_col'],
 				'desc' => (!empty($listOptions['default_sort_dir']) && $listOptions['default_sort_dir'] == 'desc') || (!empty($listOptions['columns'][$listOptions['default_sort_col']]['sort']['default']) && substr($listOptions['columns'][$listOptions['default_sort_col']]['sort']['default'], -4, 4) == 'desc') ? true : false,
 			);
+		}
 
 		// Set the database column sort.
 		$sort = $listOptions['columns'][$list_context['sort']['id']]['sort'][$list_context['sort']['desc'] ? 'reverse' : 'default'];
@@ -72,8 +73,9 @@ 
 	else
 	{
 		// First get an impression of how many items to expect.
-		if (isset($listOptions['get_count']['file']))
-			require_once($listOptions['get_count']['file']);
+		if (isset($listOptions['get_count']['file'])) {
+					require_once($listOptions['get_count']['file']);
+		}
 
 		$call = call_helper($listOptions['get_count']['function'], true);
 		$list_context['total_num_items'] = call_user_func_array($call, empty($listOptions['get_count']['params']) ? array() : $listOptions['get_count']['params']);
@@ -83,14 +85,15 @@ 
 		$list_context['items_per_page'] = $listOptions['items_per_page'];
 
 		// Then create a page index.
-		if ($list_context['total_num_items'] > $list_context['items_per_page'])
-			$list_context['page_index'] = constructPageIndex($listOptions['base_href'] . (empty($list_context['sort']) ? '' : ';' . $request_var_sort . '=' . $list_context['sort']['id'] . ($list_context['sort']['desc'] ? ';' . $request_var_desc : '')) . ($list_context['start_var_name'] != 'start' ? ';' . $list_context['start_var_name'] . '=%1$d' : ''), $list_context['start'], $list_context['total_num_items'], $list_context['items_per_page'], $list_context['start_var_name'] != 'start');
+		if ($list_context['total_num_items'] > $list_context['items_per_page']) {
+					$list_context['page_index'] = constructPageIndex($listOptions['base_href'] . (empty($list_context['sort']) ? '' : ';' . $request_var_sort . '=' . $list_context['sort']['id'] . ($list_context['sort']['desc'] ? ';' . $request_var_desc : '')) . ($list_context['start_var_name'] != 'start' ? ';' . $list_context['start_var_name'] . '=%1$d' : ''), $list_context['start'], $list_context['total_num_items'], $list_context['items_per_page'], $list_context['start_var_name'] != 'start');
+		}
 	}
 
 	// Prepare the headers of the table.
 	$list_context['headers'] = array();
-	foreach ($listOptions['columns'] as $column_id => $column)
-		$list_context['headers'][] = array(
+	foreach ($listOptions['columns'] as $column_id => $column) {
+			$list_context['headers'][] = array(
 			'id' => $column_id,
 			'label' => isset($column['header']['eval']) ? eval($column['header']['eval']) : (isset($column['header']['value']) ? $column['header']['value'] : ''),
 			'href' => empty($listOptions['default_sort_col']) || empty($column['sort']) ? '' : $listOptions['base_href'] . ';' . $request_var_sort . '=' . $column_id . ($column_id === $list_context['sort']['id'] && !$list_context['sort']['desc'] && isset($column['sort']['reverse']) ? ';' . $request_var_desc : '') . (empty($list_context['start']) ? '' : ';' . $list_context['start_var_name'] . '=' . $list_context['start']),
@@ -99,14 +102,16 @@ 
 			'style' => isset($column['header']['style']) ? $column['header']['style'] : '',
 			'colspan' => isset($column['header']['colspan']) ? $column['header']['colspan'] : '',
 		);
+	}
 
 	// We know the amount of columns, might be useful for the template.
 	$list_context['num_columns'] = count($listOptions['columns']);
 	$list_context['width'] = isset($listOptions['width']) ? $listOptions['width'] : '0';
 
 	// Get the file with the function for the item list.
-	if (isset($listOptions['get_items']['file']))
-		require_once($listOptions['get_items']['file']);
+	if (isset($listOptions['get_items']['file'])) {
+			require_once($listOptions['get_items']['file']);
+	}
 
 	// Call the function and include which items we want and in what order.
 	$call = call_helper($listOptions['get_items']['function'], true);
@@ -123,51 +128,61 @@ 
 			$cur_data = array();
 
 			// A value straight from the database?
-			if (isset($column['data']['db']))
-				$cur_data['value'] = $list_item[$column['data']['db']];
+			if (isset($column['data']['db'])) {
+							$cur_data['value'] = $list_item[$column['data']['db']];
+			}
 
 			// Take the value from the database and make it HTML safe.
-			elseif (isset($column['data']['db_htmlsafe']))
-				$cur_data['value'] = $smcFunc['htmlspecialchars']($list_item[$column['data']['db_htmlsafe']]);
+			elseif (isset($column['data']['db_htmlsafe'])) {
+							$cur_data['value'] = $smcFunc['htmlspecialchars']($list_item[$column['data']['db_htmlsafe']]);
+			}
 
 			// Using sprintf is probably the most readable way of injecting data.
 			elseif (isset($column['data']['sprintf']))
 			{
 				$params = array();
-				foreach ($column['data']['sprintf']['params'] as $sprintf_param => $htmlsafe)
-					$params[] = $htmlsafe ? $smcFunc['htmlspecialchars']($list_item[$sprintf_param]) : $list_item[$sprintf_param];
+				foreach ($column['data']['sprintf']['params'] as $sprintf_param => $htmlsafe) {
+									$params[] = $htmlsafe ? $smcFunc['htmlspecialchars']($list_item[$sprintf_param]) : $list_item[$sprintf_param];
+				}
 				$cur_data['value'] = vsprintf($column['data']['sprintf']['format'], $params);
 			}
 
 			// The most flexible way probably is applying a custom function.
-			elseif (isset($column['data']['function']))
-				$cur_data['value'] = call_user_func_array($column['data']['function'], array($list_item));
+			elseif (isset($column['data']['function'])) {
+							$cur_data['value'] = call_user_func_array($column['data']['function'], array($list_item));
+			}
 
 			// A modified value (inject the database values).
-			elseif (isset($column['data']['eval']))
-				$cur_data['value'] = eval(preg_replace('~%([a-zA-Z0-9\-_]+)%~', '$list_item[\'$1\']', $column['data']['eval']));
+			elseif (isset($column['data']['eval'])) {
+							$cur_data['value'] = eval(preg_replace('~%([a-zA-Z0-9\-_]+)%~', '$list_item[\'$1\']', $column['data']['eval']));
+			}
 
 			// A literal value.
-			elseif (isset($column['data']['value']))
-				$cur_data['value'] = $column['data']['value'];
+			elseif (isset($column['data']['value'])) {
+							$cur_data['value'] = $column['data']['value'];
+			}
 
 			// Empty value.
-			else
-				$cur_data['value'] = '';
+			else {
+							$cur_data['value'] = '';
+			}
 
 			// Allow for basic formatting.
-			if (!empty($column['data']['comma_format']))
-				$cur_data['value'] = comma_format($cur_data['value']);
-			elseif (!empty($column['data']['timeformat']))
-				$cur_data['value'] = timeformat($cur_data['value']);
+			if (!empty($column['data']['comma_format'])) {
+							$cur_data['value'] = comma_format($cur_data['value']);
+			} elseif (!empty($column['data']['timeformat'])) {
+							$cur_data['value'] = timeformat($cur_data['value']);
+			}
 
 			// Set a style class for this column?
-			if (isset($column['data']['class']))
-				$cur_data['class'] = $column['data']['class'];
+			if (isset($column['data']['class'])) {
+							$cur_data['class'] = $column['data']['class'];
+			}
 
 			// Fully customized styling for the cells in this column only.
-			if (isset($column['data']['style']))
-				$cur_data['style'] = $column['data']['style'];
+			if (isset($column['data']['style'])) {
+							$cur_data['style'] = $column['data']['style'];
+			}
 
 			// Add the data cell properties to the current row.
 			$cur_row[$column_id] = $cur_data;
@@ -176,10 +191,12 @@ 
 		// Maybe we wat set a custom class for the row based on the data in the row itself
 		if (isset($listOptions['data_check']))
 		{
-			if (isset($listOptions['data_check']['class']))
-				$list_context['rows'][$item_id]['class'] = $listOptions['data_check']['class']($list_item);
-			if (isset($listOptions['data_check']['style']))
-				$list_context['rows'][$item_id]['style'] = $listOptions['data_check']['style']($list_item);
+			if (isset($listOptions['data_check']['class'])) {
+							$list_context['rows'][$item_id]['class'] = $listOptions['data_check']['class']($list_item);
+			}
+			if (isset($listOptions['data_check']['style'])) {
+							$list_context['rows'][$item_id]['style'] = $listOptions['data_check']['style']($list_item);
+			}
 		}
 
 		// Insert the row into the list.
@@ -187,34 +204,39 @@ 
 	}
 
 	// The title is currently optional.
-	if (isset($listOptions['title']))
-		$list_context['title'] = $listOptions['title'];
+	if (isset($listOptions['title'])) {
+			$list_context['title'] = $listOptions['title'];
+	}
 
 	// In case there's a form, share it with the template context.
 	if (isset($listOptions['form']))
 	{
 		$list_context['form'] = $listOptions['form'];
 
-		if (!isset($list_context['form']['hidden_fields']))
-			$list_context['form']['hidden_fields'] = array();
+		if (!isset($list_context['form']['hidden_fields'])) {
+					$list_context['form']['hidden_fields'] = array();
+		}
 
 		// Always add a session check field.
 		$list_context['form']['hidden_fields'][$context['session_var']] = $context['session_id'];
 
 		// Will this do a token check?
-		if (isset($listOptions['form']['token']))
-			$list_context['form']['hidden_fields'][$context[$listOptions['form']['token'] . '_token_var']] = $context[$listOptions['form']['token'] . '_token'];
+		if (isset($listOptions['form']['token'])) {
+					$list_context['form']['hidden_fields'][$context[$listOptions['form']['token'] . '_token_var']] = $context[$listOptions['form']['token'] . '_token'];
+		}
 
 		// Include the starting page as hidden field?
-		if (!empty($list_context['form']['include_start']) && !empty($list_context['start']))
-			$list_context['form']['hidden_fields'][$list_context['start_var_name']] = $list_context['start'];
+		if (!empty($list_context['form']['include_start']) && !empty($list_context['start'])) {
+					$list_context['form']['hidden_fields'][$list_context['start_var_name']] = $list_context['start'];
+		}
 
 		// If sorting needs to be the same after submitting, add the parameter.
 		if (!empty($list_context['form']['include_sort']) && !empty($list_context['sort']))
 		{
 			$list_context['form']['hidden_fields']['sort'] = $list_context['sort']['id'];
-			if ($list_context['sort']['desc'])
-				$list_context['form']['hidden_fields']['desc'] = 1;
+			if ($list_context['sort']['desc']) {
+							$list_context['form']['hidden_fields']['desc'] = 1;
+			}
 		}
 	}
 
@@ -231,24 +253,28 @@ 
 		$list_context['additional_rows'] = array();
 		foreach ($listOptions['additional_rows'] as $row)
 		{
-			if (empty($row))
-				continue;
+			if (empty($row)) {
+							continue;
+			}
 
 			// Supported row positions: top_of_list, after_title,
 			// above_column_headers, below_table_data, bottom_of_list.
-			if (!isset($list_context['additional_rows'][$row['position']]))
-				$list_context['additional_rows'][$row['position']] = array();
+			if (!isset($list_context['additional_rows'][$row['position']])) {
+							$list_context['additional_rows'][$row['position']] = array();
+			}
 			$list_context['additional_rows'][$row['position']][] = $row;
 		}
 	}
 
 	// Add an option for inline JavaScript.
-	if (isset($listOptions['javascript']))
-		$list_context['javascript'] = $listOptions['javascript'];
+	if (isset($listOptions['javascript'])) {
+			$list_context['javascript'] = $listOptions['javascript'];
+	}
 
 	// We want a menu.
-	if (isset($listOptions['list_menu']))
-		$list_context['list_menu'] = $listOptions['list_menu'];
+	if (isset($listOptions['list_menu'])) {
+			$list_context['list_menu'] = $listOptions['list_menu'];
+	}
 
 	// Make sure the template is loaded.
 	loadTemplate('GenericList');

Sources/Subs-Categories.php

Braces +44 added lines, -29 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Edit the position and properties of a category.
@@ -42,8 +43,9 @@ 
 		$cat_order = array();
 
 		// Setting 'move_after' to '0' moves the category to the top.
-		if ($catOptions['move_after'] == 0)
-			$cats[] = $category_id;
+		if ($catOptions['move_after'] == 0) {
+					$cats[] = $category_id;
+		}
 
 		// Grab the categories sorted by cat_order.
 		$request = $smcFunc['db_query']('', '
@@ -55,17 +57,19 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['id_cat'] != $category_id)
-				$cats[] = $row['id_cat'];
-			if ($row['id_cat'] == $catOptions['move_after'])
-				$cats[] = $category_id;
+			if ($row['id_cat'] != $category_id) {
+							$cats[] = $row['id_cat'];
+			}
+			if ($row['id_cat'] == $catOptions['move_after']) {
+							$cats[] = $category_id;
+			}
 			$cat_order[$row['id_cat']] = $row['cat_order'];
 		}
 		$smcFunc['db_free_result']($request);
 
 		// Set the new order for the categories.
-		foreach ($cats as $index => $cat)
-			if ($index != $cat_order[$cat])
+		foreach ($cats as $index => $cat) {
+					if ($index != $cat_order[$cat])
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}categories
 					SET cat_order = {int:new_order}
@@ -75,6 +79,7 @@ 
 						'current_category' => $cat,
 					)
 				);
+		}
 
 		// If the category order changed, so did the board order.
 		require_once($sourcedir . '/Subs-Boards.php');
@@ -117,8 +122,9 @@ 
 			))
 		);
 
-		if (empty($catOptions['dont_log']))
-			logAction('edit_cat', array('catname' => isset($catOptions['cat_name']) ? $catOptions['cat_name'] : $category_id), 'admin');
+		if (empty($catOptions['dont_log'])) {
+					logAction('edit_cat', array('catname' => isset($catOptions['cat_name']) ? $catOptions['cat_name'] : $category_id), 'admin');
+		}
 	}
 }
 
@@ -135,16 +141,20 @@ 
 	global $smcFunc;
 
 	// Check required values.
-	if (!isset($catOptions['cat_name']) || trim($catOptions['cat_name']) == '')
-		trigger_error('createCategory(): A category name is required', E_USER_ERROR);
+	if (!isset($catOptions['cat_name']) || trim($catOptions['cat_name']) == '') {
+			trigger_error('createCategory(): A category name is required', E_USER_ERROR);
+	}
 
 	// Set default values.
-	if (!isset($catOptions['cat_desc']))
-		$catOptions['cat_desc'] = '';
-	if (!isset($catOptions['move_after']))
-		$catOptions['move_after'] = 0;
-	if (!isset($catOptions['is_collapsible']))
-		$catOptions['is_collapsible'] = true;
+	if (!isset($catOptions['cat_desc'])) {
+			$catOptions['cat_desc'] = '';
+	}
+	if (!isset($catOptions['move_after'])) {
+			$catOptions['move_after'] = 0;
+	}
+	if (!isset($catOptions['is_collapsible'])) {
+			$catOptions['is_collapsible'] = true;
+	}
 	// Don't log an edit right after.
 	$catOptions['dont_log'] = true;
 
@@ -210,21 +220,24 @@ 
 			)
 		);
 		$boards_inside = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_inside[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_inside[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards_inside))
-			deleteBoards($boards_inside, null);
+		if (!empty($boards_inside)) {
+					deleteBoards($boards_inside, null);
+		}
 	}
 
 	// Make sure the safe category is really safe.
-	elseif (in_array($moveBoardsTo, $categories))
-		trigger_error('deleteCategories(): You cannot move the boards to a category that\'s being deleted', E_USER_ERROR);
+	elseif (in_array($moveBoardsTo, $categories)) {
+			trigger_error('deleteCategories(): You cannot move the boards to a category that\'s being deleted', E_USER_ERROR);
+	}
 
 	// Move the boards inside the categories to a safe category.
-	else
-		$smcFunc['db_query']('', '
+	else {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET id_cat = {int:new_parent_cat}
 			WHERE id_cat IN ({array_int:category_list})',
@@ -233,6 +246,7 @@ 
 				'new_parent_cat' => $moveBoardsTo,
 			)
 		);
+	}
 
 	// Do the deletion of the category itself
 	$smcFunc['db_query']('', '
@@ -244,8 +258,9 @@ 
 	);
 
 	// Log what we've done.
-	foreach ($categories as $category)
-		logAction('delete_cat', array('catname' => $cat_tree[$category]['node']['name']), 'admin');
+	foreach ($categories as $category) {
+			logAction('delete_cat', array('catname' => $cat_tree[$category]['node']['name']), 'admin');
+	}
 
 	// Get all boards back into the right order.
 	reorderBoards();

Sources/Poll.php

Braces +163 added lines, -119 removed lines

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

Sources/ManageSmileys.php

Braces +297 added lines, -211 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the dispatcher of smileys administration.
@@ -91,8 +92,9 @@ 
 	);
 
 	// Some settings may not be enabled, disallow these from the tabs as appropriate.
-	if (empty($modSettings['messageIcons_enable']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	if (empty($modSettings['messageIcons_enable'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	}
 	if (empty($modSettings['smiley_enable']))
 	{
 		$context[$context['admin_menu_name']]['tab_data']['tabs']['addsmiley']['disabled'] = true;
@@ -125,8 +127,9 @@ 
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
 
 	$smiley_context = array();
-	foreach ($smiley_sets as $i => $set)
-		$smiley_context[$set] = $set_names[$i];
+	foreach ($smiley_sets as $i => $set) {
+			$smiley_context[$set] = $set_names[$i];
+	}
 
 	// All the settings for the page...
 	$config_vars = array(
@@ -147,8 +150,9 @@ 
 
 	call_integration_hook('integrate_modify_smiley_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the basics of the settings template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -207,8 +211,9 @@ 
 			foreach ($_POST['smiley_set'] as $id => $val)
 			{
 				// If this is the set you've marked as default, or the only one remaining, you can't delete it
-				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id]))
-					unset($set_paths[$id], $set_names[$id]);
+				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id])) {
+									unset($set_paths[$id], $set_names[$id]);
+				}
 			}
 
 			// Shortcut... array_merge() on a single array resets the numeric keys
@@ -222,8 +227,9 @@ 
 			));
 		}
 		// Add a new smiley set.
-		elseif (!empty($_POST['add']))
-			$context['sub_action'] = 'modifyset';
+		elseif (!empty($_POST['add'])) {
+					$context['sub_action'] = 'modifyset';
+		}
 		// Create or modify a smiley set.
 		elseif (isset($_POST['set']))
 		{
@@ -233,8 +239,9 @@ 
 			// Create a new smiley set.
 			if ($_POST['set'] == -1 && isset($_POST['smiley_sets_path']))
 			{
-				if (in_array($_POST['smiley_sets_path'], $set_paths))
-					fatal_lang_error('smiley_set_already_exists');
+				if (in_array($_POST['smiley_sets_path'], $set_paths)) {
+									fatal_lang_error('smiley_set_already_exists');
+				}
 
 				updateSettings(array(
 					'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . $_POST['smiley_sets_path'],
@@ -246,12 +253,14 @@ 
 			else
 			{
 				// Make sure the smiley set exists.
-				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']]))
-					fatal_lang_error('smiley_set_not_found');
+				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']])) {
+									fatal_lang_error('smiley_set_not_found');
+				}
 
 				// Make sure the path is not yet used by another smileyset.
-				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']])
-					fatal_lang_error('smiley_set_path_already_used');
+				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']]) {
+									fatal_lang_error('smiley_set_path_already_used');
+				}
 
 				$set_paths[$_POST['set']] = $_POST['smiley_sets_path'];
 				$set_names[$_POST['set']] = $_POST['smiley_sets_name'];
@@ -263,8 +272,9 @@ 
 			}
 
 			// The user might have checked to also import smileys.
-			if (!empty($_POST['smiley_sets_import']))
-				ImportSmileys($_POST['smiley_sets_path']);
+			if (!empty($_POST['smiley_sets_import'])) {
+							ImportSmileys($_POST['smiley_sets_path']);
+			}
 		}
 		cache_put_data('parsing_smileys', null, 480);
 		cache_put_data('posting_smileys', null, 480);
@@ -273,13 +283,14 @@ 
 	// Load all available smileysets...
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Importing any smileys from an existing set?
 	if ($context['sub_action'] == 'import')
@@ -290,8 +301,9 @@ 
 		$_GET['set'] = (int) $_GET['set'];
 
 		// Sanity check - then import.
-		if (isset($context['smiley_sets'][$_GET['set']]))
-			ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		if (isset($context['smiley_sets'][$_GET['set']])) {
+					ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		}
 
 		// Force the process to continue.
 		$context['sub_action'] = 'modifyset';
@@ -301,15 +313,15 @@ 
 	if ($context['sub_action'] == 'modifyset')
 	{
 		$_GET['set'] = !isset($_GET['set']) ? -1 : (int) $_GET['set'];
-		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']]))
-			$context['current_set'] = array(
+		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']])) {
+					$context['current_set'] = array(
 				'id' => '-1',
 				'path' => '',
 				'name' => '',
 				'selected' => false,
 				'is_new' => true,
 			);
-		else
+		} else
 		{
 			$context['current_set'] = &$context['smiley_sets'][$_GET['set']];
 			$context['current_set']['is_new'] = false;
@@ -321,13 +333,15 @@ 
 				$dir = dir($modSettings['smileys_dir'] . '/' . $context['current_set']['path']);
 				while ($entry = $dir->read())
 				{
-					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$smileys[strtolower($entry)] = $entry;
+					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$smileys[strtolower($entry)] = $entry;
+					}
 				}
 				$dir->close();
 
-				if (empty($smileys))
-					fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				if (empty($smileys)) {
+									fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				}
 
 				// Exclude the smileys that are already in the database.
 				$request = $smcFunc['db_query']('', '
@@ -338,9 +352,10 @@ 
 						'smiley_list' => $smileys,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					if (isset($smileys[strtolower($row['filename'])]))
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									if (isset($smileys[strtolower($row['filename'])]))
 						unset($smileys[strtolower($row['filename'])]);
+				}
 				$smcFunc['db_free_result']($request);
 
 				$context['current_set']['can_import'] = count($smileys);
@@ -355,13 +370,14 @@ 
 			$dir = dir($modSettings['smileys_dir']);
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry))
-					$context['smiley_set_dirs'][] = array(
+				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry)) {
+									$context['smiley_set_dirs'][] = array(
 						'id' => $entry,
 						'path' => $modSettings['smileys_dir'] . '/' . $entry,
 						'selectable' => $entry == $context['current_set']['path'] || !in_array($entry, explode(',', $modSettings['smiley_sets_known'])),
 						'current' => $entry == $context['current_set']['path'],
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -371,8 +387,9 @@ 
 	createToken('admin-mss', 'request');
 
 	// In case we need to import smileys, we need to add the token in now.
-	if (isset($context['current_set']['import_url']))
-		$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	if (isset($context['current_set']['import_url'])) {
+			$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	}
 
 	$listOptions = array(
 		'id' => 'smiley_set_list',
@@ -510,21 +527,23 @@ 
 		$cols['name'][] = $set_names[$i];
 	}
 	$sort_flag = strpos($sort, 'DESC') === false ? SORT_ASC : SORT_DESC;
-	if (substr($sort, 0, 4) === 'name')
-		array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
-	elseif (substr($sort, 0, 4) === 'path')
-		array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
-	else
-		array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	if (substr($sort, 0, 4) === 'name') {
+			array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
+	} elseif (substr($sort, 0, 4) === 'path') {
+			array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
+	} else {
+			array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	}
 
 	$smiley_sets = array();
-	foreach ($cols['id'] as $i => $id)
-		$smiley_sets[] = array(
+	foreach ($cols['id'] as $i => $id) {
+			$smiley_sets[] = array(
 			'id' => $id,
 			'path' => $cols['path'][$i],
 			'name' => $cols['name'][$i],
 			'selected' => $cols['path'][$i] == $modSettings['smiley_sets_default']
 		);
+	}
 
 	return $smiley_sets;
 }
@@ -553,13 +572,14 @@ 
 	$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Submitting a form?
 	if (isset($_POST[$context['session_var']], $_POST['smiley_code']))
@@ -575,8 +595,9 @@ 
 		$_POST['smiley_filename'] = htmltrim__recursive($_POST['smiley_filename']);
 
 		// Make sure some code was entered.
-		if (empty($_POST['smiley_code']))
-			fatal_lang_error('smiley_has_no_code');
+		if (empty($_POST['smiley_code'])) {
+					fatal_lang_error('smiley_has_no_code');
+		}
 
 		// Check whether the new code has duplicates. It should be unique.
 		$request = $smcFunc['db_query']('', '
@@ -588,8 +609,9 @@ 
 				'smiley_code' => $_POST['smiley_code'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) > 0)
-			fatal_lang_error('smiley_not_unique');
+		if ($smcFunc['db_num_rows']($request) > 0) {
+					fatal_lang_error('smiley_not_unique');
+		}
 		$smcFunc['db_free_result']($request);
 
 		// If we are uploading - check all the smiley sets are writable!
@@ -598,38 +620,44 @@ 
 			$writeErrors = array();
 			foreach ($context['smiley_sets'] as $set)
 			{
-				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path'])))
-					$writeErrors[] = $set['path'];
+				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path']))) {
+									$writeErrors[] = $set['path'];
+				}
+			}
+			if (!empty($writeErrors)) {
+							fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 			}
-			if (!empty($writeErrors))
-				fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 		}
 
 		// Uploading just one smiley for all of them?
 		if (isset($_POST['sameall']) && isset($_FILES['uploadSmiley']['name']) && $_FILES['uploadSmiley']['name'] != '')
 		{
-			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name'])))
-				fatal_lang_error('smileys_upload_error');
+			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name']))) {
+							fatal_lang_error('smileys_upload_error');
+			}
 
 			// Sorry, no spaces, dots, or anything else but letters allowed.
 			$_FILES['uploadSmiley']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['uploadSmiley']['name']);
 
 			// We only allow image files - it's THAT simple - no messing around here...
-			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes))
-				fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes)) {
+							fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			}
 
 			// We only need the filename...
 			$destName = basename($_FILES['uploadSmiley']['name']);
 
 			// Make sure they aren't trying to upload a nasty file - for their own good here!
-			if (in_array(strtolower($destName), $disabledFiles))
-				fatal_lang_error('smileys_upload_error_illegal');
+			if (in_array(strtolower($destName), $disabledFiles)) {
+							fatal_lang_error('smileys_upload_error_illegal');
+			}
 
 			// Check if the file already exists... and if not move it to EVERY smiley set directory.
 			$i = 0;
 			// Keep going until we find a set the file doesn't exist in. (or maybe it exists in all of them?)
-			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName))
-				$i++;
+			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName)) {
+							$i++;
+			}
 
 			// Okay, we're going to put the smiley right here, since it's not there yet!
 			if (isset($context['smiley_sets'][$i]['path']))
@@ -644,8 +672,9 @@ 
 					$currentPath = $context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName;
 
 					// The file is already there!  Don't overwrite it!
-					if (file_exists($currentPath))
-						continue;
+					if (file_exists($currentPath)) {
+											continue;
+					}
 
 					// Okay, so copy the first one we made to here.
 					copy($smileyLocation, $currentPath);
@@ -662,13 +691,15 @@ 
 			$newName = '';
 			foreach ($_FILES as $name => $data)
 			{
-				if ($_FILES[$name]['name'] == '')
-					fatal_lang_error('smileys_upload_error_blank');
+				if ($_FILES[$name]['name'] == '') {
+									fatal_lang_error('smileys_upload_error_blank');
+				}
 
-				if (empty($newName))
-					$newName = basename($_FILES[$name]['name']);
-				elseif (basename($_FILES[$name]['name']) != $newName)
-					fatal_lang_error('smileys_upload_error_name');
+				if (empty($newName)) {
+									$newName = basename($_FILES[$name]['name']);
+				} elseif (basename($_FILES[$name]['name']) != $newName) {
+									fatal_lang_error('smileys_upload_error_name');
+				}
 			}
 
 			foreach ($context['smiley_sets'] as $i => $set)
@@ -676,31 +707,36 @@ 
 				$set['name'] = un_htmlspecialchars($set['name']);
 				$set['path'] = un_htmlspecialchars($set['path']);
 
-				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '')
-					continue;
+				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '') {
+									continue;
+				}
 
 				// Got one...
-				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name'])))
-					fatal_lang_error('smileys_upload_error');
+				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name']))) {
+									fatal_lang_error('smileys_upload_error');
+				}
 
 				// Sorry, no spaces, dots, or anything else but letters allowed.
 				$_FILES['individual_' . $set['name']]['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['individual_' . $set['name']]['name']);
 
 				// We only allow image files - it's THAT simple - no messing around here...
-				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes))
-					fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes)) {
+									fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				}
 
 				// We only need the filename...
 				$destName = basename($_FILES['individual_' . $set['name']]['name']);
 
 				// Make sure they aren't trying to upload a nasty file - for their own good here!
-				if (in_array(strtolower($destName), $disabledFiles))
-					fatal_lang_error('smileys_upload_error_illegal');
+				if (in_array(strtolower($destName), $disabledFiles)) {
+									fatal_lang_error('smileys_upload_error_illegal');
+				}
 
 				// If the file exists - ignore it.
 				$smileyLocation = $context['smileys_dir'] . '/' . $set['path'] . '/' . $destName;
-				if (file_exists($smileyLocation))
-					continue;
+				if (file_exists($smileyLocation)) {
+									continue;
+				}
 
 				// Finally - move the image!
 				move_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name'], $smileyLocation);
@@ -712,8 +748,9 @@ 
 		}
 
 		// Also make sure a filename was given.
-		if (empty($_POST['smiley_filename']))
-			fatal_lang_error('smiley_has_no_filename');
+		if (empty($_POST['smiley_filename'])) {
+					fatal_lang_error('smiley_has_no_filename');
+		}
 
 		// Find the position on the right.
 		$smiley_order = '0';
@@ -732,8 +769,9 @@ 
 			list ($smiley_order) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($smiley_order))
-				$smiley_order = '0';
+			if (empty($smiley_order)) {
+							$smiley_order = '0';
+			}
 		}
 		$smcFunc['db_insert']('',
 			'{db_prefix}smileys',
@@ -761,17 +799,19 @@ 
 	{
 		foreach ($context['smiley_sets'] as $smiley_set)
 		{
-			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-				continue;
+			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+							continue;
+			}
 
 			$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-					$context['filenames'][strtolower($entry)] = array(
+				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+									$context['filenames'][strtolower($entry)] = array(
 						'id' => $smcFunc['htmlspecialchars']($entry),
 						'selected' => false,
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -809,17 +849,19 @@ 
 		// Changing the selected smileys?
 		if (isset($_POST['smiley_action']) && !empty($_POST['checked_smileys']))
 		{
-			foreach ($_POST['checked_smileys'] as $id => $smiley_id)
-				$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			foreach ($_POST['checked_smileys'] as $id => $smiley_id) {
+							$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			}
 
-			if ($_POST['smiley_action'] == 'delete')
-				$smcFunc['db_query']('', '
+			if ($_POST['smiley_action'] == 'delete') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}smileys
 					WHERE id_smiley IN ({array_int:checked_smileys})',
 					array(
 						'checked_smileys' => $_POST['checked_smileys'],
 					)
 				);
+			}
 			// Changing the status of the smiley?
 			else
 			{
@@ -829,8 +871,8 @@ 
 					'hidden' => 1,
 					'popup' => 2
 				);
-				if (isset($displayTypes[$_POST['smiley_action']]))
-					$smcFunc['db_query']('', '
+				if (isset($displayTypes[$_POST['smiley_action']])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET hidden = {int:display_type}
 						WHERE id_smiley IN ({array_int:checked_smileys})',
@@ -839,6 +881,7 @@ 
 							'display_type' => $displayTypes[$_POST['smiley_action']],
 						)
 					);
+				}
 			}
 		}
 		// Create/modify a smiley.
@@ -864,12 +907,14 @@ 
 				$_POST['smiley_location'] = empty($_POST['smiley_location']) || $_POST['smiley_location'] > 2 || $_POST['smiley_location'] < 0 ? 0 : (int) $_POST['smiley_location'];
 
 				// Make sure some code was entered.
-				if (empty($_POST['smiley_code']))
-					fatal_lang_error('smiley_has_no_code');
+				if (empty($_POST['smiley_code'])) {
+									fatal_lang_error('smiley_has_no_code');
+				}
 
 				// Also make sure a filename was given.
-				if (empty($_POST['smiley_filename']))
-					fatal_lang_error('smiley_has_no_filename');
+				if (empty($_POST['smiley_filename'])) {
+									fatal_lang_error('smiley_has_no_filename');
+				}
 
 				// Check whether the new code has duplicates. It should be unique.
 				$request = $smcFunc['db_query']('', '
@@ -883,8 +928,9 @@ 
 						'smiley_code' => $_POST['smiley_code'],
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) > 0)
-					fatal_lang_error('smiley_not_unique');
+				if ($smcFunc['db_num_rows']($request) > 0) {
+									fatal_lang_error('smiley_not_unique');
+				}
 				$smcFunc['db_free_result']($request);
 
 				$smcFunc['db_query']('', '
@@ -913,13 +959,14 @@ 
 	// Load all known smiley sets.
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Prepare overview of all (custom) smileys.
 	if ($context['sub_action'] == 'editsmileys')
@@ -935,9 +982,10 @@ 
 		// Create a list of options for selecting smiley sets.
 		$smileyset_option_list = '
 			<select name="set" onchange="changeSet(this.options[this.selectedIndex].value);">';
-		foreach ($context['smiley_sets'] as $smiley_set)
-			$smileyset_option_list .= '
+		foreach ($context['smiley_sets'] as $smiley_set) {
+					$smileyset_option_list .= '
 				<option value="' . $smiley_set['path'] . '"' . ($modSettings['smiley_sets_default'] == $smiley_set['path'] ? ' selected' : '') . '>' . $smiley_set['name'] . '</option>';
+		}
 		$smileyset_option_list .= '
 			</select>';
 
@@ -999,12 +1047,13 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($txt)
 						{
-							if (empty($rowData['hidden']))
-								return $txt['smileys_location_form'];
-							elseif ($rowData['hidden'] == 1)
-								return $txt['smileys_location_hidden'];
-							else
-								return $txt['smileys_location_popup'];
+							if (empty($rowData['hidden'])) {
+															return $txt['smileys_location_form'];
+							} elseif ($rowData['hidden'] == 1) {
+															return $txt['smileys_location_hidden'];
+							} else {
+															return $txt['smileys_location_popup'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1019,19 +1068,22 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
-							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
-								return $smcFunc['htmlspecialchars']($rowData['description']);
+							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'])) {
+															return $smcFunc['htmlspecialchars']($rowData['description']);
+							}
 
 							// Check if there are smileys missing in some sets.
 							$missing_sets = array();
-							foreach ($context['smiley_sets'] as $smiley_set)
-								if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
+							foreach ($context['smiley_sets'] as $smiley_set) {
+															if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
 									$missing_sets[] = $smiley_set['path'];
+							}
 
 							$description = $smcFunc['htmlspecialchars']($rowData['description']);
 
-							if (!empty($missing_sets))
-								$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							if (!empty($missing_sets)) {
+															$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							}
 
 							return $description;
 						},
@@ -1147,13 +1199,14 @@ 
 		$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
-		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		foreach ($context['smiley_sets'] as $i => $set) {
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => $smcFunc['htmlspecialchars']($set),
 				'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		$context['selected_set'] = $modSettings['smiley_sets_default'];
 
@@ -1163,17 +1216,19 @@ 
 		{
 			foreach ($context['smiley_sets'] as $smiley_set)
 			{
-				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-					continue;
+				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+									continue;
+				}
 
 				$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 				while ($entry = $dir->read())
 				{
-					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$context['filenames'][strtolower($entry)] = array(
+					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$context['filenames'][strtolower($entry)] = array(
 							'id' => $smcFunc['htmlspecialchars']($entry),
 							'selected' => false,
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -1188,8 +1243,9 @@ 
 				'current_smiley' => (int) $_REQUEST['smiley'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 1)
-			fatal_lang_error('smiley_not_found');
+		if ($smcFunc['db_num_rows']($request) != 1) {
+					fatal_lang_error('smiley_not_found');
+		}
 		$context['current_smiley'] = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1197,8 +1253,9 @@ 
 		$context['current_smiley']['filename'] = $smcFunc['htmlspecialchars']($context['current_smiley']['filename']);
 		$context['current_smiley']['description'] = $smcFunc['htmlspecialchars']($context['current_smiley']['description']);
 
-		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])]))
-			$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])])) {
+					$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		}
 	}
 }
 
@@ -1223,8 +1280,9 @@ 
 		)
 	);
 	$smileys = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$smileys[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$smileys[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $smileys;
@@ -1264,8 +1322,9 @@ 
 		$_GET['location'] = empty($_GET['location']) || $_GET['location'] != 'popup' ? 0 : 2;
 		$_GET['source'] = empty($_GET['source']) ? 0 : (int) $_GET['source'];
 
-		if (empty($_GET['source']))
-			fatal_lang_error('smiley_not_found');
+		if (empty($_GET['source'])) {
+					fatal_lang_error('smiley_not_found');
+		}
 
 		if (!empty($_GET['after']))
 		{
@@ -1281,12 +1340,12 @@ 
 					'after_smiley' => $_GET['after'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 1)
-				fatal_lang_error('smiley_not_found');
+			if ($smcFunc['db_num_rows']($request) != 1) {
+							fatal_lang_error('smiley_not_found');
+			}
 			list ($smiley_row, $smiley_order, $smileyLocation) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$smiley_row = (int) $_GET['row'];
 			$smiley_order = -1;
@@ -1360,14 +1419,15 @@ 
 	$context['move_smiley'] = empty($_REQUEST['move']) ? 0 : (int) $_REQUEST['move'];
 
 	// Make sure all rows are sequential.
-	foreach (array_keys($context['smileys']) as $location)
-		$context['smileys'][$location] = array(
+	foreach (array_keys($context['smileys']) as $location) {
+			$context['smileys'][$location] = array(
 			'id' => $location,
 			'title' => $location == 'postform' ? $txt['smileys_location_form'] : $txt['smileys_location_popup'],
 			'description' => $location == 'postform' ? $txt['smileys_location_form_description'] : $txt['smileys_location_popup_description'],
 			'last_row' => count($context['smileys'][$location]['rows']),
 			'rows' => array_values($context['smileys'][$location]['rows']),
 		);
+	}
 
 	// Check & fix smileys that are not ordered properly in the database.
 	foreach (array_keys($context['smileys']) as $location)
@@ -1392,8 +1452,8 @@ 
 				$context['smileys'][$location]['rows'][$id][0]['row'] = $id;
 			}
 			// Make sure the smiley order is always sequential.
-			foreach ($smiley_row as $order_id => $smiley)
-				if ($order_id != $smiley['order'])
+			foreach ($smiley_row as $order_id => $smiley) {
+							if ($order_id != $smiley['order'])
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET smiley_order = {int:new_order}
@@ -1403,6 +1463,7 @@ 
 							'current_smiley' => $smiley['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -1436,19 +1497,20 @@ 
 
 		// Check that the smiley is from simplemachines.org, for now... maybe add mirroring later.
 		// @ TODO: Our current xml files serve http links.  Allowing both for now until we serve https.
-		if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false)
-			fatal_lang_error('not_on_simplemachines');
+		if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false) {
+					fatal_lang_error('not_on_simplemachines');
+		}
 
 		$destination = $packagesdir . '/' . $base_name;
 
-		if (file_exists($destination))
-			fatal_lang_error('package_upload_error_exists');
+		if (file_exists($destination)) {
+					fatal_lang_error('package_upload_error_exists');
+		}
 
 		// Let's copy it to the Packages directory
 		file_put_contents($destination, fetch_web_data($_REQUEST['set_gz']));
 		$testing = true;
-	}
-	elseif (isset($_REQUEST['package']))
+	} elseif (isset($_REQUEST['package']))
 	{
 		$base_name = basename($_REQUEST['package']);
 		$name = $smcFunc['htmlspecialchars'](strtok(basename($_REQUEST['package']), '.'));
@@ -1457,12 +1519,14 @@ 
 		$destination = $packagesdir . '/' . basename($_REQUEST['package']);
 	}
 
-	if (empty($destination) || !file_exists($destination))
-		fatal_lang_error('package_no_file', false);
+	if (empty($destination) || !file_exists($destination)) {
+			fatal_lang_error('package_no_file', false);
+	}
 
 	// Make sure temp directory exists and is empty.
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	}
 
 	if (!mktree($packagesdir . '/temp', 0755))
 	{
@@ -1474,31 +1538,37 @@ 
 			create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=smileys;sa=install;set_gz=' . $_REQUEST['set_gz'], 'crash_on_error' => true));
 
 			deltree($packagesdir . '/temp', false);
-			if (!mktree($packagesdir . '/temp', 0777))
-				fatal_lang_error('package_cant_download', false);
+			if (!mktree($packagesdir . '/temp', 0777)) {
+							fatal_lang_error('package_cant_download', false);
+			}
 		}
 	}
 
 	$extracted = read_tgz_file($destination, $packagesdir . '/temp');
-	if (!$extracted)
-		fatal_lang_error('packageget_unable', false, array('https://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
-	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml'))
-		foreach ($extracted as $file)
+	if (!$extracted) {
+			fatal_lang_error('packageget_unable', false, array('https://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
+	}
+	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml')) {
+			foreach ($extracted as $file)
 			if (basename($file['filename']) == 'package-info.xml')
 			{
 				$base_path = dirname($file['filename']) . '/';
+	}
 				break;
 			}
 
-	if (!isset($base_path))
-		$base_path = '';
+	if (!isset($base_path)) {
+			$base_path = '';
+	}
 
-	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml'))
-		fatal_lang_error('package_get_error_missing_xml', false);
+	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml')) {
+			fatal_lang_error('package_get_error_missing_xml', false);
+	}
 
 	$smileyInfo = getPackageInfo($context['filename']);
-	if (!is_array($smileyInfo))
-		fatal_lang_error($smileyInfo);
+	if (!is_array($smileyInfo)) {
+			fatal_lang_error($smileyInfo);
+	}
 
 	// See if it is installed?
 	$request = $smcFunc['db_query']('', '
@@ -1514,8 +1584,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) > 0)
-		fatal_lang_error('package_installed_warning1');
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			fatal_lang_error('package_installed_warning1');
+	}
 
 	// Everything is fine, now it's time to do something
 	$actions = parsePackageInfo($smileyInfo['xml'], true, 'install');
@@ -1530,23 +1601,23 @@ 
 		if ($action['type'] == 'readme' || $action['type'] == 'license')
 		{
 			$type = 'package_' . $action['type'];
-			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
-			elseif (file_exists($action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
+			} elseif (file_exists($action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			}
 
 			if (!empty($action['parse_bbc']))
 			{
 				require_once($sourcedir . '/Subs-Post.php');
 				preparsecode($context[$type]);
 				$context[$type] = parse_bbc($context[$type]);
+			} else {
+							$context[$type] = nl2br($context[$type]);
 			}
-			else
-				$context[$type] = nl2br($context[$type]);
 
 			continue;
-		}
-		elseif ($action['type'] == 'require-dir')
+		} elseif ($action['type'] == 'require-dir')
 		{
 			// Do this one...
 			$thisAction = array(
@@ -1565,12 +1636,12 @@ 
 				);
 			}
 			// @todo None given?
-			if (empty($thisAction['description']))
-				$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			if (empty($thisAction['description'])) {
+							$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			}
 
 			$context['actions'][] = $thisAction;
-		}
-		elseif ($action['type'] == 'credits')
+		} elseif ($action['type'] == 'credits')
 		{
 			// Time to build the billboard
 			$credits_tag = array(
@@ -1630,12 +1701,14 @@ 
 		cache_put_data('posting_smileys', null, 480);
 	}
 
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
-	if (!$testing)
-		redirectexit('action=admin;area=smileys');
-}
+	if (!$testing) {
+			redirectexit('action=admin;area=smileys');
+	}
+	}
 
 /**
  * A function to import new smileys from an existing directory into the database.
@@ -1646,15 +1719,17 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath))
-		fatal_lang_error('smiley_set_unable_to_import');
+	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath)) {
+			fatal_lang_error('smiley_set_unable_to_import');
+	}
 
 	$smileys = array();
 	$dir = dir($modSettings['smileys_dir'] . '/' . $smileyPath);
 	while ($entry = $dir->read())
 	{
-		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-			$smileys[strtolower($entry)] = $entry;
+		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+					$smileys[strtolower($entry)] = $entry;
+		}
 	}
 	$dir->close();
 
@@ -1667,9 +1742,10 @@ 
 			'smiley_list' => $smileys,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($smileys[strtolower($row['filename'])]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($smileys[strtolower($row['filename'])]))
 			unset($smileys[strtolower($row['filename'])]);
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1686,9 +1762,10 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$new_smileys = array();
-	foreach ($smileys as $smiley)
-		if (strlen($smiley) <= 48)
+	foreach ($smileys as $smiley) {
+			if (strlen($smiley) <= 48)
 			$new_smileys[] = array(':' . strtok($smiley, '.') . ':', $smiley, strtok($smiley, '.'), 0, ++$smiley_order);
+	}
 
 	if (!empty($new_smileys))
 	{
@@ -1753,8 +1830,9 @@ 
 		if (isset($_POST['delete']) && !empty($_POST['checked_icons']))
 		{
 			$deleteIcons = array();
-			foreach ($_POST['checked_icons'] as $icon)
-				$deleteIcons[] = (int) $icon;
+			foreach ($_POST['checked_icons'] as $icon) {
+							$deleteIcons[] = (int) $icon;
+			}
 
 			// Do the actual delete!
 			$smcFunc['db_query']('', '
@@ -1771,35 +1849,41 @@ 
 			$_GET['icon'] = (int) $_GET['icon'];
 
 			// Do some preperation with the data... like check the icon exists *somewhere*
-			if (strpos($_POST['icon_filename'], '.png') !== false)
-				$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
-			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png'))
-				fatal_lang_error('icon_not_found');
+			if (strpos($_POST['icon_filename'], '.png') !== false) {
+							$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
+			}
+			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png')) {
+							fatal_lang_error('icon_not_found');
+			}
 			// There is a 16 character limit on message icons...
-			elseif (strlen($_POST['icon_filename']) > 16)
-				fatal_lang_error('icon_name_too_long');
-			elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon']))
-				fatal_lang_error('icon_after_itself');
+			elseif (strlen($_POST['icon_filename']) > 16) {
+							fatal_lang_error('icon_name_too_long');
+			} elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon'])) {
+							fatal_lang_error('icon_after_itself');
+			}
 
 			// First do the sorting... if this is an edit reduce the order of everything after it by one ;)
 			if ($_GET['icon'] != 0)
 			{
 				$oldOrder = $context['icons'][$_GET['icon']]['true_order'];
-				foreach ($context['icons'] as $id => $data)
-					if ($data['true_order'] > $oldOrder)
+				foreach ($context['icons'] as $id => $data) {
+									if ($data['true_order'] > $oldOrder)
 						$context['icons'][$id]['true_order']--;
+				}
 			}
 
 			// If there are no existing icons and this is a new one, set the id to 1 (mainly for non-mysql)
-			if (empty($_GET['icon']) && empty($context['icons']))
-				$_GET['icon'] = 1;
+			if (empty($_GET['icon']) && empty($context['icons'])) {
+							$_GET['icon'] = 1;
+			}
 
 			// Get the new order.
 			$newOrder = $_POST['icon_location'] == 0 ? 0 : $context['icons'][$_POST['icon_location']]['true_order'] + 1;
 			// Do the same, but with the one that used to be after this icon, done to avoid conflict.
-			foreach ($context['icons'] as $id => $data)
-				if ($data['true_order'] >= $newOrder)
+			foreach ($context['icons'] as $id => $data) {
+							if ($data['true_order'] >= $newOrder)
 					$context['icons'][$id]['true_order']++;
+			}
 
 			// Finally set the current icon's position!
 			$context['icons'][$_GET['icon']]['true_order'] = $newOrder;
@@ -1817,8 +1901,7 @@ 
 				if ($id != 0)
 				{
 					$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
-				}
-				else
+				} else
 				{
 					$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
 				}
@@ -1843,8 +1926,9 @@ 
 		}
 
 		// Unless we're adding a new thing, we'll escape
-		if (!isset($_POST['add']))
-			redirectexit('action=admin;area=smileys;sa=editicons');
+		if (!isset($_POST['add'])) {
+					redirectexit('action=admin;area=smileys;sa=editicons');
+		}
 	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'editicons';
@@ -1954,8 +2038,9 @@ 
 		$context['new_icon'] = !isset($_GET['icon']);
 
 		// Get the properties of the current icon from the icon list.
-		if (!$context['new_icon'])
-			$context['icon'] = $context['icons'][$_GET['icon']];
+		if (!$context['new_icon']) {
+					$context['icon'] = $context['icons'][$_GET['icon']];
+		}
 
 		// Get a list of boards needed for assigning this icon to a specific board.
 		$boardListOptions = array(
@@ -1989,8 +2074,9 @@ 
 	);
 
 	$message_icons = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$message_icons[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$message_icons[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $message_icons;

Spacing +10 added lines, -10 removed lines

@@ -393,7 +393,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '<span class="generic_icons valid"></span>' : '';
 					},
@@ -453,7 +453,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$d]">', $rowData['id']);
 					},
@@ -997,7 +997,7 @@ 
 						'value' => $txt['smileys_location'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($txt)
+						'function' => function($rowData) use ($txt)
 						{
 							if (empty($rowData['hidden']))
 								return $txt['smileys_location_form'];
@@ -1008,7 +1008,7 @@ 
 						},
 					),
 					'sort' => array(
-						'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)) ,
+						'default' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations)),
 						'reverse' => $smcFunc['db_custom_order']('hidden', array_keys($smiley_locations), true),
 					),
 				),
@@ -1017,7 +1017,7 @@ 
 						'value' => $txt['smileys_description'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
+						'function' => function($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
 							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
 								return $smcFunc['htmlspecialchars']($rowData['description']);
@@ -1554,7 +1554,7 @@ 
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
 
-			$file =  $packagesdir . '/temp/' . $base_path . $action['filename'];
+			$file = $packagesdir . '/temp/' . $base_path . $action['filename'];
 			if (isset($action['filename']) && (!file_exists($file) || !is_writable(dirname($action['destination']))))
 			{
 				$context['has_failure'] = true;
@@ -1599,7 +1599,7 @@ 
 		{
 			updateSettings(array(
 				'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . basename($action['action']),
-				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' .  (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
+				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
 			));
 		}
 
@@ -1611,7 +1611,7 @@ 
 			'{db_prefix}log_packages',
 			array(
 				'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
-				'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int',
+				'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
 				'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
 				'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
 			),
@@ -1860,7 +1860,7 @@ 
 		'columns' => array(
 			'icon' => array(
 				'data' => array(
-					'function' => function ($rowData) use ($settings, $smcFunc)
+					'function' => function($rowData) use ($settings, $smcFunc)
 					{
 						$images_url = $settings[file_exists(sprintf('%1$s/images/post/%2$s.png', $settings['theme_dir'], $rowData['filename'])) ? 'actual_images_url' : 'default_images_url'];
 						return sprintf('<img src="%1$s/post/%2$s.png" alt="%3$s">', $images_url, $rowData['filename'], $smcFunc['htmlspecialchars']($rowData['title']));
@@ -1894,7 +1894,7 @@ 
 					'value' => $txt['icons_board'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return empty($rowData['board_name']) ? $txt['icons_edit_icons_all_boards'] : $rowData['board_name'];
 					},

Sources/Subs-MessageIndex.php

Braces +13 added lines, -10 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Generates the query to determine the list of available boards for a user
@@ -25,8 +26,9 @@ 
 {
 	global $smcFunc, $sourcedir;
 
-	if (isset($boardListOptions['excluded_boards']) && isset($boardListOptions['included_boards']))
-		trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	if (isset($boardListOptions['excluded_boards']) && isset($boardListOptions['included_boards'])) {
+			trigger_error('getBoardList(): Setting both excluded_boards and included_boards is not allowed.', E_USER_ERROR);
+	}
 
 	$where = array();
 	$where_parameters = array();
@@ -42,11 +44,11 @@ 
 		$where_parameters['included_boards'] = $boardListOptions['included_boards'];
 	}
 
-	if (!empty($boardListOptions['ignore_boards']))
-		$where[] = '{query_wanna_see_board}';
-
-	elseif (!empty($boardListOptions['use_permissions']))
-		$where[] = '{query_see_board}';
+	if (!empty($boardListOptions['ignore_boards'])) {
+			$where[] = '{query_wanna_see_board}';
+	} elseif (!empty($boardListOptions['use_permissions'])) {
+			$where[] = '{query_see_board}';
+	}
 
 	if (!empty($boardListOptions['not_redirection']))
 	{
@@ -68,12 +70,13 @@ 
 	{
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($return_value[$row['id_cat']]))
-				$return_value[$row['id_cat']] = array(
+			if (!isset($return_value[$row['id_cat']])) {
+							$return_value[$row['id_cat']] = array(
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'boards' => array(),
 				);
+			}
 
 			$return_value[$row['id_cat']]['boards'][$row['id_board']] = array(
 				'id' => $row['id_board'],