SimpleMachines / SMF2.1

Themes/default/index.php

Braces +3 added lines, -2 removed lines

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

Sources/SplitTopics.php

Braces +260 added lines, -186 removed lines

@@ -15,8 +15,9 @@ 
  * Original module by Mach8 - We'll never forget you.
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * splits a topic into two topics.
@@ -30,15 +31,17 @@ 
 	global $topic, $sourcedir;
 
 	// And... which topic were you splitting, again?
-	if (empty($topic))
-		fatal_lang_error('numbers_one_to_nine', false);
+	if (empty($topic)) {
+			fatal_lang_error('numbers_one_to_nine', false);
+	}
 
 	// Are you allowed to split topics?
 	isAllowedTo('split_any');
 
 	// Load up the "dependencies" - the template, getMsgMemberID(), and sendNotifications().
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('SplitTopics');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('SplitTopics');
+	}
 	require_once($sourcedir . '/Subs-Boards.php');
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -50,12 +53,12 @@ 
 	);
 
 	// ?action=splittopics;sa=LETSBREAKIT won't work, sorry.
-	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
-		SplitIndex();
-
-	else
-		call_helper($subActions[$_REQUEST['sa']]);
-}
+	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) {
+			SplitIndex();
+	} else {
+			call_helper($subActions[$_REQUEST['sa']]);
+	}
+	}
 
 /**
  * screen shown before the actual split.
@@ -71,8 +74,9 @@ 
 	global $txt, $topic, $context, $smcFunc, $modSettings;
 
 	// Validate "at".
-	if (empty($_GET['at']))
-		fatal_lang_error('numbers_one_to_nine', false);
+	if (empty($_GET['at'])) {
+			fatal_lang_error('numbers_one_to_nine', false);
+	}
 	$_GET['at'] = (int) $_GET['at'];
 
 	// Retrieve the subject and stuff of the specific topic/message.
@@ -89,26 +93,31 @@ 
 			'split_at' => $_GET['at'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('cant_find_messages');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('cant_find_messages');
+	}
 	list ($_REQUEST['subname'], $num_replies, $unapproved_posts, $id_first_msg, $approved) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// If not approved validate they can see it.
-	if ($modSettings['postmod_active'] && !$approved)
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$approved) {
+			isAllowedTo('approve_posts');
+	}
 
 	// If this topic has unapproved posts, we need to count them too...
-	if ($modSettings['postmod_active'] && allowedTo('approve_posts'))
-		$num_replies += $unapproved_posts - ($approved ? 0 : 1);
+	if ($modSettings['postmod_active'] && allowedTo('approve_posts')) {
+			$num_replies += $unapproved_posts - ($approved ? 0 : 1);
+	}
 
 	// Check if there is more than one message in the topic.  (there should be.)
-	if ($num_replies < 1)
-		fatal_lang_error('topic_one_post', false);
+	if ($num_replies < 1) {
+			fatal_lang_error('topic_one_post', false);
+	}
 
 	// Check if this is the first message in the topic (if so, the first and second option won't be available)
-	if ($id_first_msg == $_GET['at'])
-		return SplitSelectTopics();
+	if ($id_first_msg == $_GET['at']) {
+			return SplitSelectTopics();
+	}
 
 	// Basic template information....
 	$context['message'] = array(
@@ -137,8 +146,9 @@ 
 	checkSession();
 
 	// Clean up the subject.
-	if (!isset($_POST['subname']) || $_POST['subname'] == '')
-		$_POST['subname'] = $txt['new_topic'];
+	if (!isset($_POST['subname']) || $_POST['subname'] == '') {
+			$_POST['subname'] = $txt['new_topic'];
+	}
 
 	// Redirect to the selector if they chose selective.
 	if ($_POST['step2'] == 'selective')
@@ -163,16 +173,19 @@ 
 				'split_at' => $_POST['at'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$messagesToBeSplit[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$messagesToBeSplit[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 	// Only the selected message has to be split. That should be easy.
-	elseif ($_POST['step2'] == 'onlythis')
-		$messagesToBeSplit[] = $_POST['at'];
+	elseif ($_POST['step2'] == 'onlythis') {
+			$messagesToBeSplit[] = $_POST['at'];
+	}
 	// There's another action?!
-	else
-		fatal_lang_error('no_access', false);
+	else {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['old_topic'] = $topic;
 	$context['new_topic'] = splitTopic($topic, $messagesToBeSplit, $_POST['subname']);
@@ -199,8 +212,9 @@ 
 	$_SESSION['split_selection'][$topic] = empty($_SESSION['split_selection'][$topic]) ? array() : $_SESSION['split_selection'][$topic];
 
 	// This is a special case for split topics from quick-moderation checkboxes
-	if (isset($_REQUEST['subname_enc']))
-		$_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']);
+	if (isset($_REQUEST['subname_enc'])) {
+			$_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']);
+	}
 
 	$context['not_selected'] = array(
 		'num_messages' => 0,
@@ -252,10 +266,12 @@ 
 			)
 		);
 		// You can't split the last message off.
-		if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down')
-			$_REQUEST['move'] = '';
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$original_msgs['not_selected'][] = $row['id_msg'];
+		if (empty($context['not_selected']['start']) && $smcFunc['db_num_rows']($request) <= 1 && $_REQUEST['move'] == 'down') {
+					$_REQUEST['move'] = '';
+		}
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$original_msgs['not_selected'][] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 		if (!empty($_SESSION['split_selection'][$topic]))
 		{
@@ -275,8 +291,9 @@ 
 					'messages_per_page' => $context['messages_per_page'],
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$original_msgs['selected'][] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$original_msgs['selected'][] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
@@ -286,12 +303,13 @@ 
 	{
 		$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
-		if ($_REQUEST['move'] == 'reset')
-			$_SESSION['split_selection'][$topic] = array();
-		elseif ($_REQUEST['move'] == 'up')
-			$_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg']));
-		else
-			$_SESSION['split_selection'][$topic][] = $_REQUEST['msg'];
+		if ($_REQUEST['move'] == 'reset') {
+					$_SESSION['split_selection'][$topic] = array();
+		} elseif ($_REQUEST['move'] == 'up') {
+					$_SESSION['split_selection'][$topic] = array_diff($_SESSION['split_selection'][$topic], array($_REQUEST['msg']));
+		} else {
+					$_SESSION['split_selection'][$topic][] = $_REQUEST['msg'];
+		}
 	}
 
 	// Make sure the selection is still accurate.
@@ -310,8 +328,9 @@ 
 			)
 		);
 		$_SESSION['split_selection'][$topic] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$_SESSION['split_selection'][$topic][] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$_SESSION['split_selection'][$topic][] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -328,13 +347,15 @@ 
 			'is_approved' => 1,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Fix an oversized starting page (to make sure both pageindexes are properly set).
-	if ($context['selected']['start'] >= $context['selected']['num_messages'])
-		$context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page'])));
+	if ($context['selected']['start'] >= $context['selected']['num_messages']) {
+			$context['selected']['start'] = $context['selected']['num_messages'] <= $context['messages_per_page'] ? 0 : ($context['selected']['num_messages'] - (($context['selected']['num_messages'] % $context['messages_per_page']) == 0 ? $context['messages_per_page'] : ($context['selected']['num_messages'] % $context['messages_per_page'])));
+	}
 
 	// Build a page list of the not-selected topics...
 	$context['not_selected']['page_index'] = constructPageIndex($scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), array('%' => '%%')) . ';topic=' . $topic . '.%1$d;start2=' . $context['selected']['start'], $context['not_selected']['start'], $context['not_selected']['num_messages'], $context['messages_per_page'], true);
@@ -434,11 +455,12 @@ 
 		);
 
 		$context['changes'] = array();
-		foreach ($changes as $change_type => $change_array)
-			foreach ($change_array as $section => $msg_array)
+		foreach ($changes as $change_type => $change_array) {
+					foreach ($change_array as $section => $msg_array)
 			{
 				if (empty($msg_array))
 					continue;
+		}
 
 				foreach ($msg_array as $id_msg)
 				{
@@ -447,8 +469,9 @@ 
 						'type' => $change_type,
 						'section' => $section,
 					);
-					if ($change_type == 'insert')
-						$context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg];
+					if ($change_type == 'insert') {
+											$context['changes']['insert' . $id_msg]['insert_value'] = $context[$section]['messages'][$id_msg];
+					}
 				}
 			}
 	}
@@ -468,12 +491,14 @@ 
 	checkSession();
 
 	// Default the subject in case it's blank.
-	if (!isset($_POST['subname']) || $_POST['subname'] == '')
-		$_POST['subname'] = $txt['new_topic'];
+	if (!isset($_POST['subname']) || $_POST['subname'] == '') {
+			$_POST['subname'] = $txt['new_topic'];
+	}
 
 	// You must've selected some messages!  Can't split out none!
-	if (empty($_SESSION['split_selection'][$topic]))
-		fatal_lang_error('no_posts_selected', false);
+	if (empty($_SESSION['split_selection'][$topic])) {
+			fatal_lang_error('no_posts_selected', false);
+	}
 
 	$context['old_topic'] = $topic;
 	$context['new_topic'] = splitTopic($topic, $_SESSION['split_selection'][$topic], $_POST['subname']);
@@ -499,8 +524,9 @@ 
 	global $smcFunc, $txt, $sourcedir;
 
 	// Nothing to split?
-	if (empty($splitMessages))
-		fatal_lang_error('no_posts_selected', false);
+	if (empty($splitMessages)) {
+			fatal_lang_error('no_posts_selected', false);
+	}
 
 	// Get some board info.
 	$request = $smcFunc['db_query']('', '
@@ -532,8 +558,9 @@ 
 		)
 	);
 	// You can't select ALL the messages!
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('selected_all_posts', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('selected_all_posts', false);
+	}
 
 	$split1_first_msg = null;
 	$split1_last_msg = null;
@@ -541,24 +568,27 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Get the right first and last message dependant on approved state...
-		if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg)
-			$split1_first_msg = $row['myid_first_msg'];
-		if (empty($split1_last_msg) || $row['approved'])
-			$split1_last_msg = $row['myid_last_msg'];
+		if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg) {
+					$split1_first_msg = $row['myid_first_msg'];
+		}
+		if (empty($split1_last_msg) || $row['approved']) {
+					$split1_last_msg = $row['myid_last_msg'];
+		}
 
 		// Get the counts correct...
 		if ($row['approved'])
 		{
 			$split1_replies = $row['message_count'] - 1;
 			$split1_unapprovedposts = 0;
-		}
-		else
+		} else
 		{
-			if (!isset($split1_replies))
-				$split1_replies = 0;
+			if (!isset($split1_replies)) {
+							$split1_replies = 0;
+			}
 			// If the topic isn't approved then num replies must go up by one... as first post wouldn't be counted.
-			elseif (!$split1_approved)
-				$split1_replies++;
+			elseif (!$split1_approved) {
+							$split1_replies++;
+			}
 
 			$split1_unapprovedposts = $row['message_count'];
 		}
@@ -584,10 +614,12 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// As before get the right first and last message dependant on approved state...
-		if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg)
-			$split2_first_msg = $row['myid_first_msg'];
-		if (empty($split2_last_msg) || $row['approved'])
-			$split2_last_msg = $row['myid_last_msg'];
+		if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg) {
+					$split2_first_msg = $row['myid_first_msg'];
+		}
+		if (empty($split2_last_msg) || $row['approved']) {
+					$split2_last_msg = $row['myid_last_msg'];
+		}
 
 		// Then do the counts again...
 		if ($row['approved'])
@@ -595,18 +627,20 @@ 
 			$split2_approved = true;
 			$split2_replies = $row['message_count'] - 1;
 			$split2_unapprovedposts = 0;
-		}
-		else
+		} else
 		{
 			// Should this one be approved??
-			if ($split2_first_msg == $row['myid_first_msg'])
-				$split2_approved = false;
+			if ($split2_first_msg == $row['myid_first_msg']) {
+							$split2_approved = false;
+			}
 
-			if (!isset($split2_replies))
-				$split2_replies = 0;
+			if (!isset($split2_replies)) {
+							$split2_replies = 0;
+			}
 			// As before, fix number of replies.
-			elseif (!$split2_approved)
-				$split2_replies++;
+			elseif (!$split2_approved) {
+							$split2_replies++;
+			}
 
 			$split2_unapprovedposts = $row['message_count'];
 		}
@@ -616,12 +650,14 @@ 
 	$split2_lastMem = getMsgMemberID($split2_last_msg);
 
 	// No database changes yet, so let's double check to see if everything makes at least a little sense.
-	if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved))
-		fatal_lang_error('cant_find_messages');
+	if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved)) {
+			fatal_lang_error('cant_find_messages');
+	}
 
 	// You cannot split off the first message of a topic.
-	if ($split1_first_msg > $split2_first_msg)
-		fatal_lang_error('split_first_post', false);
+	if ($split1_first_msg > $split2_first_msg) {
+			fatal_lang_error('split_first_post', false);
+	}
 
 	// We're off to insert the new topic!  Use 0 for now to avoid UNIQUE errors.
 	$split2_ID_TOPIC = $smcFunc['db_insert']('',
@@ -644,14 +680,16 @@ 
 			array('id_topic'),
 			1
 		);
-	if ($split2_ID_TOPIC <= 0)
-		fatal_lang_error('cant_insert_topic');
+	if ($split2_ID_TOPIC <= 0) {
+			fatal_lang_error('cant_insert_topic');
+	}
 
 	// Move the messages over to the other topic.
 	$new_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($new_subject)), array("\r" => '', "\n" => '', "\t" => ''));
 	// Check the subject length.
-	if ($smcFunc['strlen']($new_subject) > 100)
-		$new_subject = $smcFunc['substr']($new_subject, 0, 100);
+	if ($smcFunc['strlen']($new_subject) > 100) {
+			$new_subject = $smcFunc['substr']($new_subject, 0, 100);
+	}
 	// Valid subject?
 	if ($new_subject != '')
 	{
@@ -722,8 +760,8 @@ 
 	);
 
 	// If the new topic isn't approved ensure the first message flags this just in case.
-	if (!$split2_approved)
-		$smcFunc['db_query']('', '
+	if (!$split2_approved) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}messages
 			SET approved = {int:approved}
 			WHERE id_msg = {int:id_msg}
@@ -734,6 +772,7 @@ 
 				'id_topic' => $split2_ID_TOPIC,
 			)
 		);
+	}
 
 	// The board has more topics now (Or more unapproved ones!).
 	$smcFunc['db_query']('', '
@@ -760,8 +799,9 @@ 
 	if ($smcFunc['db_num_rows']($request) > 0)
 	{
 		$replaceEntries = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
+		}
 
 		$smcFunc['db_insert']('ignore',
 			'{db_prefix}log_topics',
@@ -785,8 +825,9 @@ 
 	// If there's a search index that needs updating, update it...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'topicSplit')))
-		$searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
+	if (is_callable(array($searchAPI, 'topicSplit'))) {
+			$searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
+	}
 
 	// Maybe we want to let an external CMS know about this split
 	$split1 = array(
@@ -833,12 +874,12 @@ 
 	);
 
 	// ?action=mergetopics;sa=LETSBREAKIT won't work, sorry.
-	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
-		MergeIndex();
-
-	else
-		call_helper($subActions[$_REQUEST['sa']]);
-}
+	if (empty($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) {
+			MergeIndex();
+	} else {
+			call_helper($subActions[$_REQUEST['sa']]);
+	}
+	}
 
 /**
  * allows to pick a topic to merge the current topic with.
@@ -852,8 +893,9 @@ 
 	global $txt, $board, $context, $smcFunc, $sourcedir;
 	global $scripturl, $modSettings;
 
-	if (!isset($_GET['from']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['from'])) {
+			fatal_lang_error('no_access', false);
+	}
 	$_GET['from'] = (int) $_GET['from'];
 
 	$_REQUEST['targetboard'] = isset($_REQUEST['targetboard']) ? (int) $_REQUEST['targetboard'] : $board;
@@ -864,9 +906,9 @@ 
 	{
 		$can_approve_boards = boardsAllowedTo('approve_posts');
 		$onlyApproved = $can_approve_boards !== array(0) && !in_array($_REQUEST['targetboard'], $can_approve_boards);
+	} else {
+			$onlyApproved = false;
 	}
-	else
-		$onlyApproved = false;
 
 	// How many topics are on this board?  (used for paging.)
 	$request = $smcFunc['db_query']('', '
@@ -900,8 +942,9 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	list ($subject) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -914,8 +957,9 @@ 
 	// Check which boards you have merge permissions on.
 	$merge_boards = boardsAllowedTo('merge_any');
 
-	if (empty($merge_boards))
-		fatal_lang_error('cannot_merge_any', 'user');
+	if (empty($merge_boards)) {
+			fatal_lang_error('cannot_merge_any', 'user');
+	}
 
 	// No sense in loading this if you can only merge on this board
 	if (count($merge_boards) > 1 || in_array(0, $merge_boards))
@@ -929,8 +973,9 @@ 
 		);
 
 		// Only include these boards in the list (0 means you're an admin')
-		if (!in_array(0, $merge_boards))
-			$options['included_boards'] = $merge_boards;
+		if (!in_array(0, $merge_boards)) {
+					$options['included_boards'] = $merge_boards;
+		}
 
 		$context['merge_categories'] = getBoardList($options);
 	}
@@ -976,8 +1021,9 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards))
-		fatal_lang_error('merge_need_more_topics');
+	if (empty($context['topics']) && count($merge_boards) <= 1 && !in_array(0, $merge_boards)) {
+			fatal_lang_error('merge_need_more_topics');
+	}
 
 	$context['sub_template'] = 'merge';
 }
@@ -1007,24 +1053,29 @@ 
 	checkSession('request');
 
 	// Handle URLs from MergeIndex.
-	if (!empty($_GET['from']) && !empty($_GET['to']))
-		$topics = array((int) $_GET['from'], (int) $_GET['to']);
+	if (!empty($_GET['from']) && !empty($_GET['to'])) {
+			$topics = array((int) $_GET['from'], (int) $_GET['to']);
+	}
 
 	// If we came from a form, the topic IDs came by post.
-	if (!empty($_POST['topics']) && is_array($_POST['topics']))
-		$topics = $_POST['topics'];
+	if (!empty($_POST['topics']) && is_array($_POST['topics'])) {
+			$topics = $_POST['topics'];
+	}
 
 	// There's nothing to merge with just one topic...
-	if (empty($topics) || !is_array($topics) || count($topics) == 1)
-		fatal_lang_error('merge_need_more_topics');
+	if (empty($topics) || !is_array($topics) || count($topics) == 1) {
+			fatal_lang_error('merge_need_more_topics');
+	}
 
 	// Make sure every topic is numeric, or some nasty things could be done with the DB.
-	foreach ($topics as $id => $topic)
-		$topics[$id] = (int) $topic;
+	foreach ($topics as $id => $topic) {
+			$topics[$id] = (int) $topic;
+	}
 
 	// Joy of all joys, make sure they're not messing about with unapproved topics they can't see :P
-	if ($modSettings['postmod_active'])
-		$can_approve_boards = boardsAllowedTo('approve_posts');
+	if ($modSettings['postmod_active']) {
+			$can_approve_boards = boardsAllowedTo('approve_posts');
+	}
 
 	// Get info about the topics and polls that will be merged.
 	$request = $smcFunc['db_query']('', '
@@ -1045,8 +1096,9 @@ 
 			'limit' => count($topics),
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) < 2)
-		fatal_lang_error('no_topic_id');
+	if ($smcFunc['db_num_rows']($request) < 2) {
+			fatal_lang_error('no_topic_id');
+	}
 	$num_views = 0;
 	$is_sticky = 0;
 	$boardTotals = array();
@@ -1059,34 +1111,38 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Sorry, redirection topics can't be merged
-		if (!empty($row['id_redirect_topic']))
-			fatal_lang_error('cannot_merge_redirect', false);
+		if (!empty($row['id_redirect_topic'])) {
+					fatal_lang_error('cannot_merge_redirect', false);
+		}
 
 		// Make a note for the board counts...
-		if (!isset($boardTotals[$row['id_board']]))
-			$boardTotals[$row['id_board']] = array(
+		if (!isset($boardTotals[$row['id_board']])) {
+					$boardTotals[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0
 			);
+		}
 
 		// We can't see unapproved topics here?
 		if ($modSettings['postmod_active'] && !$row['approved'] && $can_approve_boards != array(0) && in_array($row['id_board'], $can_approve_boards))
 		{
 			unset($topics[$row['id_topic']]); // If we can't see it, we should not merge it and not adjust counts! Instead skip it.
 			continue;
-		}elseif (!$row['approved'])
-			$boardTotals[$row['id_board']]['unapproved_topics']++;
-		else
-			$boardTotals[$row['id_board']]['topics']++;
+		} elseif (!$row['approved']) {
+					$boardTotals[$row['id_board']]['unapproved_topics']++;
+		} else {
+					$boardTotals[$row['id_board']]['topics']++;
+		}
 
 		$boardTotals[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 		$boardTotals[$row['id_board']]['posts'] += $row['num_replies'] + ($row['approved'] ? 1 : 0);
 
 		// In the case of making a redirect, the topic count goes up by one due to the redirect topic.
-		if (isset($_POST['postRedirect']))
-			$boardTotals[$row['id_board']]['topics']--;
+		if (isset($_POST['postRedirect'])) {
+					$boardTotals[$row['id_board']]['topics']--;
+		}
 
 		$topic_data[$row['id_topic']] = array(
 			'id' => $row['id_topic'],
@@ -1112,11 +1168,13 @@ 
 		$boards[] = $row['id_board'];
 
 		// If there's no poll, id_poll == 0...
-		if ($row['id_poll'] > 0)
-			$polls[] = $row['id_poll'];
+		if ($row['id_poll'] > 0) {
+					$polls[] = $row['id_poll'];
+		}
 		// Store the id_topic with the lowest id_first_msg.
-		if (empty($firstTopic))
-			$firstTopic = $row['id_topic'];
+		if (empty($firstTopic)) {
+					$firstTopic = $row['id_topic'];
+		}
 
 		// Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic)
 		if ($row['id_topic'] < $lowestTopicId || empty($lowestTopicId))
@@ -1130,11 +1188,13 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// If we didn't get any topics then they've been messing with unapproved stuff.
-	if (empty($topic_data))
-		fatal_lang_error('no_topic_id');
+	if (empty($topic_data)) {
+			fatal_lang_error('no_topic_id');
+	}
 
-	if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard))
-		$boardTotals[$lowestTopicBoard]['topics']++;
+	if (isset($_POST['postRedirect']) && !empty($lowestTopicBoard)) {
+			$boardTotals[$lowestTopicBoard]['topics']++;
+	}
 
 	// Will this be approved?
 	$context['is_approved'] = $topic_data[$firstTopic]['approved'];
@@ -1150,8 +1210,9 @@ 
 
 	// Get the boards a user is allowed to merge in.
 	$merge_boards = boardsAllowedTo('merge_any');
-	if (empty($merge_boards))
-		fatal_lang_error('cannot_merge_any', 'user');
+	if (empty($merge_boards)) {
+			fatal_lang_error('cannot_merge_any', 'user');
+	}
 
 	// Make sure they can see all boards....
 	$request = $smcFunc['db_query']('', '
@@ -1168,8 +1229,9 @@ 
 		)
 	);
 	// If the number of boards that's in the output isn't exactly the same as we've put in there, you're in trouble.
-	if ($smcFunc['db_num_rows']($request) != count($boards))
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) != count($boards)) {
+			fatal_lang_error('no_board');
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (empty($_REQUEST['sa']) || $_REQUEST['sa'] == 'options')
@@ -1188,8 +1250,8 @@ 
 					'limit' => count($polls),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['polls'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['polls'][] = array(
 					'id' => $row['id_poll'],
 					'topic' => array(
 						'id' => $row['id_topic'],
@@ -1198,6 +1260,7 @@ 
 					'question' => $row['question'],
 					'selected' => $row['id_topic'] == $firstTopic
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		if (count($boards) > 1)
@@ -1213,18 +1276,20 @@ 
 					'limit' => count($boards),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['boards'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['boards'][] = array(
 					'id' => $row['id_board'],
 					'name' => $row['name'],
 					'selected' => $row['id_board'] == $topic_data[$firstTopic]['board']
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		$context['topics'] = $topic_data;
-		foreach ($topic_data as $id => $topic)
-			$context['topics'][$id]['selected'] = $topic['id'] == $firstTopic;
+		foreach ($topic_data as $id => $topic) {
+					$context['topics'][$id]['selected'] = $topic['id'] == $firstTopic;
+		}
 
 		$context['page_title'] = $txt['merge'];
 		$context['sub_template'] = 'merge_extra_options';
@@ -1233,13 +1298,15 @@ 
 
 	// Determine target board.
 	$target_board = count($boards) > 1 ? (int) $_REQUEST['board'] : $boards[0];
-	if (!in_array($target_board, $boards))
-		fatal_lang_error('no_board');
+	if (!in_array($target_board, $boards)) {
+			fatal_lang_error('no_board');
+	}
 
 	// Determine which poll will survive and which polls won't.
 	$target_poll = count($polls) > 1 ? (int) $_POST['poll'] : (count($polls) == 1 ? $polls[0] : 0);
-	if ($target_poll > 0 && !in_array($target_poll, $polls))
-		fatal_lang_error('no_access', false);
+	if ($target_poll > 0 && !in_array($target_poll, $polls)) {
+			fatal_lang_error('no_access', false);
+	}
 	$deleted_polls = empty($target_poll) ? $polls : array_diff($polls, array($target_poll));
 
 	// Determine the subject of the newly merged topic - was a custom subject specified?
@@ -1247,19 +1314,23 @@ 
 	{
 		$target_subject = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
 		// Keep checking the length.
-		if ($smcFunc['strlen']($target_subject) > 100)
-			$target_subject = $smcFunc['substr']($target_subject, 0, 100);
+		if ($smcFunc['strlen']($target_subject) > 100) {
+					$target_subject = $smcFunc['substr']($target_subject, 0, 100);
+		}
 
 		// Nothing left - odd but pick the first topics subject.
-		if ($target_subject == '')
-			$target_subject = $topic_data[$firstTopic]['subject'];
+		if ($target_subject == '') {
+					$target_subject = $topic_data[$firstTopic]['subject'];
+		}
 	}
 	// A subject was selected from the list.
-	elseif (!empty($topic_data[(int) $_POST['subject']]['subject']))
-		$target_subject = $topic_data[(int) $_POST['subject']]['subject'];
+	elseif (!empty($topic_data[(int) $_POST['subject']]['subject'])) {
+			$target_subject = $topic_data[(int) $_POST['subject']]['subject'];
+	}
 	// Nothing worked? Just take the subject of the first message.
-	else
-		$target_subject = $topic_data[$firstTopic]['subject'];
+	else {
+			$target_subject = $topic_data[$firstTopic]['subject'];
+	}
 
 	// Get the first and last message and the number of messages....
 	$request = $smcFunc['db_query']('', '
@@ -1285,15 +1356,13 @@ 
 			{
 				$num_replies = $row['message_count'] - 1;
 				$num_unapproved = 0;
-			}
-			else
+			} else
 			{
 				$topic_approved = 0;
 				$num_replies = 0;
 				$num_unapproved = $row['message_count'];
 			}
-		}
-		else
+		} else
 		{
 			// If this has a lower first_msg then the first post is not approved and hence the number of replies was wrong!
 			if ($first_msg > $row['first_msg'])
@@ -1339,8 +1408,9 @@ 
 	list ($member_started) = $smcFunc['db_fetch_row']($request);
 	list ($member_updated) = $smcFunc['db_fetch_row']($request);
 	// First and last message are the same, so only row was returned.
-	if ($member_updated === NULL)
-		$member_updated = $member_started;
+	if ($member_updated === NULL) {
+			$member_updated = $member_started;
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1353,8 +1423,9 @@ 
 		array(
 			'topic_list' => $topics,
 	));
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$affected_msgs[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$affected_msgs[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Assign the first topic ID to be the merged topic.
@@ -1432,9 +1503,9 @@ 
 	// Grab the response prefix (like 'Re: ') in the default forum language.
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 	{
-		if ($language === $user_info['language'])
-			$context['response_prefix'] = $txt['response_prefix'];
-		else
+		if ($language === $user_info['language']) {
+					$context['response_prefix'] = $txt['response_prefix'];
+		} else
 		{
 			loadLanguage('index', $language, false);
 			$context['response_prefix'] = $txt['response_prefix'];
@@ -1514,8 +1585,9 @@ 
 	if ($smcFunc['db_num_rows']($request) > 0)
 	{
 		$replaceEntries = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
+		}
 
 		$smcFunc['db_insert']('replace',
 			'{db_prefix}log_topics',
@@ -1552,8 +1624,9 @@ 
 		if ($smcFunc['db_num_rows']($request) > 0)
 		{
 			$replaceEntries = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']);
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']);
+			}
 
 			$smcFunc['db_insert']('replace',
 					'{db_prefix}log_notify',
@@ -1728,8 +1801,9 @@ 
 	// If there's a search index that needs updating, update it...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'topicMerge')))
-		$searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject));
+	if (is_callable(array($searchAPI, 'topicMerge'))) {
+			$searchAPI->topicMerge($id_topic, $topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array($context['response_prefix'], $target_subject));
+	}
 
 	// Merging is the sort of thing an external CMS might want to know about
 	$merged_topic = array(

Sources/tasks/index.php

Braces +3 added lines, -2 removed lines

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

avatars/Oxygen/index.php

Braces +3 added lines, -2 removed lines

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

Sources/tasks/CreatePost-Notify.php

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 class CreatePost_Notify_Background extends SMF_BackgroundTask
 {
 	/**
-     * This handles notifications when a new post is created - new topic, reply, quotes and mentions.
+	 * This handles notifications when a new post is created - new topic, reply, quotes and mentions.
 	 * @return bool Always returns true
 	 */
 	public function execute()
