SimpleMachines / SMF2.1

Sources/Subs-List.php

Braces +85 added lines, -59 removed lines

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

Sources/Subs-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, $smcFunc;
 
 	// 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 === false)
-		return array();
+	if ($script === false) {
+			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);
 }
@@ -1746,8 +1851,9 @@ 
 {
 	global $package_ftp;
 
-	if (!file_exists($dir))
-		return;
+	if (!file_exists($dir)) {
+			return;
+	}
 
 	$current_dir = @opendir($dir);
 	if ($current_dir == false)
@@ -1755,8 +1861,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);
 		}
 
@@ -1765,26 +1872,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);
 			}
 		}
@@ -1797,14 +1906,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);
 		}
 	}
@@ -1826,10 +1936,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);
@@ -1837,36 +1948,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);
@@ -1874,9 +1986,9 @@ 
 		{
 			closedir($test);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
 
@@ -1891,39 +2003,46 @@ 
 {
 	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);
@@ -1941,21 +2060,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();
 
@@ -2010,8 +2132,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)
 			{
@@ -2030,8 +2153,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)
@@ -2054,8 +2178,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)
@@ -2089,11 +2214,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',
@@ -2114,8 +2241,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',
@@ -2124,6 +2251,7 @@ 
 						'preg_search' => '',
 						'preg_replace' => '',
 					);
+				}
 
 				// At least one search should be defined.
 				if (empty($actual_operation['searches']))
@@ -2148,30 +2276,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.
@@ -2199,16 +2329,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!!)
@@ -2234,8 +2365,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';
@@ -2282,8 +2412,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);
@@ -2308,22 +2439,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.
@@ -2390,8 +2524,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;
 		}
 
@@ -2408,11 +2543,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);
+			}
 		}
 	}
 
@@ -2427,8 +2564,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)
@@ -2464,32 +2602,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;
@@ -2508,10 +2650,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;
 					}
 			}
@@ -2525,8 +2668,7 @@ 
 					'type' => 'opened',
 					'filename' => $working_file
 				);
-			}
-			else
+			} else
 			{
 				$actions[] = array(
 					'type' => 'missing',
@@ -2562,11 +2704,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 ;).
 		}
 
@@ -2629,29 +2773,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',
@@ -2677,17 +2824,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.
@@ -2710,19 +2859,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);
 
@@ -2731,22 +2883,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);
 	}
 
@@ -2763,19 +2916,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);
 
@@ -2822,8 +2978,9 @@ 
 {
 	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)
@@ -2845,8 +3002,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')
@@ -2856,24 +3012,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.
@@ -2882,20 +3042,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.
@@ -2914,31 +3076,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.
@@ -2956,11 +3120,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;
 }
@@ -2979,8 +3145,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(
@@ -2997,8 +3164,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
@@ -3013,11 +3181,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;
 			}
@@ -3025,26 +3195,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);
@@ -3056,8 +3230,7 @@ 
 		 */
 		unset($a);
 		unlink($output_file);
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		log_error($e->getMessage(), 'backup');
 
@@ -3089,32 +3262,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.
@@ -3131,22 +3307,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)
@@ -3161,20 +3340,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);
@@ -3187,30 +3367,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;
@@ -3222,19 +3405,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);

Sources/Help.php

Braces +29 added lines, -22 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Redirect to the user help ;).
@@ -95,12 +96,13 @@ 
 	);
 
 	// Have we got a localized one?
-	if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt'))
-		$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
-	elseif (file_exists($boarddir . '/agreement.txt'))
-		$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
-	else
-		$context['agreement'] = '';
+	if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) {
+			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
+	} elseif (file_exists($boarddir . '/agreement.txt')) {
+			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
+	} else {
+			$context['agreement'] = '';
+	}
 
 	// Nothing to show, so let's get out of here
 	if (empty($context['agreement']))
@@ -128,18 +130,21 @@ 
 {
 	global $txt, $helptxt, $context, $scripturl;
 
-	if (!isset($_GET['help']) || !is_string($_GET['help']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['help']) || !is_string($_GET['help'])) {
+			fatal_lang_error('no_access', false);
+	}
 
-	if (!isset($helptxt))
-		$helptxt = array();
+	if (!isset($helptxt)) {
+			$helptxt = array();
+	}
 
 	// Load the admin help language file and template.
 	loadLanguage('Help');
 
 	// Permission specific help?
-	if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp')
-		loadLanguage('ManagePermissions');
+	if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp') {
+			loadLanguage('ManagePermissions');
+	}
 
 	loadTemplate('Help');
 
@@ -154,16 +159,18 @@ 
 	$context['sub_template'] = 'popup';
 
 	// What help string should be used?
-	if (isset($helptxt[$_GET['help']]))
-		$context['help_text'] = $helptxt[$_GET['help']];
-	elseif (isset($txt[$_GET['help']]))
-		$context['help_text'] = $txt[$_GET['help']];
-	else
-		$context['help_text'] = $_GET['help'];
+	if (isset($helptxt[$_GET['help']])) {
+			$context['help_text'] = $helptxt[$_GET['help']];
+	} elseif (isset($txt[$_GET['help']])) {
+			$context['help_text'] = $txt[$_GET['help']];
+	} else {
+			$context['help_text'] = $_GET['help'];
+	}
 
 	// Does this text contain a link that we should fill in?
