SimpleMachines / SMF2.1

Sources/Subs-Package.php

Braces +853 added lines, -669 removed lines

@@ -16,8 +16,9 @@ 
  * @version 2.1 Beta 3
  */
 
-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()}.
@@ -254,65 +279,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)
 	{
 		return false;
 	}
@@ -334,13 +368,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();
 
@@ -355,8 +391,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)
@@ -378,68 +415,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.
@@ -451,14 +499,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);
@@ -493,8 +543,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'];
 
@@ -529,19 +580,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?
@@ -549,10 +602,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.
@@ -560,8 +614,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]');
 
@@ -580,8 +635,9 @@ 
 		}
 	}
 
-	if (!isset($package['type']))
-		$package['type'] = 'modification';
+	if (!isset($package['type'])) {
+			$package['type'] = 'modification';
+	}
 
 	return $package;
 }
@@ -634,15 +690,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';
@@ -758,8 +813,7 @@ 
 
 			$context['sub_template'] = 'show_list';
 			$context['default_list'] = 'restore_file_permissions';
-		}
-		else
+		} else
 		{
 			unset($listOptions['columns']['result']);
 		}
@@ -769,12 +823,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(
@@ -812,11 +868,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'],
@@ -828,8 +885,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;
@@ -842,12 +900,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;
@@ -864,19 +923,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(
@@ -889,8 +950,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?
@@ -923,40 +985,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)
 		{
@@ -968,26 +1038,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)
 		{
@@ -1001,13 +1074,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;
@@ -1019,8 +1095,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']);
@@ -1042,19 +1117,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'),
@@ -1066,23 +1143,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'],
@@ -1093,8 +1171,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);
 	}
@@ -1122,16 +1201,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']))
@@ -1139,8 +1220,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);
@@ -1150,16 +1232,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!
@@ -1168,8 +1252,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('*');
@@ -1198,12 +1283,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'));
@@ -1218,9 +1303,9 @@ 
 					{
 						$context[$type][] = 'default';
 						continue;
+					} else {
+											$context[$type]['selected'] = 'default';
 					}
-					else
-						$context[$type]['selected'] = 'default';
 				}
 			}
 
@@ -1230,9 +1315,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,
@@ -1247,8 +1332,7 @@ 
 			);
 
 			continue;
-		}
-		elseif ($actionType == 'hook')
+		} elseif ($actionType == 'hook')
 		{
 			$return[] = array(
 				'type' => $actionType,
@@ -1260,16 +1344,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(
@@ -1281,8 +1365,7 @@ 
 				'title' => $action->fetch('.'),
 			);
 			continue;
-		}
-		elseif ($actionType == 'requires')
+		} elseif ($actionType == 'requires')
 		{
 			$return[] = array(
 				'type' => $actionType,
@@ -1291,14 +1374,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(
@@ -1312,8 +1393,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']);
@@ -1322,10 +1402,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.)
@@ -1334,22 +1415,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',
@@ -1357,36 +1439,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',
@@ -1394,19 +1478,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',
@@ -1414,30 +1499,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',
@@ -1448,8 +1533,9 @@ 
 	}
 
 	// Only testing - just return a list of things to be done.
-	if ($testing_only)
-		return $return;
+	if ($testing_only) {
+			return $return;
+	}
 
 	umask(0);
 
@@ -1457,78 +1543,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']))
@@ -1537,16 +1626,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;
+					}
 		}
 	}
 
@@ -1568,8 +1659,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)));
@@ -1578,16 +1670,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;
@@ -1610,15 +1705,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)
@@ -1626,12 +1723,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;
@@ -1671,12 +1770,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)
@@ -1686,13 +1787,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;
+			}
 		}
 	}
 
@@ -1726,11 +1829,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);
 }
@@ -1747,8 +1852,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)
@@ -1756,8 +1862,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);
 		}
 
@@ -1766,26 +1873,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);
 			}
 		}
@@ -1798,14 +1907,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);
 		}
 	}
@@ -1828,10 +1938,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);
@@ -1839,36 +1950,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);
@@ -1876,9 +1988,9 @@ 
 		{
 			closedir($test);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 
@@ -1894,39 +2006,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);
@@ -1944,21 +2063,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();
 
@@ -2013,8 +2135,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)
 			{
@@ -2033,8 +2156,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)
@@ -2057,8 +2181,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)
@@ -2092,11 +2217,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',
@@ -2117,8 +2244,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',
@@ -2127,6 +2254,7 @@ 
 						'preg_search' => '',
 						'preg_replace' => '',
 					);
+				}
 
 				// At least one search should be defined.
 				if (empty($actual_operation['searches']))
@@ -2151,30 +2279,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.
@@ -2202,16 +2332,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!!)
@@ -2237,8 +2368,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';
@@ -2285,8 +2415,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);
@@ -2311,22 +2442,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.
@@ -2393,8 +2527,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;
 		}
 
@@ -2411,11 +2546,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);
+			}
 		}
 	}
 
@@ -2428,8 +2565,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)
@@ -2465,32 +2603,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;
@@ -2509,10 +2651,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;
 					}
 			}
@@ -2526,8 +2669,7 @@ 
 					'type' => 'opened',
 					'filename' => $working_file
 				);
-			}
-			else
+			} else
 			{
 				$actions[] = array(
 					'type' => 'missing',
@@ -2563,11 +2705,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 ;).
 		}
 