@@ -106,7 +106,7 @@ 
 
 			// Don't send a notification if the watching member ignored the member who made the action.
 			if (!empty($data['pm_ignore_list']) && in_array($data['id_member_updated'], explode(',', $data['pm_ignore_list'])))
-			    continue;
+				continue;
 			if (!in_array($type, array('reply', 'topic')) && $notify_types == 2 && $member != $data['id_member_started'])
 				continue;
 			elseif (in_array($type, array('reply', 'topic')) && $member == $posterOptions['id'])

Braces +65 added lines, -48 removed lines

@@ -73,8 +73,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			$groups = array_merge(array($row['id_group'], $row['id_post_group']), (empty($row['additional_groups']) ? array() : explode(',', $row['additional_groups'])));
-			if (!in_array(1, $groups) && count(array_intersect($groups, explode(',', $row['member_groups']))) == 0)
-				continue;
+			if (!in_array(1, $groups) && count(array_intersect($groups, explode(',', $row['member_groups']))) == 0) {
+							continue;
+			}
 
 			$members[] = $row['id_member'];
 			$watched[$row['id_member']] = $row;
@@ -82,8 +83,9 @@ 
 
 		$smcFunc['db_free_result']($request);
 
-		if (empty($members))
-			return true;
+		if (empty($members)) {
+					return true;
+		}
 
 		$members = array_unique($members);
 		$prefs = getNotifyPrefs($members, '', true);
@@ -99,8 +101,9 @@ 
 		self::handleQuoteNotifications($msgOptions, $posterOptions, $quotedMembers, $prefs, $done_members, $alert_rows);
 
 		// Save ourselves a bit of work in the big loop below
-		foreach ($done_members as $done_member)
-			unset($watched[$done_member]);
+		foreach ($done_members as $done_member) {
+					unset($watched[$done_member]);
+		}
 
 		// Handle rest of the notifications for watched topics and boards
 		foreach ($watched as $member => $data)
@@ -109,20 +112,23 @@ 
 			$notify_types = !empty($prefs[$member]['msg_notify_type']) ? $prefs[$member]['msg_notify_type'] : 1;
 
 			// Don't send a notification if the watching member ignored the member who made the action.
-			if (!empty($data['pm_ignore_list']) && in_array($data['id_member_updated'], explode(',', $data['pm_ignore_list'])))
-			    continue;
-			if (!in_array($type, array('reply', 'topic')) && $notify_types == 2 && $member != $data['id_member_started'])
-				continue;
-			elseif (in_array($type, array('reply', 'topic')) && $member == $posterOptions['id'])
-				continue;
-			elseif (!in_array($type, array('reply', 'topic')) && $notify_types == 3)
-				continue;
-			elseif ($notify_types == 4)
-				continue;
+			if (!empty($data['pm_ignore_list']) && in_array($data['id_member_updated'], explode(',', $data['pm_ignore_list']))) {
+						    continue;
+			}
+			if (!in_array($type, array('reply', 'topic')) && $notify_types == 2 && $member != $data['id_member_started']) {
+							continue;
+			} elseif (in_array($type, array('reply', 'topic')) && $member == $posterOptions['id']) {
+							continue;
+			} elseif (!in_array($type, array('reply', 'topic')) && $notify_types == 3) {
+							continue;
+			} elseif ($notify_types == 4) {
+							continue;
+			}
 
 			if (empty($frequency) || $frequency > 2 || $data['sent']
-				|| (!empty($this->_details['members_only']) && !in_array($member, $this->_details['members_only'])))
-				continue;
+				|| (!empty($this->_details['members_only']) && !in_array($member, $this->_details['members_only']))) {
+							continue;
+			}
 
 			// Watched topic?
 			if (!empty($data['id_topic']) && $type != 'topic' && !empty($prefs[$member]))
@@ -132,10 +138,12 @@ 
 
 				if ($type == 'reply')
 				{
-					if (!empty($prefs[$member]['msg_receive_body']))
-						$message_type .= '_body';
-					if (!empty($frequency))
-						$message_type .= '_once';
+					if (!empty($prefs[$member]['msg_receive_body'])) {
+											$message_type .= '_body';
+					}
+					if (!empty($frequency)) {
+											$message_type .= '_once';
+					}
 				}
 
 				$content_type = 'topic';
@@ -148,12 +156,14 @@ 
 				$content_type = 'board';
 
 				$message_type = !empty($frequency) ? 'notify_boards_once' : 'notify_boards';
-				if (!empty($prefs[$member]['msg_receive_body']))
-					$message_type .= '_body';
+				if (!empty($prefs[$member]['msg_receive_body'])) {
+									$message_type .= '_body';
+				}
 			}
 			// If neither of the above, this might be a redundent row due to the OR clause in our SQL query, skip
-			else
-				continue;
+			else {
+							continue;
+			}
 
 			if ($pref & 0x02)
 			{
@@ -216,14 +226,15 @@ 
 		);
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
-			$smcFunc['db_insert']('',
+		if (!empty($alert_rows)) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}user_alerts',
 				array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 					'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 				$alert_rows,
 				array()
 			);
+		}
 
 		return true;
 	}
@@ -234,8 +245,9 @@ 
 
 		foreach ($quotedMembers as $id => $member)
 		{
-			if (!isset($prefs[$id]) || $id == $posterOptions['id'] || empty($prefs[$id]['msg_quote']))
-				continue;
+			if (!isset($prefs[$id]) || $id == $posterOptions['id'] || empty($prefs[$id]['msg_quote'])) {
+							continue;
+			}
 
 			$done_members[] = $id;
 
@@ -287,32 +299,35 @@ 
 		{
 			if (preg_match('/\[quote(.*)?\]/i', $block, $matches))
 			{
-				if ($quote_level == 0)
-					$message .= '[quote' . $matches[1] . ']';
+				if ($quote_level == 0) {
+									$message .= '[quote' . $matches[1] . ']';
+				}
 				$quote_level++;
-			}
-			elseif (preg_match('/\[\/quote\]/i', $block))
+			} elseif (preg_match('/\[\/quote\]/i', $block))
 			{
-				if ($quote_level <= 1)
-					$message .= '[/quote]';
+				if ($quote_level <= 1) {
+									$message .= '[/quote]';
+				}
 				if ($quote_level >= 1)
 				{
 					$quote_level--;
 					$message .= "\n";
 				}
+			} elseif ($quote_level <= 1) {
+							$message .= $block;
 			}
-			elseif ($quote_level <= 1)
-				$message .= $block;
 		}
 
 		preg_match_all('/\[quote.*?link=msg=([0-9]+).*?\]/i', $message, $matches);
 
 		$id_msgs = $matches[1];
-		foreach ($id_msgs as $k => $id_msg)
-			$id_msgs[$k] = (int) $id_msg;
+		foreach ($id_msgs as $k => $id_msg) {
+					$id_msgs[$k] = (int) $id_msg;
+		}
 
-		if (empty($id_msgs))
-			return array();
+		if (empty($id_msgs)) {
+					return array();
+		}
 
 		// Get the messages
 		$request = $smcFunc['db_query']('', '
@@ -330,8 +345,9 @@ 
 		$members = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($posterOptions['id'] == $row['id_member'])
-				continue;
+			if ($posterOptions['id'] == $row['id_member']) {
+							continue;
+			}
 
 			$members[$row['id_member']] = $row;
 		}
@@ -345,10 +361,11 @@ 
 
 		foreach ($members as $id => $member)
 		{
-			if (!empty($prefs[$id]['msg_mention']))
-				$done_members[] = $id;
-			else
-				continue;
+			if (!empty($prefs[$id]['msg_mention'])) {
+							$done_members[] = $id;
+			} else {
+							continue;
+			}
 
 			// Alerts' emails are always instant
 			if ($prefs[$id]['msg_mention'] & 0x02)

Themes/default/Display.template.php

Spacing +1 added lines, -1 removed lines

@@ -670,7 +670,7 @@
 	// Show "<< Last Edit: Time by Person >>" if this post was edited. But we need the div even if it wasn't modified!
 	// Because we insert into it through AJAX and we don't want to stop themers moving it around if they so wish so they can put it where they want it.
 	echo '
-									<span class="smalltext modified floatright', !empty($modSettings['show_modify']) && !empty($message['modified']['name']) ? ' mvisible' : '','" id="modified_', $message['id'], '">';
+									<span class="smalltext modified floatright', !empty($modSettings['show_modify']) && !empty($message['modified']['name']) ? ' mvisible' : '', '" id="modified_', $message['id'], '">';
 
 	if (!empty($modSettings['show_modify']) && !empty($message['modified']['name']))
 		echo

Braces +254 added lines, -174 removed lines

@@ -18,18 +18,20 @@ 
 	global $context, $settings, $options, $txt, $scripturl, $modSettings;
 
 	// Let them know, if their report was a success!
-	if ($context['report_sent'])
-		echo '
+	if ($context['report_sent']) {
+			echo '
 		<div class="infobox">
 			', $txt['report_sent'], '
 		</div>';
+	}
 
 	// Let them know why their message became unapproved.
-	if ($context['becomesUnapproved'])
-		echo '
+	if ($context['becomesUnapproved']) {
+			echo '
 		<div class="noticebox">
 			', $txt['post_becomesUnapproved'], '
 		</div>';
+	}
 
 	// Show new topic info here?
 	echo '
@@ -49,11 +51,13 @@ 
 			<p>';
 
 		// Show just numbers...?
-		if ($settings['display_who_viewing'] == 1)
-			echo count($context['view_members']), ' ', count($context['view_members']) == 1 ? $txt['who_member'] : $txt['members'];
+		if ($settings['display_who_viewing'] == 1) {
+					echo count($context['view_members']), ' ', count($context['view_members']) == 1 ? $txt['who_member'] : $txt['members'];
+		}
 		// Or show the actual people viewing the topic?
-		else
-			echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . ((empty($context['view_num_hidden']) || $context['can_moderate_forum']) ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+		else {
+					echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . ((empty($context['view_num_hidden']) || $context['can_moderate_forum']) ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+		}
 
 		// Now show how many guests are here too.
 		echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_topic'], '
@@ -91,10 +95,11 @@ 
 						<dt class="', $option['voted_this'] ? ' voted' : '', '">', $option['option'], '</dt>
 						<dd class="statsbar generic_bar', $option['voted_this'] ? ' voted' : '', '">';
 
-				if ($context['allow_results_view'])
-					echo '
+				if ($context['allow_results_view']) {
+									echo '
 							', $option['bar_ndt'], '
 							<span class="percentage">', $option['votes'], ' (', $option['percent'], '%)</span>';
+				}
 
 				echo '
 						</dd>';
@@ -103,9 +108,10 @@ 
 			echo '
 					</dl>';
 
-			if ($context['allow_results_view'])
-				echo '
+			if ($context['allow_results_view']) {
+							echo '
 					<p><strong>', $txt['poll_total_voters'], ':</strong> ', $context['poll']['total_votes'], '</p>';
+			}
 		}
 		// They are allowed to vote! Go to it!
 		else
@@ -114,17 +120,19 @@ 
 					<form action="', $scripturl, '?action=vote;topic=', $context['current_topic'], '.', $context['start'], ';poll=', $context['poll']['id'], '" method="post" accept-charset="', $context['character_set'], '">';
 
 			// Show a warning if they are allowed more than one option.
-			if ($context['poll']['allowed_warning'])
-				echo '
+			if ($context['poll']['allowed_warning']) {
+							echo '
 						<p class="smallpadding">', $context['poll']['allowed_warning'], '</p>';
+			}
 
 			echo '
 						<ul class="options">';
 
 			// Show each option with its button - a radio likely.
-			foreach ($context['poll']['options'] as $option)
-				echo '
+			foreach ($context['poll']['options'] as $option) {
+							echo '
 							<li>', $option['vote_button'], ' <label for="', $option['id'], '">', $option['option'], '</label></li>';
+			}
 
 			echo '
 						</ul>
@@ -136,9 +144,10 @@ 
 		}
 
 		// Is the clock ticking?
-		if (!empty($context['poll']['expire_time']))
-			echo '
+		if (!empty($context['poll']['expire_time'])) {
+					echo '
 					<p><strong>', ($context['poll']['is_expired'] ? $txt['poll_expired_on'] : $txt['poll_expires_on']), ':</strong> ', $context['poll']['expire_time'], '</p>';
+		}
 
 		echo '
 				</div><!-- #poll_options -->
@@ -168,11 +177,13 @@ 
 				<li>
 					<strong class="event_title"><a href="', $scripturl, '?action=calendar;event=', $event['id'], '">', $event['title'], '</a></strong>';
 
-			if ($event['can_edit'])
-				echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+			if ($event['can_edit']) {
+							echo ' <a href="' . $event['modify_href'] . '"><span class="generic_icons calendar_modify" title="', $txt['calendar_edit'], '"></span></a>';
+			}
 
-			if ($event['can_export'])
-				echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+			if ($event['can_export']) {
+							echo ' <a href="' . $event['export_href'] . '"><span class="generic_icons calendar_export" title="', $txt['calendar_export'], '"></span></a>';
+			}
 
 			echo '
 					<br>';
@@ -180,14 +191,14 @@ 
 			if (!empty($event['allday']))
 			{
 				echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), '</time>', ($event['start_date'] != $event['end_date']) ? ' &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">' . trim($event['end_date_local']) . '</time>' : '';
-			}
-			else
+			} else
 			{
 				// Display event info relative to user's local timezone
 				echo '<time datetime="' . $event['start_iso_gmdate'] . '">', trim($event['start_date_local']), ', ', trim($event['start_time_local']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-				if ($event['start_date_local'] != $event['end_date_local'])
-					echo trim($event['end_date_local']) . ', ';
+				if ($event['start_date_local'] != $event['end_date_local']) {
+									echo trim($event['end_date_local']) . ', ';
+				}
 
 				echo trim($event['end_time_local']);
 
@@ -196,24 +207,28 @@ 
 				{
 					echo '</time> (<time datetime="' . $event['start_iso_gmdate'] . '">';
 
-					if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig'])
-						echo trim($event['start_date_orig']), ', ';
+					if ($event['start_date_orig'] != $event['start_date_local'] || $event['end_date_orig'] != $event['end_date_local'] || $event['start_date_orig'] != $event['end_date_orig']) {
+											echo trim($event['start_date_orig']), ', ';
+					}
 
 					echo trim($event['start_time_orig']), '</time> &ndash; <time datetime="' . $event['end_iso_gmdate'] . '">';
 
-					if ($event['start_date_orig'] != $event['end_date_orig'])
-						echo trim($event['end_date_orig']) . ', ';
+					if ($event['start_date_orig'] != $event['end_date_orig']) {
+											echo trim($event['end_date_orig']) . ', ';
+					}
 
 					echo trim($event['end_time_orig']), ' ', $event['tz_abbrev'], '</time>)';
 				}
 				// Event is scheduled in the user's own timezone? Let 'em know, just to avoid confusion
-				else
-					echo ' ', $event['tz_abbrev'], '</time>';
+				else {
+									echo ' ', $event['tz_abbrev'], '</time>';
+				}
 			}
 
-			if (!empty($event['location']))
-				echo '
+			if (!empty($event['location'])) {
+							echo '
 					<br>', $event['location'];
+			}
 
 			echo '
 				</li>';
@@ -235,12 +250,13 @@ 
 		</div>';
 
 	// Mobile action - moderation buttons (top)
-	if (!empty($context['normal_buttons']))
-	echo '
+	if (!empty($context['normal_buttons'])) {
+		echo '
 		<div class="mobile_buttons floatright">
 			<a class="button mobile_act">', $txt['mobile_action'], '</a>
 			', !empty($context['mod_buttons']) ? '<a class="button mobile_mod">' . $txt['mobile_moderation'] . '</a>' : '', '
 		</div>';
+	}
 
 	// Show the topic information - icon, subject, etc.
 	echo '
@@ -251,20 +267,22 @@ 
 	$context['removableMessageIDs'] = array();
 
 	// Get all the messages...
-	while ($message = $context['get_message']())
-		template_single_post($message);
+	while ($message = $context['get_message']()) {
+			template_single_post($message);
+	}
 
 	echo '
 			</form>
 		</div><!-- #forumposts -->';
 
 	// Mobile action - moderation buttons (bottom)
-	if (!empty($context['normal_buttons']))
-	echo '
+	if (!empty($context['normal_buttons'])) {
+		echo '
 		<div class="mobile_buttons floatright">
 			<a class="button mobile_act">', $txt['mobile_action'], '</a>
 			', !empty($context['mod_buttons']) ? '<a class="button mobile_mod">' . $txt['mobile_moderation'] . '</a>' : '', '
 		</div>';
+	}
 
 	// Show the page index... "Pages: [1]".
 	echo '
@@ -291,8 +309,9 @@ 
 		<div id="display_jump_to"></div>';
 
 	// Show quickreply
-	if ($context['can_reply'])
-		template_quickreply();
+	if ($context['can_reply']) {
+			template_quickreply();
+	}
 
 	// User action pop on mobile screen (or actually small screen), this uses responsive css does not check mobile device.
 	echo '
@@ -307,8 +326,8 @@ 
 		</div>';
 
 	// Show the moderation button & pop (if there is anything to show)
-	if (!empty($context['mod_buttons']))
-		echo '
+	if (!empty($context['mod_buttons'])) {
+			echo '
 		<div id="mobile_moderation" class="popup_container">
 			<div class="popup_window description">
 				<div class="popup_heading">
@@ -320,6 +339,7 @@ 
 				</div>
 			</div>
 		</div>';
+	}
 
 	echo '
 		<script>';
@@ -443,9 +463,10 @@ 
 				});
 			}';
 
