elkarte / Elkarte

themes/default/Announce.template.php

Braces +3 added lines, -1 removed lines

@@ -36,10 +36,12 @@
 				<ul>';
 
 	foreach ($context['groups'] as $group)
-		echo '
+	{
+			echo '
 					<li>
 						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked="checked" /> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em>
 					</li>';
+	}
 
 	echo '
 					<li>

themes/default/ManageNews.template.php

Braces +6 added lines, -2 removed lines

@@ -275,8 +275,10 @@ 
 			</div>';
 
 	foreach ($context['recipients'] as $key => $values)
-		echo '
+	{
+			echo '
 			<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '" />';
+	}
 
 	// The vars used to preview a newsletter without loading a new page, used by post.js previewControl()
 	addInlineJavascript('
@@ -338,8 +340,10 @@ 
 
 	// All the things we must remember!
 	foreach ($context['recipients'] as $key => $values)
-		echo '
+	{
+			echo '
 					<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '" />';
+	}
 
 	echo '
 				</div>

themes/default/MergeTopics.template.php

Braces +15 added lines, -5 removed lines

@@ -79,8 +79,10 @@ 
 							<select name="targetboard" onchange="this.form.submit();">';
 
 		foreach ($context['boards'] as $board)
-			echo '
+		{
+					echo '
 									<option value="', $board['id'], '"', $board['id'] == $context['target_board'] ? ' selected="selected"' : '', '>', $board['category'], ' - ', $board['name'], '</option>';
+		}
 
 		echo '
 							</select>
@@ -115,13 +117,15 @@ 
 				<ul class="merge_topics">';
 
 	foreach ($context['topics'] as $topic)
-		echo '
+	{
+			echo '
 					<li>
 						<a class="linkbutton" href="', $scripturl, '?action=mergetopics;sa=options;board=', $context['current_board'], '.0;from=', $context['origin_topic'], ';to=', $topic['id'], ';', $context['session_var'], '=', $context['session_id'], '">
 							<img class="centericon" src="', $settings['images_url'], '/buttons/merge.png" alt="', $txt['merge'], '"  />
 						</a>&nbsp;
 						<a href="', $scripturl, '?topic=', $topic['id'], '.0" target="_blank" class="new_win">', $topic['subject'], '</a> ', sprintf($txt['topic_started_by'], $topic['poster']['link']), '
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -153,7 +157,8 @@ 
 				<tbody>';
 
 	foreach ($context['topics'] as $topic)
-		echo '
+	{
+			echo '
 					<tr>
 						<td class="centertext">
 							<input type="checkbox" name="topics[]" value="', $topic['id'], '" checked="checked" />
@@ -173,6 +178,7 @@ 
 							<input type="checkbox" name="notifications[]" value="' . $topic['id'] . '" checked="checked" />
 						</td>
 					</tr>';
+	}
 
 	echo '
 				</tbody>
@@ -185,8 +191,10 @@ 
 					<select name="subject" onchange="this.form.custom_subject.style.display = (this.options[this.selectedIndex].value != 0) ? \'none\': \'block\' ;">';
 
 	foreach ($context['topics'] as $topic)
-		echo '
+	{
+			echo '
 						<option value="', $topic['id'], '"' . ($topic['selected'] ? ' selected="selected"' : '') . '>', $topic['subject'], '</option>';
+	}
 
 	echo '
 						<option value="0">', $txt['merge_custom_subject'], ':</option>
@@ -218,10 +226,12 @@ 
 						<ul>';
 
 		foreach ($context['polls'] as $poll)
-			echo '
+		{
+					echo '
 							<li>
 								<input type="radio" id="poll', $poll['id'], '" name="poll" value="', $poll['id'], '"', $poll['selected'] ? ' checked="checked"' : '', ' /> <label for="poll', $poll['id'], '">', $poll['question'], '</label> (', $txt['topic'], ': <a href="', $scripturl, '?topic=', $poll['topic']['id'], '.0" target="_blank" class="new_win">', $poll['topic']['subject'], '</a>)
 							</li>';
+		}
 
 		echo '
 							<li>

themes/default/CoreFeatures.template.php

Braces +3 added lines, -1 removed lines

@@ -130,7 +130,8 @@ 
 
 	// Loop through all the shiny features.
 	foreach ($context['features'] as $id => $feature)
-		echo '
+	{
+			echo '
 			<div class="features">
 				<img class="features_image" src="', $feature['image'], '" alt="', $feature['title'], '" />
 				<div class="features_switch" id="js_feature_', $id, '">
@@ -141,6 +142,7 @@ 
 				<p>', $feature['desc'], '</p>
 				<hr />
 			</div>';
+	}
 
 	echo '
 			<div class="righttext">

themes/default/ManageMembers.template.php

Braces +6 added lines, -2 removed lines

@@ -168,7 +168,8 @@ 
 					<tbody>';
 
 	foreach ($context['membergroups'] as $membergroup)
-		echo '
+	{
+			echo '
 						<tr>
 							<td>', $membergroup['name'], '</td>
 							<td class="centertext">
@@ -178,6 +179,7 @@ 
 								', $membergroup['can_be_additional'] ? '<input type="checkbox" name="membergroups[2][]" value="' . $membergroup['id'] . '" checked="checked" />' : '', '
 							</td>
 						</tr>';
+	}
 
 	echo '
 						<tr>
@@ -206,7 +208,8 @@ 
 					<tbody>';
 
 	foreach ($context['postgroups'] as $postgroup)
-		echo '
+	{
+			echo '
 						<tr>
 							<td>
 								', $postgroup['name'], '
@@ -215,6 +218,7 @@ 
 								<input type="checkbox" name="postgroups[]" value="', $postgroup['id'], '" checked="checked" />
 							</td>
 						</tr>';
+	}
 
 	echo '
 						<tr>

themes/default/Help.template.php

Braces +3 added lines, -1 removed lines

@@ -59,8 +59,10 @@
 					<ul>';
 
 	foreach ($context['manual_sections'] as $section_id => $wiki_id)
-		echo '
+	{
+			echo '
 						<li><a href="', $context['wiki_url'], '/', $wiki_id, ($txt['lang_dictionary'] != 'en' && $txt['lang_dictionary'] != 'english' ? '/' . $txt['lang_dictionary'] : ''), '" target="_blank" class="new_win">', $txt['manual_section_' . $section_id . '_title'], '</a> - ', $txt['manual_section_' . $section_id . '_desc'], '</li>';
+	}
 
 	echo '
 					</ul>

sources/modules/Poll/PollDisplayModule.class.php

Braces +3 added lines, -1 removed lines

@@ -59,7 +59,9 @@
 			'can_remove_poll' => 'poll_remove',
 		);
 		foreach ($anyown_permissions as $contextual => $perm)
-			$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+		{
+					$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+		}
 
 		$context['can_add_poll'] &= self::$_enabled && $topicinfo['id_poll'] <= 0;
 		$context['can_remove_poll'] &= self::$_enabled && $topicinfo['id_poll'] > 0;

sources/subs/RepairBoards.subs.php

Spacing +33 added lines, -33 removed lines

@@ -109,7 +109,7 @@ 
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				WHERE t.id_topic IS NULL
 				GROUP BY m.id_topic, m.id_board',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $salvageBoardID;
 
 				$db = database();
@@ -197,7 +197,7 @@ 
 			// Remove all topics that have zero messages in the messages table.
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics) {
+				'process' => function($topics) {
 					$db = database();
 
 					$db->query('', '
@@ -231,7 +231,7 @@ 
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)
 				WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND t.id_poll IS NULL',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $salvageBoardID, $txt;
 
 				$db = database();
@@ -346,7 +346,7 @@ 
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['firstmsg_approved'] = (int) $row['firstmsg_approved'];
 				$row['myid_first_msg'] = (int) $row['myid_first_msg'];
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
@@ -366,7 +366,7 @@ 
 					'approved' => $row['firstmsg_approved'],
 				));
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				// A pretend error?
@@ -401,7 +401,7 @@ 
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_topic, t.num_replies, mf.approved
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
 
 				// Not really a problem?