@@ -2630,29 +2774,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',
@@ -2678,17 +2825,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.
@@ -2712,19 +2861,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);
 
@@ -2733,22 +2885,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);
 	}
 
@@ -2766,19 +2919,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);
 
@@ -2832,8 +2988,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)
@@ -2855,8 +3012,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')
@@ -2866,24 +3022,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.
@@ -2892,20 +3052,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.
@@ -2924,31 +3086,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.
@@ -2966,11 +3130,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;
 }
@@ -2989,8 +3155,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(
@@ -3007,8 +3174,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
@@ -3023,11 +3191,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;
 			}
@@ -3035,26 +3205,30 @@ 
 		$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';
 
 		if (file_exists($output_file . $output_ext))
 		{
 			$i = 2;
-			while (file_exists($output_file . '_' . $i . $output_ext))
-				$i++;
+			while (file_exists($output_file . '_' . $i . $output_ext)) {
+							$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);
@@ -3066,8 +3240,7 @@ 
 		 */
 		unset($a);
 		unlink($output_file);
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		log_error($e->getMessage(), 'backup');
 
@@ -3099,32 +3272,35 @@ 
 	preg_match('~^(http|ftp)(s)?://([^/:]+)(:(\d+))?(.+)$~', $url, $match);
 
 	// An FTP url. We should try connecting and RETRieving it...
-	if (empty($match[1]))
-		return false;
-	elseif ($match[1] == 'ftp')
+	if (empty($match[1])) {
+			return false;
+	} elseif ($match[1] == 'ftp')
 	{
 		// Include the file containing the ftp_connection class.
 		require_once($sourcedir . '/Class-Package.php');
 
 		// 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;
+		if ($ftp->error !== false || !$ftp->passive()) {
+					return false;
+		}
 
 		// I want that one *points*!
 		fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n");
 
 		// 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;
+		if (!$fp) {
+					return false;
+		}
 
 		// The server should now say something in acknowledgement.
 		$ftp->check_response(150);
 
 		$data = '';
-		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		while (!feof($fp)) {
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// All done, right?  Good.
@@ -3141,22 +3317,25 @@ 
 		$fetch_data->get_url_data($url, $post_data);
 
 		// 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;
+		if ($fetch_data->result('code') == 200 && !$fetch_data->result('error')) {
+					$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;
+		if ($keep_alive && $match[3] == $keep_alive_dom) {
+					$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;
+			if (!$fp) {
+							return false;
+			}
 		}
 
 		if ($keep_alive)
@@ -3171,20 +3350,21 @@ 
 			fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
 			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 			fwrite($fp, 'User-Agent: PHP/SMF' . "\r\n");
-			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n");
-			else
-				fwrite($fp, 'Connection: close' . "\r\n\r\n");
-		}
-		else
+			if ($keep_alive) {
+							fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n");
+			} else {
+							fwrite($fp, 'Connection: close' . "\r\n\r\n");
+			}
+		} else
 		{
 			fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
 			fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
 			fwrite($fp, 'User-Agent: PHP/SMF' . "\r\n");
-			if ($keep_alive)
-				fwrite($fp, 'Connection: Keep-Alive' . "\r\n");
-			else
-				fwrite($fp, 'Connection: close' . "\r\n");
+			if ($keep_alive) {
+							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);
@@ -3197,30 +3377,33 @@ 
 		{
 			$header = '';
 			$location = '';
-			while (!feof($fp) && trim($header = fgets($fp, 4096)) != '')
-				if (strpos($header, 'Location:') !== false)
+			while (!feof($fp) && trim($header = fgets($fp, 4096)) != '') {
+							if (strpos($header, 'Location:') !== false)
 					$location = trim(substr($header, strpos($header, ':') + 1));
+			}
 
-			if (empty($location))
-				return false;
-			else
+			if (empty($location)) {
+							return false;
+			} else
 			{
-				if (!$keep_alive)
-					fclose($fp);
+				if (!$keep_alive) {
+									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;
+		elseif (preg_match('~^HTTP/\S+\s+20[01]~i', $response) === 0) {
+					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];
-			elseif (preg_match('~connection:\s*close~i', $header) != 0)
+			if (preg_match('~content-length:\s*(\d+)~i', $header, $match) != 0) {
+							$content_length = $match[1];
+			} elseif (preg_match('~connection:\s*close~i', $header) != 0)
 			{
 				$keep_alive_dom = null;
 				$keep_alive = false;
@@ -3232,19 +3415,20 @@ 
 		$data = '';
 		if (isset($content_length))
 		{
-			while (!feof($fp) && strlen($data) < $content_length)
-				$data .= fread($fp, $content_length - strlen($data));
-		}
-		else
+			while (!feof($fp) && strlen($data) < $content_length) {
+							$data .= fread($fp, $content_length - strlen($data));
+			}
+		} else
 		{
-			while (!feof($fp))
-				$data .= fread($fp, 4096);
+			while (!feof($fp)) {
+							$data .= fread($fp, 4096);
+			}
 		}
 
-		if (!$keep_alive)
-			fclose($fp);
-	}
-	else
+		if (!$keep_alive) {
+					fclose($fp);
+		}
+	} else
 	{
 		// Umm, this shouldn't happen?
 		trigger_error('fetch_web_data(): Bad URL', E_USER_NOTICE);