-	if (!empty($context['ignoredMsgs']))
-		echo '
+	if (!empty($context['ignoredMsgs'])) {
+			echo '
 			ignore_toggles([', implode(', ', $context['ignoredMsgs']), '], ', JavaScriptEscape($txt['show_ignore_user_post']), ');';
+	}
 
 	echo '
 		</script>';
@@ -462,8 +483,9 @@ 
 
 	$ignoring = false;
 
-	if ($message['can_remove'])
-		$context['removableMessageIDs'][] = $message['id'];
+	if ($message['can_remove']) {
+			$context['removableMessageIDs'][] = $message['id'];
+	}
 
 	// Are we ignoring this message?
 	if (!empty($message['is_ignored']))
@@ -490,9 +512,10 @@ 
 							<div class="custom_fields_above_member">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['above_member'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['above_member'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -503,25 +526,28 @@ 
 							<h4>';
 
 	// Show online and offline buttons?
-	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
-		echo '
+	if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest']) {
+			echo '
 								', $context['can_send_pm'] ? '<a href="' . $message['member']['online']['href'] . '" title="' . $message['member']['online']['label'] . '">' : '', '<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>', $context['can_send_pm'] ? '</a>' : '';
+	}
 
 	// Custom fields BEFORE the username?
-	if (!empty($message['custom_fields']['before_member']))
-		foreach ($message['custom_fields']['before_member'] as $custom)
+	if (!empty($message['custom_fields']['before_member'])) {
+			foreach ($message['custom_fields']['before_member'] as $custom)
 			echo '
 								<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+	}
 
 	// Show a link to the member's profile.
 	echo '
 								', $message['member']['link'];
 
 	// Custom fields AFTER the username?
-	if (!empty($message['custom_fields']['after_member']))
-		foreach ($message['custom_fields']['after_member'] as $custom)
+	if (!empty($message['custom_fields']['after_member'])) {
+			foreach ($message['custom_fields']['after_member'] as $custom)
 			echo '
 								<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+	}
 
 	// Begin display of user info
 	echo '
@@ -529,50 +555,58 @@ 
 							<ul class="user_info">';
 
 	// Show the user's avatar.
-	if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
-		echo '
+	if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
+			echo '
 								<li class="avatar">
 									<a href="', $message['member']['href'], '">', $message['member']['avatar']['image'], '</a>
 								</li>';
+	}
 
 	// Are there any custom fields below the avatar?
-	if (!empty($message['custom_fields']['below_avatar']))
-		foreach ($message['custom_fields']['below_avatar'] as $custom)
+	if (!empty($message['custom_fields']['below_avatar'])) {
+			foreach ($message['custom_fields']['below_avatar'] as $custom)
 			echo '
 								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
+	}
 
 	// Show the post group icons, but not for guests.
-	if (!$message['member']['is_guest'])
-		echo '
+	if (!$message['member']['is_guest']) {
+			echo '
 								<li class="icons">', $message['member']['group_icons'], '</li>';
+	}
 
 	// Show the member's primary group (like 'Administrator') if they have one.
-	if (!empty($message['member']['group']))
-		echo '
+	if (!empty($message['member']['group'])) {
+			echo '
 								<li class="membergroup">', $message['member']['group'], '</li>';
+	}
 
 	// Show the member's custom title, if they have one.
-	if (!empty($message['member']['title']))
-		echo '
+	if (!empty($message['member']['title'])) {
+			echo '
 								<li class="title">', $message['member']['title'], '</li>';
+	}
 
 	// Don't show these things for guests.
 	if (!$message['member']['is_guest'])
 	{
 		// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
-		if ((empty($modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group']))
-			echo '
+		if ((empty($modSettings['hide_post_group']) || empty($message['member']['group'])) && !empty($message['member']['post_group'])) {
+					echo '
 								<li class="postgroup">', $message['member']['post_group'], '</li>';
+		}
 
 		// Show how many posts they have made.
-		if (!isset($context['disabled_fields']['posts']))
-			echo '
+		if (!isset($context['disabled_fields']['posts'])) {
+					echo '
 								<li class="postcount">', $txt['member_postcount'], ': ', $message['member']['posts'], '</li>';
+		}
 
 		// Show their personal text?
-		if (!empty($modSettings['show_blurb']) && !empty($message['member']['blurb']))
-			echo '
+		if (!empty($modSettings['show_blurb']) && !empty($message['member']['blurb'])) {
+					echo '
 								<li class="blurb">', $message['member']['blurb'], '</li>';
+		}
 
 		// Any custom fields to show as icons?
 		if (!empty($message['custom_fields']['icons']))
@@ -581,9 +615,10 @@ 
 								<li class="im_icons">
 									<ol>';
 
-			foreach ($message['custom_fields']['icons'] as $custom)
-				echo '
+			foreach ($message['custom_fields']['icons'] as $custom) {
+							echo '
 										<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
+			}
 
 			echo '
 									</ol>
@@ -598,19 +633,22 @@ 
 									<ol class="profile_icons">';
 
 			// Don't show an icon if they haven't specified a website.
-			if (!empty($message['member']['website']['url']) && !isset($context['disabled_fields']['website']))
-				echo '
+			if (!empty($message['member']['website']['url']) && !isset($context['disabled_fields']['website'])) {
+							echo '
 										<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" rel="noopener">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+			}
 
 			// Since we know this person isn't a guest, you *can* message them.
-			if ($context['can_send_pm'])
-				echo '
+			if ($context['can_send_pm']) {
+							echo '
 										<li><a href="', $scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', $message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline'], '">', $settings['use_image_buttons'] ? '<span class="generic_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']) . '"></span> ' : ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']), '</a></li>';
+			}
 
 			// Show the email if necessary
-			if (!empty($message['member']['email']) && $message['member']['show_email'])
-				echo '
+			if (!empty($message['member']['email']) && $message['member']['show_email']) {
+							echo '
 										<li class="email"><a href="mailto:' . $message['member']['email'] . '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
+			}
 
 			echo '
 									</ol>
@@ -618,57 +656,65 @@ 
 		}
 
 		// Any custom fields for standard placement?
-		if (!empty($message['custom_fields']['standard']))
-			foreach ($message['custom_fields']['standard'] as $custom)
+		if (!empty($message['custom_fields']['standard'])) {
+					foreach ($message['custom_fields']['standard'] as $custom)
 				echo '
 								<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
+		}
 	}
 	// Otherwise, show the guest's email.
-	elseif (!empty($message['member']['email']) && $message['member']['show_email'])
-		echo '
+	elseif (!empty($message['member']['email']) && $message['member']['show_email']) {
+			echo '
 								<li class="email">
 									<a href="mailto:' . $message['member']['email'] . '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a>
 								</li>';
+	}
 
 	// Show the IP to this user for this post - because you can moderate?
-	if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip']))
-		echo '
+	if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip'])) {
+			echo '
 								<li class="poster_ip">
 									<a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a> <a href="', $scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a>
 								</li>';
+	}
 
 	// Or, should we show it because this is you?
-	elseif ($message['can_see_ip'])
-		echo '
+	elseif ($message['can_see_ip']) {
+			echo '
 								<li class="poster_ip">
 									<a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $message['member']['ip'], '</a>
 								</li>';
+	}
 
 	// Okay, are you at least logged in? Then we can show something about why IPs are logged...
-	elseif (!$context['user']['is_guest'])
-		echo '
+	elseif (!$context['user']['is_guest']) {
+			echo '
 								<li class="poster_ip">
 									<a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $txt['logged'], '</a>
 								</li>';
+	}
 
 	// Otherwise, you see NOTHING!
-	else
-		echo '
+	else {
+			echo '
 								<li class="poster_ip">', $txt['logged'], '</li>';
+	}
 
 	// Are we showing the warning status?
 	// Don't show these things for guests.
-	if (!$message['member']['is_guest'] && $message['member']['can_see_warning'])
-		echo '
+	if (!$message['member']['is_guest'] && $message['member']['can_see_warning']) {
+			echo '
 								<li class="warning">
 									', $context['can_issue_warning'] ? '<a href="' . $scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="generic_icons warning_', $message['member']['warning_status'], '"></span> ', $context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', $txt['warn_' . $message['member']['warning_status']], '</span>
 								</li>';
+	}
 
 	// Are there any custom fields to show at the bottom of the poster info?
-	if (!empty($message['custom_fields']['bottom_poster']))
-		foreach ($message['custom_fields']['bottom_poster'] as $custom)
+	if (!empty($message['custom_fields']['bottom_poster'])) {
+			foreach ($message['custom_fields']['bottom_poster'] as $custom)
 			echo '
 								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
+	}
 
 	// Poster info ends.
 	echo '
@@ -698,9 +744,10 @@ 
 	echo '
 									<span class="smalltext modified floatright', !empty($modSettings['show_modify']) && !empty($message['modified']['name']) ? ' mvisible' : '','" id="modified_', $message['id'], '">';
 
-	if (!empty($modSettings['show_modify']) && !empty($message['modified']['name']))
-		echo
+	if (!empty($modSettings['show_modify']) && !empty($message['modified']['name'])) {
+			echo
 										$message['modified']['last_edit_text'];
+	}
 
 	echo '
 									</span>
@@ -709,22 +756,24 @@ 
 							</div><!-- .keyinfo -->';
 
 	// Ignoring this user? Hide the post.
-	if ($ignoring)
-		echo '
+	if ($ignoring) {
+			echo '
 							<div id="msg_', $message['id'], '_ignored_prompt">
 								', $txt['ignoring_user'], '
 								<a href="#" id="msg_', $message['id'], '_ignored_link" style="display: none;">', $txt['show_ignore_user_post'], '</a>
 							</div>';
+	}
 
 	// Show the post itself, finally!
 	echo '
 							<div class="post">';
 
-	if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == $context['user']['id'])
-		echo '
+	if (!$message['approved'] && $message['member']['id'] != 0 && $message['member']['id'] == $context['user']['id']) {
+			echo '
 								<div class="approve_post">
 									', $txt['post_awaiting_approval'], '
 								</div>';
+	}
 	echo '
 								<div class="inner" data-msgid="', $message['id'], '" id="msg_', $message['id'], '"', $ignoring ? ' style="display:none;"' : '', '>
 									', $message['body'], '