@@ -412,7 +412,7 @@ 
 					'num_replies' => $row['my_num_replies'],
 				));
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				// Just joking?
@@ -442,7 +442,7 @@ 
 				GROUP BY t.id_topic, t.unapproved_posts
 				HAVING unapproved_posts != COUNT(mu.id_msg)
 				ORDER BY t.id_topic',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				$row['my_unapproved_posts'] = (int) $row['my_unapproved_posts'];
 
 				setTopicAttribute($row['id_topic'], array(
@@ -474,7 +474,7 @@ 
 				WHERE b.id_board IS NULL
 					AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_board',
-			'fix_processing' => function ($row) {
+			'fix_processing' => function($row) {
 				global $salvageCatID, $txt;
 
 				$db = database();
@@ -522,7 +522,7 @@ 
 				ORDER BY b.id_cat, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_cat',
-				'process' => function ($cats) {
+				'process' => function($cats) {
 					global $salvageCatID;
 
 					$db = database();
@@ -559,7 +559,7 @@ 
 			// Last step-make sure all non-guest posters still exist.
 			'fix_collect' => array(
 				'index' => 'id_msg',
-				'process' => function ($msgs) {
+				'process' => function($msgs) {
 					$db = database();
 
 					$db->query('', '
@@ -586,7 +586,7 @@ 
 				ORDER BY b.id_parent, b.id_board',
 			'fix_collect' => array(
 				'index' => 'id_parent',
-				'process' => function ($parents) {
+				'process' => function($parents) {
 					global $salvageBoardID, $salvageCatID;
 
 					$db = database();
@@ -621,7 +621,7 @@ 
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls) {
+				'process' => function($polls) {
 					$db = database();
 
 					$db->query('', '
@@ -653,7 +653,7 @@ 
 				ORDER BY cal.id_topic',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($events) {
+				'process' => function($events) {
 					$db = database();
 
 					$db->query('', '
@@ -683,7 +683,7 @@ 
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($topics) {
+				'process' => function($topics) {
 					$db = database();
 
 					$db->query('', '
@@ -713,7 +713,7 @@ 
 				GROUP BY lt.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -743,7 +743,7 @@ 
 				GROUP BY lb.id_board',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -773,7 +773,7 @@ 
 				GROUP BY lb.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -803,7 +803,7 @@ 
 				GROUP BY lmr.id_board',
 			'fix_collect' => array(
 				'index' => 'id_board',
-				'process' => function ($boards) {
+				'process' => function($boards) {
 					$db = database();
 
 					$db->query('', '
@@ -833,7 +833,7 @@ 
 				GROUP BY lmr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -863,7 +863,7 @@ 
 				GROUP BY pmr.id_pm',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($pms) {
+				'process' => function($pms) {
 					$db = database();
 
 					$db->query('', '
@@ -894,7 +894,7 @@ 
 				GROUP BY pmr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -924,7 +924,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_pm',
-				'process' => function ($guestMessages) {
+				'process' => function($guestMessages) {
 					$db = database();
 
 					$db->query('', '
@@ -954,7 +954,7 @@ 
 				GROUP BY ln.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -982,7 +982,7 @@ 
 					LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic)
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND lss.id_topic IS NULL',
-			'fix_full_processing' => function ($result) {
+			'fix_full_processing' => function($result) {
 
 				$db = database();
 
@@ -1012,7 +1012,7 @@ 
 						array('word', 'id_topic')
 					);
 			},
-			'message_function' => function ($row) {
+			'message_function' => function($row) {
 				global $txt, $context;
 
 				if (count(text2words($row['subject'])) != 0)
@@ -1039,7 +1039,7 @@ 
 					AND t.id_topic IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_topic',
-				'process' => function ($deleteTopics) {
+				'process' => function($deleteTopics) {
 					$db = database();
 
 					$db->query('', '
@@ -1069,7 +1069,7 @@ 
 					AND mem.id_member IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -1098,7 +1098,7 @@ 
 					AND p.id_poll IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_poll',
-				'process' => function ($polls) {
+				'process' => function($polls) {
 					$db = database();
 
 					$db->query('', '
@@ -1127,7 +1127,7 @@ 
 					AND lrc.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports) {
+				'process' => function($reports) {
 					$db = database();
 
 					$db->query('', '
@@ -1156,7 +1156,7 @@ 
 					AND lr.id_report IS NULL',
 			'fix_collect' => array(
 				'index' => 'id_report',
-				'process' => function ($reports) {
+				'process' => function($reports) {
 					$db = database();
 
 					$db->query('', '
@@ -1186,7 +1186,7 @@ 
 				GROUP BY lgr.id_member',
 			'fix_collect' => array(
 				'index' => 'id_member',
-				'process' => function ($members) {
+				'process' => function($members) {
 					$db = database();
 
 					$db->query('', '
@@ -1216,7 +1216,7 @@ 
 				GROUP BY lgr.id_group',
 			'fix_collect' => array(
 				'index' => 'id_group',
-				'process' => function ($groups) {
+				'process' => function($groups) {
 					$db = database();
 
 					$db->query('', '

Braces +117 added lines, -45 removed lines

@@ -348,7 +348,9 @@ 
 
 				// Not really a problem?
 				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				{
+									return false;
+				}
 
 				$memberStartedID = getMsgMemberID($row['myid_first_msg']);
 				$memberUpdatedID = getMsgMemberID($row['myid_last_msg']);
@@ -367,13 +369,21 @@ 
 
 				// A pretend error?
 				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-					return false;
+				{
+									return false;
+				}
 				if ($row['id_first_msg'] != $row['myid_first_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
+				{
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
+				}
 				if ($row['id_last_msg'] != $row['myid_last_msg'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
+				{
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
+				}
 				if ($row['approved'] != $row['firstmsg_approved'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				{
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
+				}
 
 				return true;
 			},
@@ -401,7 +411,9 @@ 
 
 				// Not really a problem?
 				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				{
+									return false;
+				}
 
 				require_once(SUBSDIR . '/Topic.subs.php');
 				setTopicAttribute($row['id_topic'], array(
@@ -413,10 +425,14 @@ 
 
 				// Just joking?
 				if ($row['my_num_replies'] == $row['num_replies'])
-					return false;
+				{
+									return false;
+				}
 
 				if ($row['num_replies'] != $row['my_num_replies'])
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				{
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
+				}
 
 				return true;
 			},
@@ -986,7 +1002,9 @@ 
 				while ($row = $db->fetch_assoc($result))
 				{
 					foreach (text2words($row['subject']) as $word)
-						$inserts[] = array($word, $row['id_topic']);
+					{
+											$inserts[] = array($word, $row['id_topic']);
+					}
 					if (count($inserts) > 500)
 					{
 						$db->insert('ignore',
@@ -1001,12 +1019,14 @@ 
 				}
 
 				if (!empty($inserts))
-					$db->insert('ignore',
+				{
+									$db->insert('ignore',
 						'{db_prefix}log_search_subjects',
 						array('word' => 'string', 'id_topic' => 'int'),
 						$inserts,
 						array('word', 'id_topic')
 					);
+				}
 			},
 			'message_function' => function ($row) {
 				global $txt, $context;
@@ -1242,9 +1262,12 @@ 
 
 	// Have we already created it?
 	if ($createOnce)
-		return;
-	else
-		$createOnce = true;
+	{
+			return;
+	}
+	else {
+			$createOnce = true;
+	}
 
 	// Back to the forum's default language.
 	loadLanguage('Admin', $language);
@@ -1260,7 +1283,9 @@ 
 		)
 	);
 	if ($db->num_rows($result) != 0)
-		list ($salvageCatID) = $db->fetch_row($result);
+	{
+			list ($salvageCatID) = $db->fetch_row($result);
+	}
 	$db->free_result($result);
 
 	if (empty($salvageCatID))
@@ -1294,7 +1319,9 @@ 
 		)
 	);
 	if ($db->num_rows($result) != 0)
-		list ($salvageBoardID) = $db->fetch_row($result);
+	{
+			list ($salvageBoardID) = $db->fetch_row($result);
+	}
 	$db->free_result($result);
 
 	if (empty($salvageBoardID))
@@ -1348,11 +1375,15 @@ 
 
 	// Errr, wait.  How much time has this taken already?
 	if (!$force && microtime(true) - $time_start < 3000)
-		return;
+	{
+			return;
+	}
 
 	// Restore the query cache if interested.
 	if ($db_show_debug === true)
-		Debug::instance()->on();
+	{
+			Debug::instance()->on();
+	}
 
 	$context['continue_get_data'] = '?action=admin;area=repairboards' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 	$context['page_title'] = $txt['not_done_title'];
@@ -1362,9 +1393,12 @@ 
 
 	// Change these two if more steps are added!
 	if (empty($max_substep))
-		$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
-	else
-		$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	{
+			$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
+	}
+	else {
+			$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
+	}
 
 	// Never more than 100%!
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -1408,7 +1442,9 @@ 
 
 	// Don't allow the cache to get too full.
 	if ($db_show_debug === true)
-		Debug::instance()->off();
+	{
+			Debug::instance()->off();
+	}
 
 	$context['total_steps'] = count($errorTests);
 
@@ -1422,7 +1458,9 @@ 
 
 		// Already done this?
 		if ($_GET['step'] > $current_step)
-			continue;
+		{
+					continue;
+		}
 
 		// If we're fixing it but it ain't broke why try?
 		if ($do_fix && !in_array($error_type, $to_fix))
@@ -1452,13 +1490,18 @@ 
 		{
 			// Make sure there's at least one ID to test.
 			if (isset($test['substeps']) && empty($step_max))
-				break;
+			{
+							break;
+			}
 
 			// What is the testing query (Changes if we are testing or fixing)
 			if (!$do_fix)
-				$test_query = 'check_query';
-			else
-				$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			{
+							$test_query = 'check_query';
+			}
+			else {
+							$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
+			}
 
 			// Do the test...
 			$request = $db->query('',
@@ -1469,9 +1512,12 @@ 
 
 			// Does it need a fix?
 			if (!empty($test['check_type']) && $test['check_type'] == 'count')
-				list ($needs_fix) = $db->fetch_row($request);
-			else
-				$needs_fix = $db->num_rows($request);
+			{
+							list ($needs_fix) = $db->fetch_row($request);
+			}
+			else {
+							$needs_fix = $db->num_rows($request);
+			}
 
 			$total_queries++;
 
@@ -1484,7 +1530,9 @@ 
 					$found_errors = true;
 
 					if (isset($test['message']))
-						$context['repair_errors'][] = $txt[$test['message']];
+					{
+											$context['repair_errors'][] = $txt[$test['message']];
+					}
 
 					// One per row!
 					elseif (isset($test['messages']))
@@ -1495,9 +1543,13 @@ 
 							foreach ($variables as $k => $v)
 							{
 								if ($k == 0 && isset($txt[$v]))
-									$variables[$k] = $txt[$v];
+								{
+																	$variables[$k] = $txt[$v];
+								}
 								elseif ($k > 0 && isset($row[$v]))
-									$variables[$k] = $row[$v];
+								{
+																	$variables[$k] = $row[$v];
+								}
 							}
 							$context['repair_errors'][] = call_user_func_array('sprintf', $variables);
 						}
@@ -1509,12 +1561,16 @@ 
 						// Find out if there are actually errors.
 						$found_errors = false;
 						while ($row = $db->fetch_assoc($request))
-							$found_errors |= $test['message_function']($row);
+						{
+													$found_errors |= $test['message_function']($row);
+						}
 					}
 
 					// Actually have something to fix?
 					if ($found_errors)
-						$to_fix[] = $error_type;
+					{
+											$to_fix[] = $error_type;
+					}
 				}
 
 				// We want to fix, we need to fix - so work out what exactly to do!
@@ -1525,7 +1581,9 @@ 
 					{
 						$ids = array();
 						while ($row = $db->fetch_assoc($request))
-							$ids[] = $row[$test['fix_collect']['index']];
+						{
+													$ids[] = $row[$test['fix_collect']['index']];
+						}
 						if (!empty($ids))
 						{
 							// Fix it!
@@ -1535,29 +1593,37 @@ 
 
 					// Simply executing a fix it query?
 					elseif (isset($test['fix_it_query']))
-						$db->query('',
+					{
+											$db->query('',
 							$test['fix_it_query'],
 							array(
 							)
 						);
+					}
 
 					// Do we have some processing to do?
 					elseif (isset($test['fix_processing']))
 					{
 						while ($row = $db->fetch_assoc($request))
-							$test['fix_processing']($row);
+						{
+													$test['fix_processing']($row);
+						}
 					}
 
 					// What about the full set of processing?
 					elseif (isset($test['fix_full_processing']))
-						$test['fix_full_processing']($request);
+					{
+											$test['fix_full_processing']($request);
+					}
 
 					// Do we have other things we need to fix as a result?
 					if (!empty($test['force_fix']))
 					{
 						foreach ($test['force_fix'] as $item)
-							if (!in_array($item, $to_fix))
+						{
+													if (!in_array($item, $to_fix))
 								$to_fix[] = $item;
+						}
 					}
 				}
 			}
@@ -1574,15 +1640,19 @@ 
 				{
 					pauseRepairProcess($to_fix, $error_type, $step_max);
 				}
-				else
-					$done = true;
+				else {
+									$done = true;
+				}
+			}
+			else {
+							$done = true;
 			}
-			else
-				$done = true;
 
 			// Don't allow more than 1000 queries at a time.
 			if ($total_queries >= 1000)
-				pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			{
+							pauseRepairProcess($to_fix, $error_type, $step_max, true);
+			}
 		}
 
 		// Keep going.
@@ -1596,7 +1666,9 @@ 
 		{
 			$key = array_search($error_type, $to_fix);
 			if ($key !== false && isset($to_fix[$key]))
-				unset($to_fix[$key]);
+			{
+							unset($to_fix[$key]);
+			}
 		}
 
 		// Are we done?

sources/subs/Package.subs.php

Spacing +2 added lines, -2 removed lines

@@ -325,7 +325,7 @@ 
 						'value' => $txt['package_restore_permissions_cur_status'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							$formatTxt = $rowData['result'] == '' || $rowData['result'] == 'skipped' ? $txt['package_restore_permissions_pre_change'] : $txt['package_restore_permissions_post_change'];
@@ -354,7 +354,7 @@ 
 						'value' => $txt['package_restore_permissions_result'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return $txt['package_restore_permissions_action_' . $rowData['result']];

Braces +665 added lines, -253 removed lines

@@ -35,7 +35,9 @@ 
 		$data = fetch_web_data($gzfilename);
 
 		if ($data === false)
-			return false;
+		{
+					return false;
+		}
 	}
 	// Or a file on the system
 	else
@@ -43,7 +45,9 @@ 
 		$data = @file_get_contents($gzfilename);
 
 		if ($data === false)
-			return false;
+		{
+					return false;
+		}
 	}
 
 	return read_tgz_data($data, $destination, $single_file, $overwrite, $files_to_extract);
@@ -83,7 +87,9 @@ 
 
 	// Choose the right method for the file
 	if ($untgz->check_valid_tgz())
-		return $untgz->read_tgz_data();
+	{
+			return $untgz->read_tgz_data();
+	}
 	else
 	{
 		unset($untgz);
@@ -125,7 +131,9 @@ 
 	$a_url = parse_url($url);
 
 	if (!isset($a_url['scheme']))
-		return false;
+	{
+			return false;
+	}
 
 	// Attempt to connect...
 	$temp = '';
@@ -133,7 +141,9 @@ 
 
 	// Can't make a connection
 	if (!$fid)
-		return false;
+	{
+			return false;
+	}
 
 	// See if the file is where its supposed to be
 	fputs($fid, 'HEAD ' . $a_url['path'] . ' HTTP/1.0' . "\r\n" . 'Host: ' . $a_url['host'] . "\r\n\r\n");
@@ -190,7 +200,9 @@ 
 	{
 		// Already found this? If so don't add it twice!
 		if (in_array($row['package_id'], $found))
-			continue;
+		{
+					continue;
+		}
 
 		$found[] = $row['package_id'];
 
@@ -226,20 +238,29 @@ 
 
 	// Extract package-info.xml from downloaded file. (*/ is used because it could be in any directory.)
 	if (preg_match('~^https?://~i', $gzfilename) === 1)
-		$packageInfo = read_tgz_data(fetch_web_data($gzfilename, '', true), '*/package-info.xml', true);
+	{
+			$packageInfo = read_tgz_data(fetch_web_data($gzfilename, '', true), '*/package-info.xml', true);
+	}
 	else
 	{
 		// It must be in the package directory then
 		if (!file_exists(BOARDDIR . '/packages/' . $gzfilename))
-			return 'package_get_error_not_found';
+		{
+					return 'package_get_error_not_found';
+		}
 
 		// Make sure an package.xml file is available
 		if (is_file(BOARDDIR . '/packages/' . $gzfilename))
-			$packageInfo = read_tgz_file(BOARDDIR . '/packages/' . $gzfilename, '*/package-info.xml', true);
+		{
+					$packageInfo = read_tgz_file(BOARDDIR . '/packages/' . $gzfilename, '*/package-info.xml', true);
+		}
 		elseif (file_exists(BOARDDIR . '/packages/' . $gzfilename . '/package-info.xml'))
-			$packageInfo = file_get_contents(BOARDDIR . '/packages/' . $gzfilename . '/package-info.xml');
-		else
-			return 'package_get_error_missing_xml';
+		{
+					$packageInfo = file_get_contents(BOARDDIR . '/packages/' . $gzfilename . '/package-info.xml');
+		}
+		else {
+					return 'package_get_error_missing_xml';
+		}
 	}
 
 	// Nothing?
@@ -248,9 +269,12 @@ 
 		// Perhaps they are trying to install a theme, lets tell them nicely this is the wrong function
 		$packageInfo = read_tgz_file(BOARDDIR . '/packages/' . $gzfilename, '*/theme_info.xml', true);
 		if (!empty($packageInfo))
-			return 'package_get_error_is_theme';
-		else
-			return 'package_get_error_is_zero';
+		{
+					return 'package_get_error_is_theme';
+		}
+		else {
+					return 'package_get_error_is_zero';
+		}
 	}
 
 	// Parse package-info.xml into an Xml_Array.
@@ -258,7 +282,9 @@ 
 
 	// @todo Error message of some sort?
 	if (!$packageInfo->exists('package-info[0]'))
-		return 'package_get_error_packageinfo_corrupt';
+	{
+			return 'package_get_error_packageinfo_corrupt';
+	}
 
 	$packageInfo = $packageInfo->path('package-info[0]');
 
@@ -269,7 +295,9 @@ 
 
 	// Set a default type if none was supplied in the package
 	if (!isset($package['type']))
-		$package['type'] = 'modification';
+	{
+			$package['type'] = 'modification';
+	}
 
 	return $package;
 }
@@ -397,11 +425,15 @@ 
 
 		// If we just restored permissions then wherever we are, we are now done and dusted.
 		if (!empty($_POST['restore_perms']))
-			obExit();
+		{
+					obExit();
+		}
 	}
 	// Otherwise, it's entirely irrelevant?
 	elseif ($restore_write_status)
-		return true;
+	{
+			return true;
+	}
 
 	// This is where we report what we got up to.
 	$return_data = array(
@@ -418,7 +450,9 @@ 
 
 		// Check for a valid connection
 		if ($package_ftp->error !== false)
-			unset($package_ftp, $_SESSION['pack_ftp']);
+		{
+					unset($package_ftp, $_SESSION['pack_ftp']);
+		}
 	}
 
 	// Just got a submission did we?
@@ -440,10 +474,13 @@ 
 			{
 				$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);
+				{
+									$ftp_root = substr($ftp_root, 0, -1);
+				}
+			}
+			else {
+							$ftp_root = BOARDDIR;
 			}
-			else
-				$ftp_root = BOARDDIR;
 
 			$_SESSION['pack_ftp'] = array(
 				'server' => $_POST['ftp_server'],
@@ -456,7 +493,9 @@ 
 			);
 
 			if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path'])
-				updateSettings(array('package_path' => $_POST['ftp_path']));
+			{
+							updateSettings(array('package_path' => $_POST['ftp_path']));
+			}
 
 			// This is now the primary connection.
 			$package_ftp = $ftp;
@@ -470,10 +509,14 @@ 
 		{
 			// Sometimes this can somehow happen maybe?
 			if (empty($file))
-				unset($chmodFiles[$k]);
+			{
+							unset($chmodFiles[$k]);
+			}
 			// Already writable?
 			elseif (@is_writable($file))
-				$return_data['files']['writable'][] = $file;
+			{
+							$return_data['files']['writable'][] = $file;
+			}
 			else
 			{
 				// Now try to change that.
@@ -492,17 +535,25 @@ 
 				$ftp = new Ftp_Connection(null);
 			}
 			elseif ($ftp->error !== false && !isset($ftp_error))
-				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+			{
+							$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;
+			{
+							$_POST['ftp_path'] = $detect_path;
+			}
 			elseif (!isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+			{
+							$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+			}
 
 			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			{
+							$_POST['ftp_username'] = $username;
+			}
 		}
 
 		$context['package_ftp'] = array(
@@ -516,7 +567,9 @@ 
 
 		// Which files failed?
 		if (!isset($context['notwritable_files']))
-			$context['notwritable_files'] = array();
+		{
+					$context['notwritable_files'] = array();
+		}
 		$context['notwritable_files'] = array_merge($context['notwritable_files'], $return_data['files']['notwritable']);
 
 		// Sent here to die?
@@ -564,8 +617,9 @@ 
 				$ftp_file = strtr($file, array($_SESSION['pack_ftp']['root'] => ''));
 				$package_ftp->chmod($ftp_file, $perms);
 			}
-			else
-				elk_chmod($file, $perms);
+			else {
+							elk_chmod($file, $perms);
+			}
 
 			$new_permissions = @fileperms($file);
 			$result = $new_permissions == $perms ? 'success' : 'failure';
@@ -613,39 +667,56 @@ 
 		{
 			// If this file doesn't exist, then we actually want to look at the directory, no?
 			if (!file_exists($file))
-				$file = dirname($file);
+			{
+							$file = dirname($file);
+			}
 
 			// This looks odd, but it's an attempt to work around PHP suExec.
 			if (!@is_writable($file))
-				elk_chmod($file, 0755);
+			{
+							elk_chmod($file, 0755);
+			}
 			if (!@is_writable($file))
-				elk_chmod($file, 0777);
+			{
+							elk_chmod($file, 0777);
+			}
 			if (!@is_writable(dirname($file)))
-				elk_chmod($file, 0755);
+			{
+							elk_chmod($file, 0755);
+			}
 			if (!@is_writable(dirname($file)))
-				elk_chmod($file, 0777);
+			{
+							elk_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);
+				{
+									fclose($fp);
+				}
+				else {
+									closedir($fp);
+				}
 			}
 		}
 
 		// No FTP required!
 		if (empty($files))
-			return array();
+		{
+					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();
+		{
+					return array();
+		}
 
 		foreach ($files as $k => $file)
 		{
@@ -657,12 +728,18 @@ 
 				elk_chmod($file, 0755);
 			}
 			if (!@is_writable($file))
-				elk_chmod($file, 0777);
+			{
+							elk_chmod($file, 0777);
+			}
 			if (!@is_writable(dirname($file)))
-				elk_chmod(dirname($file), 0777);
+			{
+							elk_chmod(dirname($file), 0777);
+			}
 
 			if (@is_writable($file))
-				unset($files[$k]);
+			{
+							unset($files[$k]);
+			}
 		}
 
 		return $files;
@@ -672,7 +749,9 @@ 
 		$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();
+		{
+					return array();
+		}
 
 		foreach ($files as $k => $file)
 		{
@@ -688,14 +767,20 @@ 
 
 			// Still not writable, true full permissions
 			if (!@is_writable($file))
-				$package_ftp->chmod($ftp_file, 0777);
+			{
+							$package_ftp->chmod($ftp_file, 0777);
+			}
 
 			// Directory not writable, try to chmod to 777 then
 			if (!@is_writable(dirname($file)))
-				$package_ftp->chmod(dirname($ftp_file), 0777);
+			{
+							$package_ftp->chmod(dirname($ftp_file), 0777);
+			}
 
 			if (@is_writable($file))
-				unset($files[$k]);
+			{
+							unset($files[$k]);
+			}
 		}
 
 		return $files;
@@ -731,17 +816,25 @@ 
 			$ftp = new Ftp_Connection(null);
 		}
 		elseif ($ftp->error !== false && !isset($ftp_error))
-			$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+		{
+					$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;
+		{
+					$_POST['ftp_path'] = $detect_path;
+		}
 		elseif (!isset($_POST['ftp_path']))
-			$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+		{
+					$_POST['ftp_path'] = isset($modSettings['package_path']) ? $modSettings['package_path'] : $detect_path;
+		}
 
 		if (!isset($_POST['ftp_username']))
-			$_POST['ftp_username'] = $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'),
@@ -754,7 +847,9 @@ 
 
 		// If we're returning dump out here.
 		if ($return)
-			return $files;
+		{
+					return $files;
+		}
 
 		$context['page_title'] = $txt['package_ftp_necessary'];
 		$context['sub_template'] = 'ftp_required';
@@ -766,10 +861,13 @@ 
 		{
 			$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);
+			{
+							$ftp_root = substr($ftp_root, 0, -1);
+			}
+		}
+		else {
+					$ftp_root = BOARDDIR;
 		}
-		else
-			$ftp_root = BOARDDIR;
 
 		$_SESSION['pack_ftp'] = array(
 			'server' => $_POST['ftp_server'],
@@ -781,7 +879,9 @@ 
 		);
 
 		if (!isset($modSettings['package_path']) || $modSettings['package_path'] != $_POST['ftp_path'])
-			updateSettings(array('package_path' => $_POST['ftp_path']));
+		{
+					updateSettings(array('package_path' => $_POST['ftp_path']));
+		}
 
 		$files = packageRequireFTP($destination_url, $files, $return);
 	}
@@ -813,7 +913,9 @@ 
 
 	// Mayday!  That action doesn't exist!!
 	if (empty($packageXML) || !$packageXML->exists($method))
-		return array();
+	{
+			return array();
+	}
 
 	// We haven't found the package script yet...
 	$script = false;
@@ -821,7 +923,9 @@ 
 
 	// Emulation support...
 	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	{
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	// Single package emulation
 	if (!empty($_REQUEST['ve']) && !empty($_REQUEST['package']))
@@ -830,7 +934,9 @@ 
 		$_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']];
+	{
+			$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);
@@ -841,7 +947,9 @@ 
 		{
 			// Don't keep going if this won't work for this version.
 			if (!matchPackageVersion($the_version, $this_method->fetch('@for')))
-				continue;
+			{
+							continue;
+			}
 		}
 
 		// Upgrades may go from a certain old version of the mod.
@@ -849,7 +957,9 @@ 
 		{
 			// Well, this is for the wrong old version...
 			if (!matchPackageVersion($previous_version, $this_method->fetch('@from')))
-				continue;
+			{
+							continue;
+			}
 		}
 
 		// We've found it!
@@ -859,7 +969,9 @@ 
 
 	// Bad news, a matching script wasn't found!
 	if ($script === false)
-		return array();
+	{
+			return array();
+	}
 
 	// Find all the actions in this method - in theory, these should only be allowed actions. (* means all.)
 	$actions = $script->set('*');
@@ -895,7 +1007,9 @@ 
 					{
 						// In case the user put the blocks in the wrong order.
 						if (isset($context[$type]['selected']) && $context[$type]['selected'] == 'default')
-							$context[$type][] = 'default';
+						{
+													$context[$type][] = 'default';
+						}
 
 						$context[$type]['selected'] = htmlspecialchars($action->fetch('@lang'), ENT_COMPAT, 'UTF-8');
 					}
@@ -915,8 +1029,9 @@ 
 						$context[$type][] = 'default';
 						continue;
 					}
-					else
-						$context[$type]['selected'] = 'default';
+					else {
+											$context[$type]['selected'] = 'default';
+					}
 				}
 			}
 
@@ -927,8 +1042,9 @@ 
 				package_put_contents($filename, $action->fetch('.'));
 				$filename = strtr($filename, array($temp_path => ''));
 			}
-			else
-				$filename = $action->fetch('.');
+			else {
+							$filename = $action->fetch('.');
+			}
 
 			$return[] = array(
 				'type' => $actionType,
@@ -964,7 +1080,9 @@ 
 				$url = addProtocol($url, array('http://', 'https://'));
 
 				if (strlen($url) < 8)
-					$url = '';
+				{
+									$url = '';
+				}
 			}
 
 			$return[] = array(
@@ -1034,7 +1152,9 @@ 
 				{
 					$temp = $this_action['destination'];
 					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					{
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1049,7 +1169,9 @@ 
 				{
 					$temp = dirname($this_action['destination']);
 					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					{
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1058,10 +1180,12 @@ 
 				}
 
 				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				{
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
+				}
 			}
 			elseif ($actionType == 'require-dir')
 			{
@@ -1069,7 +1193,9 @@ 
 				{
 					$temp = $this_action['destination'];
 					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					{
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1080,13 +1206,17 @@ 
 			elseif ($actionType == 'require-file')
 			{
 				if ($action->exists('@theme'))
-					$this_action['theme_action'] = $action->fetch('@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);
+					{
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1095,10 +1225,12 @@ 
 				}
 
 				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				{
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
+				}
 			}
 			elseif ($actionType == 'move-dir' || $actionType == 'move-file')
 			{
@@ -1106,7 +1238,9 @@ 
 				{
 					$temp = dirname($this_action['destination']);
 					while (!file_exists($temp) && strlen($temp) > 1)
-						$temp = dirname($temp);
+					{
+											$temp = dirname($temp);
+					}
 
 					$return[] = array(
 						'type' => 'chmod',
@@ -1115,26 +1249,32 @@ 
 				}
 
 				if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-					$return[] = array(
+				{
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['destination']
 					);
+				}
 			}
 			elseif ($actionType == 'remove-dir')
 			{
 				if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-					$return[] = array(
+				{
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['filename']
 					);
+				}
 			}
 			elseif ($actionType == 'remove-file')
 			{
 				if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-					$return[] = array(
+				{
+									$return[] = array(
 						'type' => 'chmod',
 						'filename' => $this_action['filename']
 					);
+				}
 			}
 		}
 		else
@@ -1163,7 +1303,9 @@ 
 
 	// Only testing - just return a list of things to be done.
 	if ($testing_only)
-		return $return;
+	{
+			return $return;
+	}
 
 	umask(0);
 
@@ -1172,36 +1314,48 @@ 
 	foreach ($return as $action)
 	{
 		if (in_array($action['type'], array('modification', 'code', 'database', 'redirect', 'hook', 'credits')))
-			$not_done[] = $action;
+		{
+					$not_done[] = $action;
+		}
 
 		if ($action['type'] == 'create-dir')
 		{
 			if (!mktree($action['destination'], 0755) || !is_writable($action['destination']))
-				$failure |= !mktree($action['destination'], 0777);
+			{
+							$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);
+			{
+							$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;
+			{
+							$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)
+			{
+							foreach ($context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
 					copytree($action['source'], $theme_destination);
+			}
 		}
 		elseif ($action['type'] == 'require-file')
 		{
 			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			{
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			package_put_contents($action['destination'], package_get_contents($action['source']), $testing_only);
 
@@ -1209,10 +1363,12 @@ 
 
 			// 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)
+			{
+							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);
 
@@ -1222,14 +1378,18 @@ 
 		elseif ($action['type'] == 'move-file')
 		{
 			if (!mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
-				$failure |= !mktree(dirname($action['destination']), 0777);
+			{
+							$failure |= !mktree(dirname($action['destination']), 0777);
+			}
 
 			$failure |= !rename($action['source'], $action['destination']);
 		}
 		elseif ($action['type'] == 'move-dir')
 		{
 			if (!mktree($action['destination'], 0755) || !is_writable($action['destination']))
-				$failure |= !mktree($action['destination'], 0777);
+			{
+							$failure |= !mktree($action['destination'], 0777);
+			}
 
 			$failure |= !rename($action['source'], $action['destination']);
 		}
@@ -1239,8 +1399,10 @@ 
 
 			// 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)
+			{
+							foreach ($context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
 					deltree($theme_destination);
+			}
 		}
 		elseif ($action['type'] == 'remove-file')
 		{
@@ -1251,16 +1413,20 @@ 
 				$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)
+			{
+							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;
+					}
 		}
 	}
 
@@ -1285,7 +1451,9 @@ 
 	static $near_version = 0;
 
 	if ($reset)
-		$near_version = 0;
+	{
+			$near_version = 0;
+	}
 
 	// Normalize the $versions
 	$versions = explode(',', str_replace(' ', '', strtolower($versions)));
@@ -1293,22 +1461,30 @@ 
 	// If it is not ElkArte, let's just give up
 	list ($the_brand,) = explode(' ', FORUM_VERSION, 2);
 	if ($the_brand != 'ElkArte')
-		return false;
+	{
+			return false;
+	}
 
 	// Loop through each version, save the highest we can find
 	foreach ($versions as $for)
 	{
 		// Adjust for those wild cards
 		if (strpos($for, '*') !== false)
-			$for = str_replace('*', '0', $for) . '-' . str_replace('*', '999', $for);
+		{
+					$for = str_replace('*', '0', $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. 1.0 vs 1.0.99
 		if (strpos($for, '-') !== false)
-			list ($for,) = explode('-', $for);
+		{
+					list ($for,) = 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;
+		{
+					$near_version = $for;
+		}
 	}
 
 	return !empty($near_version) ? $near_version : false;
@@ -1334,14 +1510,18 @@ 
 
 	// Perhaps we do accept anything?
 	if (in_array('all', $versions))
-		return true;
+	{
+			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);
+		{
+					$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+		}
 
 		// Do we have a range?
 		if (strpos($for, '-') !== false)
@@ -1350,11 +1530,15 @@ 
 
 			// Compare the version against lower and upper bounds.
 			if (compareVersions($version, $lower) > -1 && compareVersions($version, $upper) < 1)
-				return true;
+			{
+							return true;
+			}
 		}
 		// Otherwise check if they are equal...
 		elseif (compareVersions($version, $for) === 0)
-			return true;
+		{
+					return true;
+		}
 	}
 
 	return false;
@@ -1397,11 +1581,15 @@ 
 
 	// Are they the same, perhaps?
 	if ($versions[1] === $versions[2])
-		return 0;
+	{
+			return 0;
+	}
 
 	// Get version numbering categories...
 	if (!isset($categories))
-		$categories = array_keys($versions[1]);
+	{
+			$categories = array_keys($versions[1]);
+	}
 
 	// Loop through each category.
 	foreach ($categories as $category)
@@ -1412,12 +1600,17 @@ 
 			// 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);
+			{
+							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);
+			{
+							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;
+			}
 		}
 	}
 
@@ -1437,7 +1630,9 @@ 
 	global $modSettings, $settings, $temp_path;
 
 	if (empty($path))
-		return '';
+	{
+			return '';
+	}
 
 	$dirs = array(
 		'\\' => '/',
@@ -1457,14 +1652,20 @@ 
 
 	// Do we parse in a package directory?
 	if (!empty($temp_path))
-		$dirs['PACKAGE'] = $temp_path;
+	{
+			$dirs['PACKAGE'] = $temp_path;
+	}
 
 	if (strlen($path) == 0)
-		trigger_error('parse_path(): There should never be an empty filename', E_USER_ERROR);
+	{
+			trigger_error('parse_path(): There should never be an empty filename', E_USER_ERROR);
+	}
 
 	// Check if they are using some old software install paths
 	if (strpos($path, '$') === 0 && isset($dirs[strtoupper(substr($path, 1))]))
-		$path = strtoupper(substr($path, 1));
+	{
+			$path = strtoupper(substr($path, 1));
+	}
 
 	return strtr($path, $dirs);
 }
@@ -1487,7 +1688,9 @@ 
 	global $package_ftp;
 
 	if (!file_exists($dir))
-		return;
+	{
+			return;
+	}
 
 	// Read all the files in the directory
 	try
@@ -1497,7 +1700,9 @@ 
 		{
 			// Recursively dive in to each directory looking for files to delete
 			if ($entryname->isDir())
-				deltree($entryname->getPathname());
+			{
+							deltree($entryname->getPathname());
+			}
 			// A file, delete it by any means necessary
 			else
 			{
@@ -1507,14 +1712,18 @@ 
 					$ftp_file = strtr($entryname->getPathname(), array($_SESSION['pack_ftp']['root'] => ''));
 
 					if (!$entryname->isWritable())
-						$package_ftp->chmod($ftp_file, 0777);
+					{
+											$package_ftp->chmod($ftp_file, 0777);
+					}
 
 					$package_ftp->unlink($ftp_file);
 				}
 				else
 				{
 					if (!$entryname->isWritable())
-						elk_chmod($entryname->getPathname(), 0777);
+					{
+											elk_chmod($entryname->getPathname(), 0777);
+					}
 
 					@unlink($entryname->getPathname());
 				}
@@ -1528,8 +1737,10 @@ 
 		{
 			$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
 			if (!is_writable($dir . '/'))
-				$package_ftp->chmod($ftp_file, 0777);
-			$package_ftp->unlink($ftp_file);
+			{
+							$package_ftp->chmod($ftp_file, 0777);
+			}
+			$package_ftp->unlink($ftp_file);
 		}
 
 		return;
@@ -1543,14 +1754,18 @@ 
 			$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
 
 			if (!is_writable($dir . '/'))
-				$package_ftp->chmod($ftp_file, 0777);
+			{
+							$package_ftp->chmod($ftp_file, 0777);
+			}
 
 			$package_ftp->unlink($ftp_file);
 		}
 		else
 		{
 			if (!is_writable($dir))
-				elk_chmod($dir, 0777);
+			{
+							elk_chmod($dir, 0777);
+			}
 
 			@rmdir($dir);
 		}
@@ -1578,9 +1793,12 @@ 
 		if (!is_writable($strPath) && $mode !== false)
 		{
 			if (isset($package_ftp))
-				$package_ftp->chmod(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')), $mode);
-			else
-				elk_chmod($strPath, $mode);
+			{
+							$package_ftp->chmod(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')), $mode);
+			}
+			else {
+							elk_chmod($strPath, $mode);
+			}
 		}
 
 		// See if we can open it for access, return the result
@@ -1590,26 +1808,34 @@ 
 			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;
+	{
+			return false;
+	}
 
 	// Is the dir writable and do we have permission to attempt to make it so
 	if (!is_writable(dirname($strPath)) && $mode !== false)
 	{
 		if (isset($package_ftp))
-			$package_ftp->chmod(dirname(strtr($strPath, array($_SESSION['pack_ftp']['root'] => ''))), $mode);
-		else
-			elk_chmod(dirname($strPath), $mode);
+		{
+					$package_ftp->chmod(dirname(strtr($strPath, array($_SESSION['pack_ftp']['root'] => ''))), $mode);
+		}
+		else {
+					elk_chmod(dirname($strPath), $mode);
+		}
 	}
 
 	// Return an ftp control if using FTP
 	if ($mode !== false && isset($package_ftp))
-		return $package_ftp->create_dir(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')));
+	{
+			return $package_ftp->create_dir(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')));
+	}
 	// Can't change the mode so just return the current availability
 	elseif ($mode === false)
 	{
@@ -1619,8 +1845,9 @@ 
 			closedir($test);
 			return true;
 		}
-		else
-			return false;
+		else {
+					return false;
+		}
 	}
 	// Only one choice left and thats to try and make a directory
 	else
@@ -1634,8 +1861,9 @@ 
 			closedir($test);
 			return true;
 		}
-		else
-			return false;
+		else {
+					return false;
+		}
 	}
 }
 
@@ -1653,39 +1881,58 @@ 
 	global $package_ftp;
 
 	if (!file_exists($destination) || !is_writable($destination))
-		mktree($destination, 0755);
+	{
+			mktree($destination, 0755);
+	}
 
 	if (!is_writable($destination))
-		mktree($destination, 0777);
+	{
+			mktree($destination, 0777);
+	}
 
 	$current_dir = opendir($source);
 	if ($current_dir === false)
-		return;
+	{
+			return;
+	}
 
 	while ($entryname = readdir($current_dir))
 	{
 		if (in_array($entryname, array('.', '..')))
-			continue;
+		{
+					continue;
+		}
 
 		if (isset($package_ftp))
-			$ftp_file = strtr($destination . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+		{
+					$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);
+			{
+							$package_ftp->create_file($ftp_file);
+			}
 			elseif (!file_exists($destination . '/' . $entryname))
-				@touch($destination . '/' . $entryname);
+			{
+							@touch($destination . '/' . $entryname);
+			}
 		}
 
 		package_chmod($destination . '/' . $entryname);
 
 		if (is_dir($source . '/' . $entryname))
-			copytree($source . '/' . $entryname, $destination . '/' . $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);
+		{
+					package_put_contents($destination . '/' . $entryname, package_get_contents($source . '/' . $entryname));
+		}
+		else {
+					copy($source . '/' . $entryname, $destination . '/' . $entryname);
+		}
 	}
 
 	closedir($current_dir);
@@ -1705,21 +1952,28 @@ 
 
 	$dir = @dir($path . $sub_path);
 	if (!$dir)
-		return array();
+	{
+			return array();
+	}
 
 	while ($entry = $dir->read())
 	{
 		if ($entry == '.' || $entry == '..')
-			continue;
+		{
+					continue;
+		}
 
 		if (is_dir($path . $sub_path . '/' . $entry))
-			$data = array_merge($data, listtree($path, $sub_path . '/' . $entry));
-		else
-			$data[] = array(
+		{
+					$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();
 
@@ -1777,7 +2031,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;
+			{
+							$real_filename = BOARDDIR . '/' . $filename;
+			}
 
 			if (strpos($real_filename, $theme['theme_dir']) === 0)
 			{
@@ -1797,7 +2053,9 @@ 
 		{
 			// Default is getting done anyway, so no need for involvement here.
 			if ($id == 1)
-				continue;
+			{
+							continue;
+			}
 
 			// For every template, do we want it? Yea, no, maybe?
 			foreach ($template_changes[1] as $index => $template_file)
@@ -1821,7 +2079,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]];
+		{
+					$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)
@@ -1856,10 +2116,13 @@ 
 			}
 			// Okay, we're creating this file then...?
 			elseif (!file_exists($working_file))
-				$working_data = '';
+			{
+							$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',
@@ -1881,7 +2144,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(
+				{
+									$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',
@@ -1890,6 +2154,7 @@ 
 						'preg_search' => '',
 						'preg_replace' => '',
 					);
+				}
 
 				// At least one search should be defined.
 				if (empty($actual_operation['searches']))
@@ -1914,12 +2179,14 @@ 
 						if ($search['is_reg_exp'])
 						{
 							if ($actual_operation['error'] === 'fatal')
-								$actions[] = array(
+							{
+															$actions[] = array(
 									'type' => 'failure',
 									'filename' => $working_file,
 									'search' => $search['search'],
 									'is_custom' => $theme > 1 ? $theme : 0,
 								);
+							}
 
 							// Continue to the next operation.
 							continue 2;
@@ -1927,16 +2194,22 @@ 
 
 						// The replacement is now the search subject...
 						if ($search['position'] === 'replace' || $search['position'] === 'end')
-							$actual_operation['searches'][$i]['search'] = $search['add'];
+						{
+													$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'];
+							{
+															$actual_operation['searches'][$i]['search'] .= $search['add'];
+							}
 							elseif ($search['position'] === 'after')
-								$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+							{
+															$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+							}
 						}
 
 						// ...and the search subject is now the replacement.
@@ -1965,7 +2238,9 @@ 
 				{
 					// Not much needed if the search subject is already a regexp.
 					if ($search['is_reg_exp'])
-						$actual_operation['searches'][$i]['preg_search'] = $search['search'];
+					{
+											$actual_operation['searches'][$i]['preg_search'] = $search['search'];
+					}
 					else
 					{
 						// Make the search subject fit into a regular expression.
@@ -1973,7 +2248,9 @@ 
 
 						// 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']);
+						{
+													$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!!)
@@ -2048,7 +2325,9 @@ 
 
 					// Replace it into nothing? That's not an option...unless it's an undoing end.
 					if ($search['add'] === '' && ($search['position'] !== 'end' || !$undo))
-						continue;
+					{
+											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);
@@ -2074,21 +2353,28 @@ 
 			package_chmod($working_file);
 
 			if ((file_exists($working_file) && !is_writable($working_file)) || (!file_exists($working_file) && !is_writable(dirname($working_file))))
-				$actions[] = array(
+			{
+							$actions[] = array(
 					'type' => 'chmod',
 					'filename' => $working_file
 				);
+			}
 
 			if (basename($working_file) == 'Settings_bak.php')
-				continue;
+			{
+							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 . '~');
+				{
+									@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.
@@ -2127,16 +2413,22 @@ 
 
 		// 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;
+		{
+					$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];
-}
+	{
+			return file_get_contents($filename);
+	}
+	else {
+			return $package_cache[$filename];
+	}
+	}
 
 /**
  * Writes data to a file, almost exactly like the file_put_contents() function.
@@ -2162,18 +2454,27 @@ 
 		$mem_check = detectServer()->setMemoryLimit('128M');
 
 		if (!empty($modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false)
-			$package_cache = array();
-		else
-			$package_cache = false;
+		{
+					$package_cache = array();
+		}
+		else {
+					$package_cache = false;
+		}
 	}
 
 	if (isset($package_ftp))
-		$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+	{
+			$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+	}
 
 	if (!file_exists($filename) && isset($package_ftp))
-		$package_ftp->create_file($ftp_file);
+	{
+			$package_ftp->create_file($ftp_file);
+	}
 	elseif (!file_exists($filename))
-		@touch($filename);
+	{
+			@touch($filename);
+	}
 
 	package_chmod($filename);
 
@@ -2183,13 +2484,17 @@ 
 
 		// We should show an error message or attempt a rollback, no?
 		if (!$fp)
-			return false;
+		{
+					return false;
+		}
 
 		fwrite($fp, $data);
 		fclose($fp);
 	}
 	elseif (strpos($filename, 'packages/') !== false || $package_cache === false)
-		return strlen($data);
+	{
+			return strlen($data);
+	}
 	else
 	{
 		$package_cache[$filename] = $data;
@@ -2197,7 +2502,9 @@ 
 		// Permission denied, eh?
 		$fp = @fopen($filename, 'r+');
 		if (!$fp)
-			return false;
+		{
+					return false;
+		}
 		fclose($fp);
 	}
 
@@ -2216,18 +2523,26 @@ 
 	static $text_filetypes = array('php', 'txt', '.js', 'css', 'vbs', 'tml', 'htm');
 
 	if (empty($package_cache))
-		return;
+	{
+			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'] => ''));
+		{
+					$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		}
 
 		if (!file_exists($filename) && isset($package_ftp))
-			$package_ftp->create_file($ftp_file);
+		{
+					$package_ftp->create_file($ftp_file);
+		}
 		elseif (!file_exists($filename))
-			@touch($filename);
+		{
+					@touch($filename);
+		}
 
 		$result = package_chmod($filename);
 
@@ -2279,7 +2594,9 @@ 
 	global $package_ftp;
 
 	if (file_exists($filename) && is_writable($filename) && $perm_state == 'writable')
-		return true;
+	{
+			return true;
+	}
 
 	// Start off checking without FTP.
 	if (!isset($package_ftp) || $package_ftp === false)
@@ -2313,23 +2630,34 @@ 
 					@touch($chmod_file);
 					elk_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')
-				elk_chmod($chmod_file, $perm_state == 'execute' ? 0755 : 0644);
+			{
+							elk_chmod($chmod_file, $perm_state == 'execute' ? 0755 : 0644);
+			}
 			else
 			{
 				if (!@is_writable($chmod_file))
-					elk_chmod($chmod_file, 0755);
+				{
+									elk_chmod($chmod_file, 0755);
+				}
 				if (!@is_writable($chmod_file))
-					elk_chmod($chmod_file, 0777);
+				{
+									elk_chmod($chmod_file, 0777);
+				}
 				if (!@is_writable(dirname($chmod_file)))
-					elk_chmod($chmod_file, 0755);
+				{
+									elk_chmod($chmod_file, 0755);
+				}
 				if (!@is_writable(dirname($chmod_file)))
-					elk_chmod($chmod_file, 0777);
+				{
+									elk_chmod($chmod_file, 0777);
+				}
 			}
 
 			// The ultimate writable test.
@@ -2339,19 +2667,26 @@ 
 				if (@is_writable($chmod_file) && $fp)
 				{
 					if (!is_dir($chmod_file))
-						fclose($fp);
-					else
-						closedir($fp);
+					{
+											fclose($fp);
+					}
+					else {
+											closedir($fp);
+					}
 
 					// It worked!
 					if ($track_change)
-						$_SESSION['pack_ftp']['original_perms'][$chmod_file] = $file_permissions;
+					{
+											$_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]);
+			{
+							unset($_SESSION['pack_ftp']['original_perms'][$chmod_file]);
+			}
 		}
 
 		// If we're here we're a failure.
@@ -2371,8 +2706,9 @@ 
 			$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')
 		{
@@ -2381,20 +2717,28 @@ 
 		else
 		{
 			if (!@is_writable($filename))
-				$package_ftp->chmod($ftp_file, 0777);
+			{
+							$package_ftp->chmod($ftp_file, 0777);
+			}
 			if (!@is_writable(dirname($filename)))
-				$package_ftp->chmod(dirname($ftp_file), 0777);
+			{
+							$package_ftp->chmod(dirname($ftp_file), 0777);
+			}
 		}
 
 		if (@is_writable($filename))
 		{
 			if ($track_change)
-				$_SESSION['pack_ftp']['original_perms'][$filename] = $file_permissions;
+			{
+							$_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]);
+		{
+					unset($_SESSION['pack_ftp']['original_perms'][$filename]);
+		}
 	}
 
 	// Oh dear, we failed if we get here.
@@ -2414,10 +2758,14 @@ 
 
 	$salt = session_id();
 	while (strlen($salt) < $n)
-		$salt .= session_id();
+	{
+			$salt .= session_id();
+	}
 
 	for ($i = 0; $i < $n; $i++)
-		$pass[$i] = chr(ord($pass[$i]) ^ (ord($salt[$i]) - 32));
+	{
+			$pass[$i] = chr(ord($pass[$i]) ^ (ord($salt[$i]) - 32));
+	}
 
 	return $pass;
 }
@@ -2441,7 +2789,9 @@ 
 	foreach ($base_files as $file)
 	{
 		if (file_exists(BOARDDIR . '/' . $file))
-			$files[$use_relative_paths ? $file : realpath(BOARDDIR . '/' . $file)] = BOARDDIR . '/' . $file;
+		{
+					$files[$use_relative_paths ? $file : realpath(BOARDDIR . '/' . $file)] = BOARDDIR . '/' . $file;
+		}
 	}
 
 	// Root directory where most of our files reside
@@ -2461,7 +2811,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$dirs[$row['value']] = $use_relative_paths ? 'themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+	{
+			$dirs[$row['value']] = $use_relative_paths ? 'themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+	}
 	$db->free_result($request);
 
 	try
@@ -2477,10 +2829,14 @@ 
 			foreach ($iter as $entry => $dir)
 			{
 				if ($dir->isDir())
-					continue;
+				{
+									continue;
+				}
 
 				if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~)$~', $entry) != 0)
-					continue;
+				{
+									continue;
+				}
 
 				$files[$use_relative_paths ? str_replace(realpath(BOARDDIR), '', $entry) : $entry] = $entry;
 			}
@@ -2488,10 +2844,14 @@ 
 
 		// Make sure we have a backup directory and its writable
 		if (!file_exists(BOARDDIR . '/packages/backups'))
-			mktree(BOARDDIR . '/packages/backups', 0777);
+		{
+					mktree(BOARDDIR . '/packages/backups', 0777);
+		}
 
 		if (!is_writable(BOARDDIR . '/packages/backups'))
-			package_chmod(BOARDDIR . '/packages/backups');
+		{
+					package_chmod(BOARDDIR . '/packages/backups');
+		}
 
 		// Name the output file, yyyy-mm-dd_before_package_name.tar.gz
 		$output_file = BOARDDIR . '/packages/backups/' . Util::strftime('%Y-%m-%d_') . preg_replace('~[$\\\\/:<>|?*"\']~', '', $id);
@@ -2501,11 +2861,14 @@ 
 		{
 			$i = 2;
 			while (file_exists($output_file . '_' . $i . $output_ext . '.gz'))
-				$i++;
+			{
+							$i++;
+			}
 			$output_file = $output_file . '_' . $i . $output_ext;
 		}
-		else
-			$output_file .= $output_ext;
+		else {
+					$output_file .= $output_ext;
+		}
 
 		// Buy some more time so we have enough to create this archive
 		detectServer()->setTimeLimit(300);
@@ -2555,13 +2918,17 @@ 
 
 	// An FTP url. We should try connecting and RETRieving it...
 	if (empty($match[1]))
-		return false;
+	{
+			return false;
+	}
 	elseif ($match[1] == 'ftp')
 	{
 		// Establish a connection and attempt to enable passive mode.
 		$ftp = new Ftp_Connection(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
 		if ($ftp->error !== false || !$ftp->passive())
-			return false;
+		{
+					return false;
+		}
 
 		// I want that one *points*!
 		fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n");
@@ -2569,14 +2936,18 @@ 
 		// Since passive mode worked (or we would have returned already!) open the connection.
 		$fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $err, $err, 5);
 		if (!$fp)
-			return false;
+		{
+					return false;
+		}
 
 		// The server should now say something in acknowledgement.
 		$ftp->check_response(150);
 
 		$data = '';
 		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		{
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// All done, right?  Good.
@@ -2591,21 +2962,28 @@ 
 
 		// no errors and a 200 result, then we have a good dataset, well we at least have data ;)
 		if ($fetch_data->result('code') == 200 && !$fetch_data->result('error'))
-			$data = $fetch_data->result('body');
-		else
-			return false;
+		{
+					$data = $fetch_data->result('body');
+		}
+		else {
+					return false;
+		}
 	}
 	// This is more likely; a standard HTTP URL.
 	elseif (isset($match[1]) && $match[1] == 'http')
 	{
 		if ($keep_alive && $match[3] == $keep_alive_dom)
-			$fp = $keep_alive_fp;
+		{
+					$fp = $keep_alive_fp;
+		}
 		if (empty($fp))
 		{
 			// Open the socket on the port we want...
 			$fp = @fsockopen(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? ($match[2] ? 443 : 80) : $match[5], $err, $err, 5);
 			if (!$fp)
-				return false;
+			{
+							return false;
+			}
 		}
 
 		if ($keep_alive)
@@ -2621,9 +2999,12 @@ 
 			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 			fwrite($fp, 'User-Agent: PHP/ELK' . "\r\n");
 			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n");
-			else
-				fwrite($fp, 'Connection: close' . "\r\n\r\n");
+			{
+							fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n");
+			}
+			else {
+							fwrite($fp, 'Connection: close' . "\r\n\r\n");
+			}
 		}
 		else
 		{
@@ -2631,9 +3012,12 @@ 
 			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 			fwrite($fp, 'User-Agent: PHP/ELK' . "\r\n");
 			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n");
-			else
-				fwrite($fp, 'Connection: close' . "\r\n");
+			{
+							fwrite($fp, 'Connection: Keep-Alive' . "\r\n");
+			}
+			else {
+							fwrite($fp, 'Connection: close' . "\r\n");
+			}
 			fwrite($fp, 'Content-Type: application/x-www-form-urlencoded' . "\r\n");
 			fwrite($fp, 'Content-Length: ' . strlen($post_data) . "\r\n\r\n");
 			fwrite($fp, $post_data);
@@ -2646,28 +3030,38 @@ 
 		{
 			$location = '';
 			while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
-				if (strpos($header, 'Location:') !== false)
+			{
+							if (strpos($header, 'Location:') !== false)
 					$location = trim(substr($header, strpos($header, ':') + 1));
+			}
 
 			if (empty($location))
-				return false;
+			{
+							return false;
+			}
 			else
 			{
 				if (!$keep_alive)
-					fclose($fp);
+				{
+									fclose($fp);
+				}
 				return fetch_web_data($location, $post_data, $keep_alive, $redirection_level + 1);
 			}
 		}
 
 		// Make sure we get a 200 OK.
 		elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0)
-			return false;
+		{
+					return false;
+		}
 
 		// Skip the headers...
 		while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
 		{
 			if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0)
-				$content_length = $match[1];
+			{
+							$content_length = $match[1];
+			}
 			elseif (preg_match('~connection:\s*close~i', $header) != 0)
 			{
 				$keep_alive_dom = null;
@@ -2681,16 +3075,22 @@ 
 		if (isset($content_length))
 		{
 			while (!feof($fp) && strlen($data) < $content_length)
-				$data .= fread($fp, $content_length - strlen($data));
+			{
+							$data .= fread($fp, $content_length - strlen($data));
+			}
 		}
 		else
 		{
 			while (!feof($fp))
-				$data .= fread($fp, 4096);
+			{
+							$data .= fread($fp, 4096);
+			}
 		}
 
 		if (!$keep_alive)
-			fclose($fp);
+		{
+					fclose($fp);
+		}
 	}
 	else
 	{
@@ -2727,7 +3127,9 @@ 
 	);
 
 	if (empty($id))
-		return $result;
+	{
+			return $result;
+	}
 
 	// See if it is installed?
 	$request = $db->query('', '
@@ -2812,7 +3214,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_row($request))
-		list ($version) = $row;
+	{
+			list ($version) = $row;
+	}
 	$db->free_result($request);
 
 	return $version;
@@ -2884,11 +3288,15 @@ 
 	// Know addon servers
 	$servers = Util::unserialize($modSettings['authorized_package_servers']);
 	if (empty($servers))
-		return false;
+	{
+			return false;
+	}
 
 	foreach ($servers as $server)
-		if (preg_match('~^' . preg_quote($server) . '~', $remote_url) == 0)
+	{
+			if (preg_match('~^' . preg_quote($server) . '~', $remote_url) == 0)
 			return true;
+	}
 
 	return false;
 }
@@ -2923,9 +3331,13 @@ 
 
 	// Make sure we have a form of 0777 or '777' or '0777' so its safe for intval '8'
 	if (($mode % 10) >= 8)
-		$mode = decoct($mode);
+	{
+			$mode = decoct($mode);
+	}
 	if ($mode == decoct(octdec($mode)))
-		$result = @chmod($file, intval($mode, 8));
+	{
+			$result = @chmod($file, intval($mode, 8));
+	}
 
 	return $result;
 }