-	if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match))
-		$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
-}
+	if (preg_match('~%([0-9]+\$)?s\?~', $context['help_text'], $match)) {
+			$context['help_text'] = sprintf($context['help_text'], $scripturl, $context['session_id'], $context['session_var']);
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/CacheAPI-smf.php

Braces +36 added lines, -26 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -43,8 +44,9 @@ 
 	{
 		$supported = is_writable($this->cachedir);
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -61,11 +63,13 @@ 
 		{
 			// Work around Zend's opcode caching (PHP 5.5+), they would cache older files for a couple of seconds
 			// causing newer files to take effect a while later.
-			if (function_exists('opcache_invalidate'))
-				opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+			if (function_exists('opcache_invalidate')) {
+							opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+			}
 
-			if (function_exists('apc_delete_file'))
-				@apc_delete_file($cachedir . '/data_' . $key . '.php');
+			if (function_exists('apc_delete_file')) {
+							@apc_delete_file($cachedir . '/data_' . $key . '.php');
+			}
 
 			// php will cache file_exists et all, we can't 100% depend on its results so proceed with caution
 			@include($cachedir . '/data_' . $key . '.php');
@@ -89,16 +93,18 @@ 
 
 		// Work around Zend's opcode caching (PHP 5.5+), they would cache older files for a couple of seconds
 		// causing newer files to take effect a while later.
-		if (function_exists('opcache_invalidate'))
-			opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+		if (function_exists('opcache_invalidate')) {
+					opcache_invalidate($cachedir . '/data_' . $key . '.php', true);
+		}
 
-		if (function_exists('apc_delete_file'))
-			@apc_delete_file($cachedir . '/data_' . $key . '.php');
+		if (function_exists('apc_delete_file')) {
+					@apc_delete_file($cachedir . '/data_' . $key . '.php');
+		}
 
 		// Otherwise custom cache?
-		if ($value === null)
-			@unlink($cachedir . '/data_' . $key . '.php');
-		else
+		if ($value === null) {
+					@unlink($cachedir . '/data_' . $key . '.php');
+		} else
 		{
 			$cache_data = '<' . '?' . 'php if (!defined(\'SMF\')) die; if (' . (time() + $ttl) . ' < time()) $expired = true; else{$expired = false; $value = \'' . addcslashes($value, '\\\'') . '\';}' . '?' . '>';
 
@@ -109,9 +115,9 @@ 
 			{
 				@unlink($cachedir . '/data_' . $key . '.php');
 				return false;
+			} else {
+							return true;
 			}
-			else
-				return true;
 		}
 	}
 
@@ -123,15 +129,17 @@ 
 		$cachedir = $this->cachedir;
 
 		// No directory = no game.
-		if (!is_dir($cachedir))
-			return;
+		if (!is_dir($cachedir)) {
+					return;
+		}
 
 		// Remove the files in SMF's own disk cache, if any
 		$dh = opendir($cachedir);
 		while ($file = readdir($dh))
 		{
-			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type))
-				@unlink($cachedir . '/' . $file);
+			if ($file != '.' && $file != '..' && $file != 'index.php' && $file != '.htaccess' && (!$type || substr($file, 0, strlen($type)) == $type)) {
+							@unlink($cachedir . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -165,8 +173,9 @@ 
 		$config_vars[] = $txt['cache_smf_settings'];
 		$config_vars[] = array('cachedir', $txt['cachedir'], 'file', 'text', 36, 'cache_cachedir');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
@@ -187,10 +196,11 @@ 
 		global $cachedir;
 
 		// If its invalid, use SMF's.
-		if (is_null($dir) || !is_writable($dir))
-			$this->cachedir = $cachedir;
-		else
-			$this->cachedir = $dir;
+		if (is_null($dir) || !is_writable($dir)) {
+					$this->cachedir = $cachedir;
+		} else {
+					$this->cachedir = $dir;
+		}
 	}
 
 	/**

Sources/Reports.php

Braces +199 added lines, -148 removed lines

@@ -21,8 +21,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Handling function for generating reports.
@@ -69,14 +70,15 @@ 
 	);
 
 	$is_first = 0;
-	foreach ($context['report_types'] as $k => $temp)
-		$context['report_types'][$k] = array(
+	foreach ($context['report_types'] as $k => $temp) {
+			$context['report_types'][$k] = array(
 			'id' => $k,
 			'title' => isset($txt['gr_type_' . $k]) ? $txt['gr_type_' . $k] : $k,
 			'description' => isset($txt['gr_type_desc_' . $k]) ? $txt['gr_type_desc_' . $k] : null,
 			'function' => $temp,
 			'is_first' => $is_first++ == 0,
 		);
+	}
 
 	// If they haven't chosen a report type which is valid, send them off to the report type chooser!
 	if (empty($_REQUEST['rt']) || !isset($context['report_types'][$_REQUEST['rt']]))
@@ -102,8 +104,9 @@ 
 		$context['sub_template'] = $_REQUEST['st'];
 
 		// Are we disabling the other layers - print friendly for example?
-		if ($reportTemplates[$_REQUEST['st']]['layers'] !== null)
-			$context['template_layers'] = $reportTemplates[$_REQUEST['st']]['layers'];
+		if ($reportTemplates[$_REQUEST['st']]['layers'] !== null) {
+					$context['template_layers'] = $reportTemplates[$_REQUEST['st']]['layers'];
+		}
 	}
 
 	// Make the page title more descriptive.
@@ -151,8 +154,9 @@ 
 		)
 	);
 	$moderators = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$moderators[$row['id_board']][] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$moderators[$row['id_board']][] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get every moderator gruop.
@@ -164,8 +168,9 @@ 
 		)
 	);
 	$moderator_groups = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$moderator_groups[$row['id_board']][] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$moderator_groups[$row['id_board']][] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get all the possible membergroups!
@@ -176,8 +181,9 @@ 
 		)
 	);
 	$groups = array(-1 => $txt['guest_title'], 0 => $txt['full_member']);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -195,8 +201,9 @@ 
 		'moderator_groups' => $txt['board_moderator_groups'],
 		'groups' => $txt['board_groups'],
 	);
-	if (!empty($modSettings['deny_boards_access']))
-		$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+	if (!empty($modSettings['deny_boards_access'])) {
+			$boardSettings['disallowed_groups'] = $txt['board_disallowed_groups'];
+	}
 
 	// Do it in columns, it's just easier.
 	setKeys('cols');
@@ -222,8 +229,9 @@ 
 		newTable($row['name'], '', 'left', 'auto', 'left', 200, 'left');
 
 		$this_boardSettings = $boardSettings;
-		if (empty($row['redirect']))
-			unset($this_boardSettings['redirect']);
+		if (empty($row['redirect'])) {
+					unset($this_boardSettings['redirect']);
+		}
 
 		// First off, add in the side key.
 		addData($this_boardSettings);
@@ -250,10 +258,11 @@ 
 		$allowedGroups = explode(',', $row['member_groups']);
 		foreach ($allowedGroups as $key => $group)
 		{
-			if (isset($groups[$group]))
-				$allowedGroups[$key] = $groups[$group];
-			else
-				unset($allowedGroups[$key]);
+			if (isset($groups[$group])) {
+							$allowedGroups[$key] = $groups[$group];
+			} else {
+							unset($allowedGroups[$key]);
+			}
 		}
 		$boardData['groups'] = implode(', ', $allowedGroups);
 		if (!empty($modSettings['deny_boards_access']))
@@ -261,16 +270,18 @@ 
 			$disallowedGroups = explode(',', $row['deny_member_groups']);
 			foreach ($disallowedGroups as $key => $group)
 			{
-				if (isset($groups[$group]))
-					$disallowedGroups[$key] = $groups[$group];
-				else
-					unset($disallowedGroups[$key]);
+				if (isset($groups[$group])) {
+									$disallowedGroups[$key] = $groups[$group];
+				} else {
+									unset($disallowedGroups[$key]);
+				}
 			}
 			$boardData['disallowed_groups'] = implode(', ', $disallowedGroups);
 		}
 
-		if (empty($row['redirect']))
-			unset ($boardData['redirect']);
+		if (empty($row['redirect'])) {
+					unset ($boardData['redirect']);
+		}
 
 		// Next add the main data.
 		addData($boardData);
@@ -295,27 +306,31 @@ 
 
 	if (isset($_REQUEST['boards']))
 	{
-		if (!is_array($_REQUEST['boards']))
-			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $k => $dummy)
-			$_REQUEST['boards'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['boards'])) {
+					$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
+		}
+		foreach ($_REQUEST['boards'] as $k => $dummy) {
+					$_REQUEST['boards'][$k] = (int) $dummy;
+		}
 
 		$board_clause = 'id_board IN ({array_int:boards})';
+	} else {
+			$board_clause = '1=1';
 	}
-	else
-		$board_clause = '1=1';
 
 	if (isset($_REQUEST['groups']))
 	{
-		if (!is_array($_REQUEST['groups']))
-			$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
-		foreach ($_REQUEST['groups'] as $k => $dummy)
-			$_REQUEST['groups'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['groups'])) {
+					$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+		}
+		foreach ($_REQUEST['groups'] as $k => $dummy) {
+					$_REQUEST['groups'][$k] = (int) $dummy;
+		}
 
 		$group_clause = 'id_group IN ({array_int:groups})';
+	} else {
+			$group_clause = '1=1';
 	}
-	else
-		$group_clause = '1=1';
 
 	// Fetch all the board names.
 	$request = $smcFunc['db_query']('', '
@@ -369,12 +384,14 @@ 
 			'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
 		)
 	);
-	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
-	else
-		$member_groups = array('col' => '');
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$member_groups[$row['id_group']] = $row['group_name'];
+	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$member_groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
+	} else {
+			$member_groups = array('col' => '');
+	}
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$member_groups[$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that every group is represented - plus in rows!
@@ -411,12 +428,14 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['permission'], $disabled_permissions))
-			continue;
+		if (in_array($row['permission'], $disabled_permissions)) {
+					continue;
+		}
 
-		foreach ($boards as $id => $board)
-			if ($board['profile'] == $row['id_profile'])
+		foreach ($boards as $id => $board) {
+					if ($board['profile'] == $row['id_profile'])
 				$board_permissions[$id][$row['id_group']][$row['permission']] = $row['add_deny'];
+		}
 
 		// Make sure we get every permission.
 		if (!isset($permissions[$row['permission']]))
@@ -454,8 +473,9 @@ 
 			foreach ($member_groups as $id_group => $name)
 			{
 				// Don't overwrite the key column!
-				if ($id_group === 'col')
-					continue;
+				if ($id_group === 'col') {
+									continue;
+				}
 
 				$group_permissions = isset($groups[$id_group]) ? $groups[$id_group] : array();
 
@@ -477,16 +497,18 @@ 
 				}
 
 				// Now actually make the data for the group look right.
-				if (empty($curData[$id_group]))
-					$curData[$id_group] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
-				elseif ($curData[$id_group] == 1)
-					$curData[$id_group] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
-				else
-					$curData[$id_group] = 'x';
+				if (empty($curData[$id_group])) {
+									$curData[$id_group] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+				} elseif ($curData[$id_group] == 1) {
+									$curData[$id_group] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+				} else {
+									$curData[$id_group] = 'x';
+				}
 
 				// Embolden those permissions different from global (makes it a lot easier!)
-				if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM])
-					$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
+				if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM]) {
+									$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
+				}
 			}
 
 			// Now add the data for this permission.
@@ -516,15 +538,17 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (trim($row['member_groups']) == '')
-			$groups = array(1);
-		else
-			$groups = array_merge(array(1), explode(',', $row['member_groups']));
+		if (trim($row['member_groups']) == '') {
+					$groups = array(1);
+		} else {
+					$groups = array_merge(array(1), explode(',', $row['member_groups']));
+		}
 
-		if (trim($row['deny_member_groups']) == '')
-			$denyGroups = array();
-		else
-			$denyGroups = explode(',', $row['deny_member_groups']);
+		if (trim($row['deny_member_groups']) == '') {
+					$denyGroups = array();
+		} else {
+					$denyGroups = explode(',', $row['deny_member_groups']);
+		}
 
 		$boards[$row['id_board']] = array(
 			'id' => $row['id_board'],
@@ -548,8 +572,9 @@ 
 	);
 
 	// Add on the boards!
-	foreach ($boards as $board)
-		$mgSettings['board_' . $board['id']] = $board['name'];
+	foreach ($boards as $board) {
+			$mgSettings['board_' . $board['id']] = $board['name'];
+	}
 
 	// Add all the membergroup settings, plus we'll be adding in columns!
 	setKeys('cols', $mgSettings);
@@ -594,8 +619,9 @@ 
 			'icons' => ''
 		),
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$rows[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$rows[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	foreach ($rows as $row)
@@ -611,8 +637,9 @@ 
 		);
 
 		// Board permissions.
-		foreach ($boards as $board)
-			$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">' . $txt['board_perms_deny'] . '</span>' : 'x');
+		foreach ($boards as $board) {
+					$group['board_' . $board['id']] = in_array($row['id_group'], $board['groups']) ? '<span class="success">' . $txt['board_perms_allow'] . '</span>' : (!empty($modSettings['deny_boards_access']) && in_array($row['id_group'], $board['deny_groups']) ? '<span class="alert">' . $txt['board_perms_deny'] . '</span>' : 'x');
+		}
 
 		addData($group);
 	}
@@ -632,16 +659,18 @@ 
 
 	if (isset($_REQUEST['groups']))
 	{
-		if (!is_array($_REQUEST['groups']))
-			$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
-		foreach ($_REQUEST['groups'] as $k => $dummy)
-			$_REQUEST['groups'][$k] = (int) $dummy;
+		if (!is_array($_REQUEST['groups'])) {
+					$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+		}
+		foreach ($_REQUEST['groups'] as $k => $dummy) {
+					$_REQUEST['groups'][$k] = (int) $dummy;
+		}
 		$_REQUEST['groups'] = array_diff($_REQUEST['groups'], array(3));
 
 		$clause = 'id_group IN ({array_int:groups})';
+	} else {
+			$clause = 'id_group != {int:moderator_group}';
 	}
-	else
-		$clause = 'id_group != {int:moderator_group}';
 
 	// Get all the possible membergroups, except admin!
 	$request = $smcFunc['db_query']('', '
@@ -659,12 +688,14 @@ 
 			'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
 		)
 	);
-	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
-	else
-		$groups = array('col' => '');
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = $row['group_name'];
+	if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$groups = array('col' => '', -1 => $txt['membergroups_guests'], 0 => $txt['membergroups_members']);
+	} else {
+			$groups = array('col' => '');
+	}
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that every group is represented!
@@ -688,8 +719,9 @@ 
 		$disabled_permissions[] = 'calendar_edit_own';
 		$disabled_permissions[] = 'calendar_edit_any';
 	}
-	if (empty($modSettings['warning_settings']) || $modSettings['warning_settings'][0] == 0)
-		$disabled_permissions[] = 'issue_warning';
+	if (empty($modSettings['warning_settings']) || $modSettings['warning_settings'][0] == 0) {
+			$disabled_permissions[] = 'issue_warning';
+	}
 
 	call_integration_hook('integrate_reports_groupperm', array(&$disabled_permissions));
 
@@ -710,15 +742,17 @@ 
 	$curData = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (in_array($row['permission'], $disabled_permissions))
-			continue;
+		if (in_array($row['permission'], $disabled_permissions)) {
+					continue;
+		}
 
 		// If this is a new permission flush the last row.
 		if ($row['permission'] != $lastPermission)
 		{
 			// Send the data!
-			if ($lastPermission !== null)
-				addData($curData);
+			if ($lastPermission !== null) {
+							addData($curData);
+			}
 
 			// Add the permission name in the left column.
 			$curData = array('col' => isset($txt['group_perms_name_' . $row['permission']]) ? $txt['group_perms_name_' . $row['permission']] : $row['permission']);
@@ -727,10 +761,11 @@ 
 		}
 
 		// Good stuff - add the permission to the list!
-		if ($row['add_deny'])
-			$curData[$row['id_group']] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
-		else
-			$curData[$row['id_group']] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+		if ($row['add_deny']) {
+					$curData[$row['id_group']] = '<span style="color: darkgreen;">' . $txt['board_perms_allow'] . '</span>';
+		} else {
+					$curData[$row['id_group']] = '<span class="red">' . $txt['board_perms_deny'] . '</span>';
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -760,8 +795,9 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Get every moderator.
@@ -793,12 +829,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Either we don't have them as a moderator at all or at least not as a moderator of this board
-		if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']]))
-			$moderators[$row['id_member']][] = $row['id_board'];
+		if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']])) {
+					$moderators[$row['id_member']][] = $row['id_board'];
+		}
 
 		// We don't have them listed as a moderator yet
-		if (!array_key_exists($row['id_member'], $local_mods))
-			$local_mods[$row['id_member']] = $row['id_member'];
+		if (!array_key_exists($row['id_member'], $local_mods)) {
+					$local_mods[$row['id_member']] = $row['id_member'];
+		}
 	}
 
 	// Get a list of global moderators (i.e. members with moderation powers).
@@ -811,8 +849,9 @@ 
 	$allStaff = array_unique($allStaff);
 
 	// This is a bit of a cop out - but we're protecting their forum, really!
-	if (count($allStaff) > 300)
-		fatal_lang_error('report_error_too_many_staff');
+	if (count($allStaff) > 300) {
+			fatal_lang_error('report_error_too_many_staff');
+	}
 
 	// Get all the possible membergroups!
 	$request = $smcFunc['db_query']('', '
@@ -822,8 +861,9 @@ 
 		)
 	);
 	$groups = array(0 => $txt['full_member']);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	// All the fields we'll show.
@@ -864,19 +904,20 @@ 
 		);
 
 		// What do they moderate?
-		if (in_array($row['id_member'], $global_mods))
-			$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
-		elseif (isset($moderators[$row['id_member']]))
+		if (in_array($row['id_member'], $global_mods)) {
+					$staffData['moderates'] = '<em>' . $txt['report_staff_all_boards'] . '</em>';
+		} elseif (isset($moderators[$row['id_member']]))
 		{
 			// Get the names
-			foreach ($moderators[$row['id_member']] as $board)
-				if (isset($boards[$board]))
+			foreach ($moderators[$row['id_member']] as $board) {
+							if (isset($boards[$board]))
 					$staffData['moderates'][] = $boards[$board];
+			}
 
 			$staffData['moderates'] = implode(', ', $staffData['moderates']);
+		} else {
+					$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
 		}
-		else
-			$staffData['moderates'] = '<em>' . $txt['report_staff_no_boards'] . '</em>';
 
 		// Next add the main data.
 		addData($staffData);
@@ -904,8 +945,9 @@ 
 	global $context;
 
 	// Set the table count if needed.
-	if (empty($context['table_count']))
-		$context['table_count'] = 0;
+	if (empty($context['table_count'])) {
+			$context['table_count'] = 0;
+	}
 
 	// Create the table!
 	$context['tables'][$context['table_count']] = array(
@@ -955,16 +997,18 @@ 
 	global $context;
 
 	// No tables? Create one even though we are probably already in a bad state!
-	if (empty($context['table_count']))
-		newTable();
+	if (empty($context['table_count'])) {
+			newTable();
+	}
 
 	// Specific table?
-	if ($custom_table !== null && !isset($context['tables'][$custom_table]))
-		return false;
-	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	if ($custom_table !== null && !isset($context['tables'][$custom_table])) {
+			return false;
+	} elseif ($custom_table !== null) {
+			$table = $custom_table;
+	} else {
+			$table = $context['current_table'];
+	}
 
 	// If we have keys, sanitise the data...
 	if (!empty($context['keys']))
@@ -976,11 +1020,11 @@ 
 				'v' => empty($inc_data[$key]) ? $context['tables'][$table]['default_value'] : $inc_data[$key],
 			);
 			// Special "hack" the adding separators when doing data by column.
-			if (substr($key, 0, 5) == '#sep#')
-				$data[$key]['separator'] = true;
+			if (substr($key, 0, 5) == '#sep#') {
+							$data[$key]['separator'] = true;
+			}
 		}
-	}
-	else
+	} else
 	{
 		$data = $inc_data;
 		foreach ($data as $key => $value)
@@ -988,8 +1032,9 @@ 
 			$data[$key] = array(
 				'v' => $value,
 			);
-			if (substr($key, 0, 5) == '#sep#')
-				$data[$key]['separator'] = true;
+			if (substr($key, 0, 5) == '#sep#') {
+							$data[$key]['separator'] = true;
+			}
 		}
 	}
 
@@ -1002,8 +1047,9 @@ 
 	// Otherwise, tricky!
 	else
 	{
-		foreach ($data as $key => $item)
-			$context['tables'][$table]['data'][$key][] = $item;
+		foreach ($data as $key => $item) {
+					$context['tables'][$table]['data'][$key][] = $item;
+		}
 	}
 }
 
@@ -1020,16 +1066,18 @@ 
 	global $context;
 
 	// No tables - return?
-	if (empty($context['table_count']))
-		return;
+	if (empty($context['table_count'])) {
+			return;
+	}
 
 	// Specific table?
-	if ($custom_table !== null && !isset($context['tables'][$table]))
-		return false;
-	elseif ($custom_table !== null)
-		$table = $custom_table;
-	else
-		$table = $context['current_table'];
+	if ($custom_table !== null && !isset($context['tables'][$table])) {
+			return false;
+	} elseif ($custom_table !== null) {
+			$table = $custom_table;
+	} else {
+			$table = $context['current_table'];
+	}
 
 	// Plumb in the separator
 	$context['tables'][$table]['data'][] = array(0 => array(
@@ -1050,8 +1098,9 @@ 
 {
 	global $context;
 
-	if (empty($context['tables']))
-		return;
+	if (empty($context['tables'])) {
+			return;
+	}
 
 	// Loop through each table counting up some basic values, to help with the templating.
 	foreach ($context['tables'] as $id => $table)
@@ -1062,12 +1111,13 @@ 
 		$context['tables'][$id]['column_count'] = count($curElement);
 
 		// Work out the rough width - for templates like the print template. Without this we might get funny tables.
-		if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto')
-			$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
-		elseif ($table['width']['normal'] != 'auto')
-			$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
-		else
-			$context['tables'][$id]['max_width'] = 'auto';
+		if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto') {
+					$context['tables'][$id]['max_width'] = $table['width']['shaded'] + ($context['tables'][$id]['column_count'] - 1) * $table['width']['normal'];
+		} elseif ($table['width']['normal'] != 'auto') {
+					$context['tables'][$id]['max_width'] = $context['tables'][$id]['column_count'] * $table['width']['normal'];
+		} else {
+					$context['tables'][$id]['max_width'] = 'auto';
+		}
 	}
 }
 
@@ -1092,10 +1142,11 @@ 
 	global $context;
 
 	// Do we want to use the keys of the keys as the keys? :P
-	if ($reverse)
-		$context['keys'] = array_flip($keys);
-	else
-		$context['keys'] = $keys;
+	if ($reverse) {
+			$context['keys'] = array_flip($keys);
+	} else {
+			$context['keys'] = $keys;
+	}
 
 	// Rows or columns?
 	$context['key_method'] = $method == 'rows' ? 'rows' : 'cols';

Sources/SearchAPI-Standard.php

Braces +2 added lines, -1 removed lines

@@ -11,8 +11,9 @@
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Standard non full index, non custom index search

Sources/DbPackages-postgresql.php

Braces +110 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -52,8 +53,9 @@ 
 		'messages', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_recipients', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'themes', 'topics');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -102,8 +104,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -113,10 +116,11 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else
-			return $if_exists == 'ignore';
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else {
+					return $if_exists == 'ignore';
+		}
 	}
 
 	// If we've got this far - good news - no table exists. We can build our own!
@@ -134,17 +138,18 @@ 
 				)
 			);
 			$default = 'default nextval(\'' . $table_name . '_seq\')';
+		} elseif (isset($column['default']) && $column['default'] !== null) {
+					$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+		} else {
+					$default = '';
 		}
-		elseif (isset($column['default']) && $column['default'] !== null)
-			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-		else
-			$default = '';
 
 		// Sort out the size...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column['type'], $column['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// Now just put it together!
 		$table_query .= "\n\t\"" . $column['name'] . '" ' . $type . ' ' . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default . ',';
@@ -157,19 +162,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Primary goes in the table...
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$index_queries[] = 'CREATE ' . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $table_name . '_' . $index['name'] . ' ON ' . $table_name . ' (' . $columns . ')';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	$table_query .= ')';
 
@@ -180,12 +187,13 @@ 
 		)
 	);
 	// And the indexes...
-	foreach ($index_queries as $query)
-		$smcFunc['db_query']('', $query,
+	foreach ($index_queries as $query) {
+			$smcFunc['db_query']('', $query,
 		array(
 			'security_override' => true,
 		)
 	);
+	}
 
 	// Go, go power rangers!
 	$smcFunc['db_transaction']('commit');
@@ -213,8 +221,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -272,21 +281,24 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
 	$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now add the thing!
 	$query = '
@@ -301,11 +313,12 @@ 
 	// If there's more attributes they need to be done via a change on PostgreSQL.
 	unset($column_info['type'], $column_info['size']);
 
-	if (count($column_info) != 1)
-		return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-	else
-		return true;
-}
+	if (count($column_info) != 1) {
+			return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Removes a column.
@@ -324,8 +337,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			// If there is an auto we need remove it!
 			if ($column['auto'])
@@ -335,6 +348,7 @@ 
 						'security_override' => true,
 					)
 				);
+	}
 
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -369,13 +383,15 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Now we check each bit individually and ALTER as required.
 	if (isset($column_info['name']) && $column_info['name'] != $old_column)
@@ -432,8 +448,9 @@ 
 	{
 		$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 		list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
-		if ($size !== null)
-			$type = $type . '(' . $size . ')';
+		if ($size !== null) {
+					$type = $type . '(' . $size . ')';
+		}
 
 		// The alter is a pain.
 		$smcFunc['db_transaction']('begin');
@@ -527,21 +544,23 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = $table_name . implode('_', $index_info['columns']);
+		}
+	} else {
+			$index_info['name'] = $table_name . $index_info['name'];
 	}
-	else
-		$index_info['name'] = $table_name . $index_info['name'];
 
 	// Log that we are going to want to remove this!
 	$db_package_log[] = array('remove_index', $table_name, $index_info['name']);
@@ -554,10 +573,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -571,8 +591,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			CREATE ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $index_info['name'] . ' ON ' . $table_name . ' (' . $columns . ')',
@@ -600,8 +619,9 @@ 
 
 	// Better exist!
 	$indexes = $smcFunc['db_list_indexes']($table_name, true);
-	if ($index_name != 'primary')
-		$index_name = $table_name . '_' . $index_name;
+	if ($index_name != 'primary') {
+			$index_name = $table_name . '_' . $index_name;
+	}
 
 	foreach ($indexes as $index)
 	{
@@ -665,8 +685,7 @@ 
 			'datetime' => 'timestamp without time zone',
 			'timestamp' => 'timestamp without time zone',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'character varying' => 'varchar',
@@ -682,14 +701,16 @@ 
 	// Got it? Change it!
 	if (isset($types[$type_name]))
 	{
-		if ($type_name == 'tinytext')
-			$type_size = 255;
+		if ($type_name == 'tinytext') {
+					$type_size = 255;
+		}
 		$type_name = $types[$type_name];
 	}
 
 	// Only char fields got size
-	if (strpos($type_name, 'char') === false)
-			$type_size = null;
+	if (strpos($type_name, 'char') === false) {
+				$type_size = null;
+	}
 
 
 	return array($type_name, $type_size);
@@ -744,8 +765,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['column_name'];
-		}
-		else
+		} else
 		{
 			$auto = false;
 			// What is the default?
@@ -753,11 +773,11 @@ 
 			{
 				$default = null;
 				$auto = true;
+			} elseif (trim($row['column_default']) != '') {
+							$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
+			} else {
+							$default = null;
 			}
-			elseif (trim($row['column_default']) != '')
-				$default = strpos($row['column_default'], '::') === false ? $row['column_default'] : substr($row['column_default'], 0, strpos($row['column_default'], '::'));
-			else
-				$default = null;
 
 			// Make the type generic.
 			list ($type, $size) = $smcFunc['db_calculate_type']($row['data_type'], $row['character_maximum_length'], true);
@@ -808,26 +828,30 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// Try get the columns that make it up.
-		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-			continue;
+		if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+					continue;
+		}
 
 		$columns = explode(',', $matches[1]);
 
-		if (empty($columns))
-			continue;
+		if (empty($columns)) {
+					continue;
+		}
 
-		foreach ($columns as $k => $v)
-			$columns[$k] = trim($v);
+		foreach ($columns as $k => $v) {
+					$columns[$k] = trim($v);
+		}
 
 		// Fix up the name to be consistent cross databases
-		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1)
-			$row['name'] = 'PRIMARY';
-		else
-			$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1) {
+					$row['name'] = 'PRIMARY';
+		} else {
+					$row['name'] = str_replace($table_name . '_', '', $row['name']);
+		}
 
-		if (!$detail)
-			$indexes[] = $row['name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['name'];
+		} else
 		{
 			$indexes[$row['name']] = array(
 				'name' => $row['name'],

Sources/Profile-View.php

Braces +297 added lines, -216 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * View a summary.
@@ -23,8 +24,9 @@ 
 	global $context, $memberContext, $txt, $modSettings, $user_profile, $sourcedir, $scripturl, $smcFunc;
 
 	// Attempt to load the member's profile data.
-	if (!loadMemberContext($memID) || !isset($memberContext[$memID]))
-		fatal_lang_error('not_a_user', false, 404);
+	if (!loadMemberContext($memID) || !isset($memberContext[$memID])) {
+			fatal_lang_error('not_a_user', false, 404);
+	}
 
 	// Set up the stuff and load the user.
 	$context += array(
@@ -49,19 +51,21 @@ 
 
 	// See if they have broken any warning levels...
 	list ($modSettings['warning_enable'], $modSettings['user_limit']) = explode(',', $modSettings['warning_settings']);
-	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_muted'];
-	elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_moderation'];
-	elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning'])
-		$context['warning_status'] = $txt['profile_warning_is_watch'];
+	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_muted'];
+	} elseif (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_moderation'];
+	} elseif (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $context['member']['warning']) {
+			$context['warning_status'] = $txt['profile_warning_is_watch'];
+	}
 
 	// They haven't even been registered for a full day!?
 	$days_registered = (int) ((time() - $user_profile[$memID]['date_registered']) / (3600 * 24));
-	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1)
-		$context['member']['posts_per_day'] = $txt['not_applicable'];
-	else
-		$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	if (empty($user_profile[$memID]['date_registered']) || $days_registered < 1) {
+			$context['member']['posts_per_day'] = $txt['not_applicable'];
+	} else {
+			$context['member']['posts_per_day'] = comma_format($context['member']['real_posts'] / $days_registered, 3);
+	}
 
 	// Set the age...
 	if (empty($context['member']['birth_date']))
@@ -70,8 +74,7 @@ 
 			'age' => $txt['not_applicable'],
 			'today_is_birthday' => false
 		);
-	}
-	else
+	} else
 	{
 		list ($birth_year, $birth_month, $birth_day) = sscanf($context['member']['birth_date'], '%d-%d-%d');
 		$datearray = getdate(forum_time());
@@ -84,15 +87,16 @@ 
 	if (allowedTo('moderate_forum'))
 	{
 		// Make sure it's a valid ip address; otherwise, don't bother...
-		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup']))
-			$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
-		else
-			$context['member']['hostname'] = '';
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $memberContext[$memID]['ip']) == 1 && empty($modSettings['disableHostnameLookup'])) {
+					$context['member']['hostname'] = host_from_ip($memberContext[$memID]['ip']);
+		} else {
+					$context['member']['hostname'] = '';
+		}
 
 		$context['can_see_ip'] = true;
+	} else {
+			$context['can_see_ip'] = false;
 	}
-	else
-		$context['can_see_ip'] = false;
 
 	// Are they hidden?
 	$context['member']['is_hidden'] = empty($user_profile[$memID]['show_online']);
@@ -103,8 +107,9 @@ 
 		include_once($sourcedir . '/Who.php');
 		$action = determineActions($user_profile[$memID]['url']);
 
-		if ($action !== false)
-			$context['member']['action'] = $action;
+		if ($action !== false) {
+					$context['member']['action'] = $action;
+		}
 	}
 
 	// If the user is awaiting activation, and the viewer has permission - setup some activation context messages.
@@ -167,13 +172,15 @@ 
 		{
 			// Work out what restrictions we actually have.
 			$ban_restrictions = array();
-			foreach (array('access', 'register', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
+			foreach (array('access', 'register', 'login', 'post') as $type) {
+							if ($row['cannot_' . $type])
 					$ban_restrictions[] = $txt['ban_type_' . $type];
+			}
 
 			// No actual ban in place?
-			if (empty($ban_restrictions))
-				continue;
+			if (empty($ban_restrictions)) {
+							continue;
+			}
 
 			// Prepare the link for context.
 			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
@@ -196,9 +203,10 @@ 
 	$context['print_custom_fields'] = array();
 
 	// Any custom profile fields?
-	if (!empty($context['custom_fields']))
-		foreach ($context['custom_fields'] as $custom)
+	if (!empty($context['custom_fields'])) {
+			foreach ($context['custom_fields'] as $custom)
 			$context['print_custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
 }
 
@@ -242,14 +250,16 @@ 
 		$row['extra'] = !empty($row['extra']) ? smf_json_decode($row['extra'], true) : array();
 		$alerts[$id_alert] = $row;
 
-		if (!empty($row['sender_id']))
-			$senders[] = $row['sender_id'];
+		if (!empty($row['sender_id'])) {
+					$senders[] = $row['sender_id'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	$senders = loadMemberData($senders);
-	foreach ($senders as $member)
-		loadMemberContext($member);
+	foreach ($senders as $member) {
+			loadMemberContext($member);
+	}
 
 	// Now go through and actually make with the text.
 	loadLanguage('Alerts');
@@ -263,12 +273,15 @@ 
 	$msgs = array();
 	foreach ($alerts as $id_alert => $alert)
 	{
-		if (isset($alert['extra']['board']))
-			$boards[$alert['extra']['board']] = $txt['board_na'];
-		if (isset($alert['extra']['topic']))
-			$topics[$alert['extra']['topic']] = $txt['topic_na'];
-		if ($alert['content_type'] == 'msg')
-			$msgs[$alert['content_id']] = $txt['topic_na'];
+		if (isset($alert['extra']['board'])) {
+					$boards[$alert['extra']['board']] = $txt['board_na'];
+		}
+		if (isset($alert['extra']['topic'])) {
+					$topics[$alert['extra']['topic']] = $txt['topic_na'];
+		}
+		if ($alert['content_type'] == 'msg') {
+					$msgs[$alert['content_id']] = $txt['topic_na'];
+		}
 	}
 
 	// Having figured out what boards etc. there are, let's now get the names of them if we can see them. If not, there's already a fallback set up.
@@ -283,8 +296,9 @@ 
 				'boards' => array_keys($boards),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards[$row['id_board']] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+		}
 	}
 	if (!empty($topics))
 	{
@@ -299,8 +313,9 @@ 
 				'topics' => array_keys($topics),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topics[$row['id_topic']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>';
+		}
 	}
 	if (!empty($msgs))
 	{
@@ -315,26 +330,33 @@ 
 				'msgs' => array_keys($msgs),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$msgs[$row['id_msg']] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+		}
 	}
 
 	// Now to go back through the alerts, reattach this extra information and then try to build the string out of it (if a hook didn't already)
 	foreach ($alerts as $id_alert => $alert)
 	{
-		if (!empty($alert['text']))
-			continue;
-		if (isset($alert['extra']['board']))
-			$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
-		if (isset($alert['extra']['topic']))
-			$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
-		if ($alert['content_type'] == 'msg')
-			$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
-		if ($alert['content_type'] == 'profile')
-			$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
-
-		if (!empty($memberContext[$alert['sender_id']]))
-			$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		if (!empty($alert['text'])) {
+					continue;
+		}
+		if (isset($alert['extra']['board'])) {
+					$alerts[$id_alert]['extra']['board_msg'] = $boards[$alert['extra']['board']];
+		}
+		if (isset($alert['extra']['topic'])) {
+					$alerts[$id_alert]['extra']['topic_msg'] = $topics[$alert['extra']['topic']];
+		}
+		if ($alert['content_type'] == 'msg') {
+					$alerts[$id_alert]['extra']['msg_msg'] = $msgs[$alert['content_id']];
+		}
+		if ($alert['content_type'] == 'profile') {
+					$alerts[$id_alert]['extra']['profile_msg'] = '<a href="' . $scripturl . '?action=profile;u=' . $alerts[$id_alert]['content_id'] . '">' . $alerts[$id_alert]['extra']['user_name'] . '</a>';
+		}
+
+		if (!empty($memberContext[$alert['sender_id']])) {
+					$alerts[$id_alert]['sender'] = &$memberContext[$alert['sender_id']];
+		}
 
 		$string = 'alert_' . $alert['content_type'] . '_' . $alert['content_action'];
 		if (isset($txt[$string]))
@@ -422,11 +444,11 @@ 
 		checkSession('request');
 
 		// Call it!
-		if ($action == 'remove')
-			alert_delete($toMark, $memID);
-
-		else
-			alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
+		if ($action == 'remove') {
+					alert_delete($toMark, $memID);
+		} else {
+					alert_mark($memID, $toMark, $action == 'read' ? 1 : 0);
+		}
 
 		// Set a nice update message.
 		$_SESSION['update_message'] = true;
@@ -476,23 +498,27 @@ 
 	);
 
 	// Set the page title
-	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title))
-		$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
-	else
-		$context['page_title'] = $txt['showPosts'];
+	if (isset($_GET['sa']) && array_key_exists($_GET['sa'], $title)) {
+			$context['page_title'] = $txt['show' . $title[$_GET['sa']]];
+	} else {
+			$context['page_title'] = $txt['showPosts'];
+	}
 
 	$context['page_title'] .= ' - ' . $user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts'])
-		fatal_lang_error('loadavg_show_posts_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_show_posts']) && $context['load_average'] >= $modSettings['loadavg_show_posts']) {
+			fatal_lang_error('loadavg_show_posts_disabled', false);
+	}
 
 	// If we're specifically dealing with attachments use that function!
-	if (isset($_GET['sa']) && $_GET['sa'] == 'attach')
-		return showAttachments($memID);
+	if (isset($_GET['sa']) && $_GET['sa'] == 'attach') {
+			return showAttachments($memID);
+	}
 	// Instead, if we're dealing with unwatched topics (and the feature is enabled) use that other function.
-	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics')
-		return showUnwatched($memID);
+	elseif (isset($_GET['sa']) && $_GET['sa'] == 'unwatchedtopics') {
+			return showUnwatched($memID);
+	}
 
 	// Are we just viewing topics?
 	$context['is_topics'] = isset($_GET['sa']) && $_GET['sa'] == 'topics' ? true : false;
@@ -515,27 +541,30 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Trying to remove a message that doesn't exist.
-		if (empty($info))
-			redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+		if (empty($info)) {
+					redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
+		}
 
 		// We can be lazy, since removeMessage() will check the permissions for us.
 		require_once($sourcedir . '/RemoveTopic.php');
 		removeMessage((int) $_GET['delete']);
 
 		// Add it to the mod log.
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
-			logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
+					logAction('delete', array('topic' => $info[2], 'subject' => $info[0], 'member' => $info[1], 'board' => $info[3]));
+		}
 
 		// Back to... where we are now ;).
 		redirectexit('action=profile;u=' . $memID . ';area=showposts;start=' . $_GET['start']);
 	}
 
 	// Default to 10.
-	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
-		$_REQUEST['viewscount'] = '10';
+	if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
+			$_REQUEST['viewscount'] = '10';
+	}
 
-	if ($context['is_topics'])
-		$request = $smcFunc['db_query']('', '
+	if ($context['is_topics']) {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}topics AS t' . ($user_info['query_see_board'] == '1=1' ? '' : '
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board AND {query_see_board})') . '
@@ -548,8 +577,8 @@ 
 				'board' => $board,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(*)
 			FROM {db_prefix}messages AS m' . ($user_info['query_see_board'] == '1=1' ? '' : '
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})') . '
@@ -562,6 +591,7 @@ 
 				'board' => $board,
 			)
 		);
+	}
 	list ($msgCount) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -583,10 +613,11 @@ 
 	$reverse = false;
 	$range_limit = '';
 
-	if ($context['is_topics'])
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
-	else
-		$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
+	if ($context['is_topics']) {
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics'];
+	} else {
+			$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
+	}
 
 	$maxIndex = $maxPerPage;
 
@@ -612,9 +643,9 @@ 
 		{
 			$margin *= 5;
 			$range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin);
+		} else {
+					$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
 		}
-		else
-			$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
 	}
 
 	// Find this user's posts.  The left join on categories somehow makes this faster, weird as it looks.
@@ -646,8 +677,7 @@ 
 					'max' => $maxIndex,
 				)
 			);
-		}
-		else
+		} else
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT
@@ -676,8 +706,9 @@ 
 		}
 
 		// Make sure we quit this loop.
-		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped)
-			break;
+		if ($smcFunc['db_num_rows']($request) === $maxIndex || $looped) {
+					break;
+		}
 		$looped = true;
 		$range_limit = '';
 	}
@@ -721,19 +752,21 @@ 
 			'css_class' => $row['approved'] ? 'windowbg' : 'approvebg',
 		);
 
-		if ($user_info['id'] == $row['id_member_started'])
-			$board_ids['own'][$row['id_board']][] = $counter;
+		if ($user_info['id'] == $row['id_member_started']) {
+					$board_ids['own'][$row['id_board']][] = $counter;
+		}
 		$board_ids['any'][$row['id_board']][] = $counter;
 	}
 	$smcFunc['db_free_result']($request);
 
 	// All posts were retrieved in reverse order, get them right again.
-	if ($reverse)
-		$context['posts'] = array_reverse($context['posts'], true);
+	if ($reverse) {
+			$context['posts'] = array_reverse($context['posts'], true);
+	}
 
 	// These are all the permissions that are different from board to board..
-	if ($context['is_topics'])
-		$permissions = array(
+	if ($context['is_topics']) {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 			),
@@ -741,8 +774,8 @@ 
 				'post_reply_any' => 'can_reply',
 			)
 		);
-	else
-		$permissions = array(
+	} else {
+			$permissions = array(
 			'own' => array(
 				'post_reply_own' => 'can_reply',
 				'delete_own' => 'can_delete',
@@ -752,6 +785,7 @@ 
 				'delete_any' => 'can_delete',
 			)
 		);
+	}
 
 	// For every permission in the own/any lists...
 	foreach ($permissions as $type => $list)
@@ -762,19 +796,22 @@ 
 			$boards = boardsAllowedTo($permission);
 
 			// Hmm, they can do it on all boards, can they?
-			if (!empty($boards) && $boards[0] == 0)
-				$boards = array_keys($board_ids[$type]);
+			if (!empty($boards) && $boards[0] == 0) {
+							$boards = array_keys($board_ids[$type]);
+			}
 
 			// Now go through each board they can do the permission on.
 			foreach ($boards as $board_id)
 			{
 				// There aren't any posts displayed from this board.
-				if (!isset($board_ids[$type][$board_id]))
-					continue;
+				if (!isset($board_ids[$type][$board_id])) {
+									continue;
+				}
 
 				// Set the permission to true ;).
-				foreach ($board_ids[$type][$board_id] as $counter)
-					$context['posts'][$counter][$allowed] = true;
+				foreach ($board_ids[$type][$board_id] as $counter) {
+									$context['posts'][$counter][$allowed] = true;
+				}
 			}
 		}
 	}
@@ -805,8 +842,9 @@ 
 	$boardsAllowed = boardsAllowedTo('view_attachments');
 
 	// Make sure we can't actually see anything...
-	if (empty($boardsAllowed))
-		$boardsAllowed = array(-1);
+	if (empty($boardsAllowed)) {
+			$boardsAllowed = array(-1);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 
@@ -957,8 +995,8 @@ 
 		)
 	);
 	$attachments = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$attachments[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$attachments[] = array(
 			'id' => $row['id_attach'],
 			'filename' => $row['filename'],
 			'downloads' => $row['downloads'],
@@ -970,6 +1008,7 @@ 
 			'board_name' => $row['name'],
 			'approved' => $row['approved'],
 		);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1024,8 +1063,9 @@ 
 	global $txt, $user_info, $scripturl, $modSettings, $context, $sourcedir;
 
 	// Only the owner can see the list (if the function is enabled of course)
-	if ($user_info['id'] != $memID)
-		return;
+	if ($user_info['id'] != $memID) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 
@@ -1171,8 +1211,9 @@ 
 	);
 
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[] = $row['id_topic'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[] = $row['id_topic'];
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1192,8 +1233,9 @@ 
 				'topics' => $topics,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topicsInfo[] = $row;
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topicsInfo[] = $row;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1241,8 +1283,9 @@ 
 	$context['page_title'] = $txt['statPanel_showStats'] . ' ' . $user_profile[$memID]['real_name'];
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats'])
-		fatal_lang_error('loadavg_userstats_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_userstats']) && $context['load_average'] >= $modSettings['loadavg_userstats']) {
+			fatal_lang_error('loadavg_userstats_disabled', false);
+	}
 
 	// General user statistics.
 	$timeDays = floor($user_profile[$memID]['total_time_logged_in'] / 86400);
@@ -1400,11 +1443,13 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if ($maxPosts > 0)
-		for ($hour = 0; $hour < 24; $hour++)
+	if ($maxPosts > 0) {
+			for ($hour = 0;
+	}
+	$hour < 24; $hour++)
 		{
-			if (!isset($context['posts_by_time'][$hour]))
-				$context['posts_by_time'][$hour] = array(
+			if (!isset($context['posts_by_time'][$hour])) {
+							$context['posts_by_time'][$hour] = array(
 					'hour' => $hour,
 					'hour_format' => stripos($user_info['time_format'], '%p') === false ? $hour : date('g a', mktime($hour)),
 					'posts' => 0,
@@ -1412,7 +1457,7 @@ 
 					'relative_percent' => 0,
 					'is_last' => $hour == 23,
 				);
-			else
+			} else
 			{
 				$context['posts_by_time'][$hour]['posts_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $realPosts);
 				$context['posts_by_time'][$hour]['relative_percent'] = round(($context['posts_by_time'][$hour]['posts'] * 100) / $maxPosts);
@@ -1445,8 +1490,9 @@ 
 
 	foreach ($subActions as $sa => $action)
 	{
-		if (!allowedTo($action[2]))
-			unset($subActions[$sa]);
+		if (!allowedTo($action[2])) {
+					unset($subActions[$sa]);
+		}
 	}
 
 	// Create the tabs for the template.
@@ -1464,15 +1510,18 @@ 
 	);
 
 	// Moderation must be on to track edits.
-	if (empty($modSettings['userlog_enabled']))
-		unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
+	if (empty($modSettings['userlog_enabled'])) {
+			unset($context[$context['profile_menu_name']]['tab_data']['edits'], $subActions['edits']);
+	}
 
 	// Group requests must be active to show it...
-	if (empty($modSettings['show_group_membership']))
-		unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
+	if (empty($modSettings['show_group_membership'])) {
+			unset($context[$context['profile_menu_name']]['tab_data']['groupreq'], $subActions['groupreq']);
+	}
 
-	if (empty($subActions))
-		fatal_lang_error('no_access', false);
+	if (empty($subActions)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$keys = array_keys($subActions);
 	$default = array_shift($keys);
@@ -1485,9 +1534,10 @@ 
 	$context['sub_template'] = $subActions[$context['tracking_area']][0];
 	$call = call_helper($subActions[$context['tracking_area']][0], true);
 
-	if (!empty($call))
-		call_user_func($call, $memID);
-}
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
+	}
 
 /**
  * Handles tracking a user's activity
@@ -1503,8 +1553,9 @@ 
 	isAllowedTo('moderate_forum');
 
 	$context['last_ip'] = $user_profile[$memID]['member_ip'];
-	if ($context['last_ip'] != $user_profile[$memID]['member_ip2'])
-		$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
+	if ($context['last_ip'] != $user_profile[$memID]['member_ip2']) {
+			$context['last_ip2'] = $user_profile[$memID]['member_ip2'];
+	}
 	$context['member']['name'] = $user_profile[$memID]['real_name'];
 
 	// Set the options for the list component.
@@ -1670,8 +1721,9 @@ 
 			)
 		);
 		$message_members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$message_members[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$message_members[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Fetch their names, cause of the GROUP BY doesn't like giving us that normally.
@@ -1686,8 +1738,9 @@ 
 					'ip_list' => $ips,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
@@ -1701,8 +1754,9 @@ 
 				'ip_list' => $ips,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['members_in_range'][$row['id_member']] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 }
@@ -1762,8 +1816,8 @@ 
 		))
 	);
 	$error_messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$error_messages[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$error_messages[] = array(
 			'ip' => inet_dtop($row['ip']),
 			'member_link' => $row['id_member'] > 0 ? '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>' : $row['display_name'],
 			'message' => strtr($row['message'], array('&lt;span class=&quot;remove&quot;&gt;' => '', '&lt;/span&gt;' => '')),
@@ -1771,6 +1825,7 @@ 
 			'time' => timeformat($row['log_time']),
 			'timestamp' => forum_time(true, $row['log_time']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_messages;
@@ -1833,8 +1888,8 @@ 
 		))
 	);
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = array(
 			'ip' => inet_dtop($row['poster_ip']),
 			'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>',
 			'board' => array(
@@ -1847,6 +1902,7 @@ 
 			'time' => timeformat($row['poster_time']),
 			'timestamp' => forum_time(true, $row['poster_time'])
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $messages;
@@ -1873,19 +1929,20 @@ 
 		$context['sub_template'] = 'trackIP';
 		$context['page_title'] = $txt['profile'];
 		$context['base_url'] = $scripturl . '?action=trackip';
-	}
-	else
+	} else
 	{
 		$context['ip'] = $user_profile[$memID]['member_ip'];
 		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
 	}
 
 	// Searching?
-	if (isset($_REQUEST['searchip']))
-		$context['ip'] = trim($_REQUEST['searchip']);
+	if (isset($_REQUEST['searchip'])) {
+			$context['ip'] = trim($_REQUEST['searchip']);
+	}
 
-	if (isValidIP($context['ip']) === false)
-		fatal_lang_error('invalid_tracking_ip', false);
+	if (isValidIP($context['ip']) === false) {
+			fatal_lang_error('invalid_tracking_ip', false);
+	}
 
 	//mysql didn't support like search with varbinary
 	//$ip_var = str_replace('*', '%', $context['ip']);
@@ -1893,8 +1950,9 @@ 
 	$ip_var = $context['ip'];
 	$ip_string = '= {inet:ip_address}';
 
-	if (empty($context['tracking_area']))
-		$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+	if (empty($context['tracking_area'])) {
+			$context['page_title'] = $txt['trackIP'] . ' - ' . $context['ip'];
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_member, real_name AS display_name, member_ip
@@ -1905,8 +1963,9 @@ 
 		)
 	);
 	$context['ips'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['ips'][inet_dtop($row['member_ip'])][] = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
+	}
 	$smcFunc['db_free_result']($request);
 
 	ksort($context['ips']);
@@ -2135,8 +2194,9 @@ 
 		foreach ($context['whois_servers'] as $whois)
 		{
 			// Strip off the "decimal point" and anything following...
-			if (in_array((int) $context['ip'], $whois['range']))
-				$context['auto_whois_server'] = $whois;
+			if (in_array((int) $context['ip'], $whois['range'])) {
+							$context['auto_whois_server'] = $whois;
+			}
 		}
 	}
 }
@@ -2153,10 +2213,11 @@ 
 	// Gonna want this for the list.
 	require_once($sourcedir . '/Subs-List.php');
 
-	if ($memID == 0)
-		$context['base_url'] = $scripturl . '?action=trackip';
-	else
-		$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+	if ($memID == 0) {
+			$context['base_url'] = $scripturl . '?action=trackip';
+	} else {
+			$context['base_url'] = $scripturl . '?action=profile;area=tracking;sa=ip;u=' . $memID;
+	}
 
 	// Start with the user messages.
 	$listOptions = array(
@@ -2266,12 +2327,13 @@ 
 		)
 	);
 	$logins = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$logins[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$logins[] = array(
 			'time' => timeformat($row['time']),
 			'ip' => inet_dtop($row['ip']),
 			'ip2' => inet_dtop($row['ip2']),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $logins;
@@ -2296,11 +2358,12 @@ 
 		)
 	);
 	$context['custom_field_titles'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
 			'title' => $row['field_name'],
 			'parse_bbc' => $row['bbc'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Set the options for the error lists.
@@ -2439,19 +2502,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$extra = smf_json_decode($row['extra'], true);
-		if (!empty($extra['applicator']))
-			$members[] = $extra['applicator'];
+		if (!empty($extra['applicator'])) {
+					$members[] = $extra['applicator'];
+		}
 
 		// Work out what the name of the action is.
-		if (isset($txt['trackEdit_action_' . $row['action']]))
-			$action_text = $txt['trackEdit_action_' . $row['action']];
-		elseif (isset($txt[$row['action']]))
-			$action_text = $txt[$row['action']];
+		if (isset($txt['trackEdit_action_' . $row['action']])) {
+					$action_text = $txt['trackEdit_action_' . $row['action']];
+		} elseif (isset($txt[$row['action']])) {
+					$action_text = $txt[$row['action']];
+		}
 		// Custom field?
-		elseif (isset($context['custom_field_titles'][$row['action']]))
-			$action_text = $context['custom_field_titles'][$row['action']]['title'];
-		else
-			$action_text = $row['action'];
+		elseif (isset($context['custom_field_titles'][$row['action']])) {
+					$action_text = $context['custom_field_titles'][$row['action']]['title'];
+		} else {
+					$action_text = $row['action'];
+		}
 
 		// Parse BBC?
 		$parse_bbc = isset($context['custom_field_titles'][$row['action']]) && $context['custom_field_titles'][$row['action']]['parse_bbc'] ? true : false;
@@ -2483,13 +2549,15 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row['real_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row['real_name'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		foreach ($edits as $key => $value)
-			if (isset($members[$value['id_member']]))
+		foreach ($edits as $key => $value) {
+					if (isset($members[$value['id_member']]))
 				$edits[$key]['member_link'] = '<a href="' . $scripturl . '?action=profile;u=' . $value['id_member'] . '">' . $members[$value['id_member']] . '</a>';
+		}
 	}
 
 	return $edits;
@@ -2690,10 +2758,11 @@ 
 	$context['board'] = $board;
 
 	// Determine which groups this user is in.
-	if (empty($user_profile[$memID]['additional_groups']))
-		$curGroups = array();
-	else
-		$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
+	if (empty($user_profile[$memID]['additional_groups'])) {
+			$curGroups = array();
+	} else {
+			$curGroups = explode(',', $user_profile[$memID]['additional_groups']);
+	}
 	$curGroups[] = $user_profile[$memID]['id_group'];
 	$curGroups[] = $user_profile[$memID]['id_post_group'];
 
@@ -2713,28 +2782,30 @@ 
 	$context['no_access_boards'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod'])
-			$context['no_access_boards'][] = array(
+		if (count(array_intersect($curGroups, explode(',', $row['member_groups']))) === 0 && !$row['is_mod']) {
+					$context['no_access_boards'][] = array(
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'is_last' => false,
 			);
-		elseif ($row['id_profile'] != 1 || $row['is_mod'])
-			$context['boards'][$row['id_board']] = array(
+		} elseif ($row['id_profile'] != 1 || $row['is_mod']) {
+					$context['boards'][$row['id_board']] = array(
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'selected' => $board == $row['id_board'],
 				'profile' => $row['id_profile'],
 				'profile_name' => $context['profiles'][$row['id_profile']]['name'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($context['boards']);
 
-	if (!empty($context['no_access_boards']))
-		$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+	if (!empty($context['no_access_boards'])) {
+			$context['no_access_boards'][count($context['no_access_boards']) - 1]['is_last'] = true;
+	}
 
 	$context['member']['permissions'] = array(
 		'general' => array(),
@@ -2743,8 +2814,9 @@ 
 
 	// If you're an admin we know you can do everything, we might as well leave.
 	$context['member']['has_all_permissions'] = in_array(1, $curGroups);
-	if ($context['member']['has_all_permissions'])
-		return;
+	if ($context['member']['has_all_permissions']) {
+			return;
+	}
 
 	$denied = array();
 
@@ -2763,21 +2835,24 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		if (!isset($txt['permissionname_' . $row['permission']])) {
+					continue;
+		}
 
-		if (empty($row['add_deny']))
-			$denied[] = $row['permission'];
+		if (empty($row['add_deny'])) {
+					$denied[] = $row['permission'];
+		}
 
 		// Permissions that end with _own or _any consist of two parts.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		} else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Add this permission if it doesn't exist yet.
-		if (!isset($context['member']['permissions']['general'][$row['permission']]))
-			$context['member']['permissions']['general'][$row['permission']] = array(
+		if (!isset($context['member']['permissions']['general'][$row['permission']])) {
+					$context['member']['permissions']['general'][$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -2787,6 +2862,7 @@ 
 				'is_denied' => false,
 				'is_global' => true,
 			);
+		}
 
 		// Add the membergroup to either the denied or the allowed groups.
 		$context['member']['permissions']['general'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
@@ -2820,18 +2896,20 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We don't know about this permission, it doesn't exist :P.
-		if (!isset($txt['permissionname_' . $row['permission']]))
-			continue;
+		if (!isset($txt['permissionname_' . $row['permission']])) {
+					continue;
+		}
 
 		// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
-		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
-		else
-			$name = $txt['permissionname_' . $row['permission']];
+		if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset($txt['permissionname_' . substr($row['permission'], 0, -4)])) {
+					$name = $txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . $txt['permissionname_' . $row['permission']];
+		} else {
+					$name = $txt['permissionname_' . $row['permission']];
+		}
 
 		// Create the structure for this permission.
-		if (!isset($context['member']['permissions']['board'][$row['permission']]))
-			$context['member']['permissions']['board'][$row['permission']] = array(
+		if (!isset($context['member']['permissions']['board'][$row['permission']])) {
+					$context['member']['permissions']['board'][$row['permission']] = array(
 				'id' => $row['permission'],
 				'groups' => array(
 					'allowed' => array(),
@@ -2841,6 +2919,7 @@ 
 				'is_denied' => false,
 				'is_global' => empty($board),
 			);
+		}
 
 		$context['member']['permissions']['board'][$row['permission']]['groups'][empty($row['add_deny']) ? 'denied' : 'allowed'][$row['id_group']] = $row['id_group'] == 0 ? $txt['membergroups_members'] : $row['group_name'];
 
@@ -2859,8 +2938,9 @@ 
 	global $modSettings, $context, $sourcedir, $txt, $scripturl;
 
 	// Firstly, can we actually even be here?
-	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum'))
-		fatal_lang_error('no_access', false);
+	if (!($context['user']['is_owner'] && allowedTo('view_warning_own')) && !allowedTo('view_warning_any') && !allowedTo('issue_warning') && !allowedTo('moderate_forum')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make sure things which are disabled stay disabled.
 	$modSettings['warning_watch'] = !empty($modSettings['warning_watch']) ? $modSettings['warning_watch'] : 110;
@@ -2947,9 +3027,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_own_muted'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Xml.php

Braces +55 added lines, -42 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main handler and designator for AJAX stuff - jumpto, message icons and previews
@@ -32,8 +33,9 @@ 
 	// Easy adding of sub actions.
 	call_integration_hook('integrate_XMLhttpMain_subActions', array(&$subActions));
 
-	if (!isset($_REQUEST['sa'], $subActions[$_REQUEST['sa']]))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['sa'], $subActions[$_REQUEST['sa']])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	call_helper($subActions[$_REQUEST['sa']]);
 }
@@ -57,8 +59,9 @@ 
 	foreach ($context['jump_to'] as $id_cat => $cat)
 	{
 		$context['jump_to'][$id_cat]['name'] = un_htmlspecialchars(strip_tags($cat['name']));
-		foreach ($cat['boards'] as $id_board => $board)
-			$context['jump_to'][$id_cat]['boards'][$id_board]['name'] = un_htmlspecialchars(strip_tags($board['name']));
+		foreach ($cat['boards'] as $id_board => $board) {
+					$context['jump_to'][$id_cat]['boards'][$id_board]['name'] = un_htmlspecialchars(strip_tags($board['name']));
+		}
 	}
 
 	$context['sub_template'] = 'jump_to';
@@ -95,8 +98,9 @@ 
 
 	$context['sub_template'] = 'generic_xml';
 
-	if (!isset($_POST['item']) || !in_array($_POST['item'], $items))
-		return false;
+	if (!isset($_POST['item']) || !in_array($_POST['item'], $items)) {
+			return false;
+	}
 
 	$_POST['item']();
 }
@@ -112,10 +116,11 @@ 
 
 	$errors = array();
 	$news = !isset($_POST['news'])? '' : $smcFunc['htmlspecialchars']($_POST['news'], ENT_QUOTES);
-	if (empty($news))
-		$errors[] = array('value' => 'no_news');
-	else
-		preparsecode($news);
+	if (empty($news)) {
+			$errors[] = array('value' => 'no_news');
+	} else {
+			preparsecode($news);
+	}
 
 	$context['xml_data'] = array(
 		'news' => array(
@@ -148,10 +153,12 @@ 
 	$context['send_pm'] = !empty($_POST['send_pm']) ? 1 : 0;
 	$context['send_html'] = !empty($_POST['send_html']) ? 1 : 0;
 
-	if (empty($_POST['subject']))
-		$context['post_error']['messages'][] = $txt['error_no_subject'];
-	if (empty($_POST['message']))
-		$context['post_error']['messages'][] = $txt['error_no_message'];
+	if (empty($_POST['subject'])) {
+			$context['post_error']['messages'][] = $txt['error_no_subject'];
+	}
+	if (empty($_POST['message'])) {
+			$context['post_error']['messages'][] = $txt['error_no_message'];
+	}
 
 	prepareMailingForPreview();
 
@@ -196,38 +203,41 @@ 
 		$preview_signature = !empty($_POST['signature']) ? $_POST['signature'] : $txt['no_signature_preview'];
 		$validation = profileValidateSignature($preview_signature);
 
-		if ($validation !== true && $validation !== false)
-			$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+		if ($validation !== true && $validation !== false) {
+					$errors[] = array('value' => $txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+		}
 
 		censorText($preview_signature);
 		$preview_signature = parse_bbc($preview_signature, true, 'sig' . $user);
-	}
-	elseif (!$can_change)
+	} elseif (!$can_change)
 	{
-		if ($is_owner)
-			$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
-		else
-			$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+		if ($is_owner) {
+					$errors[] = array('value' => $txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
+		} else {
+					$errors[] = array('value' => $txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+		}
+	} else {
+			$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 	}
-	else
-		$errors[] = array('value' => $txt['no_user_selected'], 'attributes' => array('type' => 'error'));
 
 	$context['xml_data']['signatures'] = array(
 			'identifier' => 'signature',
 			'children' => array()
 		);
-	if (isset($current_signature))
-		$context['xml_data']['signatures']['children'][] = array(
+	if (isset($current_signature)) {
+			$context['xml_data']['signatures']['children'][] = array(
 					'value' => $current_signature,
 					'attributes' => array('type' => 'current'),
 				);
-	if (isset($preview_signature))
-		$context['xml_data']['signatures']['children'][] = array(
+	}
+	if (isset($preview_signature)) {
+			$context['xml_data']['signatures']['children'][] = array(
 					'value' => $preview_signature,
 					'attributes' => array('type' => 'preview'),
 				);
-	if (!empty($errors))
-		$context['xml_data']['errors'] = array(
+	}
+	if (!empty($errors)) {
+			$context['xml_data']['errors'] = array(
 			'identifier' => 'error',
 			'children' => array_merge(
 				array(
@@ -239,7 +249,8 @@ 
 				$errors
 			),
 		);
-}
+	}
+	}
 
 /**
  * Handles previewing user warnings
@@ -261,15 +272,17 @@ 
 		$context['preview_subject'] = !empty($_POST['title']) ? trim($smcFunc['htmlspecialchars']($_POST['title'])) : '';
 		if (isset($_POST['issuing']))
 		{
-			if (empty($_POST['title']) || empty($_POST['body']))
-				$context['post_error']['messages'][] = $txt['warning_notify_blank'];
-		}
-		else
+			if (empty($_POST['title']) || empty($_POST['body'])) {
+							$context['post_error']['messages'][] = $txt['warning_notify_blank'];
+			}
+		} else
 		{
-			if (empty($_POST['title']))
-				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_title'];
-			if (empty($_POST['body']))
-				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
+			if (empty($_POST['title'])) {
+							$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_title'];
+			}
+			if (empty($_POST['body'])) {
+							$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
+			}
 			// Add in few replacements.
 			/**
 			* These are the defaults:
@@ -300,9 +313,9 @@ 
 			$warning_body = parse_bbc($warning_body, true);
 		}
 		$context['preview_message'] = $warning_body;
+	} else {
+			$context['post_error']['messages'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
 	}
-	else
-		$context['post_error']['messages'][] = array('value' => $txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
 
 	$context['sub_template'] = 'warning';
 }