@@ -743,9 +792,9 @@ 
 		foreach ($message['attachment'] as $attachment)
 		{
 			// Do we want this attachment to not be showed here?
-			if (!empty($modSettings['dont_show_attach_under_post']) && !empty($context['show_attach_under_post'][$attachment['id']]))
-				continue;
-			elseif (!$div_output)
+			if (!empty($modSettings['dont_show_attach_under_post']) && !empty($context['show_attach_under_post'][$attachment['id']])) {
+							continue;
+			} elseif (!$div_output)
 			{
 				$div_output = true;
 
@@ -762,9 +811,10 @@ 
 									<legend>
 										', $txt['attach_awaiting_approve'];
 
-				if ($context['can_approve'])
-					echo '
+				if ($context['can_approve']) {
+									echo '
 										&nbsp;[<a href="', $scripturl, '?action=attachapprove;sa=all;mid=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve_all'], '</a>]';
+				}
 
 				echo '
 									</legend>';
@@ -778,12 +828,13 @@ 
 				echo '
 										<div class="attachments_top">';
 
-				if ($attachment['thumbnail']['has_thumb'])
-					echo '
+				if ($attachment['thumbnail']['has_thumb']) {
+									echo '
 											<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="atc_img"></a>';
-				else
-					echo '
+				} else {
+									echo '
 											<img src="' . $attachment['href'] . ';image" alt="" width="' . $attachment['width'] . '" height="' . $attachment['height'] . '" class="atc_img">';
+				}
 
 				echo '
 										</div><!-- .attachments_top -->';
@@ -793,9 +844,10 @@ 
 										<div class="attachments_bot">
 											<a href="' . $attachment['href'] . '"><img src="' . $settings['images_url'] . '/icons/clip.png" class="centericon" alt="*">&nbsp;' . $attachment['name'] . '</a> ';
 
-			if (!$attachment['is_approved'] && $context['can_approve'])
-				echo '
+			if (!$attachment['is_approved'] && $context['can_approve']) {
+							echo '
 											[<a href="', $scripturl, '?action=attachapprove;sa=approve;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['approve'], '</a>] [<a href="', $scripturl, '?action=attachapprove;sa=reject;aid=', $attachment['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['delete'], '</a>] ';
+			}
 			echo '
 											<br>', $attachment['size'], ($attachment['is_image'] ? ', ' . $attachment['real_width'] . 'x' . $attachment['real_height'] . '<br>' . sprintf($txt['attach_viewed'], $attachment['downloads']) : '<br>' . sprintf($txt['attach_downloaded'], $attachment['downloads'])), '
 										</div><!-- .attachments_bot -->';
@@ -804,35 +856,40 @@ 
 									</div><!-- .attached -->';
 
 			// Next attachment line ?
-			if (++$i % $attachments_per_line === 0)
-				echo '
+			if (++$i % $attachments_per_line === 0) {
+							echo '
 									<br>';
+			}
 		}
 
 		// If we had unapproved attachments clean up.
-		if ($last_approved_state == 0)
-			echo '
+		if ($last_approved_state == 0) {
+					echo '
 								</fieldset>';
+		}
 
 		// Only do this if we output a div above - otherwise it'll break things
-		if ($div_output)
-			echo '
+		if ($div_output) {
+					echo '
 							</div><!-- #msg_[id]_footer -->';
+		}
 	}
 
 	// And stuff below the attachments.
-	if ($context['can_report_moderator'] || !empty($modSettings['enable_likes']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote'])
-		echo '
+	if ($context['can_report_moderator'] || !empty($modSettings['enable_likes']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote']) {
+			echo '
 							<div class="under_message">';
+	}
 
 	// Maybe they want to report this post to the moderator(s)?
-	if ($context['can_report_moderator'])
-		echo '
+	if ($context['can_report_moderator']) {
+			echo '
 								<ul class="floatright smalltext">
 									<li class="report_link">
 										<a href="', $scripturl, '?action=reporttm;topic=', $context['current_topic'], '.', $message['counter'], ';msg=', $message['id'], '">', $txt['report_to_mod'], '</a>
 									</li>
 								</ul>';
+	}
 
 	// What about likes?
 	if (!empty($modSettings['enable_likes']))
@@ -879,83 +936,95 @@ 
 								<ul class="quickbuttons">';
 
 		// Can they quote? if so they can select and quote as well!
-		if ($context['can_quote'])
-			echo '
+		if ($context['can_quote']) {
+					echo '
 									<li><a href="', $scripturl, '?action=post;quote=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], ';last_msg=', $context['topic_last_message'], '" onclick="return oQuickReply.quote(', $message['id'], ');"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>
 									<li style="display:none;" id="quoteSelected_', $message['id'], '">
 										<a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a>
 									</li>';
+		}
 
 		// Can the user modify the contents of this post? Show the modify inline image.
-		if ($message['can_modify'])
-			echo '
+		if ($message['can_modify']) {
+					echo '
 									<li class="quick_edit">
 										<a title="', $txt['modify_msg'], '" class="modifybutton" id="modify_button_', $message['id'], '" onclick="oQuickModify.modifyMsg(\'', $message['id'], '\', \'', !empty($modSettings['toggle_subject']), '\')"><span class="generic_icons quick_edit_button"></span>', $txt['quick_edit'], '</a>
 									</li>';
+		}
 
-		if ($message['can_approve'] || $message['can_unapprove'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'])
-			echo '
+		if ($message['can_approve'] || $message['can_unapprove'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg']) {
+					echo '
 									<li class="post_options">', $txt['post_options'];
+		}
 
 		echo '
 										<ul>';
 
 		// Can the user modify the contents of this post?
-		if ($message['can_modify'])
-			echo '
+		if ($message['can_modify']) {
+					echo '
 											<li><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '"><span class="generic_icons modify_button"></span>', $txt['modify'], '</a></li>';
+		}
 
 		// How about... even... remove it entirely?!
-		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id']))
-			echo '
+		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['are_sure_remove_topic'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove_topic'], '</a></li>';
-
-		elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id']))
-			echo '
+		} elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message_question'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+		}
 
 		// What about splitting it off the rest of the topic?
-		if ($context['can_split'] && !empty($context['real_num_replies']))
-			echo '
+		if ($context['can_split'] && !empty($context['real_num_replies'])) {
+					echo '
 											<li><a href="', $scripturl, '?action=splittopics;topic=', $context['current_topic'], '.0;at=', $message['id'], '"><span class="generic_icons split_button"></span>', $txt['split'], '</a></li>';
+		}
 
 		// Can we issue a warning because of this post? Remember, we can't give guests warnings.
-		if ($context['can_issue_warning'] && !$message['is_message_author'] && !$message['member']['is_guest'])
-			echo '
+		if ($context['can_issue_warning'] && !$message['is_message_author'] && !$message['member']['is_guest']) {
+					echo '
 											<li><a href="', $scripturl, '?action=profile;area=issuewarning;u=', $message['member']['id'], ';msg=', $message['id'], '"><span class="generic_icons warn_button"></span>', $txt['issue_warning'], '</a></li>';
+		}
 
 		// Can we restore topics?
-		if ($context['can_restore_msg'])
-			echo '
+		if ($context['can_restore_msg']) {
+					echo '
 											<li><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons restore_button"></span>', $txt['restore_message'], '</a></li>';
+		}
 
 		// Maybe we can approve it, maybe we should?
-		if ($message['can_approve'])
-			echo '
+		if ($message['can_approve']) {
+					echo '
 											<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons approve_button"></span>', $txt['approve'], '</a></li>';
+		}
 
 		// Maybe we can unapprove it?
-		if ($message['can_unapprove'])
-			echo '
+		if ($message['can_unapprove']) {
+					echo '
 											<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons unapprove_button"></span>', $txt['unapprove'], '</a></li>';
+		}
 
 		echo '
 										</ul>
 									</li>';
 
 		// Show a checkbox for quick moderation?
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove'])
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $message['can_remove']) {
+					echo '
 									<li style="display: none;" id="in_topic_mod_check_', $message['id'], '"></li>';
+		}
 
-		if ($message['can_approve'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'])
-			echo '
+		if ($message['can_approve'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg']) {
+					echo '
 								</ul><!-- .quickbuttons -->';
+		}
 	}
 
-	if ($context['can_report_moderator'] || !empty($modSettings['enable_likes']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote'])
-		echo '
+	if ($context['can_report_moderator'] || !empty($modSettings['enable_likes']) || $message['can_approve'] || $message['can_unapprove'] || $context['can_reply'] || $message['can_modify'] || $message['can_remove'] || $context['can_split'] || $context['can_restore_msg'] || $context['can_quote']) {
+			echo '
 							</div><!-- .under_message -->';
+	}
 
 	echo '
 						</div><!-- .postarea -->
@@ -968,9 +1037,10 @@ 
 							<div class="custom_fields_above_signature">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['above_signature'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['above_signature'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -978,11 +1048,12 @@ 
 	}
 
 	// Show the member's signature?
-	if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
-		echo '
+	if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled']) {
+			echo '
 							<div class="signature" id="msg_', $message['id'], '_signature"', $ignoring ? ' style="display:none;"' : '', '>
 								', $message['member']['signature'], '
 							</div>';
+	}
 
 
 	// Are there any custom profile fields for below the signature?
@@ -992,9 +1063,10 @@ 
 							<div class="custom_fields_below_signature">
 								<ul class="nolist">';
 
-		foreach ($message['custom_fields']['below_signature'] as $custom)
-			echo '
+		foreach ($message['custom_fields']['below_signature'] as $custom) {
+					echo '
 									<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
+		}
 
 		echo '
 								</ul>
@@ -1027,24 +1099,28 @@ 
 				<div class="roundframe">';
 
 	// Are we hiding the full editor?
-	if (empty($options['use_editor_quick_reply']))
-		echo '
+	if (empty($options['use_editor_quick_reply'])) {
+			echo '
 					<p class="smalltext lefttext">', $txt['quick_reply_desc'], '</p>';
+	}
 
 	// Is the topic locked?
-	if ($context['is_locked'])
-		echo '
+	if ($context['is_locked']) {
+			echo '
 					<p class="alert smalltext">', $txt['quick_reply_warning'], '</p>';
+	}
 
 	// Show a warning if the topic is old
-	if (!empty($context['oldTopicError']))
-		echo '
+	if (!empty($context['oldTopicError'])) {
+			echo '
 					<p class="alert smalltext">', sprintf($txt['error_old_topic'], $modSettings['oldTopicDays']), '</p>';
+	}
 
 	// Does the post need approval?
-	if (!$context['can_reply_approved'])
-		echo '
+	if (!$context['can_reply_approved']) {
+			echo '
 					<p><em>', $txt['wait_for_approval'], '</em></p>';
+	}
 
 	echo '
 					<form action="', $scripturl, '?board=', $context['current_board'], ';action=post2" method="post" accept-charset="', $context['character_set'], '" name="postmodify" id="postmodify" onsubmit="submitonce(this);">
@@ -1060,8 +1136,8 @@ 
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">';
 
 	// Guests just need more.
-	if ($context['user']['is_guest'])
-		echo '
+	if ($context['user']['is_guest']) {
+			echo '
 						<dl id="post_header">
 							<dt>
 								', $txt['name'], ':
@@ -1076,6 +1152,7 @@ 
 								<input type="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" required>
 							</dd>
 						</dl>';
+	}
 
 	echo '
 						', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'), '
@@ -1100,12 +1177,13 @@ 
 						</script>';
 
 	// Is visual verification enabled?
-	if ($context['require_verification'])
-		echo '
+	if ($context['require_verification']) {
+			echo '
 						<div class="post_verification">
 							<strong>', $txt['verification'], ':</strong>
 							', template_control_verification($context['visual_verification_id'], 'all'), '
 						</div>';
+	}
 
 	// Finally, the submit buttons.
 	echo '
@@ -1121,8 +1199,8 @@ 
 		<br class="clear">';
 
 	// Draft autosave available and the user has it enabled?
-	if (!empty($context['drafts_autosave']))
-		echo '
+	if (!empty($context['drafts_autosave'])) {
+			echo '
 		<script>
 			var oDraftAutoSave = new smf_DraftAutoSave({
 				sSelf: \'oDraftAutoSave\',
@@ -1134,12 +1212,14 @@ 
 				iFreq: ', (empty($modSettings['masterAutoSaveDraftsDelay']) ? 60000 : $modSettings['masterAutoSaveDraftsDelay'] * 1000), '
 			});
 		</script>';
+	}
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 		<form action="', $scripturl, '?action=spellcheck" method="post" accept-charset="', $context['character_set'], '" name="spell_form" id="spell_form" target="spellWindow">
 			<input type="hidden" name="spellstring" value="">
 		</form>';
+	}
 
 	echo '
 		<script>

Sources/Subs-Package.php

Doc Comments +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
  * @param bool $single_file If true returns the contents of the file specified by destination if it exists
  * @param bool $overwrite Whether to overwrite existing files
  * @param null|array $files_to_extract Specific files to extract
- * @return array|false An array of information about extracted files or false on failure
+ * @return string An array of information about extracted files or false on failure
  */
 function read_tgz_file($gzfilename, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {
@@ -59,7 +59,7 @@ 
  * @param bool $single_file Whether to only extract a single file
  * @param bool $overwrite Whether to overwrite existing data
  * @param null|array $files_to_extract If set, only extracts the specified files
- * @return array|false An array of information about the extracted files or false on failure
+ * @return string An array of information about the extracted files or false on failure
  */
 function read_tgz_data($gzfilename, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {
@@ -3255,7 +3255,7 @@ 
 	 * https://php.net/crc32#79567
 	 *
 	 * @param string $number
-	 * @return string The crc32
+	 * @return integer The crc32
 	 */
 	function smf_crc32($number)
 	{

Braces +799 added lines, -624 removed lines

@@ -16,8 +16,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Reads a .tar.gz file, filename, in and extracts file(s) from it.
@@ -67,47 +68,53 @@ 
 	loadLanguage('Packages');
 
 	// This function sorta needs gzinflate!
-	if (!function_exists('gzinflate'))
-		fatal_lang_error('package_no_zlib', 'critical');
+	if (!function_exists('gzinflate')) {
+			fatal_lang_error('package_no_zlib', 'critical');
+	}
 
 	if (substr($gzfilename, 0, 7) == 'http://' || substr($gzfilename, 0, 8) == 'https://')
 	{
 		$data = fetch_web_data($gzfilename);
 
-		if ($data === false)
-			return false;
-	}
-	else
+		if ($data === false) {
+					return false;
+		}
+	} else
 	{
 		$data = @file_get_contents($gzfilename);
 
-		if ($data === false)
-			return false;
+		if ($data === false) {
+					return false;
+		}
 	}
 
 	umask(0);
-	if (!$single_file && $destination !== null && !file_exists($destination))
-		mktree($destination, 0777);
+	if (!$single_file && $destination !== null && !file_exists($destination)) {
+			mktree($destination, 0777);
+	}
 
 	// No signature?
-	if (strlen($data) < 2)
-		return false;
+	if (strlen($data) < 2) {
+			return false;
+	}
 
 	$id = unpack('H2a/H2b', substr($data, 0, 2));
 	if (strtolower($id['a'] . $id['b']) != '1f8b')
 	{
 		// Okay, this ain't no tar.gz, but maybe it's a zip file.
-		if (substr($data, 0, 2) == 'PK')
-			return read_zip_file($gzfilename, $destination, $single_file, $overwrite, $files_to_extract);
-		else
-			return false;
+		if (substr($data, 0, 2) == 'PK') {
+					return read_zip_file($gzfilename, $destination, $single_file, $overwrite, $files_to_extract);
+		} else {
+					return false;
+		}
 	}
 
 	$flags = unpack('Ct/Cf', substr($data, 2, 2));
 
 	// Not deflate!
-	if ($flags['t'] != 8)
-		return false;
+	if ($flags['t'] != 8) {
+			return false;
+	}
 	$flags = $flags['f'];
 
 	$offset = 10;
@@ -117,18 +124,21 @@ 
 	// @todo Might be mussed.
 	if ($flags & 12)
 	{
-		while ($flags & 8 && $data{$offset++} != "\0")
-			continue;
-		while ($flags & 4 && $data{$offset++} != "\0")
-			continue;
+		while ($flags & 8 && $data{$offset++} != "\0") {
+					continue;
+		}
+		while ($flags & 4 && $data{$offset++} != "\0") {
+					continue;
+		}
 	}
 
 	$crc = unpack('Vcrc32/Visize', substr($data, strlen($data) - 8, 8));
 	$data = @gzinflate(substr($data, $offset, strlen($data) - 8 - $offset));
 
 	// smf_crc32 and crc32 may not return the same results, so we accept either.
-	if ($crc['crc32'] != smf_crc32($data) && $crc['crc32'] != crc32($data))
-		return false;
+	if ($crc['crc32'] != smf_crc32($data) && $crc['crc32'] != crc32($data)) {
+			return false;
+	}
 
 	$blocks = strlen($data) / 512 - 1;
 	$offset = 0;
@@ -149,83 +159,98 @@ 
 
 		foreach ($current as $k => $v)
 		{
-			if (in_array($k, $octdec))
-				$current[$k] = octdec(trim($v));
-			else
-				$current[$k] = trim($v);
+			if (in_array($k, $octdec)) {
+							$current[$k] = octdec(trim($v));
+			} else {
+							$current[$k] = trim($v);
+			}
 		}
 
-		if ($current['type'] == 5 && substr($current['filename'], -1) != '/')
-			$current['filename'] .= '/';
+		if ($current['type'] == 5 && substr($current['filename'], -1) != '/') {
+					$current['filename'] .= '/';
+		}
 
 		$checksum = 256;
-		for ($i = 0; $i < 148; $i++)
-			$checksum += ord($header{$i});
-		for ($i = 156; $i < 512; $i++)
-			$checksum += ord($header{$i});
+		for ($i = 0; $i < 148; $i++) {
+					$checksum += ord($header{$i});
+		}
+		for ($i = 156; $i < 512; $i++) {
+					$checksum += ord($header{$i});
+		}
 
-		if ($current['checksum'] != $checksum)
-			break;
+		if ($current['checksum'] != $checksum) {
+					break;
+		}
 
 		$size = ceil($current['size'] / 512);
 		$current['data'] = substr($data, ++$offset << 9, $current['size']);
 		$offset += $size;
 
 		// Not a directory and doesn't exist already...
-		if (substr($current['filename'], -1, 1) != '/' && !file_exists($destination . '/' . $current['filename']))
-			$write_this = true;
+		if (substr($current['filename'], -1, 1) != '/' && !file_exists($destination . '/' . $current['filename'])) {
+					$write_this = true;
+		}
 		// File exists... check if it is newer.
-		elseif (substr($current['filename'], -1, 1) != '/')
-			$write_this = $overwrite || filemtime($destination . '/' . $current['filename']) < $current['mtime'];
+		elseif (substr($current['filename'], -1, 1) != '/') {
+					$write_this = $overwrite || filemtime($destination . '/' . $current['filename']) < $current['mtime'];
+		}
 		// Folder... create.
 		elseif ($destination !== null && !$single_file)
 		{
 			// Protect from accidental parent directory writing...
 			$current['filename'] = strtr($current['filename'], array('../' => '', '/..' => ''));
 
-			if (!file_exists($destination . '/' . $current['filename']))
-				mktree($destination . '/' . $current['filename'], 0777);
+			if (!file_exists($destination . '/' . $current['filename'])) {
+							mktree($destination . '/' . $current['filename'], 0777);
+			}
 			$write_this = false;
+		} else {
+					$write_this = false;
 		}
-		else
-			$write_this = false;
 
 		if ($write_this && $destination !== null)
 		{
-			if (strpos($current['filename'], '/') !== false && !$single_file)
-				mktree($destination . '/' . dirname($current['filename']), 0777);
+			if (strpos($current['filename'], '/') !== false && !$single_file) {
+							mktree($destination . '/' . dirname($current['filename']), 0777);
+			}
 
 			// Is this the file we're looking for?
-			if ($single_file && ($destination == $current['filename'] || $destination == '*/' . basename($current['filename'])))
-				return $current['data'];
+			if ($single_file && ($destination == $current['filename'] || $destination == '*/' . basename($current['filename']))) {
+							return $current['data'];
+			}
 			// If we're looking for another file, keep going.
-			elseif ($single_file)
-				continue;
+			elseif ($single_file) {
+							continue;
+			}
 			// Looking for restricted files?
-			elseif ($files_to_extract !== null && !in_array($current['filename'], $files_to_extract))
-				continue;
+			elseif ($files_to_extract !== null && !in_array($current['filename'], $files_to_extract)) {
+							continue;
+			}
 
 			package_put_contents($destination . '/' . $current['filename'], $current['data']);
 		}
 
-		if (substr($current['filename'], -1, 1) != '/')
-			$return[] = array(
+		if (substr($current['filename'], -1, 1) != '/') {
+					$return[] = array(
 				'filename' => $current['filename'],
 				'md5' => md5($current['data']),
 				'preview' => substr($current['data'], 0, 100),
 				'size' => $current['size'],
 				'skipped' => false
 			);
+		}
 	}
 
-	if ($destination !== null && !$single_file)
-		package_flush_cache();
+	if ($destination !== null && !$single_file) {
+			package_flush_cache();
+	}
 
-	if ($single_file)
-		return false;
-	else
-		return $return;
-}
+	if ($single_file) {
+			return false;
+	} else {
+			return $return;
+	}
+	}
 
 /**
  * Extract zip data. A functional copy of {@list read_zip_data()}.
@@ -247,9 +272,10 @@ 
 		$return = array();
 
 		// Some hosted unix platforms require an extension; win may have .tmp & that works ok
-		if (!in_array(strtolower(pathinfo($file, PATHINFO_EXTENSION)), array('zip', 'tmp')))
-			if (@rename($file, $file . '.zip'))
+		if (!in_array(strtolower(pathinfo($file, PATHINFO_EXTENSION)), array('zip', 'tmp'))) {
+					if (@rename($file, $file . '.zip'))
 				$file = $file . '.zip';
+		}
 
 		// Phar doesn't handle open_basedir restrictions very well and throws a PHP Warning. Ignore that.
 		set_error_handler(function($errno, $errstr, $errfile, $errline)
@@ -258,8 +284,9 @@ 
 				if (0 === error_reporting()) {
 					return false;
 				}
-				if (strpos($errstr, 'PharData::__construct(): open_basedir') === false)
-					log_error($errstr, 'general', $errfile, $errline);
+				if (strpos($errstr, 'PharData::__construct(): open_basedir') === false) {
+									log_error($errstr, 'general', $errfile, $errline);
+				}
 			}
 		);
 		$archive = new PharData($file, RecursiveIteratorIterator::SELF_FIRST, null, Phar::ZIP);
@@ -272,65 +299,74 @@ 
 			{
 				$i = $iterator->getSubPathname();
 				// If this is a file, and it doesn't exist.... happy days!
-				if (substr($i, -1) != '/' && !file_exists($destination . '/' . $i))
-					$write_this = true;
+				if (substr($i, -1) != '/' && !file_exists($destination . '/' . $i)) {
+									$write_this = true;
+				}
 				// If the file exists, we may not want to overwrite it.
-				elseif (substr($i, -1) != '/')
-					$write_this = $overwrite;
-				else
-					$write_this = false;
+				elseif (substr($i, -1) != '/') {
+									$write_this = $overwrite;
+				} else {
+									$write_this = false;
+				}
 
 				// Get the actual compressed data.
-				if (!$file_info->isDir())
-					$file_data = file_get_contents($file_info);
-				elseif ($destination !== null && !$single_file)
+				if (!$file_info->isDir()) {
+									$file_data = file_get_contents($file_info);
+				} elseif ($destination !== null && !$single_file)
 				{
 					// Folder... create.
-					if (!file_exists($destination . '/' . $i))
-						mktree($destination . '/' . $i, 0777);
+					if (!file_exists($destination . '/' . $i)) {
+											mktree($destination . '/' . $i, 0777);
+					}
 					$file_data = null;
+				} else {
+									$file_data = null;
 				}
-				else
-					$file_data = null;
 
 				// Okay!  We can write this file, looks good from here...
 				if ($write_this && $destination !== null)
 				{
-					if (!$single_file && !is_dir($destination . '/' . dirname($i)))
-						mktree($destination . '/' . dirname($i), 0777);
+					if (!$single_file && !is_dir($destination . '/' . dirname($i))) {
+											mktree($destination . '/' . dirname($i), 0777);
+					}
 
 					// If we're looking for a specific file, and this is it... ka-bam, baby.
-					if ($single_file && ($destination == $i || $destination == '*/' . basename($i)))
-						return $file_data;
+					if ($single_file && ($destination == $i || $destination == '*/' . basename($i))) {
+											return $file_data;
+					}
 					// Oh?  Another file.  Fine.  You don't like this file, do you?  I know how it is.  Yeah... just go away.  No, don't apologize.  I know this file's just not *good enough* for you.
-					elseif ($single_file)
-						continue;
+					elseif ($single_file) {
+											continue;
+					}
 					// Don't really want this?
-					elseif ($files_to_extract !== null && !in_array($i, $files_to_extract))
-						continue;
+					elseif ($files_to_extract !== null && !in_array($i, $files_to_extract)) {
+											continue;
+					}
 
 					package_put_contents($destination . '/' . $i, $file_data);
 				}
 
-				if (substr($i, -1, 1) != '/')
-					$return[] = array(
+				if (substr($i, -1, 1) != '/') {
+									$return[] = array(
 						'filename' => $i,
 						'md5' => md5($file_data),
 						'preview' => substr($file_data, 0, 100),
 						'size' => strlen($file_data),
 						'skipped' => false
 					);
+				}
 			}
 
-		if ($destination !== null && !$single_file)
-			package_flush_cache();
+		if ($destination !== null && !$single_file) {
+					package_flush_cache();
+		}
 
-		if ($single_file)
-			return false;
-		else
-			return $return;
-	}
-	catch (Exception $e)
+		if ($single_file) {
+					return false;
+		} else {
+					return $return;
+		}
+	} catch (Exception $e)
 	{
 		log_error($e->getMessage(), 'general', $e->getFile(), $e->getLine());
 		return false;
@@ -353,13 +389,15 @@ 
 function read_zip_data($data, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 {
 	umask(0);
-	if ($destination !== null && !file_exists($destination) && !$single_file)
-		mktree($destination, 0777);
+	if ($destination !== null && !file_exists($destination) && !$single_file) {
+			mktree($destination, 0777);
+	}
 
 	// Look for the end of directory signature 0x06054b50
 	$data_ecr = explode("\x50\x4b\x05\x06", $data);
-	if (!isset($data_ecr[1]))
-		return false;
+	if (!isset($data_ecr[1])) {
+			return false;
+	}
 
 	$return = array();
 
@@ -374,8 +412,9 @@ 
 	array_shift($file_sections);
 
 	// sections and count from the signature must match or the zip file is bad
-	if (count($file_sections) != $zip_info['files'])
-		return false;
+	if (count($file_sections) != $zip_info['files']) {
+			return false;
+	}
 
 	// go though each file in the archive
 	foreach ($file_sections as $data)
@@ -397,68 +436,79 @@ 
 		}
 
 		// If this is a file, and it doesn't exist.... happy days!
-		if (substr($file_info['filename'], -1) != '/' && !file_exists($destination . '/' . $file_info['filename']))
-			$write_this = true;
+		if (substr($file_info['filename'], -1) != '/' && !file_exists($destination . '/' . $file_info['filename'])) {
+					$write_this = true;
+		}
 		// If the file exists, we may not want to overwrite it.
-		elseif (substr($file_info['filename'], -1) != '/')
-			$write_this = $overwrite;
+		elseif (substr($file_info['filename'], -1) != '/') {
+					$write_this = $overwrite;
+		}
 		// This is a directory, so we're gonna want to create it. (probably...)
 		elseif ($destination !== null && !$single_file)
 		{
 			// Just a little accident prevention, don't mind me.
 			$file_info['filename'] = strtr($file_info['filename'], array('../' => '', '/..' => ''));
 
-			if (!file_exists($destination . '/' . $file_info['filename']))
-				mktree($destination . '/' . $file_info['filename'], 0777);
+			if (!file_exists($destination . '/' . $file_info['filename'])) {
+							mktree($destination . '/' . $file_info['filename'], 0777);
+			}
 			$write_this = false;
+		} else {
+					$write_this = false;
 		}
-		else
-			$write_this = false;
 
 		// Get the actual compressed data.
 		$file_info['data'] = substr($data, 26 + $file_info['filename_length'] + $file_info['extrafield_length']);
 
 		// Only inflate it if we need to ;)
-		if (!empty($file_info['compress_method']) || ($file_info['compressed_size'] != $file_info['size']))
-			$file_info['data'] = gzinflate($file_info['data']);
+		if (!empty($file_info['compress_method']) || ($file_info['compressed_size'] != $file_info['size'])) {
+					$file_info['data'] = gzinflate($file_info['data']);
+		}
 
 		// Okay!  We can write this file, looks good from here...
 		if ($write_this && $destination !== null)
 		{
-			if ((strpos($file_info['filename'], '/') !== false && !$single_file) || (!$single_file && !is_dir($file_info['dir'])))
-				mktree($file_info['dir'], 0777);
+			if ((strpos($file_info['filename'], '/') !== false && !$single_file) || (!$single_file && !is_dir($file_info['dir']))) {
+							mktree($file_info['dir'], 0777);
+			}
 
 			// If we're looking for a specific file, and this is it... ka-bam, baby.
-			if ($single_file && ($destination == $file_info['filename'] || $destination == '*/' . basename($file_info['filename'])))
-				return $file_info['data'];
+			if ($single_file && ($destination == $file_info['filename'] || $destination == '*/' . basename($file_info['filename']))) {
+							return $file_info['data'];
+			}
 			// Oh?  Another file.  Fine.  You don't like this file, do you?  I know how it is.  Yeah... just go away.  No, don't apologize.  I know this file's just not *good enough* for you.
-			elseif ($single_file)
-				continue;
+			elseif ($single_file) {
+							continue;
+			}
 			// Don't really want this?
-			elseif ($files_to_extract !== null && !in_array($file_info['filename'], $files_to_extract))
-				continue;
+			elseif ($files_to_extract !== null && !in_array($file_info['filename'], $files_to_extract)) {
+							continue;
+			}
 
 			package_put_contents($destination . '/' . $file_info['filename'], $file_info['data']);
 		}
 
-		if (substr($file_info['filename'], -1, 1) != '/')
-			$return[] = array(
+		if (substr($file_info['filename'], -1, 1) != '/') {
+					$return[] = array(
 				'filename' => $file_info['filename'],
 				'md5' => md5($file_info['data']),
 				'preview' => substr($file_info['data'], 0, 100),
 				'size' => $file_info['size'],
 				'skipped' => false
 			);
+		}
 	}
 
-	if ($destination !== null && !$single_file)
-		package_flush_cache();
+	if ($destination !== null && !$single_file) {
+			package_flush_cache();
+	}
 
-	if ($single_file)
-		return false;
-	else
-		return $return;
-}
+	if ($single_file) {
+			return false;
+	} else {
+			return $return;
+	}
+	}
 
 /**
  * Checks the existence of a remote file since file_exists() does not do remote.
@@ -470,14 +520,16 @@ 
 {
 	$a_url = parse_url($url);
 
-	if (!isset($a_url['scheme']))
-		return false;
+	if (!isset($a_url['scheme'])) {
+			return false;
+	}
 
 	// Attempt to connect...
 	$temp = '';
 	$fid = fsockopen($a_url['host'], !isset($a_url['port']) ? 80 : $a_url['port'], $temp, $temp, 8);
-	if (!$fid)
-		return false;
+	if (!$fid) {
+			return false;
+	}
 
 	fputs($fid, 'HEAD ' . $a_url['path'] . ' HTTP/1.0' . "\r\n" . 'Host: ' . $a_url['host'] . "\r\n\r\n");
 	$head = fread($fid, 1024);
@@ -512,8 +564,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Already found this? If so don't add it twice!
-		if (in_array($row['package_id'], $found))
-			continue;
+		if (in_array($row['package_id'], $found)) {
+					continue;
+		}
 
 		$found[] = $row['package_id'];
 
@@ -548,19 +601,21 @@ 
 	global $sourcedir, $packagesdir;
 
 	// Extract package-info.xml from downloaded file. (*/ is used because it could be in any directory.)
-	if (strpos($gzfilename, 'http://') !== false || strpos($gzfilename, 'https://') !== false)
-		$packageInfo = read_tgz_data($gzfilename, 'package-info.xml', true);
-	else
+	if (strpos($gzfilename, 'http://') !== false || strpos($gzfilename, 'https://') !== false) {
+			$packageInfo = read_tgz_data($gzfilename, 'package-info.xml', true);
+	} else
 	{
-		if (!file_exists($packagesdir . '/' . $gzfilename))
-			return 'package_get_error_not_found';
+		if (!file_exists($packagesdir . '/' . $gzfilename)) {
+					return 'package_get_error_not_found';
+		}
 
-		if (is_file($packagesdir . '/' . $gzfilename))
-			$packageInfo = read_tgz_file($packagesdir . '/' . $gzfilename, '*/package-info.xml', true);
-		elseif (file_exists($packagesdir . '/' . $gzfilename . '/package-info.xml'))
-			$packageInfo = file_get_contents($packagesdir . '/' . $gzfilename . '/package-info.xml');
-		else
-			return 'package_get_error_missing_xml';
+		if (is_file($packagesdir . '/' . $gzfilename)) {
+					$packageInfo = read_tgz_file($packagesdir . '/' . $gzfilename, '*/package-info.xml', true);
+		} elseif (file_exists($packagesdir . '/' . $gzfilename . '/package-info.xml')) {
+					$packageInfo = file_get_contents($packagesdir . '/' . $gzfilename . '/package-info.xml');
+		} else {
+					return 'package_get_error_missing_xml';
+		}
 	}
 
 	// Nothing?
@@ -568,10 +623,11 @@ 
 	{
 		// Perhaps they are trying to install a theme, lets tell them nicely this is the wrong function
 		$packageInfo = read_tgz_file($packagesdir . '/' . $gzfilename, '*/theme_info.xml', true);
-		if (!empty($packageInfo))
-			return 'package_get_error_is_theme';
-		else
-			return 'package_get_error_is_zero';
+		if (!empty($packageInfo)) {
+					return 'package_get_error_is_theme';
+		} else {
+					return 'package_get_error_is_zero';
+		}
 	}
 
 	// Parse package-info.xml into an xmlArray.
@@ -579,8 +635,9 @@ 
 	$packageInfo = new xmlArray($packageInfo);
 
 	// @todo Error message of some sort?
-	if (!$packageInfo->exists('package-info[0]'))
-		return 'package_get_error_packageinfo_corrupt';
+	if (!$packageInfo->exists('package-info[0]')) {
+			return 'package_get_error_packageinfo_corrupt';
+	}
 
 	$packageInfo = $packageInfo->path('package-info[0]');
 
@@ -599,8 +656,9 @@ 
 		}
 	}
 
-	if (!isset($package['type']))
-		$package['type'] = 'modification';
+	if (!isset($package['type'])) {
+			$package['type'] = 'modification';
+	}
 
 	return $package;
 }
@@ -653,15 +711,14 @@ 
 					{
 						$ftp_file = strtr($file, array($_SESSION['pack_ftp']['root'] => ''));
 						$package_ftp->chmod($ftp_file, $perms);
+					} else {
+											smf_chmod($file, $perms);
 					}
-					else
-						smf_chmod($file, $perms);
 
 					$new_permissions = @fileperms($file);
 					$result = $new_permissions == $perms ? 'success' : 'failure';
 					unset($_SESSION['pack_ftp']['original_perms'][$file]);
-				}
-				elseif ($do_change)
+				} elseif ($do_change)
 				{
 					$new_permissions = '';
 					$result = 'skipped';
@@ -777,8 +834,7 @@ 
 
 			$context['sub_template'] = 'show_list';
 			$context['default_list'] = 'restore_file_permissions';
-		}
-		else
+		} else
 		{
 			unset($listOptions['columns']['result']);
 		}
@@ -788,12 +844,14 @@ 
 		createList($listOptions);
 
 		// If we just restored permissions then whereever we are, we are now done and dusted.
-		if (!empty($_POST['restore_perms']))
-			obExit();
+		if (!empty($_POST['restore_perms'])) {
+					obExit();
+		}
 	}
 	// Otherwise, it's entirely irrelevant?
-	elseif ($restore_write_status)
-		return true;
+	elseif ($restore_write_status) {
+			return true;
+	}
 
 	// This is where we report what we got up to.
 	$return_data = array(
@@ -831,11 +889,12 @@ 
 			if (!in_array($_POST['ftp_path'], array('', '/')))
 			{
 				$ftp_root = strtr($boarddir, array($_POST['ftp_path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || substr($_POST['ftp_path'], 0, 1) == '/'))
-					$ftp_root = substr($ftp_root, 0, -1);
+				if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || substr($_POST['ftp_path'], 0, 1) == '/')) {
+									$ftp_root = substr($ftp_root, 0, -1);
+				}
+			} else {
+							$ftp_root = $boarddir;
 			}
-			else
-				$ftp_root = $boarddir;
 
 			$_SESSION['pack_ftp'] = array(
 				'server' => $_POST['ftp_server'],
@@ -847,8 +906,9 @@ 
 				'connected' => true,
 			);
 
-			if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path'])
-				updateSettings(array('package_path' => $_POST['ftp_path']));
+			if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path']) {
+							updateSettings(array('package_path' => $_POST['ftp_path']));
+			}
 
 			// This is now the primary connection.
 			$package_ftp = $ftp;
@@ -861,12 +921,13 @@ 
 		foreach ($chmodFiles as $k => $file)
 		{
 			// Sometimes this can somehow happen maybe?
-			if (empty($file))
-				unset($chmodFiles[$k]);
+			if (empty($file)) {
+							unset($chmodFiles[$k]);
+			}
 			// Already writable?
-			elseif (@is_writable($file))
-				$return_data['files']['writable'][] = $file;
-			else
+			elseif (@is_writable($file)) {
+							$return_data['files']['writable'][] = $file;
+			} else
 			{
 				// Now try to change that.
 				$return_data['files'][package_chmod($file, 'writable', true) ? 'writable' : 'notwritable'][] = $file;
@@ -883,19 +944,21 @@ 
 			{
 				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($boarddir);
 
-			if ($found_path)
-				$_POST['ftp_path'] = $detect_path;
-			elseif (!isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+			if ($found_path) {
+							$_POST['ftp_path'] = $detect_path;
+			} elseif (!isset($_POST['ftp_path'])) {
+							$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_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(
@@ -908,8 +971,9 @@ 
 		);
 
 		// Which files failed?
-		if (!isset($context['notwritable_files']))
-			$context['notwritable_files'] = array();
+		if (!isset($context['notwritable_files'])) {
+					$context['notwritable_files'] = array();
+		}
 		$context['notwritable_files'] = array_merge($context['notwritable_files'], $return_data['files']['notwritable']);
 
 		// Sent here to die?
@@ -942,40 +1006,48 @@ 
 		foreach ($files as $k => $file)
 		{
 			// If this file doesn't exist, then we actually want to look at the directory, no?
-			if (!file_exists($file))
-				$file = dirname($file);
+			if (!file_exists($file)) {
+							$file = dirname($file);
+			}
 
 			// This looks odd, but it's an attempt to work around PHP suExec.
-			if (!@is_writable($file))
-				smf_chmod($file, 0755);
-			if (!@is_writable($file))
-				smf_chmod($file, 0777);
-			if (!@is_writable(dirname($file)))
-				smf_chmod($file, 0755);
-			if (!@is_writable(dirname($file)))
-				smf_chmod($file, 0777);
+			if (!@is_writable($file)) {
+							smf_chmod($file, 0755);
+			}
+			if (!@is_writable($file)) {
+							smf_chmod($file, 0777);
+			}
+			if (!@is_writable(dirname($file))) {
+							smf_chmod($file, 0755);
+			}
+			if (!@is_writable(dirname($file))) {
+							smf_chmod($file, 0777);
+			}
 
 			$fp = is_dir($file) ? @opendir($file) : @fopen($file, 'rb');
 			if (@is_writable($file) && $fp)
 			{
 				unset($files[$k]);
-				if (!is_dir($file))
-					fclose($fp);
-				else
-					closedir($fp);
+				if (!is_dir($file)) {
+									fclose($fp);
+				} else {
+									closedir($fp);
+				}
 			}
 		}
 
 		// No FTP required!
-		if (empty($files))
-			return array();
+		if (empty($files)) {
+					return array();
+		}
 	}
 
 	// They've opted to not use FTP, and try anyway.
 	if (isset($_SESSION['pack_ftp']) && $_SESSION['pack_ftp'] == false)
 	{
-		if ($files === null)
-			return array();
+		if ($files === null) {
+					return array();
+		}
 
 		foreach ($files as $k => $file)
 		{
@@ -987,26 +1059,29 @@ 
 				smf_chmod($file, 0755);
 			}
 
-			if (!@is_writable($file))
-				smf_chmod($file, 0777);
-			if (!@is_writable(dirname($file)))
-				smf_chmod(dirname($file), 0777);
+			if (!@is_writable($file)) {
+							smf_chmod($file, 0777);
+			}
+			if (!@is_writable(dirname($file))) {
+							smf_chmod(dirname($file), 0777);
+			}
 
-			if (@is_writable($file))
-				unset($files[$k]);
+			if (@is_writable($file)) {
+							unset($files[$k]);
+			}
 		}
 
 		return $files;
-	}
-	elseif (isset($_SESSION['pack_ftp']))
+	} elseif (isset($_SESSION['pack_ftp']))
 	{
 		// Load the file containing the ftp_connection class.
 		require_once($sourcedir . '/Class-Package.php');
 
 		$package_ftp = new ftp_connection($_SESSION['pack_ftp']['server'], $_SESSION['pack_ftp']['port'], $_SESSION['pack_ftp']['username'], package_crypt($_SESSION['pack_ftp']['password']));
 
-		if ($files === null)
-			return array();
+		if ($files === null) {
+					return array();
+		}
 
 		foreach ($files as $k => $file)
 		{
@@ -1020,13 +1095,16 @@ 
 				$package_ftp->chmod($ftp_file, 0755);
 			}
 
-			if (!@is_writable($file))
-				$package_ftp->chmod($ftp_file, 0777);
-			if (!@is_writable(dirname($file)))
-				$package_ftp->chmod(dirname($ftp_file), 0777);
+			if (!@is_writable($file)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
+			if (!@is_writable(dirname($file))) {
+							$package_ftp->chmod(dirname($ftp_file), 0777);
+			}
 
-			if (@is_writable($file))
-				unset($files[$k]);
+			if (@is_writable($file)) {
+							unset($files[$k]);
+			}
 		}
 
 		return $files;
@@ -1038,8 +1116,7 @@ 
 
 		$files = packageRequireFTP($destination_url, $files, $return);
 		return $files;
-	}
-	elseif (isset($_POST['ftp_username']))
+	} elseif (isset($_POST['ftp_username']))
 	{
 		require_once($sourcedir . '/Class-Package.php');
 		$ftp = new ftp_connection($_POST['ftp_server'], $_POST['ftp_port'], $_POST['ftp_username'], $_POST['ftp_password']);
@@ -1061,19 +1138,21 @@ 
 		{
 			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($boarddir);
 
-		if ($found_path)
-			$_POST['ftp_path'] = $detect_path;
-		elseif (!isset($_POST['ftp_path']))
-			$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+		if ($found_path) {
+					$_POST['ftp_path'] = $detect_path;
+		} elseif (!isset($_POST['ftp_path'])) {
+					$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_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'),
@@ -1085,23 +1164,24 @@ 
 		);
 
 		// If we're returning dump out here.
-		if ($return)
-			return $files;
+		if ($return) {
+					return $files;
+		}
 
 		$context['page_title'] = $txt['package_ftp_necessary'];
 		$context['sub_template'] = 'ftp_required';
 		obExit();
-	}
-	else
+	} else
 	{
 		if (!in_array($_POST['ftp_path'], array('', '/')))
 		{
 			$ftp_root = strtr($boarddir, array($_POST['ftp_path'] => ''));
-			if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || $_POST['ftp_path'][0] == '/'))
-				$ftp_root = substr($ftp_root, 0, -1);
+			if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || $_POST['ftp_path'][0] == '/')) {
+							$ftp_root = substr($ftp_root, 0, -1);
+			}
+		} else {
+					$ftp_root = $boarddir;
 		}
-		else
-			$ftp_root = $boarddir;
 
 		$_SESSION['pack_ftp'] = array(
 			'server' => $_POST['ftp_server'],
@@ -1112,8 +1192,9 @@ 
 			'root' => $ftp_root,
 		);
 
-		if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path'])
-			updateSettings(array('package_path' => $_POST['ftp_path']));
+		if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path']) {
+					updateSettings(array('package_path' => $_POST['ftp_path']));
+		}
 
 		$files = packageRequireFTP($destination_url, $files, $return);
 	}
@@ -1141,16 +1222,18 @@ 
 	global $packagesdir, $forum_version, $context, $temp_path, $language, $smcFunc;
 
 	// Mayday!  That action doesn't exist!!
-	if (empty($packageXML) || !$packageXML->exists($method))
-		return array();
+	if (empty($packageXML) || !$packageXML->exists($method)) {
+			return array();
+	}
 
 	// We haven't found the package script yet...
 	$script = false;
 	$the_version = strtr($forum_version, array('SMF ' => ''));
 
 	// Emulation support...
-	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	if (!empty($_SESSION['version_emulate'])) {
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	// Single package emulation
 	if (!empty($_REQUEST['ve']) && !empty($_REQUEST['package']))
@@ -1158,8 +1241,9 @@ 
 		$the_version = $_REQUEST['ve'];
 		$_SESSION['single_version_emulate'][$_REQUEST['package']] = $the_version;
 	}
-	if (!empty($_REQUEST['package']) && (!empty($_SESSION['single_version_emulate'][$_REQUEST['package']])))
-		$the_version = $_SESSION['single_version_emulate'][$_REQUEST['package']];
+	if (!empty($_REQUEST['package']) && (!empty($_SESSION['single_version_emulate'][$_REQUEST['package']]))) {
+			$the_version = $_SESSION['single_version_emulate'][$_REQUEST['package']];
+	}
 
 	// Get all the versions of this method and find the right one.
 	$these_methods = $packageXML->set($method);
@@ -1169,16 +1253,18 @@ 
 		if ($this_method->exists('@for'))
 		{
 			// Don't keep going if this won't work for this version of SMF.
-			if (!matchPackageVersion($the_version, $this_method->fetch('@for')))
-				continue;
+			if (!matchPackageVersion($the_version, $this_method->fetch('@for'))) {
+							continue;
+			}
 		}
 
 		// Upgrades may go from a certain old version of the mod.
 		if ($method == 'upgrade' && $this_method->exists('@from'))
 		{
 			// Well, this is for the wrong old version...
-			if (!matchPackageVersion($previous_version, $this_method->fetch('@from')))
-				continue;
+			if (!matchPackageVersion($previous_version, $this_method->fetch('@from'))) {
+							continue;
+			}
 		}
 
 		// We've found it!
@@ -1187,8 +1273,9 @@ 
 	}
 
 	// Bad news, a matching script wasn't found!
-	if (!($script instanceof xmlArray))
-		return array();
+	if (!($script instanceof xmlArray)) {
+			return array();
+	}
 
 	// Find all the actions in this method - in theory, these should only be allowed actions. (* means all.)
 	$actions = $script->set('*');
@@ -1217,12 +1304,12 @@ 
 					if ((isset($_REQUEST['readme']) && $action->fetch('@lang') == $_REQUEST['readme']) || (isset($_REQUEST['license']) && $action->fetch('@lang') == $_REQUEST['license']) || (!isset($_REQUEST['readme']) && $action->fetch('@lang') == $language) || (!isset($_REQUEST['license']) && $action->fetch('@lang') == $language))
 					{
 						// In case the user put the blocks in the wrong order.
-						if (isset($context[$type]['selected']) && $context[$type]['selected'] == 'default')
-							$context[$type][] = 'default';
+						if (isset($context[$type]['selected']) && $context[$type]['selected'] == 'default') {
+													$context[$type][] = 'default';
+						}
 
 						$context[$type]['selected'] = $smcFunc['htmlspecialchars']($action->fetch('@lang'));
-					}
-					else
+					} else
 					{
 						// We don't want this now, but we'll allow the user to select to read it.
 						$context[$type][] = $smcFunc['htmlspecialchars']($action->fetch('@lang'));
@@ -1237,9 +1324,9 @@ 
 					{
 						$context[$type][] = 'default';
 						continue;
+					} else {
+											$context[$type]['selected'] = 'default';
 					}
-					else
-						$context[$type]['selected'] = 'default';
 				}
 			}
 
@@ -1249,9 +1336,9 @@ 
 				$filename = $temp_path . '$auto_' . $temp_auto++ . (in_array($actionType, array('readme', 'redirect', 'license')) ? '.txt' : ($actionType == 'code' || $actionType == 'database' ? '.php' : '.mod'));
 				package_put_contents($filename, $action->fetch('.'));
 				$filename = strtr($filename, array($temp_path => ''));
+			} else {
+							$filename = $action->fetch('.');
 			}
-			else
-				$filename = $action->fetch('.');
 
 			$return[] = array(
 				'type' => $actionType,
@@ -1266,8 +1353,7 @@ 
 			);
 
 			continue;
-		}
-		elseif ($actionType == 'hook')
+		} elseif ($actionType == 'hook')
 		{
 			$return[] = array(
 				'type' => $actionType,
@@ -1279,16 +1365,16 @@ 
 				'description' => '',
 			);
 			continue;
-		}
-		elseif ($actionType == 'credits')
+		} elseif ($actionType == 'credits')
 		{
 			// quick check of any supplied url
 			$url = $action->exists('@url') ? $action->fetch('@url') : '';
 			if (strlen(trim($url)) > 0 && substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://')
 			{
 				$url = 'http://' . $url;
-				if (strlen($url) < 8 || (substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://'))
-					$url = '';
+				if (strlen($url) < 8 || (substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://')) {
+									$url = '';
+				}
 			}
 
 			$return[] = array(
@@ -1300,8 +1386,7 @@ 
 				'title' => $action->fetch('.'),
 			);
 			continue;
-		}
-		elseif ($actionType == 'requires')
+		} elseif ($actionType == 'requires')
 		{
 			$return[] = array(
 				'type' => $actionType,
@@ -1310,14 +1395,12 @@ 
 				'description' => '',
 			);
 			continue;
-		}
-		elseif ($actionType == 'error')
+		} elseif ($actionType == 'error')
 		{
 			$return[] = array(
 				'type' => 'error',
 			);
-		}
-		elseif (in_array($actionType, array('require-file', 'remove-file', 'require-dir', 'remove-dir', 'move-file', 'move-dir', 'create-file', 'create-dir')))
+		} elseif (in_array($actionType, array('require-file', 'remove-file', 'require-dir', 'remove-dir', 'move-file', 'move-dir', 'create-file', 'create-dir')))
 		{
 			$this_action = &$return[];
 			$this_action = array(
@@ -1331,8 +1414,7 @@ 
 			{
 				$this_action['unparsed_destination'] = $action->fetch('@destination');
 				$this_action['destination'] = parse_path($action->fetch('@destination')) . '/' . basename($this_action['filename']);
-			}
-			else
+			} else
 			{
 				$this_action['unparsed_filename'] = $this_action['filename'];
 				$this_action['filename'] = parse_path($this_action['filename']);
@@ -1341,10 +1423,11 @@ 
 			// If we're moving or requiring (copying) a file.
 			if (substr($actionType, 0, 4) == 'move' || substr($actionType, 0, 7) == 'require')
 			{
-				if ($action->exists('@from'))
-					$this_action['source'] = parse_path($action->fetch('@from'));
-				else
-					$this_action['source'] = $temp_path . $this_action['filename'];
+				if ($action->exists('@from')) {
+									$this_action['source'] = parse_path($action->fetch('@from'));
+				} else {
+									$this_action['source'] = $temp_path . $this_action['filename'];
+				}
 			}
 
 			// Check if these things can be done. (chmod's etc.)
@@ -1353,22 +1436,23 @@ 
 				if (!mktree($this_action['destination'], false))
 				{
 					$temp = $this_action['destination'];
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
 						'filename' => $temp
 					);
 				}
-			}
-			elseif ($actionType == 'create-file')
+			} elseif ($actionType == 'create-file')
 			{
 				if (!mktree(dirname($this_action['destination']), false))
 				{
 					$temp = dirname($this_action['destination']);
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1376,36 +1460,38 @@ 
 					);
 				}
 
-				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
-			}
-			elseif ($actionType == 'require-dir')
+				}
+			} elseif ($actionType == 'require-dir')
 			{
 				if (!mktree($this_action['destination'], false))
 				{
 					$temp = $this_action['destination'];
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
 						'filename' => $temp
 					);
 				}
-			}
-			elseif ($actionType == 'require-file')
+			} elseif ($actionType == 'require-file')
 			{
-				if ($action->exists('@theme'))
-					$this_action['theme_action'] = $action->fetch('@theme');
+				if ($action->exists('@theme')) {
+									$this_action['theme_action'] = $action->fetch('@theme');
+				}
 
 				if (!mktree(dirname($this_action['destination']), false))
 				{
 					$temp = dirname($this_action['destination']);
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1413,19 +1499,20 @@ 
 					);
 				}
 
-				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
-			}
-			elseif ($actionType == 'move-dir' || $actionType == 'move-file')
+				}
+			} elseif ($actionType == 'move-dir' || $actionType == 'move-file')
 			{
 				if (!mktree(dirname($this_action['destination']), false))
 				{
 					$temp = dirname($this_action['destination']);
-					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					while (!file_exists($temp) && strlen($temp) > 1) {
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1433,30 +1520,30 @@ 
 					);
 				}
 
-				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
-			}
-			elseif ($actionType == 'remove-dir')
+				}
+			} elseif ($actionType == 'remove-dir')
 			{
-				if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-					$return[] = array(
+				if (!is_writable($this_action['filename']) && file_exists($this_action['filename'])) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['filename']
 					);
-			}
-			elseif ($actionType == 'remove-file')
+				}
+			} elseif ($actionType == 'remove-file')
 			{
-				if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-					$return[] = array(
+				if (!is_writable($this_action['filename']) && file_exists($this_action['filename'])) {
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['filename']
 					);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$return[] = array(
 				'type' => 'error',
@@ -1467,8 +1554,9 @@ 
 	}
 
 	// Only testing - just return a list of things to be done.
-	if ($testing_only)
-		return $return;
+	if ($testing_only) {
+			return $return;
+	}
 
 	umask(0);
 
@@ -1476,78 +1564,81 @@ 
 	$not_done = array(array('type' => '!'));
 	foreach ($return as $action)
 	{
-		if (in_array($action['type'], array('modification', 'code', 'database', 'redirect', 'hook', 'credits')))
-			$not_done[] = $action;
+		if (in_array($action['type'], array('modification', 'code', 'database', 'redirect', 'hook', 'credits'))) {
+					$not_done[] = $action;
+		}
 
 		if ($action['type'] == 'create-dir')
 		{
-			if (!mktree($action['destination'], 0755) || !is_writable($action['destination']))
-				$failure |= !mktree($action['destination'], 0777);
-		}
-		elseif ($action['type'] == 'create-file')
+			if (!mktree($action['destination'], 0755) || !is_writable($action['destination'])) {
+							$failure |= !mktree($action['destination'], 0777);
+			}
+		} elseif ($action['type'] == 'create-file')
 		{
-			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			// Create an empty file.
 			package_put_contents($action['destination'], package_get_contents($action['source']), $testing_only);
 
-			if (!file_exists($action['destination']))
-				$failure = true;
-		}
-		elseif ($action['type'] == 'require-dir')
+			if (!file_exists($action['destination'])) {
+							$failure = true;
+			}
+		} elseif ($action['type'] == 'require-dir')
 		{
 			copytree($action['source'], $action['destination']);
 			// Any other theme folders?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']]))
-				foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
 					copytree($action['source'], $theme_destination);
-		}
-		elseif ($action['type'] == 'require-file')
+			}
+		} elseif ($action['type'] == 'require-file')
 		{
-			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			package_put_contents($action['destination'], package_get_contents($action['source']), $testing_only);
 
 			$failure |= !copy($action['source'], $action['destination']);
 
 			// Any other theme files?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']]))
-				foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['destination']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
 				{
 					if (!mktree(dirname($theme_destination), 0755) || !is_writable(dirname($theme_destination)))
 						$failure |= !mktree(dirname($theme_destination), 0777);
+			}
 
 					package_put_contents($theme_destination, package_get_contents($action['source']), $testing_only);
 
 					$failure |= !copy($action['source'], $theme_destination);
 				}
-		}
-		elseif ($action['type'] == 'move-file')
+		} elseif ($action['type'] == 'move-file')
 		{
-			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			$failure |= !rename($action['source'], $action['destination']);
-		}
-		elseif ($action['type'] == 'move-dir')
+		} elseif ($action['type'] == 'move-dir')
 		{
-			if (!mktree($action['destination'], 0755) || !is_writable($action['destination']))
-				$failure |= !mktree($action['destination'], 0777);
+			if (!mktree($action['destination'], 0755) || !is_writable($action['destination'])) {
+							$failure |= !mktree($action['destination'], 0777);
+			}
 
 			$failure |= !rename($action['source'], $action['destination']);
-		}
-		elseif ($action['type'] == 'remove-dir')
+		} elseif ($action['type'] == 'remove-dir')
 		{
 			deltree($action['filename']);
 
 			// Any other theme folders?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']]))
-				foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
 					deltree($theme_destination);
-		}
-		elseif ($action['type'] == 'remove-file')
+			}
+		} elseif ($action['type'] == 'remove-file')
 		{
 			// Make sure the file exists before deleting it.
 			if (file_exists($action['filename']))
@@ -1556,16 +1647,18 @@ 
 				$failure |= !unlink($action['filename']);
 			}
 			// The file that was supposed to be deleted couldn't be found.
-			else
-				$failure = true;
+			else {
+							$failure = true;
+			}
 
 			// Any other theme folders?
-			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']]))
-				foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
+			if (!empty($context['theme_copies']) && !empty($context['theme_copies'][$action['type']][$action['filename']])) {
+							foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
 					if (file_exists($theme_destination))
 						$failure |= !unlink($theme_destination);
-					else
-						$failure = true;
+			} else {
+											$failure = true;
+					}
 		}
 	}
 
@@ -1587,8 +1680,9 @@ 
 {
 	static $near_version = 0;
 
-	if ($reset)
-		$near_version = 0;
+	if ($reset) {
+			$near_version = 0;
+	}
 
 	// Normalize the $versions while we remove our previous Doh!
 	$versions = explode(',', str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($versions)));
@@ -1597,16 +1691,19 @@ 
 	foreach ($versions as $for)
 	{
 		// Adjust for those wild cards
-		if (strpos($for, '*') !== false)
-			$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		if (strpos($for, '*') !== false) {
+					$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		}
 
 		// If we have a range, grab the lower value, done this way so it looks normal-er to the user e.g. 2.0 vs 2.0.99
-		if (strpos($for, '-') !== false)
-			list ($for, $higher) = explode('-', $for);
+		if (strpos($for, '-') !== false) {
+					list ($for, $higher) = explode('-', $for);
+		}
 
 		// Do the compare, if the for is greater, than what we have but not greater than what we are running .....
-		if (compareVersions($near_version, $for) === -1 && compareVersions($for, $the_version) !== 1)
-			$near_version = $for;
+		if (compareVersions($near_version, $for) === -1 && compareVersions($for, $the_version) !== 1) {
+					$near_version = $for;
+		}
 	}
 
 	return !empty($near_version) ? $near_version : false;
@@ -1629,15 +1726,17 @@ 
 	$versions = explode(',', str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($versions)));
 
 	// Perhaps we do accept anything?
-	if (in_array('all', $versions))
-		return true;
+	if (in_array('all', $versions)) {
+			return true;
+	}
 
 	// Loop through each version.
 	foreach ($versions as $for)
 	{
 		// Wild card spotted?
-		if (strpos($for, '*') !== false)
-			$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		if (strpos($for, '*') !== false) {
+					$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		}
 
 		// Do we have a range?
 		if (strpos($for, '-') !== false)
@@ -1645,12 +1744,14 @@ 
 			list ($lower, $upper) = explode('-', $for);
 
 			// Compare the version against lower and upper bounds.
-			if (compareVersions($version, $lower) > -1 && compareVersions($version, $upper) < 1)
-				return true;
+			if (compareVersions($version, $lower) > -1 && compareVersions($version, $upper) < 1) {
+							return true;
+			}
 		}
 		// Otherwise check if they are equal...
-		elseif (compareVersions($version, $for) === 0)
-			return true;
+		elseif (compareVersions($version, $for) === 0) {
+					return true;
+		}
 	}
 
 	return false;
@@ -1690,12 +1791,14 @@ 
 	}
 
 	// Are they the same, perhaps?
-	if ($versions[1] === $versions[2])
-		return 0;
+	if ($versions[1] === $versions[2]) {
+			return 0;
+	}
 
 	// Get version numbering categories...
-	if (!isset($categories))
-		$categories = array_keys($versions[1]);
+	if (!isset($categories)) {
+			$categories = array_keys($versions[1]);
+	}
 
 	// Loop through each category.
 	foreach ($categories as $category)
@@ -1705,13 +1808,15 @@ 
 		{
 			// Dev builds are a problematic exception.
 			// (stable) dev < (stable) but (unstable) dev = (unstable)
-			if ($category == 'type')
-				return $versions[1][$category] > $versions[2][$category] ? ($versions[1]['dev'] ? -1 : 1) : ($versions[2]['dev'] ? 1 : -1);
-			elseif ($category == 'dev')
-				return $versions[1]['dev'] ? ($versions[2]['type'] == 'stable' ? -1 : 0) : ($versions[1]['type'] == 'stable' ? 1 : 0);
+			if ($category == 'type') {
+							return $versions[1][$category] > $versions[2][$category] ? ($versions[1]['dev'] ? -1 : 1) : ($versions[2]['dev'] ? 1 : -1);
+			} elseif ($category == 'dev') {
+							return $versions[1]['dev'] ? ($versions[2]['type'] == 'stable' ? -1 : 0) : ($versions[1]['type'] == 'stable' ? 1 : 0);
+			}
 			// Otherwise a simple comparison.
-			else
-				return $versions[1][$category] > $versions[2][$category] ? 1 : -1;
+			else {
+							return $versions[1][$category] > $versions[2][$category] ? 1 : -1;
+			}
 		}
 	}
 
@@ -1745,11 +1850,13 @@ 
 	);
 
 	// do we parse in a package directory?
-	if (!empty($temp_path))
-		$dirs['$package'] = $temp_path;
+	if (!empty($temp_path)) {
+			$dirs['$package'] = $temp_path;
+	}
 
-	if (strlen($path) == 0)
-		trigger_error('parse_path(): There should never be an empty filename', E_USER_ERROR);
+	if (strlen($path) == 0) {
+			trigger_error('parse_path(): There should never be an empty filename', E_USER_ERROR);
+	}
 
 	return strtr($path, $dirs);
 }
@@ -1766,8 +1873,9 @@ 
 	/** @var ftp_connection $package_ftp */
 	global $package_ftp;
 
-	if (!file_exists($dir))
-		return;
+	if (!file_exists($dir)) {
+			return;
+	}
 
 	$current_dir = @opendir($dir);
 	if ($current_dir == false)
@@ -1775,8 +1883,9 @@ 
 		if ($delete_dir && isset($package_ftp))
 		{
 			$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
-			if (!is_dir($dir))
-				$package_ftp->chmod($ftp_file, 0777);
+			if (!is_dir($dir)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
 			$package_ftp->unlink($ftp_file);
 		}
 
@@ -1785,26 +1894,28 @@ 
 
 	while ($entryname = readdir($current_dir))
 	{
-		if (in_array($entryname, array('.', '..')))
-			continue;
+		if (in_array($entryname, array('.', '..'))) {
+					continue;
+		}
 
-		if (is_dir($dir . '/' . $entryname))
-			deltree($dir . '/' . $entryname);
-		else
+		if (is_dir($dir . '/' . $entryname)) {
+					deltree($dir . '/' . $entryname);
+		} else
 		{
 			// Here, 755 doesn't really matter since we're deleting it anyway.
 			if (isset($package_ftp))
 			{
 				$ftp_file = strtr($dir . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
 
-				if (!is_writable($dir . '/' . $entryname))
-					$package_ftp->chmod($ftp_file, 0777);
+				if (!is_writable($dir . '/' . $entryname)) {
+									$package_ftp->chmod($ftp_file, 0777);
+				}
 				$package_ftp->unlink($ftp_file);
-			}
-			else
+			} else
 			{
-				if (!is_writable($dir . '/' . $entryname))
-					smf_chmod($dir . '/' . $entryname, 0777);
+				if (!is_writable($dir . '/' . $entryname)) {
+									smf_chmod($dir . '/' . $entryname, 0777);
+				}
 				unlink($dir . '/' . $entryname);
 			}
 		}
@@ -1817,14 +1928,15 @@ 
 		if (isset($package_ftp))
 		{
 			$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
-			if (!is_writable($dir . '/' . $entryname))
-				$package_ftp->chmod($ftp_file, 0777);
+			if (!is_writable($dir . '/' . $entryname)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
 			$package_ftp->unlink($ftp_file);
-		}
-		else
+		} else
 		{
-			if (!is_writable($dir))
-				smf_chmod($dir, 0777);
+			if (!is_writable($dir)) {
+							smf_chmod($dir, 0777);
+			}
 			@rmdir($dir);
 		}
 	}
@@ -1847,10 +1959,11 @@ 
 	{
 		if (!is_writable($strPath) && $mode !== false)
 		{
-			if (isset($package_ftp))
-				$package_ftp->chmod(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')), $mode);
-			else
-				smf_chmod($strPath, $mode);
+			if (isset($package_ftp)) {
+							$package_ftp->chmod(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')), $mode);
+			} else {
+							smf_chmod($strPath, $mode);
+			}
 		}
 
 		$test = @opendir($strPath);
@@ -1858,36 +1971,37 @@ 
 		{
 			closedir($test);
 			return is_writable($strPath);
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 	// Is this an invalid path and/or we can't make the directory?
-	if ($strPath == dirname($strPath) || !mktree(dirname($strPath), $mode))
-		return false;
+	if ($strPath == dirname($strPath) || !mktree(dirname($strPath), $mode)) {
+			return false;
+	}
 
 	if (!is_writable(dirname($strPath)) && $mode !== false)
 	{
-		if (isset($package_ftp))
-			$package_ftp->chmod(dirname(strtr($strPath, array($_SESSION['pack_ftp']['root'] => ''))), $mode);
-		else
-			smf_chmod(dirname($strPath), $mode);
+		if (isset($package_ftp)) {
+					$package_ftp->chmod(dirname(strtr($strPath, array($_SESSION['pack_ftp']['root'] => ''))), $mode);
+		} else {
+					smf_chmod(dirname($strPath), $mode);
+		}
 	}
 
-	if ($mode !== false && isset($package_ftp))
-		return $package_ftp->create_dir(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')));
-	elseif ($mode === false)
+	if ($mode !== false && isset($package_ftp)) {
+			return $package_ftp->create_dir(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')));
+	} elseif ($mode === false)
 	{
 		$test = @opendir(dirname($strPath));
 		if ($test)
 		{
 			closedir($test);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
-	}
-	else
+	} else
 	{
 		@mkdir($strPath, $mode);
 		$test = @opendir($strPath);
@@ -1895,9 +2009,9 @@ 
 		{
 			closedir($test);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 
@@ -1913,39 +2027,46 @@ 
 	/** @var ftp_connection $package_ftp */
 	global $package_ftp;
 
-	if (!file_exists($destination) || !is_writable($destination))
-		mktree($destination, 0755);
-	if (!is_writable($destination))
-		mktree($destination, 0777);
+	if (!file_exists($destination) || !is_writable($destination)) {
+			mktree($destination, 0755);
+	}
+	if (!is_writable($destination)) {
+			mktree($destination, 0777);
+	}
 
 	$current_dir = opendir($source);
-	if ($current_dir == false)
-		return;
+	if ($current_dir == false) {
+			return;
+	}
 
 	while ($entryname = readdir($current_dir))
 	{
-		if (in_array($entryname, array('.', '..')))
-			continue;
+		if (in_array($entryname, array('.', '..'))) {
+					continue;
+		}
 
-		if (isset($package_ftp))
-			$ftp_file = strtr($destination . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+		if (isset($package_ftp)) {
+					$ftp_file = strtr($destination . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+		}
 
 		if (is_file($source . '/' . $entryname))
 		{
-			if (isset($package_ftp) && !file_exists($destination . '/' . $entryname))
-				$package_ftp->create_file($ftp_file);
-			elseif (!file_exists($destination . '/' . $entryname))
-				@touch($destination . '/' . $entryname);
+			if (isset($package_ftp) && !file_exists($destination . '/' . $entryname)) {
+							$package_ftp->create_file($ftp_file);
+			} elseif (!file_exists($destination . '/' . $entryname)) {
+							@touch($destination . '/' . $entryname);
+			}
 		}
 
 		package_chmod($destination . '/' . $entryname);
 
-		if (is_dir($source . '/' . $entryname))
-			copytree($source . '/' . $entryname, $destination . '/' . $entryname);
-		elseif (file_exists($destination . '/' . $entryname))
-			package_put_contents($destination . '/' . $entryname, package_get_contents($source . '/' . $entryname));
-		else
-			copy($source . '/' . $entryname, $destination . '/' . $entryname);
+		if (is_dir($source . '/' . $entryname)) {
+					copytree($source . '/' . $entryname, $destination . '/' . $entryname);
+		} elseif (file_exists($destination . '/' . $entryname)) {
+					package_put_contents($destination . '/' . $entryname, package_get_contents($source . '/' . $entryname));
+		} else {
+					copy($source . '/' . $entryname, $destination . '/' . $entryname);
+		}
 	}
 
 	closedir($current_dir);
@@ -1963,21 +2084,24 @@ 
 	$data = array();
 
 	$dir = @dir($path . $sub_path);
-	if (!$dir)
-		return array();
+	if (!$dir) {
+			return array();
+	}
 	while ($entry = $dir->read())
 	{
-		if ($entry == '.' || $entry == '..')
-			continue;
+		if ($entry == '.' || $entry == '..') {
+					continue;
+		}
 
-		if (is_dir($path . $sub_path . '/' . $entry))
-			$data = array_merge($data, listtree($path, $sub_path . '/' . $entry));
-		else
-			$data[] = array(
+		if (is_dir($path . $sub_path . '/' . $entry)) {
+					$data = array_merge($data, listtree($path, $sub_path . '/' . $entry));
+		} else {
+					$data[] = array(
 				'filename' => $sub_path == '' ? $entry : $sub_path . '/' . $entry,
 				'size' => filesize($path . $sub_path . '/' . $entry),
 				'skipped' => false,
 			);
+		}
 	}
 	$dir->close();
 
@@ -2032,8 +2156,9 @@ 
 		{
 			// If this filename is relative, if so take a guess at what it should be.
 			$real_filename = $filename;
-			if (strpos($filename, 'Themes') === 0)
-				$real_filename = $boarddir . '/' . $filename;
+			if (strpos($filename, 'Themes') === 0) {
+							$real_filename = $boarddir . '/' . $filename;
+			}
 
 			if (strpos($real_filename, $theme['theme_dir']) === 0)
 			{
@@ -2052,8 +2177,9 @@ 
 		foreach ($theme_paths as $id => $theme)
 		{
 			// Default is getting done anyway, so no need for involvement here.
-			if ($id == 1)
-				continue;
+			if ($id == 1) {
+							continue;
+			}
 
 			// For every template, do we want it? Yea, no, maybe?
 			foreach ($template_changes[1] as $index => $template_file)
@@ -2076,8 +2202,9 @@ 
 		);
 
 		// Sometimes though, we have some additional files for other themes, if we have add them to the mix.
-		if (isset($custom_themes_add[$files_to_change[1]]))
-			$files_to_change += $custom_themes_add[$files_to_change[1]];
+		if (isset($custom_themes_add[$files_to_change[1]])) {
+					$files_to_change += $custom_themes_add[$files_to_change[1]];
+		}
 
 		// Now, loop through all the files we're changing, and, well, change them ;)
 		foreach ($files_to_change as $theme => $working_file)
@@ -2111,11 +2238,13 @@ 
 				continue;
 			}
 			// Okay, we're creating this file then...?
-			elseif (!file_exists($working_file))
-				$working_data = '';
+			elseif (!file_exists($working_file)) {
+							$working_data = '';
+			}
 			// Phew, it exists!  Load 'er up!
-			else
-				$working_data = str_replace("\r", '', package_get_contents($working_file));
+			else {
+							$working_data = str_replace("\r", '', package_get_contents($working_file));
+			}
 
 			$actions[] = array(
 				'type' => 'opened',
@@ -2136,8 +2265,8 @@ 
 
 				// Grab all search items of this operation (in most cases just 1).
 				$searches = $operation->set('search');
-				foreach ($searches as $i => $search)
-					$actual_operation['searches'][] = array(
+				foreach ($searches as $i => $search) {
+									$actual_operation['searches'][] = array(
 						'position' => $search->exists('@position') && in_array(trim($search->fetch('@position')), array('before', 'after', 'replace', 'end')) ? trim($search->fetch('@position')) : 'replace',
 						'is_reg_exp' => $search->exists('@regexp') && trim($search->fetch('@regexp')) === 'true',
 						'loose_whitespace' => $search->exists('@whitespace') && trim($search->fetch('@whitespace')) === 'loose',
@@ -2146,6 +2275,7 @@ 
 						'preg_search' => '',
 						'preg_replace' => '',
 					);
+				}
 
 				// At least one search should be defined.
 				if (empty($actual_operation['searches']))
@@ -2169,30 +2299,32 @@ 
 						// Reverse modification of regular expressions are not allowed.
 						if ($search['is_reg_exp'])
 						{
-							if ($actual_operation['error'] === 'fatal')
-								$actions[] = array(
+							if ($actual_operation['error'] === 'fatal') {
+															$actions[] = array(
 									'type' => 'failure',
 									'filename' => $working_file,
 									'search' => $search['search'],
 									'is_custom' => $theme > 1 ? $theme : 0,
 								);
+							}
 
 							// Continue to the next operation.
 							continue 2;
 						}
 
 						// The replacement is now the search subject...
-						if ($search['position'] === 'replace' || $search['position'] === 'end')
-							$actual_operation['searches'][$i]['search'] = $search['add'];
-						else
+						if ($search['position'] === 'replace' || $search['position'] === 'end') {
+													$actual_operation['searches'][$i]['search'] = $search['add'];
+						} else
 						{
 							// Reversing a before/after modification becomes a replacement.
 							$actual_operation['searches'][$i]['position'] = 'replace';
 
-							if ($search['position'] === 'before')
-								$actual_operation['searches'][$i]['search'] .= $search['add'];
-							elseif ($search['position'] === 'after')
-								$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+							if ($search['position'] === 'before') {
+															$actual_operation['searches'][$i]['search'] .= $search['add'];
+							} elseif ($search['position'] === 'after') {
+															$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+							}
 						}
 
 						// ...and the search subject is now the replacement.
@@ -2220,16 +2352,17 @@ 
 				foreach ($actual_operation['searches'] as $i => $search)
 				{
 					// Not much needed if the search subject is already a regexp.
-					if ($search['is_reg_exp'])
-						$actual_operation['searches'][$i]['preg_search'] = $search['search'];
-					else
+					if ($search['is_reg_exp']) {
+											$actual_operation['searches'][$i]['preg_search'] = $search['search'];
+					} else
 					{
 						// Make the search subject fit into a regular expression.
 						$actual_operation['searches'][$i]['preg_search'] = preg_quote($search['search'], '~');
 
 						// Using 'loose', a random amount of tabs and spaces may be used.
-						if ($search['loose_whitespace'])
-							$actual_operation['searches'][$i]['preg_search'] = preg_replace('~[ \t]+~', '[ \t]+', $actual_operation['searches'][$i]['preg_search']);
+						if ($search['loose_whitespace']) {
+													$actual_operation['searches'][$i]['preg_search'] = preg_replace('~[ \t]+~', '[ \t]+', $actual_operation['searches'][$i]['preg_search']);
+						}
 					}
 
 					// Shuzzup.  This is done so we can safely use a regular expression. ($0 is bad!!)
@@ -2255,8 +2388,7 @@ 
 						if ($undo)
 						{
 							$actual_operation['searches'][$i]['preg_replace'] = '';
-						}
-						else
+						} else
 						{
 							$actual_operation['searches'][$i]['preg_search'] = '(\\n\\?\\>)?$';
 							$actual_operation['searches'][$i]['preg_replace'] .= '$1';
@@ -2303,8 +2435,9 @@ 
 					}
 
 					// Replace it into nothing? That's not an option...unless it's an undoing end.
-					if ($search['add'] === '' && ($search['position'] !== 'end' || !$undo))
-						continue;
+					if ($search['add'] === '' && ($search['position'] !== 'end' || !$undo)) {
+											continue;
+					}
 
 					// Finally, we're doing some replacements.
 					$working_data = preg_replace('~' . $actual_operation['searches'][$i]['preg_search'] . '~s', $actual_operation['searches'][$i]['preg_replace'], $working_data, 1);
@@ -2329,22 +2462,25 @@ 
 
 			package_chmod($working_file);
 
-			if ((file_exists($working_file) && !is_writable($working_file)) || (!file_exists($working_file) && !is_writable(dirname($working_file))))
-				$actions[] = array(
+			if ((file_exists($working_file) && !is_writable($working_file)) || (!file_exists($working_file) && !is_writable(dirname($working_file)))) {
+							$actions[] = array(
 					'type' => 'chmod',
 					'filename' => $working_file
 				);
+			}
 
-			if (basename($working_file) == 'Settings_bak.php')
-				continue;
+			if (basename($working_file) == 'Settings_bak.php') {
+							continue;
+			}
 
 			if (!$testing && !empty($modSettings['package_make_backups']) && file_exists($working_file))
 			{
 				// No, no, not Settings.php!
-				if (basename($working_file) == 'Settings.php')
-					@copy($working_file, dirname($working_file) . '/Settings_bak.php');
-				else
-					@copy($working_file, $working_file . '~');
+				if (basename($working_file) == 'Settings.php') {
+									@copy($working_file, dirname($working_file) . '/Settings_bak.php');
+				} else {
+									@copy($working_file, $working_file . '~');
+				}
 			}
 
 			// Always call this, even if in testing, because it won't really be written in testing mode.
@@ -2411,8 +2547,9 @@ 
 		if ($code_match[1] != 'edit file' && $code_match[1] != 'file')
 		{
 			// It's a step, let's add that to the current steps.
-			if (isset($temp_changes[$step_counter]))
-				$temp_changes[$step_counter]['changes'][] = $code_match[0];
+			if (isset($temp_changes[$step_counter])) {
+							$temp_changes[$step_counter]['changes'][] = $code_match[0];
+			}
 			continue;
 		}
 
@@ -2429,11 +2566,13 @@ 
 		foreach ($theme_paths as $id => $theme)
 		{
 			// If this filename is relative, if so take a guess at what it should be.
-			if (strpos($filename, 'Themes') === 0)
-				$filename = $boarddir . '/' . $filename;
+			if (strpos($filename, 'Themes') === 0) {
+							$filename = $boarddir . '/' . $filename;
+			}
 
-			if (strpos($filename, $theme['theme_dir']) === 0)
-				$template_changes[$id][$counter] = substr($filename, strlen($theme['theme_dir']) + 1);
+			if (strpos($filename, $theme['theme_dir']) === 0) {
+							$template_changes[$id][$counter] = substr($filename, strlen($theme['theme_dir']) + 1);
+			}
 		}
 	}
 
@@ -2446,8 +2585,9 @@ 
 		foreach ($theme_paths as $id => $theme)
 		{
 			// Don't do default, it means nothing to me.
-			if ($id == 1)
-				continue;
+			if ($id == 1) {
+							continue;
+			}
 
 			// Now, for each file do we need to edit it?
 			foreach ($template_changes[1] as $pos => $template_file)
@@ -2483,32 +2623,36 @@ 
 				package_chmod($working_file);
 
 				// Don't even dare.
-				if (basename($working_file) == 'Settings_bak.php')
-					continue;
+				if (basename($working_file) == 'Settings_bak.php') {
+									continue;
+				}
 
-				if (!is_writable($working_file))
-					$actions[] = array(
+				if (!is_writable($working_file)) {
+									$actions[] = array(
 						'type' => 'chmod',
 						'filename' => $working_file
 					);
+				}
 
 				if (!$testing && !empty($modSettings['package_make_backups']) && file_exists($working_file))
 				{
-					if (basename($working_file) == 'Settings.php')
-						@copy($working_file, dirname($working_file) . '/Settings_bak.php');
-					else
-						@copy($working_file, $working_file . '~');
+					if (basename($working_file) == 'Settings.php') {
+											@copy($working_file, dirname($working_file) . '/Settings_bak.php');
+					} else {
+											@copy($working_file, $working_file . '~');
+					}
 				}
 
 				package_put_contents($working_file, $working_data, $testing);
 			}
 
-			if ($working_file !== null)
-				$actions[] = array(
+			if ($working_file !== null) {
+							$actions[] = array(
 					'type' => 'saved',
 					'filename' => $working_file,
 					'is_custom' => $is_custom,
 				);
+			}
 
 			// Is this "now working on" file a theme specific one?
 			$is_custom = isset($theme_id_ref[$counter - 1]) ? $theme_id_ref[$counter - 1] : 0;
@@ -2527,10 +2671,11 @@ 
 			{
 				$places_to_check = array($boarddir, $sourcedir, $settings['default_theme_dir'], $settings['default_theme_dir'] . '/languages');
 
-				foreach ($places_to_check as $place)
-					if (file_exists($place . '/' . $working_file))
+				foreach ($places_to_check as $place) {
+									if (file_exists($place . '/' . $working_file))
 					{
 						$working_file = $place . '/' . $working_file;
+				}
 						break;
 					}
 			}
@@ -2544,8 +2689,7 @@ 
 					'type' => 'opened',
 					'filename' => $working_file
 				);
-			}
-			else
+			} else
 			{
 				$actions[] = array(
 					'type' => 'missing',
@@ -2581,11 +2725,13 @@ 
 			$replace_with = $code_match[2];
 
 			// Add this afterward...
-			if ($code_match[1] == 'add' || $code_match[1] == 'add after')
-				$replace_with = $working_search . "\n" . $replace_with;
+			if ($code_match[1] == 'add' || $code_match[1] == 'add after') {
+							$replace_with = $working_search . "\n" . $replace_with;
+			}
 			// Add this beforehand.
-			elseif ($code_match[1] == 'before' || $code_match[1] == 'add before' || $code_match[1] == 'above' || $code_match[1] == 'add above')
-				$replace_with .= "\n" . $working_search;
+			elseif ($code_match[1] == 'before' || $code_match[1] == 'add before' || $code_match[1] == 'above' || $code_match[1] == 'add above') {
+							$replace_with .= "\n" . $working_search;
+			}
 			// Otherwise.. replace with $replace_with ;).
 		}
 
@@ -2648,29 +2794,32 @@ 
 	{
 		package_chmod($working_file);
 
-		if (!is_writable($working_file))
-			$actions[] = array(
+		if (!is_writable($working_file)) {
+					$actions[] = array(
 				'type' => 'chmod',
 				'filename' => $working_file
 			);
+		}
 
 		if (!$testing && !empty($modSettings['package_make_backups']) && file_exists($working_file))
 		{
-			if (basename($working_file) == 'Settings.php')
-				@copy($working_file, dirname($working_file) . '/Settings_bak.php');
-			else
-				@copy($working_file, $working_file . '~');
+			if (basename($working_file) == 'Settings.php') {
+							@copy($working_file, dirname($working_file) . '/Settings_bak.php');
+			} else {
+							@copy($working_file, $working_file . '~');
+			}
 		}
 
 		package_put_contents($working_file, $working_data, $testing);
 	}
 
-	if ($working_file !== null)
-		$actions[] = array(
+	if ($working_file !== null) {
+			$actions[] = array(
 			'type' => 'saved',
 			'filename' => $working_file,
 			'is_custom' => $is_custom,
 		);
+	}
 
 	$actions[] = array(
 		'type' => 'result',
@@ -2695,17 +2844,19 @@ 
 		$mem_check = setMemoryLimit('128M');
 
 		// Windows doesn't seem to care about the memory_limit.
-		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false)
-			$package_cache = array();
-		else
-			$package_cache = false;
+		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false) {
+					$package_cache = array();
+		} else {
+					$package_cache = false;
+		}
 	}
 
-	if (strpos($filename, 'Packages/') !== false || $package_cache === false || !isset($package_cache[$filename]))
-		return file_get_contents($filename);
-	else
-		return $package_cache[$filename];
-}
+	if (strpos($filename, 'Packages/') !== false || $package_cache === false || !isset($package_cache[$filename])) {
+			return file_get_contents($filename);
+	} else {
+			return $package_cache[$filename];
+	}
+	}
 
 /**
  * Writes data to a file, almost exactly like the file_put_contents() function.
@@ -2729,19 +2880,22 @@ 
 		// Try to increase the memory limit - we don't want to run out of ram!
 		$mem_check = setMemoryLimit('128M');
 
-		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false)
-			$package_cache = array();
-		else
-			$package_cache = false;
+		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false) {
+					$package_cache = array();
+		} else {
+					$package_cache = false;
+		}
 	}
 
-	if (isset($package_ftp))
-		$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+	if (isset($package_ftp)) {
+			$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+	}
 
-	if (!file_exists($filename) && isset($package_ftp))
-		$package_ftp->create_file($ftp_file);
-	elseif (!file_exists($filename))
-		@touch($filename);
+	if (!file_exists($filename) && isset($package_ftp)) {
+			$package_ftp->create_file($ftp_file);
+	} elseif (!file_exists($filename)) {
+			@touch($filename);
+	}
 
 	package_chmod($filename);
 
@@ -2750,22 +2904,23 @@ 
 		$fp = @fopen($filename, in_array(substr($filename, -3), $text_filetypes) ? 'w' : 'wb');
 
 		// We should show an error message or attempt a rollback, no?
-		if (!$fp)
-			return false;
+		if (!$fp) {
+					return false;
+		}
 
 		fwrite($fp, $data);
 		fclose($fp);
-	}
-	elseif (strpos($filename, 'Packages/') !== false || $package_cache === false)
-		return strlen($data);
-	else
+	} elseif (strpos($filename, 'Packages/') !== false || $package_cache === false) {
+			return strlen($data);
+	} else
 	{
 		$package_cache[$filename] = $data;
 
 		// Permission denied, eh?
 		$fp = @fopen($filename, 'r+');
-		if (!$fp)
-			return false;
+		if (!$fp) {
+					return false;
+		}
 		fclose($fp);
 	}
 
@@ -2783,19 +2938,22 @@ 
 	global $package_ftp, $package_cache;
 	static $text_filetypes = array('php', 'txt', '.js', 'css', 'vbs', 'tml', 'htm');
 
-	if (empty($package_cache))
-		return;
+	if (empty($package_cache)) {
+			return;
+	}
 
 	// First, let's check permissions!
 	foreach ($package_cache as $filename => $data)
 	{
-		if (isset($package_ftp))
-			$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		if (isset($package_ftp)) {
+					$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		}
 
-		if (!file_exists($filename) && isset($package_ftp))
-			$package_ftp->create_file($ftp_file);
-		elseif (!file_exists($filename))
-			@touch($filename);
+		if (!file_exists($filename) && isset($package_ftp)) {
+					$package_ftp->create_file($ftp_file);
+		} elseif (!file_exists($filename)) {
+					@touch($filename);
+		}
 
 		$result = package_chmod($filename);
 
@@ -2849,8 +3007,9 @@ 
 	/** @var ftp_connection $package_ftp */
 	global $package_ftp;
 
-	if (file_exists($filename) && is_writable($filename) && $perm_state == 'writable')
-		return true;
+	if (file_exists($filename) && is_writable($filename) && $perm_state == 'writable') {
+			return true;
+	}
 
 	// Start off checking without FTP.
 	if (!isset($package_ftp) || $package_ftp === false)
@@ -2872,8 +3031,7 @@ 
 
 				// Keep track of the writable status here.
 				$file_permissions = @fileperms($chmod_file);
-			}
-			else
+			} else
 			{
 				// This looks odd, but it's an attempt to work around PHP suExec.
 				if (!file_exists($chmod_file) && $perm_state == 'writable')
@@ -2883,24 +3041,28 @@ 
 					mktree(dirname($chmod_file), 0755);
 					@touch($chmod_file);
 					smf_chmod($chmod_file, 0755);
+				} else {
+									$file_permissions = @fileperms($chmod_file);
 				}
-				else
-					$file_permissions = @fileperms($chmod_file);
 			}
 
 			// This looks odd, but it's another attempt to work around PHP suExec.
-			if ($perm_state != 'writable')
-				smf_chmod($chmod_file, $perm_state == 'execute' ? 0755 : 0644);
-			else
+			if ($perm_state != 'writable') {
+							smf_chmod($chmod_file, $perm_state == 'execute' ? 0755 : 0644);
+			} else
 			{
-				if (!@is_writable($chmod_file))
-					smf_chmod($chmod_file, 0755);
-				if (!@is_writable($chmod_file))
-					smf_chmod($chmod_file, 0777);
-				if (!@is_writable(dirname($chmod_file)))
-					smf_chmod($chmod_file, 0755);
-				if (!@is_writable(dirname($chmod_file)))
-					smf_chmod($chmod_file, 0777);
+				if (!@is_writable($chmod_file)) {
+									smf_chmod($chmod_file, 0755);
+				}
+				if (!@is_writable($chmod_file)) {
+									smf_chmod($chmod_file, 0777);
+				}
+				if (!@is_writable(dirname($chmod_file))) {
+									smf_chmod($chmod_file, 0755);
+				}
+				if (!@is_writable(dirname($chmod_file))) {
+									smf_chmod($chmod_file, 0777);
+				}
 			}
 
 			// The ultimate writable test.
@@ -2909,20 +3071,22 @@ 
 				$fp = is_dir($chmod_file) ? @opendir($chmod_file) : @fopen($chmod_file, 'rb');
 				if (@is_writable($chmod_file) && $fp)
 				{
-					if (!is_dir($chmod_file))
-						fclose($fp);
-					else
-						closedir($fp);
+					if (!is_dir($chmod_file)) {
+											fclose($fp);
+					} else {
+											closedir($fp);
+					}
 
 					// It worked!
-					if ($track_change)
-						$_SESSION['pack_ftp']['original_perms'][$chmod_file] = $file_permissions;
+					if ($track_change) {
+											$_SESSION['pack_ftp']['original_perms'][$chmod_file] = $file_permissions;
+					}
 
 					return true;
 				}
+			} elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$chmod_file])) {
+							unset($_SESSION['pack_ftp']['original_perms'][$chmod_file]);
 			}
-			elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$chmod_file]))
-				unset($_SESSION['pack_ftp']['original_perms'][$chmod_file]);
 		}
 
 		// If we're here we're a failure.
@@ -2941,31 +3105,33 @@ 
 			mktree(dirname($filename), 0755);
 			$package_ftp->create_file($ftp_file);
 			$package_ftp->chmod($ftp_file, 0755);
+		} else {
+					$file_permissions = @fileperms($filename);
 		}
-		else
-			$file_permissions = @fileperms($filename);
 
 		if ($perm_state != 'writable')
 		{
 			$package_ftp->chmod($ftp_file, $perm_state == 'execute' ? 0755 : 0644);
-		}
-		else
+		} else
 		{
-			if (!@is_writable($filename))
-				$package_ftp->chmod($ftp_file, 0777);
-			if (!@is_writable(dirname($filename)))
-				$package_ftp->chmod(dirname($ftp_file), 0777);
+			if (!@is_writable($filename)) {
+							$package_ftp->chmod($ftp_file, 0777);
+			}
+			if (!@is_writable(dirname($filename))) {
+							$package_ftp->chmod(dirname($ftp_file), 0777);
+			}
 		}
 
 		if (@is_writable($filename))
 		{
-			if ($track_change)
-				$_SESSION['pack_ftp']['original_perms'][$filename] = $file_permissions;
+			if ($track_change) {
+							$_SESSION['pack_ftp']['original_perms'][$filename] = $file_permissions;
+			}
 
 			return true;
+		} elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$filename])) {
+					unset($_SESSION['pack_ftp']['original_perms'][$filename]);
 		}
-		elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$filename]))
-			unset($_SESSION['pack_ftp']['original_perms'][$filename]);
 	}
 
 	// Oh dear, we failed if we get here.
@@ -2983,11 +3149,13 @@ 
 	$n = strlen($pass);
 
 	$salt = session_id();
-	while (strlen($salt) < $n)
-		$salt .= session_id();
+	while (strlen($salt) < $n) {
+			$salt .= session_id();
+	}
 
-	for ($i = 0; $i < $n; $i++)
-		$pass{$i} = chr(ord($pass{$i}) ^ (ord($salt{$i}) - 32));
+	for ($i = 0; $i < $n; $i++) {
+			$pass{$i} = chr(ord($pass{$i}) ^ (ord($salt{$i}) - 32));
+	}
 
 	return $pass;
 }
@@ -3006,8 +3174,9 @@ 
 	$base_files = array('index.php', 'SSI.php', 'agreement.txt', 'cron.php', 'ssi_examples.php', 'ssi_examples.shtml', 'subscriptions.php');
 	foreach ($base_files as $file)
 	{
-		if (file_exists($boarddir . '/' . $file))
-			$files[empty($_REQUEST['use_full_paths']) ? $file : $boarddir . '/' . $file] = $boarddir . '/' . $file;
+		if (file_exists($boarddir . '/' . $file)) {
+					$files[empty($_REQUEST['use_full_paths']) ? $file : $boarddir . '/' . $file] = $boarddir . '/' . $file;
+		}
 	}
 
 	$dirs = array(
@@ -3024,8 +3193,9 @@ 
 			'theme_dir' => 'theme_dir',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$dirs[$row['value']] = empty($_REQUEST['use_full_paths']) ? 'Themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$dirs[$row['value']] = empty($_REQUEST['use_full_paths']) ? 'Themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+	}
 	$smcFunc['db_free_result']($request);
 
 	try
@@ -3040,11 +3210,13 @@ 
 
 			foreach ($iter as $entry => $dir)
 			{
-				if ($dir->isDir())
-					continue;
+				if ($dir->isDir()) {
+									continue;
+				}
 
-				if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~)$~', $entry) != 0)
-					continue;
+				if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~)$~', $entry) != 0) {
+									continue;
+				}
 
 				$files[empty($_REQUEST['use_full_paths']) ? str_replace(realpath($boarddir), '', $entry) : $entry] = $entry;
 			}
@@ -3052,10 +3224,12 @@ 
 		$obj = new ArrayObject($files);
 		$iterator = $obj->getIterator();
 
-		if (!file_exists($packagesdir . '/backups'))
-			mktree($packagesdir . '/backups', 0777);
-		if (!is_writable($packagesdir . '/backups'))
-			package_chmod($packagesdir . '/backups');
+		if (!file_exists($packagesdir . '/backups')) {
+					mktree($packagesdir . '/backups', 0777);
+		}
+		if (!is_writable($packagesdir . '/backups')) {
+					package_chmod($packagesdir . '/backups');
+		}
 		$output_file = $packagesdir . '/backups/' . strftime('%Y-%m-%d_') . preg_replace('~[$\\\\/:<>|?*"\']~', '', $id);
 		$output_ext = '.tar';
 		$output_ext_target = '.tar.gz';
@@ -3063,16 +3237,18 @@ 
 		if (file_exists($output_file . $output_ext_target))
 		{
 			$i = 2;
-			while (file_exists($output_file . '_' . $i . $output_ext_target))
-				$i++;
+			while (file_exists($output_file . '_' . $i . $output_ext_target)) {
+							$i++;
+			}
 			$output_file = $output_file . '_' . $i . $output_ext;
+		} else {
+					$output_file .= $output_ext;
 		}
-		else
-			$output_file .= $output_ext;
 
 		@set_time_limit(300);
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 
 		$a = new PharData($output_file);
 		$a->buildFromIterator($iterator);
@@ -3084,8 +3260,7 @@ 
 		 */
 		unset($a);
 		unlink($output_file);
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		log_error($e->getMessage(), 'backup');
 

Sources/ManageServer.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 			$fts_language[$row['cfgname']] = $row['cfgname'];
 		
-		$config_vars = array_merge ($config_vars, array(
+		$config_vars = array_merge($config_vars, array(
 				'',
 				array('search_language', $txt['search_language'], 'db', 'select', $fts_language, 'pgFulltextSearch')
 			)

Braces +315 added lines, -243 removed lines

@@ -59,8 +59,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the main dispatcher. Sets up all the available sub-actions, all the tabs and selects
@@ -111,10 +112,11 @@ 
 	$settings_not_writable = !is_writable($boarddir . '/Settings.php');
 	$settings_backup_fail = !@is_writable($boarddir . '/Settings_bak.php') || !@copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php');
 
-	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
-	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	if ($settings_not_writable) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+	} elseif ($settings_backup_fail) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	}
 
 	$context['settings_not_writable'] = $settings_not_writable;
 
@@ -142,10 +144,11 @@ 
 
 	// If no cert, force_ssl must remain 0
 	require_once($sourcedir . '/Subs.php');
-	if (!ssl_cert_found($boardurl) && empty($modSettings['force_ssl']))
-		$disable_force_ssl = true;
-	else
-		$disable_force_ssl = false;
+	if (!ssl_cert_found($boardurl) && empty($modSettings['force_ssl'])) {
+			$disable_force_ssl = true;
+	} else {
+			$disable_force_ssl = false;
+	}
 
 	/* If you're writing a mod, it's a bad idea to add things here....
 	For each option:
@@ -174,8 +177,9 @@ 
 
 	call_integration_hook('integrate_general_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=general;save';
@@ -192,16 +196,18 @@ 
 			$registerSMStats = registerSMStats();
 
 			// Failed to register, disable it again.
-			if (empty($registerSMStats))
-				$_POST['enable_sm_stats'] = 0;
+			if (empty($registerSMStats)) {
+							$_POST['enable_sm_stats'] = 0;
+			}
 		}
 
 		// Ensure all URLs are aligned with the new force_ssl setting
 		// Treat unset like 0
-		if (isset($_POST['force_ssl']))
-			AlignURLsWithSSLSetting($_POST['force_ssl']);
-		else
-			AlignURLsWithSSLSetting(0);
+		if (isset($_POST['force_ssl'])) {
+					AlignURLsWithSSLSetting($_POST['force_ssl']);
+		} else {
+					AlignURLsWithSSLSetting(0);
+		}
 
 		saveSettings($config_vars);
 		$_SESSION['adm-save'] = true;
@@ -254,10 +260,11 @@ 
 	require_once($sourcedir . '/Subs-Admin.php');
 
 	// Check $boardurl
-	if (!empty($new_force_ssl))
-		$newval = strtr($boardurl, array('http://' => 'https://'));
-	else
-		$newval = strtr($boardurl, array('https://' => 'http://'));
+	if (!empty($new_force_ssl)) {
+			$newval = strtr($boardurl, array('http://' => 'https://'));
+	} else {
+			$newval = strtr($boardurl, array('https://' => 'http://'));
+	}
 	updateSettingsFile(array('boardurl' => '\'' . addslashes($newval) . '\''));
 
 	$new_settings = array();
@@ -265,20 +272,22 @@ 
 	// Check $smileys_url, but only if it points to a subfolder of $boardurl
 	if (BoardurlMatch($modSettings['smileys_url']))
 	{
-		if (!empty($new_force_ssl))
-			$newval = strtr($modSettings['smileys_url'], array('http://' => 'https://'));
-		else
-			$newval = strtr($modSettings['smileys_url'], array('https://' => 'http://'));
+		if (!empty($new_force_ssl)) {
+					$newval = strtr($modSettings['smileys_url'], array('http://' => 'https://'));
+		} else {
+					$newval = strtr($modSettings['smileys_url'], array('https://' => 'http://'));
+		}
 		$new_settings['smileys_url'] = $newval;
 	}
 
 	// Check $avatar_url, but only if it points to a subfolder of $boardurl
 	if (BoardurlMatch($modSettings['avatar_url']))
 	{
-		if (!empty($new_force_ssl))
-			$newval = strtr($modSettings['avatar_url'], array('http://' => 'https://'));
-		else
-			$newval = strtr($modSettings['avatar_url'], array('https://' => 'http://'));
+		if (!empty($new_force_ssl)) {
+					$newval = strtr($modSettings['avatar_url'], array('http://' => 'https://'));
+		} else {
+					$newval = strtr($modSettings['avatar_url'], array('https://' => 'http://'));
+		}
 		$new_settings['avatar_url'] = $newval;
 	}
 
@@ -286,16 +295,18 @@ 
 	// This one had been optional in the past, make sure it is set first
 	if (isset($modSettings['custom_avatar_url']) && BoardurlMatch($modSettings['custom_avatar_url']))
 	{
-		if (!empty($new_force_ssl))
-			$newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://'));
-		else
-			$newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://'));
+		if (!empty($new_force_ssl)) {
+					$newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://'));
+		} else {
+					$newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://'));
+		}
 		$new_settings['custom_avatar_url'] = $newval;
 	}
 
 	// Save updates to the settings table
-	if (!empty($new_settings))
-		updateSettings($new_settings, true);
+	if (!empty($new_settings)) {
+			updateSettings($new_settings, true);
+	}
 
 	// Now we move onto the themes.
 	// First, get a list of theme URLs...
@@ -316,10 +327,11 @@ 
 		// First check to see if it points to a subfolder of $boardurl
 		if (BoardurlMatch($row['value']))
 		{
-			if (!empty($new_force_ssl))
-				$newval = strtr($row['value'], array('http://' => 'https://'));
-			else
-				$newval = strtr($row['value'], array('https://' => 'http://'));
+			if (!empty($new_force_ssl)) {
+							$newval = strtr($row['value'], array('http://' => 'https://'));
+			} else {
+							$newval = strtr($row['value'], array('https://' => 'http://'));
+			}
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}themes
 				   SET value = {string:theme_val}
@@ -359,11 +371,12 @@ 
 
 	// If leftmost portion of path matches boardurl, return true
 	$result = strpos($urlpath, $boardurlpath);
-	if ($result === false || $result != 0)
-		return false;
-	else
-		return true;
-}
+	if ($result === false || $result != 0) {
+			return false;
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Basic database and paths settings - database name, host, etc.
@@ -402,8 +415,9 @@ 
 		$request = $smcFunc['db_query']('', 'SELECT cfgname FROM pg_ts_config', array());
 		$fts_language = array();
 
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$fts_language[$row['cfgname']] = $row['cfgname'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$fts_language[$row['cfgname']] = $row['cfgname'];
+		}
 
 		$config_vars = array_merge ($config_vars, array(
 				'',
@@ -415,20 +429,22 @@ 
 
 	call_integration_hook('integrate_database_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=database;save';
 	$context['settings_title'] = $txt['database_settings'];
 	$context['save_disabled'] = $context['settings_not_writable'];
 
-	if (!$smcFunc['db_allow_persistent']())
-		addInlineJavaScript('
+	if (!$smcFunc['db_allow_persistent']()) {
+			addInlineJavaScript('
 			$(function()
 			{
 				$("#db_persist").prop("disabled", true);
 			});', true);
+	}
 
 	// Saving settings?
 	if (isset($_REQUEST['save']))
@@ -498,13 +514,15 @@ 
 		hideGlobalCookies();
 	});', true);
 
-	if (empty($user_settings['tfa_secret']))
-		addInlineJavaScript('');
+	if (empty($user_settings['tfa_secret'])) {
+			addInlineJavaScript('');
+	}
 
 	call_integration_hook('integrate_cookie_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=cookie;save';
 	$context['settings_title'] = $txt['cookies_sessions_settings'];
@@ -515,14 +533,17 @@ 
 		call_integration_hook('integrate_save_cookie_settings');
 
 		// Local and global do not play nicely together.
-		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies']))
-			unset ($_POST['globalCookies']);
+		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies'])) {
+					unset ($_POST['globalCookies']);
+		}
 
-		if (empty($modSettings['localCookies']) != empty($_POST['localCookies']) || empty($modSettings['globalCookies']) != empty($_POST['globalCookies']))
-			$scope_changed = true;
+		if (empty($modSettings['localCookies']) != empty($_POST['localCookies']) || empty($modSettings['globalCookies']) != empty($_POST['globalCookies'])) {
+					$scope_changed = true;
+		}
 
-		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false)
-			fatal_lang_error('invalid_cookie_domain', false);
+		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false) {
+					fatal_lang_error('invalid_cookie_domain', false);
+		}
 
 		saveSettings($config_vars);
 
@@ -605,8 +626,9 @@ 
 
 	call_integration_hook('integrate_general_security_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -645,8 +667,7 @@ 
 		$txt['cache_settings_message'] = $txt['detected_no_caching'];
 		$cache_level = array($txt['cache_off']);
 		$detected['none'] = $txt['cache_off'];
-	}
-	else
+	} else
 	{
 		$txt['cache_settings_message'] = sprintf($txt['detected_accelerators'], implode(', ', $detected));
 		$cache_level = array($txt['cache_off'], $txt['cache_level1'], $txt['cache_level2'], $txt['cache_level3']);
@@ -683,8 +704,9 @@ 
 			}
 		}
 	}
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving again?
 	if (isset($_GET['save']))
@@ -712,8 +734,9 @@ 
 	$context['save_disabled'] = $context['settings_not_writable'];
 
 	// Decide what message to show.
-	if (!$context['save_disabled'])
-		$context['settings_message'] = $txt['caching_information'];
+	if (!$context['save_disabled']) {
+			$context['settings_message'] = $txt['caching_information'];
+	}
 
 	// Prepare the template.
 	prepareServerSettingsContext($config_vars);
@@ -736,24 +759,25 @@ 
 	if (stripos(PHP_OS, 'win') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_windows'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
-	}
-	elseif (stripos(PHP_OS, 'darwin') === 0)
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
+		}
+	} elseif (stripos(PHP_OS, 'darwin') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_osx'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
-	}
-	else
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
+		}
+	} else
 	{
 		$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
-		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		else
-			unset($modSettings['load_average']);
+		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} else {
+					unset($modSettings['load_average']);
+		}
 
 		if (!empty($modSettings['load_average']) || (isset($modSettings['load_average']) && $modSettings['load_average'] === 0.0))
 		{
@@ -789,8 +813,9 @@ 
 
 	call_integration_hook('integrate_loadavg_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=loads;save';
 	$context['settings_title'] = $txt['load_balancing_settings'];
@@ -801,24 +826,27 @@ 
 		// Stupidity is not allowed.
 		foreach ($_POST as $key => $value)
 		{
-			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values)))
-				continue;
-			else
-				$_POST[$key] = (float) $value;
-
-			if ($key == 'loadavg_auto_opt' && $value <= 1)
-				$_POST['loadavg_auto_opt'] = 1.0;
-			elseif ($key == 'loadavg_forum' && $value < 10)
-				$_POST['loadavg_forum'] = 10.0;
-			elseif ($value < 2)
-				$_POST[$key] = 2.0;
+			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values))) {
+							continue;
+			} else {
+							$_POST[$key] = (float) $value;
+			}
+
+			if ($key == 'loadavg_auto_opt' && $value <= 1) {
+							$_POST['loadavg_auto_opt'] = 1.0;
+			} elseif ($key == 'loadavg_forum' && $value < 10) {
+							$_POST['loadavg_forum'] = 10.0;
+			} elseif ($value < 2) {
+							$_POST[$key] = 2.0;
+			}
 		}
 
 		call_integration_hook('integrate_save_loadavg_settings');
 
 		saveDBSettings($config_vars);
-		if (!isset($_SESSION['adm-save']))
-			$_SESSION['adm-save'] = true;
+		if (!isset($_SESSION['adm-save'])) {
+					$_SESSION['adm-save'] = true;
+		}
 		redirectexit('action=admin;area=serversettings;sa=loads;' . $context['session_var'] . '=' . $context['session_id']);
 	}
 
@@ -854,10 +882,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -865,9 +894,9 @@ 
 	$context['config_vars'] = array();
 	foreach ($config_vars as $identifier => $config_var)
 	{
-		if (!is_array($config_var) || !isset($config_var[1]))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var) || !isset($config_var[1])) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			$varname = $config_var[0];
 			global $$varname;
@@ -902,16 +931,19 @@ 
 			if ($config_var[3] == 'int' || $config_var[3] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[0]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[0]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -919,12 +951,13 @@ 
 			{
 				// If it's associative
 				$config_values = array_values($config_var[4]);
-				if (isset($config_values[0]) && is_array($config_values[0]))
-					$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
-				else
+				if (isset($config_values[0]) && is_array($config_values[0])) {
+									$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
+				} else
 				{
-					foreach ($config_var[4] as $key => $item)
-						$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					foreach ($config_var[4] as $key => $item) {
+											$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					}
 				}
 			}
 		}
@@ -949,10 +982,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -964,26 +998,30 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// HR?
-		if (!is_array($config_var))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var)) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			// If it has no name it doesn't have any purpose!
-			if (empty($config_var[1]))
-				continue;
+			if (empty($config_var[1])) {
+							continue;
+			}
 
 			// Special case for inline permissions
-			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions'))
-				$inlinePermissions[] = $config_var[1];
-			elseif ($config_var[0] == 'permissions')
-				continue;
+			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions')) {
+							$inlinePermissions[] = $config_var[1];
+			} elseif ($config_var[0] == 'permissions') {
+							continue;
+			}
 
-			if ($config_var[0] == 'boards')
-				$board_list = true;
+			if ($config_var[0] == 'boards') {
+							$board_list = true;
+			}
 
 			// Are we showing the BBC selection box?
-			if ($config_var[0] == 'bbc')
-				$bbcChoice[] = $config_var[1];
+			if ($config_var[0] == 'bbc') {
+							$bbcChoice[] = $config_var[1];
+			}
 
 			// We need to do some parsing of the value before we pass it in.
 			if (isset($modSettings[$config_var[1]]))
@@ -1002,8 +1040,7 @@ 
 					default:
 						$value = $smcFunc['htmlspecialchars']($modSettings[$config_var[1]]);
 				}
-			}
-			else
+			} else
 			{
 				// Darn, it's empty. What type is expected?
 				switch ($config_var[0])
@@ -1043,16 +1080,19 @@ 
 			if ($config_var[0] == 'int' || $config_var[0] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[1]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[1]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -1066,12 +1106,13 @@ 
 				}
 
 				// If it's associative
-				if (isset($config_var[2][0]) && is_array($config_var[2][0]))
-					$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
-				else
+				if (isset($config_var[2][0]) && is_array($config_var[2][0])) {
+									$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
+				} else
 				{
-					foreach ($config_var[2] as $key => $item)
-						$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					foreach ($config_var[2] as $key => $item) {
+											$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					}
 				}
 			}
 
@@ -1080,17 +1121,19 @@ 
 			{
 				if (!is_numeric($k))
 				{
-					if (substr($k, 0, 2) == 'on')
-						$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
-					else
-						$context['config_vars'][$config_var[1]][$k] = $v;
+					if (substr($k, 0, 2) == 'on') {
+											$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
+					} else {
+											$context['config_vars'][$config_var[1]][$k] = $v;
+					}
 				}
 
 				// See if there are any other labels that might fit?
-				if (isset($txt['setting_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
-				elseif (isset($txt['groups_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				if (isset($txt['setting_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
+				} elseif (isset($txt['groups_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				}
 			}
 
 			// Set the subtext in case it's part of the label.
@@ -1123,8 +1166,9 @@ 
 		// What are the options, eh?
 		$temp = parse_bbc(false);
 		$bbcTags = array();
-		foreach ($temp as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach ($temp as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
 		$bbcTags = array_unique($bbcTags);
 		$totalTags = count($bbcTags);
@@ -1139,8 +1183,9 @@ 
 		$col = 0; $i = 0;
 		foreach ($bbcTags as $tag)
 		{
-			if ($i % $tagsPerColumn == 0 && $i != 0)
-				$col++;
+			if ($i % $tagsPerColumn == 0 && $i != 0) {
+							$col++;
+			}
 
 			$context['bbc_columns'][$col][] = array(
 				'tag' => $tag,
@@ -1183,18 +1228,21 @@ 
 	validateToken('admin-ssc');
 
 	// Fix the darn stupid cookiename! (more may not be allowed, but these for sure!)
-	if (isset($_POST['cookiename']))
-		$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	if (isset($_POST['cookiename'])) {
+			$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	}
 
 	// Fix the forum's URL if necessary.
 	if (isset($_POST['boardurl']))
 	{
-		if (substr($_POST['boardurl'], -10) == '/index.php')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
-		elseif (substr($_POST['boardurl'], -1) == '/')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
-		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://')
-			$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		if (substr($_POST['boardurl'], -10) == '/index.php') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
+		} elseif (substr($_POST['boardurl'], -1) == '/') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
+		}
+		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') {
+					$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		}
 	}
 
 	// Any passwords?
@@ -1229,21 +1277,21 @@ 
 	// Figure out which config vars we're saving here...
 	foreach ($config_vars as $var)
 	{
-		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]])))
-			continue;
+		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]]))) {
+					continue;
+		}
 
 		$config_var = $var[0];
 
 		if (in_array($config_var, $config_passwords))
 		{
-			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1])
-				$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_strs))
+			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1]) {
+							$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
+			}
+		} elseif (in_array($config_var, $config_strs))
 		{
 			$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_ints))
+		} elseif (in_array($config_var, $config_ints))
 		{
 			$new_settings[$config_var] = (int) $_POST[$config_var];
 
@@ -1252,17 +1300,17 @@ 
 			$new_settings[$config_var] = max($min, $new_settings[$config_var]);
 
 			// Is there a max value for this as well?
-			if (isset($var['max']))
-				$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
-		}
-		elseif (in_array($config_var, $config_bools))
+			if (isset($var['max'])) {
+							$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
+			}
+		} elseif (in_array($config_var, $config_bools))
 		{
-			if (!empty($_POST[$config_var]))
-				$new_settings[$config_var] = '1';
-			else
-				$new_settings[$config_var] = '0';
-		}
-		else
+			if (!empty($_POST[$config_var])) {
+							$new_settings[$config_var] = '1';
+			} else {
+							$new_settings[$config_var] = '0';
+			}
+		} else
 		{
 			// This shouldn't happen, but it might...
 			fatal_error('Unknown config_var \'' . $config_var . '\'');
@@ -1278,30 +1326,35 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// We just saved the file-based settings, so skip their definitions.
-		if (!is_array($config_var) || $config_var[2] == 'file')
-			continue;
+		if (!is_array($config_var) || $config_var[2] == 'file') {
+					continue;
+		}
 
 		$new_setting = array($config_var[3], $config_var[0]);
 
 		// Select options need carried over, too.
-		if (isset($config_var[4]))
-			$new_setting[] = $config_var[4];
+		if (isset($config_var[4])) {
+					$new_setting[] = $config_var[4];
+		}
 
 		// Include min and max if necessary
-		if (isset($config_var['min']))
-			$new_setting['min'] = $config_var['min'];
+		if (isset($config_var['min'])) {
+					$new_setting['min'] = $config_var['min'];
+		}
 
-		if (isset($config_var['max']))
-			$new_setting['max'] = $config_var['max'];
+		if (isset($config_var['max'])) {
+					$new_setting['max'] = $config_var['max'];
+		}
 
 		// Rewrite the definition a bit.
 		$new_settings[] = $new_setting;
 	}
 
 	// Save the new database-based settings, if any.
-	if (!empty($new_settings))
-		saveDBSettings($new_settings);
-}
+	if (!empty($new_settings)) {
+			saveDBSettings($new_settings);
+	}
+	}
 
 /**
  * Helper function for saving database settings.
@@ -1319,22 +1372,25 @@ 
 	$inlinePermissions = array();
 	foreach ($config_vars as $var)
 	{
-		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags']))))
-			continue;
+		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags'])))) {
+					continue;
+		}
 
 		// Checkboxes!
-		elseif ($var[0] == 'check')
-			$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		elseif ($var[0] == 'check') {
+					$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		}
 		// Select boxes!
-		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2])))
-			$setArray[$var[1]] = $_POST[$var[1]];
-		elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
+		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2]))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		} elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
 		{
 			// For security purposes we validate this line by line.
 			$lOptions = array();
-			foreach ($_POST[$var[1]] as $invar)
-				if (in_array($invar, array_keys($var[2])))
+			foreach ($_POST[$var[1]] as $invar) {
+							if (in_array($invar, array_keys($var[2])))
 					$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = $smcFunc['json_encode']($lOptions);
 		}
@@ -1348,18 +1404,20 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_row']($request))
-					$board_list[$row[0]] = true;
+				while ($row = $smcFunc['db_fetch_row']($request)) {
+									$board_list[$row[0]] = true;
+				}
 
 				$smcFunc['db_free_result']($request);
 			}
 
 			$lOptions = array();
 
-			if (!empty($_POST[$var[1]]))
-				foreach ($_POST[$var[1]] as $invar => $dummy)
+			if (!empty($_POST[$var[1]])) {
+							foreach ($_POST[$var[1]] as $invar => $dummy)
 					if (isset($board_list[$invar]))
 						$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = !empty($lOptions) ? implode(',', $lOptions) : '';
 		}
@@ -1373,8 +1431,9 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Floating point!
 		elseif ($var[0] == 'float')
@@ -1386,39 +1445,46 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Text!
-		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time')))
-			$setArray[$var[1]] = $_POST[$var[1]];
+		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		}
 		// Passwords!
 		elseif ($var[0] == 'password')
 		{
-			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1])
-				$setArray[$var[1]] = $_POST[$var[1]][0];
+			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1]) {
+							$setArray[$var[1]] = $_POST[$var[1]][0];
+			}
 		}
 		// BBC.
 		elseif ($var[0] == 'bbc')
 		{
 			$bbcTags = array();
-			foreach (parse_bbc(false) as $tag)
-				$bbcTags[] = $tag['tag'];
+			foreach (parse_bbc(false) as $tag) {
+							$bbcTags[] = $tag['tag'];
+			}
 
-			if (!isset($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array();
-			elseif (!is_array($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			if (!isset($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array();
+			} elseif (!is_array($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			}
 
 			$setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1] . '_enabledTags']));
 		}
 		// Permissions?
-		elseif ($var[0] == 'permissions')
-			$inlinePermissions[] = $var[1];
+		elseif ($var[0] == 'permissions') {
+					$inlinePermissions[] = $var[1];
+		}
 	}
 
-	if (!empty($setArray))
-		updateSettings($setArray);
+	if (!empty($setArray)) {
+			updateSettings($setArray);
+	}
 
 	// If we have inline permissions we need to save them.
 	if (!empty($inlinePermissions) && allowedTo('manage_permissions'))
@@ -1455,18 +1521,21 @@ 
 	// put all of it into an array
 	foreach ($info_lines as $line)
 	{
-		if (preg_match('~(' . $remove . ')~', $line))
-			continue;
+		if (preg_match('~(' . $remove . ')~', $line)) {
+					continue;
+		}
 
 		// new category?
-		if (strpos($line, '<h2>') !== false)
-			$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		if (strpos($line, '<h2>') !== false) {
+					$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		}
 
 		// load it as setting => value or the old setting local master
-		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = $val[2];
-		elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = $val[2];
+		} elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		}
 	}
 
 	// load it in to context and display it
@@ -1501,8 +1570,9 @@ 
 				$testAPI = new $cache_class_name();
 
 				// No Support?  NEXT!
-				if (!$testAPI->isSupported(true))
-					continue;
+				if (!$testAPI->isSupported(true)) {
+									continue;
+				}
 
 				$apis[$tryCache] = isset($txt[$tryCache . '_cache']) ? $txt[$tryCache . '_cache'] : $tryCache;
 			}
@@ -1527,8 +1597,9 @@ 
 	global $modSettings, $boardurl, $smcFunc;
 
 	// Already have a key?  Can't register again.
-	if (!empty($modSettings['sm_stats_key']))
-		return true;
+	if (!empty($modSettings['sm_stats_key'])) {
+			return true;
+	}
 
 	$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);
 	if ($fp)
@@ -1539,8 +1610,9 @@ 
 		fwrite($fp, $out);
 
 		$return_data = '';
-		while (!feof($fp))
-			$return_data .= fgets($fp, 128);
+		while (!feof($fp)) {
+					$return_data .= fgets($fp, 128);
+		}
 
 		fclose($fp);
 

Sources/DbSearch-postgresql.php

Spacing +7 added lines, -7 removed lines

@@ -38,12 +38,12 @@ 
 	$version = $smcFunc['db_get_version']();
 	// if we got a Beta Version
 	if (stripos($version, 'beta') !== false)
-		$version = substr($version, 0, stripos($version, 'beta')).'.0';
+		$version = substr($version, 0, stripos($version, 'beta')) . '.0';
 	// or RC
 	if (stripos($version, 'rc') !== false)
-		$version = substr($version, 0, stripos($version, 'rc')).'.0';
+		$version = substr($version, 0, stripos($version, 'rc')) . '.0';
 
-	if (version_compare($version,'9.5.0','>='))
+	if (version_compare($version, '9.5.0', '>='))
 		$smcFunc['db_support_ignore'] = true;
 }
 
@@ -55,7 +55,7 @@ 
  */
 function smf_db_search_support($search_type)
 {
-	$supported_types = array('custom','fulltext');
+	$supported_types = array('custom', 'fulltext');
 
 	return in_array($search_type, $supported_types);
 }
@@ -109,9 +109,9 @@ 
 	if (preg_match('~^\s*INSERT\sIGNORE~i', $db_string) != 0)
 	{
 		$db_string = preg_replace('~^\s*INSERT\sIGNORE~i', 'INSERT', $db_string);
-		if ($smcFunc['db_support_ignore']){
+		if ($smcFunc['db_support_ignore']) {
 			//pg style "INSERT INTO.... ON CONFLICT DO NOTHING"
-			$db_string = $db_string.' ON CONFLICT DO NOTHING';
+			$db_string = $db_string . ' ON CONFLICT DO NOTHING';
 		}
 		else
 		{
@@ -168,7 +168,7 @@ 
 		$language_ftx = $modSettings['search_language'];
 	else
 	{
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT cfgname FROM pg_ts_config WHERE oid = current_setting({string:default_language})::regconfig',
 			array(
 			'default_language' => 'default_text_search_config'

Braces +25 added lines, -19 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Add the file functions to the $smcFunc array.
@@ -23,29 +24,33 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_search_query')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_search_query') {
+			$smcFunc += array(
 			'db_search_query' => 'smf_db_search_query',
 			'db_search_support' => 'smf_db_search_support',
 			'db_create_word_search' => 'smf_db_create_word_search',
 			'db_support_ignore' => false,
 			'db_search_language' => 'smf_db_search_language',
 		);
+	}
 
 	db_extend();
 
 	//pg 9.5 got ignore support
 	$version = $smcFunc['db_get_version']();
 	// if we got a Beta Version
-	if (stripos($version, 'beta') !== false)
-		$version = substr($version, 0, stripos($version, 'beta')).'.0';
+	if (stripos($version, 'beta') !== false) {
+			$version = substr($version, 0, stripos($version, 'beta')).'.0';
+	}
 	// or RC
-	if (stripos($version, 'rc') !== false)
-		$version = substr($version, 0, stripos($version, 'rc')).'.0';
+	if (stripos($version, 'rc') !== false) {
+			$version = substr($version, 0, stripos($version, 'rc')).'.0';
+	}
 
-	if (version_compare($version,'9.5.0','>='))
-		$smcFunc['db_support_ignore'] = true;
-}
+	if (version_compare($version,'9.5.0','>=')) {
+			$smcFunc['db_support_ignore'] = true;
+	}
+	}
 
 /**
  * This function will tell you whether this database type supports this search type.
@@ -104,16 +109,16 @@ 
 		),
 	);
 
-	if (isset($replacements[$identifier]))
-		$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	if (isset($replacements[$identifier])) {
+			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	}
 	if (preg_match('~^\s*INSERT\sIGNORE~i', $db_string) != 0)
 	{
 		$db_string = preg_replace('~^\s*INSERT\sIGNORE~i', 'INSERT', $db_string);
 		if ($smcFunc['db_support_ignore']){
 			//pg style "INSERT INTO.... ON CONFLICT DO NOTHING"
 			$db_string = $db_string.' ON CONFLICT DO NOTHING';
-		}
-		else
+		} else
 		{
 			// Don't error on multi-insert.
 			$db_values['db_error_skip'] = true;
@@ -121,8 +126,9 @@ 
 	}
 
 	//fix double quotes
-	if ($identifier == 'insert_into_log_messages_fulltext')
-		$db_values = str_replace('"', "'", $db_values);
+	if ($identifier == 'insert_into_log_messages_fulltext') {
+			$db_values = str_replace('"', "'", $db_values);
+	}
 
 	$return = $smcFunc['db_query']('', $db_string,
 		$db_values, $connection
@@ -164,9 +170,9 @@ 
 
 	$language_ftx = 'english';
 
-	if (!empty($modSettings['search_language']))
-		$language_ftx = $modSettings['search_language'];
-	else
+	if (!empty($modSettings['search_language'])) {
+			$language_ftx = $modSettings['search_language'];
+	} else
 	{
 		$request = $smcFunc['db_query']('','
 			SELECT cfgname FROM pg_ts_config WHERE oid = current_setting({string:default_language})::regconfig',