elkarte / Elkarte

sources/subs/Package.subs.php

Spacing +2 added lines, -2 removed lines

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

Braces +665 added lines, -253 removed lines

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

sources/subs/Search/Search.php

Braces +21 added lines, -7 removed lines

@@ -514,7 +514,9 @@ 
 		else
 		{
 			foreach ($this->_searchArray as $index => $value)
-				$orParts[$index] = array($value);
+			{
+							$orParts[$index] = array($value);
+			}
 		}
 
 		// Make sure the excluded words are in all or-branches.
@@ -612,7 +614,9 @@ 
 		}
 
 		foreach ($temp_params as $k => $v)
-			$encoded[] = $k . '|\'|' . $v;
+		{
+					$encoded[] = $k . '|\'|' . $v;
+		}
 
 		if (!empty($encoded))
 		{
@@ -766,12 +770,14 @@ 
 			// Create a list of database-escaped search names.
 			$realNameMatches = array();
 			foreach ($possible_users as $possible_user)
-				$realNameMatches[] = $this->_db->quote(
+			{
+							$realNameMatches[] = $this->_db->quote(
 					'{string:possible_user}',
 					array(
 						'possible_user' => $possible_user
 					)
 				);
+			}
 
 			// Retrieve a list of possible members.
 			$request = $this->_db->query('', '
@@ -889,7 +895,9 @@ 
 		if (count($this->_search_params['brd']) != 0)
 		{
 			foreach ($this->_search_params['brd'] as $k => $v)
-				$this->_search_params['brd'][$k] = (int) $v;
+			{
+							$this->_search_params['brd'][$k] = (int) $v;
+			}
 
 			// If we've selected all boards, this parameter can be left empty.
 			require_once(SUBSDIR . '/Boards.subs.php');
@@ -1510,7 +1518,9 @@ 
 		);
 		$posters = array();
 		while ($row = $this->_db->fetch_assoc($request))
-			$posters[] = $row['id_member'];
+		{
+					$posters[] = $row['id_member'];
+		}
 		$this->_db->free_result($request);
 
 		return $posters;
@@ -1957,7 +1967,9 @@ 
 
 				$usedIDs[$row['id_topic']] = true;
 				foreach ($row as $key => $value)
-					$inserts[$row['id_topic']][] = (int) $row[$key];
+				{
+									$inserts[$row['id_topic']][] = (int) $row[$key];
+				}
 			}
 			$this->_db->free_result($ignoreRequest);
 
@@ -1966,7 +1978,9 @@ 
 			{
 				$query_columns = array();
 				foreach ($main_query['select'] as $k => $v)
-					$query_columns[$k] = 'int';
+				{
+									$query_columns[$k] = 'int';
+				}
 
 				$this->_db->insert('',
 					'{db_prefix}log_search_results',

sources/database/Db-postgresql.class.php

Spacing +2 added lines, -2 removed lines

@@ -1078,13 +1078,13 @@
 	{
 		global $db_row_count;
 
-		if(!is_resource($resource) && ($resource instanceof \PgSql\Result))
+		if (!is_resource($resource) && ($resource instanceof \PgSql\Result))
 		{
 			$id = spl_object_id($resource);
 		}
 		else
 		{
-			$id = (int)$resource;
+			$id = (int) $resource;
 		}
 
 		return $id;

Braces +161 added lines, -61 removed lines

@@ -17,7 +17,9 @@ 
 
 // Let's define the name of the class so that we will be able to use it in the instantiations
 if (!defined('DB_TYPE'))
+{
 	define('DB_TYPE', 'PostgreSQL');
+}
 
 /**
  * PostgreSQL database class, implements database class to control mysql functions
@@ -67,25 +69,36 @@ 
 	{
 		// initialize the instance... if not done already!
 		if (self::$_db === null)
-			self::$_db = new self();
+		{
+					self::$_db = new self();
+		}
 
 		if (!empty($db_options['port']))
-			$db_port = ' port=' . (int) $db_options['port'];
-		else
-			$db_port = '';
+		{
+					$db_port = ' port=' . (int) $db_options['port'];
+		}
+		else {
+					$db_port = '';
+		}
 
 		if (!empty($db_options['persist']))
-			$connection = @pg_pconnect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
-		else
-			$connection = @pg_connect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
+		{
+					$connection = @pg_pconnect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
+		}
+		else {
+					$connection = @pg_connect('host=' . $db_server . $db_port . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'');
+		}
 
 		// Something's wrong, show an error if its fatal (which we assume it is)
 		if (!$connection)
 		{
 			if (!empty($db_options['non_fatal']))
-				return null;
-			else
-				Errors::instance()->display_db_error();
+			{
+							return null;
+			}
+			else {
+							Errors::instance()->display_db_error();
+			}
 		}
 
 		self::$_db->_connection = $connection;
@@ -179,13 +192,17 @@ 
 		);
 
 		if (isset($replacements[$identifier]))
-			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+		{
+					$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+		}
 
 		// Limits need to be a little different.
 		$db_string = preg_replace('~\sLIMIT\s(\d+|{int:.+}),\s*(\d+|{int:.+})(.*)~i', 'LIMIT $2 OFFSET $1 $3', $db_string);
 
 		if (trim($db_string) == '')
-			return false;
+		{
+					return false;
+		}
 
 		// Comments that are allowed in a query are preg_removed.
 		static $allowed_comments_from = array(
@@ -206,7 +223,9 @@ 
 		$this->_db_replace_result = null;
 
 		if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
-			$this->error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+		{
+					$this->error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+		}
 
 		if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
 		{
@@ -257,7 +276,9 @@ 
 			{
 				$pos = strpos($db_string, '\'', $pos + 1);
 				if ($pos === false)
-					break;
+				{
+									break;
+				}
 				$clean .= substr($db_string, $old_pos, $pos - $old_pos);
 
 				while (true)
@@ -266,7 +287,9 @@ 
 					$pos2 = strpos($db_string, '\'\'', $pos + 1);
 
 					if ($pos1 === false)
-						break;
+					{
+											break;
+					}
 					elseif ($pos2 === false || $pos2 > $pos1)
 					{
 						$pos = $pos1;
@@ -285,19 +308,29 @@ 
 
 			// Comments?  We don't use comments in our queries, we leave 'em outside!
 			if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
-				$fail = true;
+			{
+							$fail = true;
+			}
 			// Trying to change passwords, slow us down, or something?
 			elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
-				$fail = true;
+			{
+							$fail = true;
+			}
 			elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
-				$fail = true;
+			{
+							$fail = true;
+			}
 
 			if (!empty($fail) && class_exists('Errors'))
-				$this->error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+			{
+							$this->error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+			}
 
 			// If we are updating something, better start a transaction so that indexes may be kept consistent
 			if (!$this->_in_transaction && strpos($clean, 'update') !== false)
-				$this->db_transaction('begin', $connection);
+			{
+							$this->db_transaction('begin', $connection);
+			}
 		}
 
 		$this->_db_last_result = @pg_query($connection, $db_string);
@@ -320,7 +353,9 @@ 
 		}
 
 		if ($this->_in_transaction)
-			$this->db_transaction('commit', $connection);
+		{
+					$this->db_transaction('commit', $connection);
+		}
 
 		// Debugging.
 		if ($db_show_debug === true)
@@ -340,9 +375,13 @@ 
 	public function affected_rows($result = null)
 	{
 		if ($this->_db_replace_result !== null)
-			return $this->_db_replace_result;
+		{
+					return $this->_db_replace_result;
+		}
 		elseif ($result === null && !$this->_db_last_result)
-			return 0;
+		{
+					return 0;
+		}
 
 		return pg_affected_rows($result === null ? $this->_db_last_result : $result);
 	}
@@ -371,7 +410,9 @@ 
 		);
 
 		if (!$request)
-			return false;
+		{
+					return false;
+		}
 
 		list ($lastID) = $this->fetch_row($request);
 		$this->free_result($request);
@@ -391,11 +432,15 @@ 
 		global $db_row_count;
 
 		if ($counter !== false)
-			return pg_fetch_row($result, $counter);
+		{
+					return pg_fetch_row($result, $counter);
+		}
 
 		// Reset the row counter...
 		if (!isset($db_row_count[$this->seekCounter($result)]))
-			$db_row_count[$this->seekCounter($result)] = 0;
+		{
+					$db_row_count[$this->seekCounter($result)] = 0;
+		}
 
 		// Return the right row.
 		return @pg_fetch_row($result, $db_row_count[$this->seekCounter($result)]++);
@@ -413,7 +458,9 @@ 
 		$id = $this->seekCounter($result);
 		// Reset the row counter...
 		if (isset($db_row_count[$id]))
-			unset($db_row_count[$id]);
+		{
+					unset($db_row_count[$id]);
+		}
 
 		// Just delegate to the native function
 		pg_free_result($result);
@@ -472,7 +519,9 @@ 
 			return @pg_query($connection, 'BEGIN');
 		}
 		elseif ($type == 'rollback')
-			return @pg_query($connection, 'ROLLBACK');
+		{
+					return @pg_query($connection, 'ROLLBACK');
+		}
 		elseif ($type == 'commit')
 		{
 			$this->_in_transaction = false;
@@ -493,7 +542,9 @@ 
 		$connection = $connection === null ? $this->_connection : $connection;
 
 		if (is_resource($connection) || $connection instanceof \PgSql\Connection)
-			return pg_last_error($connection);
+		{
+					return pg_last_error($connection);
+		}
 	}
 
 	/**
@@ -526,21 +577,30 @@ 
 
 		// Nothing's defined yet... just die with it.
 		if (empty($context) || empty($txt))
-			die($query_error);
+		{
+					die($query_error);
+		}
 
 		// Show an error message, if possible.
 		$context['error_title'] = $txt['database_error'];
 		if (allowedTo('admin_forum'))
-			$context['error_message'] = nl2br($query_error) . '<br />' . $txt['file'] . ': ' . $file . '<br />' . $txt['line'] . ': ' . $line;
-		else
-			$context['error_message'] = $txt['try_again'];
+		{
+					$context['error_message'] = nl2br($query_error) . '<br />' . $txt['file'] . ': ' . $file . '<br />' . $txt['line'] . ': ' . $line;
+		}
+		else {
+					$context['error_message'] = $txt['try_again'];
+		}
 
 		// Add database version that we know of, for the admin to know. (and ask for support)
 		if (allowedTo('admin_forum'))
-			$context['error_message'] .= '<br /><br />' . sprintf($txt['database_error_versions'], $modSettings['elkVersion']);
+		{
+					$context['error_message'] .= '<br /><br />' . sprintf($txt['database_error_versions'], $modSettings['elkVersion']);
+		}
 
 		if (allowedTo('admin_forum') && $db_show_debug === true)
-			$context['error_message'] .= '<br /><br />' . nl2br($db_string);
+		{
+					$context['error_message'] .= '<br /><br />' . nl2br($db_string);
+		}
 
 		// It's already been logged... don't log it again.
 		throw new Elk_Exception($context['error_message'], false);
@@ -566,11 +626,15 @@ 
 
 		// With nothing to insert, simply return.
 		if (empty($data))
-			return;
+		{
+					return;
+		}
 
 		// Inserting data as a single row can be done as a single array.
 		if (!is_array($data[array_rand($data)]))
-			$data = array($data);
+		{
+					$data = array($data);
+		}
 
 		// Replace the prefix holder with the actual prefix.
 		$table = str_replace('{db_prefix}', $db_prefix, $table);
@@ -592,13 +656,18 @@ 
 			{
 				// Are we restricting the length?
 				if (strpos($type, 'string-') !== false)
-					$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
-				else
-					$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				{
+									$actualType = sprintf($columnName . ' = SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $count);
+				}
+				else {
+									$actualType = sprintf($columnName . ' = {%1$s:%2$s}, ', $type, $count);
+				}
 
 				// A key? That's what we were looking for.
 				if (in_array($columnName, $keys))
-					$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				{
+									$where .= (empty($where) ? '' : ' AND ') . substr($actualType, 0, -2);
+				}
 				$count++;
 			}
 
@@ -625,9 +694,12 @@ 
 			{
 				// Are we restricting the length?
 				if (strpos($type, 'string-') !== false)
-					$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-				else
-					$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+				{
+									$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
+				}
+				else {
+									$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+				}
 			}
 			$insertData = substr($insertData, 0, -2) . ')';
 
@@ -637,7 +709,9 @@ 
 			// Here's where the variables are injected to the query.
 			$insertRows = array();
 			foreach ($data as $dataRow)
-				$insertRows[] = $this->quote($insertData, $this->_array_combine($indexed_columns, $dataRow), $connection);
+			{
+							$insertRows[] = $this->quote($insertData, $this->_array_combine($indexed_columns, $dataRow), $connection);
+			}
 
 			$inserted_results = 0;
 			$skip_error = $method == 'ignore' || $table === $db_prefix . 'log_errors';
@@ -658,11 +732,15 @@ 
 				$inserted_results += (!$this->_db_last_result ? 0 : pg_affected_rows($this->_db_last_result));
 			}
 			if (isset($db_replace_result))
-				$this->_db_replace_result = $db_replace_result + $inserted_results;
+			{
+							$this->_db_replace_result = $db_replace_result + $inserted_results;
+			}
 		}
 
 		if ($priv_trans)
-			$this->db_transaction('commit', $connection);
+		{
+					$this->db_transaction('commit', $connection);
+		}
 	}
 
 	/**
@@ -726,7 +804,9 @@ 
 		$num_rows = $this->num_rows($result);
 
 		if ($num_rows == 0)
-			return '';
+		{
+					return '';
+		}
 
 		if ($new_table)
 		{
@@ -747,11 +827,16 @@ 
 			{
 				// Try to figure out the type of each field. (NULL, number, or 'string'.)
 				if (!isset($item))
-					$field_list[] = 'NULL';
+				{
+									$field_list[] = 'NULL';
+				}
 				elseif (is_numeric($item) && (int) $item == $item)
-					$field_list[] = $item;
-				else
-					$field_list[] = '\'' . $this->escape_string($item) . '\'';
+				{
+									$field_list[] = $item;
+				}
+				else {
+									$field_list[] = '\'' . $this->escape_string($item) . '\'';
+				}
 			}
 
 			// 'Insert' the data.
@@ -801,12 +886,18 @@ 
 		while ($row = $this->fetch_assoc($result))
 		{
 			if ($row['data_type'] == 'character varying')
-				$row['data_type'] = 'varchar';
+			{
+							$row['data_type'] = 'varchar';
+			}
 			elseif ($row['data_type'] == 'character')
-				$row['data_type'] = 'char';
+			{
+							$row['data_type'] = 'char';
+			}
 
 			if ($row['character_maximum_length'])
-				$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+			{
+							$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+			}
 
 			// Make the CREATE for this column.
 			$schema_create .= ' "' . $row['column_name'] . '" ' . $row['data_type'] . ($row['is_nullable'] != 'YES' ? ' NOT NULL' : '');
@@ -859,12 +950,15 @@ 
 			if ($row['is_primary'])
 			{
 				if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-					continue;
+				{
+									continue;
+				}
 
 				$index_create .= $crlf . 'ALTER TABLE ' . $tableName . ' ADD PRIMARY KEY ("' . $matches[1] . '");';
 			}
-			else
-				$index_create .= $crlf . $row['inddef'] . ';';
+			else {
+							$index_create .= $crlf . $row['inddef'] . ';';
+			}
 		}
 		$this->free_result($result);
 
@@ -892,7 +986,9 @@ 
 		);
 		$tables = array();
 		while ($row = $this->fetch_row($request))
-			$tables[] = $row[0];
+		{
+					$tables[] = $row[0];
+		}
 		$this->free_result($request);
 
 		return $tables;
@@ -1008,11 +1104,15 @@ 
 		global $db_row_count;
 
 		if ($counter !== false)
-			return pg_fetch_assoc($request, $counter);
+		{
+					return pg_fetch_assoc($request, $counter);
+		}
 
 		// Reset the row counter...
 		if (!isset($db_row_count[$this->seekCounter($request)]))
-			$db_row_count[$this->seekCounter($request)] = 0;
+		{
+					$db_row_count[$this->seekCounter($request)] = 0;
+		}
 
 		// Return the right row.
 		return @pg_fetch_assoc($request, $db_row_count[$this->seekCounter($request)]++);

SSI.php

Braces +3 added lines, -1 removed lines

@@ -803,8 +803,10 @@
 	global $txt, $context;
 
 	if ($output_method === 'echo')
-		echo '
+	{
+			echo '
 		', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br />';
+	}
 	else
 	{
 		return $context['common_stats']['latest_member'];

themes/default/MessageIndex.template.php

Braces +102 added lines, -37 removed lines

@@ -51,7 +51,9 @@ 
 	global $context, $settings, $txt, $options;
 
 	if ($context['no_topic_listing'])
-		return;
+	{
+			return;
+	}
 
 	template_pagesection('normal_buttons', 'right');
 
@@ -62,14 +64,18 @@ 
 
 	// Show the board description
 	if (!empty($context['description']))
-		echo '
+	{
+			echo '
 				<div id="boarddescription">
 					', $context['description'], '
 				</div>';
+	}
 
 	if (!empty($context['moderators']))
-		echo '
+	{
+			echo '
 				<div class="moderators">', count($context['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $context['link_moderators']), '.</div>';
+	}
 
 	echo '
 				<div id="whoisviewing">';
@@ -78,9 +84,12 @@ 
 	if (!empty($settings['display_who_viewing']))
 	{
 		if ($settings['display_who_viewing'] == 1)
-			echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
-		else
-			echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+		{
+					echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
+		}
+		else {
+					echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+		}
 
 		echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_board'];
 	}
@@ -90,10 +99,12 @@ 
 					<ul id="sort_by" class="topic_sorting">';
 
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
-		echo '
+	{
+			echo '
 						<li class="listlevel1 quickmod_select_all">
 							<input type="checkbox" onclick="invertAll(this, document.getElementById(\'quickModForm\'), \'topics[]\');" />
 						</li>';
+	}
 
 	$current_header = $context['topics_headers'][$context['sort_by']];
 	echo '
@@ -106,8 +117,10 @@ 
 							<ul class="menulevel2" id="sortby">';
 
 	foreach ($context['topics_headers'] as $key => $value)
-		echo '
+	{
+			echo '
 								<li class="listlevel2 sort_by_item" id="sort_by_item_', $key, '"><a href="', $value['url'], '" class="linklevel2">', $txt[$key], ' ', $value['sort_dir_img'], '</a></li>';
+	}
 
 	echo '
 							</ul>
@@ -129,13 +142,17 @@ 
 	{
 		// If Quick Moderation is enabled start the form.
 		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		{
+					echo '
 	<form action="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], '" method="post" accept-charset="UTF-8" class="clear" name="quickModForm" id="quickModForm">';
+		}
 
 		// If this person can approve items and we have some awaiting approval tell them.
 		if (!empty($context['unapproved_posts_message']))
-			echo '
+		{
+					echo '
 		<div class="warningbox">', $context['unapproved_posts_message'], '</div>';
+		}
 
 		echo '
 		<main>
@@ -143,7 +160,8 @@ 
 
 		// No topics.... just say, "sorry bub".
 		if (empty($context['topics']))
-			echo '
+		{
+					echo '
 			<li class="basic_row">
 				<div class="topic_info">
 					<div class="topic_name">
@@ -153,24 +171,34 @@ 
 					</div>
 				</div>
 			</li>';
+		}
 
 		foreach ($context['topics'] as $topic)
 		{
 			// Is this topic pending approval, or does it have any posts pending approval?
 			if ($context['can_approve_posts'] && $topic['unapproved_posts'])
-				$color_class = !$topic['approved'] ? 'approvetopic_row' : 'approve_row';
+			{
+							$color_class = !$topic['approved'] ? 'approvetopic_row' : 'approve_row';
+			}
 			// We start with locked and sticky topics.
 			elseif ($topic['is_sticky'] && $topic['is_locked'])
-				$color_class = 'locked_row sticky_row';
+			{
+							$color_class = 'locked_row sticky_row';
+			}
 			// Sticky topics should get a different color, too.
 			elseif ($topic['is_sticky'])
-				$color_class = 'sticky_row';
+			{
+							$color_class = 'sticky_row';
+			}
 			// Locked topics get special treatment as well.
 			elseif ($topic['is_locked'])
-				$color_class = 'locked_row';
+			{
+							$color_class = 'locked_row';
+			}
 			// Last, but not least: regular topics.
-			else
-				$color_class = 'basic_row';
+			else {
+							$color_class = 'basic_row';
+			}
 
 			echo '
 			<li class="', $color_class, '">
@@ -178,8 +206,10 @@ 
 					<p class="topic_icons', empty($modSettings['messageIcons_enable']) ? ' topicicon i-' . $topic['first_post']['icon'] : '', '">';
 
 			if (!empty($modSettings['messageIcons_enable']))
-				echo '
+			{
+							echo '
 						<img src="', $topic['first_post']['icon_url'], '" alt="" />';
+			}
 
 			echo '
 						', $topic['is_posted_in'] ? '<span class="fred topicicon i-profile"></span>' : '', '
@@ -189,12 +219,16 @@ 
 
 			// Is this topic new? (assuming they are logged in!)
 			if ($topic['new'] && $context['user']['is_logged'])
-				echo '
+			{
+							echo '
 							<a class="new_posts" href="', $topic['new_href'], '" id="newicon' . $topic['first_post']['id'] . '">' . $txt['new'] . '</a>';
+			}
 
 			// Is this an unapproved topic and they can approve it?
 			if ($context['can_approve_posts'] && !$topic['approved'])
-				echo '<span class="require_approval">' . $txt['awaiting_approval'] . '</span>';
+			{
+							echo '<span class="require_approval">' . $txt['awaiting_approval'] . '</span>';
+			}
 
 			echo '
 							', $topic['is_sticky'] ? '<strong>' : '', '<span class="preview" title="', $topic['default_preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], '</span></span>', $topic['is_sticky'] ? '</strong>' : '', '
@@ -212,19 +246,24 @@ 
 
 			// Show likes?
 			if (!empty($modSettings['likes_enabled']))
-				echo '<br />
+			{
+							echo '<br />
 					', $topic['likes'], ' ', $txt['likes'];
+			}
 
 			echo '
 					</p>
 					<p class="topic_lastpost">';
 
 			if (!empty($topic['last_post']['member']['avatar']))
-				echo '
+			{
+							echo '
 						<span class="board_avatar"><a href="', $topic['last_post']['member']['href'], '"><img class="avatar" src="', $topic['last_post']['member']['avatar']['href'], '" alt="" loading="lazy" /></a></span>';
-			else
-				echo '
+			}
+			else {
+							echo '
 						<span class="board_avatar"><a href="#"></a></span>';
+			}
 
 			echo '
 						<a class="topicicon i-last_post" href="', $topic['last_post']['href'], '" title="', $txt['last_post'], '"></a>
@@ -240,25 +279,37 @@ 
 				<p class="topic_moderation', $options['display_quick_mod'] == 1 ? '' : '_alt', '" >';
 
 				if ($options['display_quick_mod'] == 1)
-					echo '
+				{
+									echo '
 						<input type="checkbox" name="topics[]" value="', $topic['id'], '" />';
+				}
 				else
 				{
 					// Check permissions on each and show only the ones they are allowed to use.
 					if ($topic['quick_mod']['remove'])
-						echo '<a class="topicicon i-remove" href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['quickmod_confirm'], '\');" title="', $txt['remove_topic'], '"></a>';
+					{
+											echo '<a class="topicicon i-remove" href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=remove;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['quickmod_confirm'], '\');" title="', $txt['remove_topic'], '"></a>';
+					}
 
 					if ($topic['quick_mod']['lock'])
-						echo '<a class="topicicon i-locked" href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['quickmod_confirm'], '\');" title="', $txt[$topic['is_locked'] ? 'set_unlock' : 'set_lock'], '"></a>';
+					{
+											echo '<a class="topicicon i-locked" href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=lock;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['quickmod_confirm'], '\');" title="', $txt[$topic['is_locked'] ? 'set_unlock' : 'set_lock'], '"></a>';
+					}
 
 					if ($topic['quick_mod']['lock'] || $topic['quick_mod']['remove'])
-						echo '<br />';
+					{
+											echo '<br />';
+					}
 
 					if ($topic['quick_mod']['sticky'])
-						echo '<a class="topicicon i-sticky" href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['quickmod_confirm'], '\');" title="', $txt[$topic['is_sticky'] ? 'set_nonsticky' : 'set_sticky'], '"></a>';
+					{
+											echo '<a class="topicicon i-sticky" href="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], ';actions%5B', $topic['id'], '%5D=sticky;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['quickmod_confirm'], '\');" title="', $txt[$topic['is_sticky'] ? 'set_nonsticky' : 'set_sticky'], '"></a>';
+					}
 
 					if ($topic['quick_mod']['move'])
-						echo '<a class="topicicon i-move" href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0" title="', $txt['move_topic'], '"></a>';
+					{
+											echo '<a class="topicicon i-move" href="', $scripturl, '?action=movetopic;current_board=', $context['current_board'], ';board=', $context['current_board'], '.', $context['start'], ';topic=', $topic['id'], '.0" title="', $txt['move_topic'], '"></a>';
+					}
 				}
 
 				echo '
@@ -281,17 +332,21 @@ 
 					<option value="">&nbsp;</option>';
 
 			foreach ($context['qmod_actions'] as $qmod_action)
-				if ($context['can_' . $qmod_action])
+			{
+							if ($context['can_' . $qmod_action])
 					echo '
 					<option value="' . $qmod_action . '">&#10148;&nbsp;', $txt['quick_mod_' . $qmod_action] . '</option>';
+			}
 
 			echo '
 				</select>';
 
 			// Show a list of boards they can move the topic to.
 			if ($context['can_move'])
-				echo '
+			{
+							echo '
 				<span id="quick_mod_jump_to">&nbsp;</span>';
+			}
 
 			echo '
 				<input type="submit" value="', $txt['quick_mod_go'], '" onclick="return document.forms.quickModForm.qaction.value != \'\' &amp;&amp; confirm(\'', $txt['quickmod_confirm'], '\');" />
@@ -300,9 +355,11 @@ 
 
 		// Finish off the form - again.
 		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
-			echo '
+		{
+					echo '
 	<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '" />
 	</form>';
+		}
 	}
 }
 
@@ -314,7 +371,9 @@ 
 	global $context, $txt, $options;
 
 	if ($context['no_topic_listing'])
-		return;
+	{
+			return;
+	}
 
 	template_pagesection('normal_buttons', 'right');
 
@@ -326,17 +385,22 @@ 
 		<div class="qaction_row floatright" id="message_index_jump_to">&nbsp;</div>';
 
 	if (!$context['no_topic_listing'])
-		template_basicicons_legend();
+	{
+			template_basicicons_legend();
+	}
 
 	echo '
 			<script>';
 
 	if (!empty($context['using_relative_time']))
-		echo '
+	{
+			echo '
 				$(\'.topic_latest\').addClass(\'relative\');';
+	}
 
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1 && !empty($context['topics']) && $context['can_move'])
-		echo '
+	{
+			echo '
 				aJumpTo[aJumpTo.length] = new JumpTo({
 					sContainerId: "quick_mod_jump_to",
 					sClassName: "qaction",
@@ -352,6 +416,7 @@ 
 					bDisabled: true,
 					sCustomName: "move_to"
 				});';
+	}
 
 	echo '
 				aJumpTo[aJumpTo.length] = new JumpTo({

themes/default/Post.template.php

Braces +93 added lines, -32 removed lines

@@ -35,15 +35,19 @@ 
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
 	if (isBrowser('is_firefox'))
-		echo '
+	{
+			echo '
 			window.addEventListener("pageshow", reActivate, false);';
+	}
 
 	// Start with message icons - and any missing from this theme.
 	echo '
 			var icon_urls = {';
 	foreach ($context['icons'] as $icon)
-		echo '
+	{
+			echo '
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
+	}
 	echo '
 			};';
 
@@ -76,7 +80,9 @@ 
 	// If an error occurred, explain what happened.
 	template_show_error('post_error');
 	if (!empty($context['attachment_error_keys']))
-		template_attachment_errors();
+	{
+			template_attachment_errors();
+	}
 
 	// If this won't be approved let them know!
 	// @todo why not use the template_show_error above?
@@ -97,10 +103,12 @@ 
 						</p>';
 
 	if (!empty($context['drafts_autosave']))
-		echo '
+	{
+			echo '
 						<div id="draft_section" class="successbox', isset($context['draft_saved']) ? '"' : ' hide"', '>
 							', sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
 						</div>';
+	}
 
 	// The post header... important stuff
 	echo '
@@ -118,13 +126,15 @@ 
 							</dd>';
 
 		if (empty($modSettings['guest_post_no_email']))
-			echo '
+		{
+					echo '
 							<dt>
 								<label for="email"', isset($context['post_error']['no_email']) || isset($context['post_error']['bad_email']) ? ' class="error"' : '', ' id="caption_email">', $txt['email'], ':</label>
 							</dt>
 							<dd>
 								<input type="email" id="email" name="email" size="25" value="', $context['email'], '" tabindex="', $context['tabindex']++, '" class="input_text" required="required" />
 							</dd>';
+		}
 	}
 
 	// Now show the subject box for this post.
@@ -143,8 +153,10 @@ 
 
 	// Loop through each message icon allowed, adding it to the drop down list.
 	foreach ($context['icons'] as $icon)
-		echo '
+	{
+			echo '
 									<option value="', $icon['value'], '"', $icon['value'] == $context['icon'] ? ' selected="selected"' : '', '>', $icon['name'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -152,12 +164,14 @@ 
 							</dd>';
 
 	if (!empty($context['show_boards_dropdown']))
-		echo '
+	{
+			echo '
 							<dt class="clear_left">
 								<label for="post_in_board">', $txt['post_in_board'], '</label>:
 							</dt>
 							<dd>', template_select_boards('post_in_board'), '
 							</dd>';
+	}
 
 	echo '
 						</dl>';
@@ -199,8 +213,10 @@ 
 
 	// Show a list of all the years we allow...
 	for ($year = $context['cal_minyear']; $year <= $context['cal_maxyear']; $year++)
-		echo '
+	{
+			echo '
 										<option value="', $year, '"', $year == $context['event']['year'] ? ' selected="selected"' : '', '>', $year, '&nbsp;</option>';
+	}
 
 	echo '
 									</select>
@@ -209,8 +225,10 @@ 
 
 	// There are 12 months per year - ensure that they all get listed.
 	for ($month = 1; $month <= 12; $month++)
-		echo '
+	{
+			echo '
 										<option value="', $month, '"', $month == $context['event']['month'] ? ' selected="selected"' : '', '>', $txt['months'][$month], '&nbsp;</option>';
+	}
 
 	echo '
 									</select>
@@ -219,8 +237,10 @@ 
 
 	// This prints out all the days in the current month - this changes dynamically as we switch months.
 	for ($day = 1; $day <= $context['event']['last_day']; $day++)
-		echo '
+	{
+			echo '
 										<option value="', $day, '"', $day == $context['event']['day'] ? ' selected="selected"' : '', '>', $day, '&nbsp;</option>';
+	}
 
 	echo '
 									</select>
@@ -240,8 +260,10 @@ 
 										<select id="span" name="span">';
 
 			for ($days = 1; $days <= $modSettings['cal_maxspan']; $days++)
-				echo '
+			{
+							echo '
 											<option value="', $days, '"', $days == $context['event']['span'] ? ' selected="selected"' : '', '>', $days, '&nbsp;</option>';
+			}
 
 			echo '
 										</select>
@@ -262,8 +284,10 @@ 
 	}
 
 	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
-		echo '
+	{
+			echo '
 								<input type="hidden" name="eventid" value="', $context['event']['id'], '" />';
+	}
 
 	echo '
 							</fieldset>
@@ -288,8 +312,10 @@ 
 							<div id="mentioned" class="hide">';
 
 		foreach ($context['member_ids'] as $id)
-			echo '
+		{
+					echo '
 								<input type="hidden" name="uid[]" value="', $id, '" />';
+		}
 
 		echo '
 							</div>';
@@ -302,13 +328,17 @@ 
 
 	// Option to delete an event if user is editing one.
 	if (!empty($context['make_event']) && !$context['event']['new'])
-		echo '
+	{
+			echo '
 							<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" onclick="return confirm(\'', $txt['event_delete_confirm'], '\');" />';
+	}
 
 	// Option to add a poll (javascript if enabled, otherwise preview with poll)
 	if (empty($context['make_poll']) && $context['can_add_poll'])
-		echo '
+	{
+			echo '
 							<input type="submit" name="poll" aria-label="', $txt['add_poll'], '" value="', $txt['add_poll'], '" onclick="return loadAddNewPoll(this, ', empty($context['current_board']) ? '0' : $context['current_board'], ', \'postmodify\');" />';
+	}
 
 	echo '
 						</div>';
@@ -323,18 +353,22 @@ 
 
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
 	if (!empty($settings['additional_options_collapsible']))
-		echo '
+	{
+			echo '
 					<h3 id="postAdditionalOptionsHeader" class="category_header panel_toggle">
 							<i id="postMoreExpand" class="chevricon i-chevron-', empty($context['minmax_preferences']['post']) ? 'up' : 'down', ' hide" title="', $txt['hide'], '"></i>
 						<a href="#" id="postMoreExpandLink">', !empty($context['attachments']) && $context['attachments']['can']['post'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a>
 					</h3>';
+	}
 
 	echo '
 					<div id="', empty($settings['additional_options_collapsible']) ? 'postAdditionalOptionsNC"' : 'postAdditionalOptions"', empty($settings['additional_options_collapsible']) || empty($context['minmax_preferences']['post']) ? '' : ' class="hide"', '>';
 
 	// Is the user allowed to post or if this post already has attachments on it give them the boxes.
 	if (!empty($context['attachments']) && ($context['attachments']['can']['post'] || !empty($context['attachments']['current'])))
-		$context['attachments']['template']();
+	{
+			$context['attachments']['template']();
+	}
 
 	// Display the check boxes for all the standard options - if they are available to the user!
 	echo '
@@ -387,7 +421,8 @@ 
 
 		// Show more boxes if they aren't approaching that limit.
 		if ($context['attachments']['num_allowed'] > 1)
-			echo '
+		{
+					echo '
 								<script>
 									var allowed_attachments = ', $context['attachments']['num_allowed'], ',
 										current_attachment = 1,
@@ -397,18 +432,24 @@ 
 								</script>
 							</dd>
 							<dd class="smalltext drop_attachments_no_js" id="moreAttachments"><a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a></dd>';
-		else
-			echo '
+		}
+		else {
+					echo '
 							</dd>';
+		}
 	}
 
 	foreach ($context['attachments']['current'] as $attachment)
 	{
 		$label = $attachment['name'];
 		if (empty($attachment['approved']))
-			$label .= ' (' . $txt['awaiting_approval'] . ')';
+		{
+					$label .= ' (' . $txt['awaiting_approval'] . ')';
+		}
 		if (!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']))
-			$label .= sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0));
+		{
+					$label .= sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0));
+		}
 
 		echo '
 							<dd class="smalltext">
@@ -423,20 +464,28 @@ 
 
 	// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
 	if (!empty($context['attachments']['allowed_extensions']))
-		echo '
+	{
+			echo '
 								<p id="types">', $txt['allowed_types'], ': ', $context['attachments']['allowed_extensions'], '</p>';
+	}
 
 	if (!empty($context['attachments']['restrictions']))
-		echo '
+	{
+			echo '
 								<p id="restrictions">', $txt['attach_restrictions'], ' ', implode(', ', $context['attachments']['restrictions']), '</p>';
+	}
 
 	if ($context['attachments']['num_allowed'] == 0)
-		echo '
+	{
+			echo '
 								<p class="infobox">', $txt['attach_limit_nag'], '</p>';
+	}
 
 	if (!$context['attachments']['can']['post_unapproved'])
-		echo '
+	{
+			echo '
 								<p class="warningbox">', $txt['attachment_requires_approval'], '</p>';
+	}
 
 	echo '
 							</dd>
@@ -537,9 +586,11 @@ 
 							</dd>';
 
 	foreach ($context['drafts'] as $draft)
-		echo '
+	{
+			echo '
 							<dt>', $draft['link'], '</dt>
 							<dd>', $draft['poster_time'], '</dd>';
+	}
 
 	echo '
 						</dl>
@@ -600,7 +651,9 @@ 
 		{
 			$ignoring = false;
 			if (!empty($post['is_ignored']))
-				$ignored_posts[] = $ignoring = $post['id'];
+			{
+							$ignored_posts[] = $ignoring = $post['id'];
+			}
 
 			echo '
 			<div class="content forumposts">
@@ -611,20 +664,24 @@ 
 						</h5>';
 
 			if ($context['can_quote'])
-				echo '
+			{
+							echo '
 						<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
 							<li class="listlevel1"><a href="#postmodify" onmousedown="return insertQuoteFast(', $post['id'], ');" class="linklevel1 quote_button">', $txt['bbc_quote'], '</a></li>
 						</ul>';
+			}
 
 			echo '
 					</div>';
 
 			if ($ignoring)
-				echo '
+			{
+							echo '
 					<div id="msg_', $post['id'], '_ignored_prompt">
 						', $txt['ignoring_user'], '
 						<a href="#" id="msg_', $post['id'], '_ignored_link" class="hide">', $txt['show_ignore_user_post'], '</a>
 					</div>';
+			}
 
 			echo '
 					<div class="inner" id="msg_', $post['id'], '_body">', $post['body'], '</div>
@@ -706,8 +763,10 @@ 
 
 	// If we are starting a new topic starting from another one, here is the place to remember some details
 	if (!empty($context['original_post']))
-		echo '
+	{
+			echo '
 			<input type="hidden" name="followup" value="' . $context['original_post'] . '" />';
+	}
 
 	echo '
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '" />
@@ -737,7 +796,8 @@ 
 
 	// Code for showing and hiding additional options.
 	if (!empty($settings['additional_options_collapsible']))
-		addInlineJavascript('
+	{
+			addInlineJavascript('
 			var oSwapAdditionalOptions = new elk_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: ' . (empty($context['minmax_preferences']['post']) ? 'false' : 'true') . ',
@@ -774,6 +834,7 @@ 
 					sAdditionalVars: \';minmax_key=post\'
 				},
 			});', true);
+	}
 
 	template_topic_replies_below();
 }

themes/default/Theme.php

Braces +15 added lines, -5 removed lines

@@ -316,7 +316,9 @@ 
 		if (!empty($this->js_vars) && !$do_deferred)
 		{
 			foreach ($this->js_vars as $var => $value)
-				$js_vars[] = $var . ' = ' . $value;
+			{
+							$js_vars[] = $var . ' = ' . $value;
+			}
 
 			// Newlines and tabs are here to make it look nice in the page source view, stripped if minimized though
 			$this->js_inline['standard'][] = 'var ' . implode(",\n\t\t\t", $js_vars) . ';';
@@ -383,14 +385,18 @@ 
 				}
 
 				foreach ($combiner->getSpares() as $id => $file)
-					echo '
+				{
+									echo '
 	<link rel="stylesheet" href="', $file['filename'], '" id="', $id, '" />';
+				}
 			}
 			else
 			{
 				foreach ($this->css_files as $id => $file)
-					echo '
+				{
+									echo '
 	<link rel="stylesheet" href="', $file['filename'], '" id="', $id, '" />';
+				}
 			}
 		}
 	}
@@ -766,7 +772,9 @@ 
 		// Since it's nice to have avatars all of the same size, and in some cases the size detection may fail,
 		// let's add the css in any case
 		if (!isset($context['html_headers']))
-			$context['html_headers'] = '';
+		{
+					$context['html_headers'] = '';
+		}
 
 		if (!empty($modSettings['avatar_max_width']) || !empty($modSettings['avatar_max_height']))
 		{
@@ -1097,7 +1105,9 @@ 
 
 			// Load each template...
 			foreach ($templates as $template)
-				$this->templates->load($template);
+			{
+							$this->templates->load($template);
+			}
 
 			// ...and attempt to load their associated language files.
 			$required_files = implode('+', array_merge($templates, array('Addons')));

themes/default/ProfileOptions.template.php

Braces +161 added lines, -56 removed lines

@@ -39,8 +39,10 @@ 
 				<th scope="col">', $txt['status'], '</th>';
 
 	if ($context['can_send_email'])
-		echo '
+	{
+			echo '
 				<th scope="col">', $txt['email'], '</th>';
+	}
 
 	echo '
 				<th scope="col">', $txt['profile_contact'], '</th>
@@ -49,12 +51,14 @@ 
 
 	// If they don't have any buddies don't list them!
 	if (empty($context['buddies']))
-		echo '
+	{
+			echo '
 			<tr>
 				<td colspan="5" class="centertext">
 					<strong>', $txt['no_buddies'], '</strong>
 				</td>
 			</tr>';
+	}
 
 	// Now loop through each buddy showing info on each.
 	foreach ($context['buddies'] as $buddy)
@@ -67,8 +71,10 @@ 
 				</td>';
 
 		if ($context['can_send_email'])
-			echo '
+		{
+					echo '
 				<td>', template_member_email($buddy), '</td>';
+		}
 
 		//  Any custom profile (with icon) fields to show
 		$im = array();
@@ -76,8 +82,10 @@ 
 		{
 
 			foreach ($buddy['custom_fields'] as $key => $cpf)
-				if ($cpf['placement'] == 1)
+			{
+							if ($cpf['placement'] == 1)
 					$im[] = $cpf['value'];
+			}
 		}
 
 		echo '
@@ -111,8 +119,10 @@ 
 				</dl>';
 
 	if (!empty($context['token_check']))
-		echo '
+	{
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
@@ -152,8 +162,10 @@ 
 				<th scope="col">', $txt['status'], '</th>';
 
 	if ($context['can_send_email'])
-		echo '
+	{
+			echo '
 				<th scope="col">', $txt['email'], '</th>';
+	}
 
 	echo '
 				<th scope="col"></th>
@@ -161,12 +173,14 @@ 
 
 	// If they don't have anyone on their ignore list, don't list it!
 	if (empty($context['ignore_list']))
-		echo '
+	{
+			echo '
 			<tr>
 				<td colspan="4" class="centertext">
 					<strong>', $txt['no_ignore'], '</strong>
 				</td>
 			</tr>';
+	}
 
 	// Now loop through each buddy showing info on each.
 	foreach ($context['ignore_list'] as $member)
@@ -179,8 +193,10 @@ 
 				</td>';
 
 		if ($context['can_send_email'])
-			echo '
+		{
+					echo '
 				<td>', template_member_email($member), '</td>';
+		}
 
 		echo '
 				<td class="righttext">
@@ -211,8 +227,10 @@ 
 				</dl>';
 
 	if (!empty($context['token_check']))
-		echo '
+	{
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
@@ -249,31 +267,40 @@ 
 
 	// Don't say "Profile" if this isn't the profile...
 	if (!empty($context['profile_header_text']))
-		echo '
+	{
+			echo '
 				', $context['profile_header_text'];
-	else
-		echo '
+	}
+	else {
+			echo '
 				', $txt['profile'];
+	}
 
 	echo '
 			</h2>';
 
 	// Have we some description?
 	if ($context['page_desc'])
-		echo '
+	{
+			echo '
 			<p class="description">', $context['page_desc'], '</p>';
+	}
 
 	echo '
 			<div class="content">';
 
 	// Any bits at the start?
 	if (!empty($context['profile_prehtml']))
-		echo '
+	{
+			echo '
 				<div>', $context['profile_prehtml'], '</div>';
+	}
 
 	if (!empty($context['profile_fields']))
-		echo '
+	{
+			echo '
 				<dl>';
+	}
 
 	// Start the big old loop 'of love.
 	$lastItem = 'hr';
@@ -281,7 +308,9 @@ 
 	{
 		// We add a little hack to be sure we never get more than one hr in a row!
 		if ($lastItem === 'hr' && $field['type'] === 'hr')
-			continue;
+		{
+					continue;
+		}
 
 		$lastItem = $field['type'];
 		if ($field['type'] === 'hr')
@@ -307,8 +336,10 @@ 
 
 			// Does it have any subtext to show?
 			if (!empty($field['subtext']))
-				echo '
+			{
+							echo '
 						<p class="smalltext">', $field['subtext'], '</p>';
+			}
 
 			echo '
 					</dt>
@@ -316,28 +347,38 @@ 
 
 			// Want to put something in front of the box?
 			if (!empty($field['preinput']))
-				echo '
+			{
+							echo '
 						', $field['preinput'];
+			}
 
 			// What type of data are we showing?
 			if ($field['type'] === 'label')
-				echo '
+			{
+							echo '
 						', $field['value'];
+			}
 
 			// Maybe it's a text box - very likely!
 			elseif (in_array($field['type'], array('int', 'float', 'text', 'password')))
-				echo '
+			{
+							echo '
 						<input type="', $field['type'] == 'password' ? 'password' : 'text', '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' class="input_', $field['type'] == 'password' ? 'password' : 'text', '" />';
+			}
 
 			// Maybe it's an html5 input
 			elseif (in_array($field['type'], array('url', 'search', 'date', 'email', 'color')))
-				echo '
+			{
+							echo '
 						<input type="', $field['type'], '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' class="input_', $field['type'] == 'password' ? 'password' : 'text', '" />';
+			}
 
 			// You "checking" me out? ;)
 			elseif ($field['type'] === 'check')
-				echo '
+			{
+							echo '
 						<input type="hidden" name="', $key, '" value="0" /><input type="checkbox" name="', $key, '" id="', $key, '" ', !empty($field['value']) ? ' checked="checked"' : '', ' value="1" ', $field['input_attr'], ' />';
+			}
 
 			// Always fun - select boxes!
 			elseif ($field['type'] === 'select')
@@ -362,9 +403,11 @@ 
 
 					// Assuming we now have some!
 					if (is_array($field['options']))
-						foreach ($field['options'] as $value => $name)
+					{
+											foreach ($field['options'] as $value => $name)
 							echo '
 							<option value="', $value, '" ', $value == $field['value'] ? 'selected="selected"' : '', '>', $name, '</option>';
+					}
 				}
 
 				echo '
@@ -373,8 +416,10 @@ 
 
 			// Something to end with?
 			if (!empty($field['postinput']))
-				echo '
+			{
+							echo '
 						', $field['postinput'];
+			}
 
 			echo '
 					</dd>';
@@ -382,15 +427,19 @@ 
 	}
 
 	if (!empty($context['profile_fields']))
-		echo '
+	{
+			echo '
 				</dl>';
+	}
 
 	// Are there any custom profile fields - if so print them!
 	if (!empty($context['custom_fields']))
 	{
 		if ($lastItem !== 'hr')
-			echo '
+		{
+					echo '
 				<hr class="clear" />';
+		}
 
 		echo '
 				<dl>';
@@ -413,8 +462,10 @@ 
 
 	// Any closing HTML?
 	if (!empty($context['profile_posthtml']))
-		echo '
+	{
+			echo '
 				<div>', $context['profile_posthtml'], '</div>';
+	}
 
 	// Only show the password box if it's actually needed.
 	template_profile_save();
@@ -431,18 +482,22 @@ 
 
 	// If this part requires a password, make sure to give a warning.
 	if ($context['require_password'])
-		echo '
+	{
+			echo '
 				// Did you forget to type your password?
 				if (document.forms.creator.oldpasswrd.value === "")
 				{
 					alert("', $txt['required_security_reasons'], '");
 					return false;
 				}';
+	}
 
 	// Any onsubmit javascript?
 	if (!empty($context['profile_onsubmit_javascript']))
-		echo '
+	{
+			echo '
 				', $context['profile_onsubmit_javascript'];
+	}
 
 	echo '
 			}
@@ -450,12 +505,14 @@ 
 
 	// Any final spellchecking stuff?
 	if (!empty($context['show_spellchecking']))
-		echo '
+	{
+			echo '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="UTF-8" target="spellWindow" action="', $scripturl, '?action=spellcheck">
 			<input type="hidden" id="spellstring" name="spellstring" value="" />
 			<input type="hidden" id="fulleditor" name="fulleditor" value="" />
 		</form>';
-}
+	}
+	}
 
 /**
  * Personal Message settings.
@@ -493,8 +550,10 @@ 
 									<option value="1"', !empty($context['send_email']) && ($context['send_email'] == 1 || (empty($modSettings['enable_buddylist']) && $context['send_email'] > 1)) ? ' selected="selected"' : '', '>', $txt['email_notify_always'], '</option>';
 
 	if (!empty($modSettings['enable_buddylist']))
-		echo '
+	{
+			echo '
 										<option value="2"', !empty($context['send_email']) && $context['send_email'] > 1 ? ' selected="selected"' : '', '>', $txt['email_notify_buddies'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -562,7 +621,8 @@ 
 							</dd>';
 
 	if ($context['allow_no_censored'])
-		echo '
+	{
+			echo '
 							<dt>
 								<label for="show_no_censored">', $txt['show_no_censored'], '</label>
 							</dt>
@@ -570,6 +630,7 @@ 
 								<input type="hidden" name="default_options[show_no_censored]" value="0" />
 								<input type="checkbox" name="default_options[show_no_censored]" id="show_no_censored" value="1"' . (!empty($context['member']['options']['show_no_censored']) ? ' checked="checked"' : '') . ' />
 							</dd>';
+	}
 
 	echo '
 							<dt>
@@ -624,7 +685,8 @@ 
 	}
 
 	if (!empty($modSettings['cal_enabled']))
-		echo '
+	{
+			echo '
 							<dt>
 								<label for="calendar_start_day">', $txt['calendar_start_day'], '</label>
 							</dt>
@@ -635,9 +697,11 @@ 
 									<option value="6"', !empty($context['member']['options']['calendar_start_day']) && $context['member']['options']['calendar_start_day'] == 6 ? ' selected="selected"' : '', '>', $txt['days'][6], '</option>
 								</select>
 								</dd>';
+	}
 
 	if (!empty($modSettings['drafts_enabled']) && !empty($modSettings['drafts_autosave_enabled']))
-		echo '
+	{
+			echo '
 							<dt>
 								<label for="drafts_autosave_enabled">', $txt['drafts_autosave_enabled'], '</label>
 							</dt>
@@ -645,6 +709,7 @@ 
 								<input type="hidden" name="default_options[drafts_autosave_enabled]" value="0" />
 								<label for="drafts_autosave_enabled"><input type="checkbox" name="default_options[drafts_autosave_enabled]" id="drafts_autosave_enabled" value="1"', !empty($context['member']['options']['drafts_autosave_enabled']) ? ' checked="checked"' : '', ' /></label>
 							</dd>';
+	}
 
 	echo '
 							<dt>
@@ -719,7 +784,8 @@ 
 
 	// Allow notification on announcements to be disabled?
 	if (!empty($modSettings['allow_disableAnnounce']))
-		echo '
+	{
+			echo '
 					<dt>
 						<label for="notify_announcements">', $txt['notify_important_email'], '</label>
 					</dt>
@@ -727,6 +793,7 @@ 
 						<input type="hidden" name="notify_announcements" value="0" />
 						<input type="checkbox" id="notify_announcements" name="notify_announcements"', !empty($context['member']['notify_announcements']) ? ' checked="checked"' : '', ' />
 					</dd>';
+	}
 
 	// Auto notification when you reply / start a topic?
 	echo '
@@ -741,7 +808,8 @@ 
 
 	// Can the body of the post be sent, PBE will ensure it can
 	if (empty($modSettings['disallow_sendBody']))
-		echo '
+	{
+			echo '
 					<dt>
 						<label for="notify_send_body">', $txt['notify_send_body' . (!empty($modSettings['maillist_enabled']) ? '_pbe' : '')], '</label>
 					</dt>
@@ -750,6 +818,7 @@ 
 						<input type="checkbox" id="notify_send_body" name="notify_send_body"', !empty($context['member']['notify_send_body']) ? ' checked="checked"' : '', ' />
 						', (!empty($modSettings['maillist_enabled']) ? $txt['notify_send_body_pbe_post'] : ''), '
 					</dd>';
+	}
 
 	// How often do you want to hear from us, instant, daily, weekly?
 	echo '
@@ -823,10 +892,12 @@ 
 
 	// Do we have an update message?
 	if (!empty($context['update_message']))
-		echo '
+	{
+			echo '
 			<div class="successbox">
 				', $context['update_message'], '
 			</div>';
+	}
 
 	// Requesting membership to a group?
 	if (!empty($context['group_request']))
@@ -862,10 +933,12 @@ 
 					<tr  id="primdiv_', $group['id'], '">';
 
 			if ($context['can_edit_primary'])
-				echo '
+			{
+							echo '
 						<td>
 							<input type="radio" name="primary" id="primary_', $group['id'], '" value="', $group['id'], '" ', $group['is_primary'] ? 'checked="checked" ' : '', $group['can_be_primary'] ? '' : 'disabled="disabled" ', ' />
 						</td>';
+			}
 
 			echo '
 						<td>
@@ -877,8 +950,10 @@ 
 
 			// Can they leave their group?
 			if ($group['can_leave'])
-				echo '
+			{
+							echo '
 							<a class="linkbutton" href="' . $scripturl . '?action=profile;save;u=' . $context['id_member'] . ';area=groupmembership;' . $context['session_var'] . '=' . $context['session_id'] . ';gid=' . $group['id'] . ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '">' . $txt['leave_group'] . '</a>';
+			}
 			echo '
 						</td>
 					</tr>';
@@ -889,10 +964,12 @@ 
 			</table>';
 
 		if ($context['can_edit_primary'])
-			echo '
+		{
+					echo '
 			<div class="submitbutton">
 				<input type="submit" value="', $txt['make_primary'], '" />
 			</div>';
+		}
 
 		// Any groups they can join?
 		if (!empty($context['groups']['available']))
@@ -920,15 +997,21 @@ 
 						<td class="lefttext">';
 
 				if ($group['type'] == 3)
-					echo '
+				{
+									echo '
 							<a class="linkbutton_right" href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '">', $txt['join_group'], '</a>';
+				}
 				elseif ($group['type'] == 2 && $group['pending'])
-					echo '
+				{
+									echo '
 							', $txt['approval_pending'];
+				}
 				elseif ($group['type'] == 2)
-					echo '
+				{
+									echo '
 							<a class="linkbutton_right" href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['request_group'], '</a>';
-// @todo
+				}
+				// @todo
 //				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />';
 
 				echo '
@@ -948,16 +1031,20 @@ 
 				prevDiv = "";';
 
 		if (isset($context['groups']['member'][$context['primary_group']]))
-			echo '
+		{
+					echo '
 			initHighlightSelection("primdiv_' . $context['primary_group'] . '");';
+		}
 
 		echo '
 		</script>';
 	}
 
 	if (!empty($context['token_check']))
-		echo '
+	{
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '" />';
+	}
 
 	echo '
 				<input type="hidden" name="save" value="save" />
@@ -1011,11 +1098,13 @@ 
 
 	// Fill the select box with all primary membergroups that can be assigned to a member.
 	foreach ($context['member_groups'] as $member_group)
-		if (!empty($member_group['can_be_primary']))
+	{
+			if (!empty($member_group['can_be_primary']))
 			echo '
 									<option value="', $member_group['id'], '"', $member_group['is_primary'] ? ' selected="selected"' : '', '>
 										', $member_group['name'], '
 									</option>';
+	}
 
 	echo '
 								</select>
@@ -1031,11 +1120,13 @@ 
 
 	// For each membergroup show a checkbox so members can be assigned to more than one group.
 	foreach ($context['member_groups'] as $member_group)
-		if ($member_group['can_be_additional'])
+	{
+			if ($member_group['can_be_additional'])
 			echo '
 										<li>
 											<label for="additional_groups-', $member_group['id'], '"><input type="checkbox" name="additional_groups[]" value="', $member_group['id'], '" id="additional_groups-', $member_group['id'], '"', $member_group['is_additional'] ? ' checked="checked"' : '', ' /> ', $member_group['name'], '</label>
 										</li>';
+	}
 
 	echo '
 									</ul>
@@ -1093,20 +1184,28 @@ 
 
 	// If there is a limit at all!
 	if (!empty($context['signature_limits']['max_length']))
-		echo '
+	{
+			echo '
 								<p class="smalltext">', sprintf($txt['max_sig_characters'], $context['signature_limits']['max_length']), ' <span id="signatureLeft">', $context['signature_limits']['max_length'], '</span></p>';
+	}
 
 	if ($context['show_spellchecking'])
-		echo '
+	{
+			echo '
 								<input type="button" value="', $txt['spell_check'], '" onclick="spellCheck(\'creator\', \'signature\', false);"  tabindex="', $context['tabindex']++, '" class="right_submit" />';
+	}
 
 	if (!empty($context['show_preview_button']))
-		echo '
+	{
+			echo '
 								<input type="submit" name="preview_signature" id="preview_button" value="', $txt['preview_signature'], '"  tabindex="', $context['tabindex']++, '" class="right_submit" />';
+	}
 
 	if ($context['signature_warning'])
-		echo '
+	{
+			echo '
 								<span class="smalltext">', $context['signature_warning'], '</span>';
+	}
 
 	// Some javascript used to count how many characters have been used so far in the signature.
 	echo '
@@ -1179,8 +1278,10 @@ 
 
 		// This lists all the file categories.
 		foreach ($context['avatars'] as $avatar)
-			echo '
+		{
+					echo '
 											<option value="', $avatar['filename'] . ($avatar['is_dir'] ? '/' : ''), '"', ($avatar['checked'] ? ' selected="selected"' : ''), '>', $avatar['name'], '</option>';
+		}
 		echo '
 										</select>
 									</div>
@@ -1290,8 +1391,10 @@ 
 
 	// Help the user by showing a list of common time formats.
 	foreach ($context['easy_timeformats'] as $time_format)
-		echo '
+	{
+			echo '
 									<option value="', $time_format['format'], '"', $time_format['format'] == $context['member']['time_format'] ? ' selected="selected"' : '', '>', $time_format['title'], '</option>';
+	}
 
 	echo '
 								</select>
@@ -1348,8 +1451,10 @@ 
 								<select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.gif\';">';
 
 	foreach ($context['smiley_sets'] as $set)
-		echo '
+	{
+			echo '
 									<option value="', $set['id'], '"', $set['selected'] ? ' selected="selected"' : '', '>', $set['name'], '</option>';
+	}
 
 	echo '
 								</select>

themes/default/GenericBoards.template.php

Braces +45 added lines, -20 removed lines

@@ -60,9 +60,12 @@ 
 		$diff_alternate = $diff_current - 2 * ($categories[$last_group] + 1);
 
 		if (abs($diff_alternate) < $diff_current)
-			array_unshift($groups[1], $last_group);
-		else
-			$groups[0][] = $last_group;
+		{
+					array_unshift($groups[1], $last_group);
+		}
+		else {
+					$groups[0][] = $last_group;
+		}
 	}
 	// If we have less on the left, let's try picking one from the right
 	elseif ($diff_current < 0)
@@ -72,9 +75,12 @@ 
 		$diff_alternate = $diff_current + 2 * ($categories[$first_group] + 1);
 
 		if (abs($diff_alternate) < abs($diff_current))
-			$groups[0][] = $first_group;
-		else
-			array_unshift($groups[1], $first_group);
+		{
+					$groups[0][] = $first_group;
+		}
+		else {
+					array_unshift($groups[1], $first_group);
+		}
 	}
 
 	return $groups;
@@ -106,18 +112,23 @@ 
 
 		// If the board or children is new, show an indicator.
 		if ($board['new'] || $board['children_new'])
-			echo '
+		{
+					echo '
 							<span class="board_icon ', $board['new'] ? 'i-board-new' : 'i-board-sub', '" title="', $txt['new_posts'], '"></span>';
+		}
 
 		// Is it a redirection board?
 		elseif ($board['is_redirect'])
-			echo '
+		{
+					echo '
 							<span class="board_icon i-board-redirect" title="', sprintf($txt['redirect_board_to'], Util::htmlspecialchars($board['name'])), '"></span>';
+		}
 
 		// No new posts at all! The agony!!
-		else
-			echo '
+		else {
+					echo '
 							<span class="board_icon i-board-off" title="', $txt['old_posts'], '"></span>';
+		}
 
 		echo '
 						</a>
@@ -126,8 +137,10 @@ 
 
 		// Has it outstanding posts for approval? @todo - Might change presentation here.
 		if ($board['can_approve_posts'] && ($board['unapproved_posts'] || $board['unapproved_topics']))
-			echo '
+		{
+					echo '
 							<a href="', $scripturl, '?action=moderate;area=postmod;sa=', ($board['unapproved_topics'] > 0 ? 'topics' : 'posts'), ';brd=', $board['id'], ';', $context['session_var'], '=', $context['session_id'], '" title="', sprintf($txt['unapproved_posts'], $board['unapproved_topics'], $board['unapproved_posts']), '" class="moderation_link"><i class="icon i-alert"></i></a>';
+		}
 
 		echo '
 						</h3>
@@ -135,8 +148,10 @@ 
 
 		// Show the "Moderators: ". Each has name, href, link, and id. (but we're gonna use link_moderators.)
 		if (!empty($board['moderators']))
-			echo '
+		{
+					echo '
 						<p class="moderators">', count($board['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $board['link_moderators']), '</p>';
+		}
 
 		// Show some basic information about the number of posts, etc.
 		echo '
@@ -156,11 +171,14 @@ 
 						<p class="board_lastpost">';
 
 			if (!empty($board['last_post']['member']['avatar']))
-				echo '
+			{
+							echo '
 							<span class="board_avatar"><a href="', $board['last_post']['member']['href'], '"><img class="avatar" src="', $board['last_post']['member']['avatar']['href'], '" alt="" loading="lazy" /></a></span>';
-			else
-				echo '
+			}
+			else {
+							echo '
 							<span class="board_avatar"><a href="#"></a></span>';
+			}
 			echo '
 							', $board['last_post']['last_post_message'], '
 						</p>';
@@ -181,13 +199,18 @@ 
 			foreach ($board['children'] as $child)
 			{
 				if (!$child['is_redirect'])
-					$child['link'] = '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . ($child['new'] ? '</a> <a ' . ($child['new'] ? 'class="new_posts" ' : '') . 'href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
-				else
-					$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+				{
+									$child['link'] = '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . ($child['new'] ? '</a> <a ' . ($child['new'] ? 'class="new_posts" ' : '') . 'href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
+				}
+				else {
+									$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
+				}
 
 				// Has it posts awaiting approval?
 				if ($child['can_approve_posts'] && ($child['unapproved_posts'] || $child['unapproved_topics']))
-					$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link"><i class="icon i-alert"></i></a>';
+				{
+									$child['link'] .= ' <a href="' . $scripturl . '?action=moderate;area=postmod;sa=' . ($child['unapproved_topics'] > 0 ? 'topics' : 'posts') . ';brd=' . $child['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . sprintf($txt['unapproved_posts'], $child['unapproved_topics'], $child['unapproved_posts']) . '" class="moderation_link"><i class="icon i-alert"></i></a>';
+				}
 
 				$children[] = $child['link'];
 			}
@@ -226,7 +249,8 @@ 
 	global $context, $txt;
 
 	if ($select_all)
-		echo '
+	{
+			echo '
 						<h3 class="secondary_header panel_toggle">
 							<span>
 								<span id="advanced_panel_toggle" class="chevricon i-chevron-', $context['boards_check_all'] ? 'down' : 'up', ' hide" title="', $txt['hide'], '"></span>
@@ -234,6 +258,7 @@ 
 							<a href="#" id="advanced_panel_link">', $txt['choose_board'], '</a>
 						</h3>
 						<div id="advanced_panel_div"', $context['boards_check_all'] ? ' class="hide"' : '', '>';
+	}
 
 	// Make two nice columns of boards, link each category header to toggle select all boards in each
 	$group_cats = optimizeBoardsSubdivision($context['boards_in_category'], $context['num_boards']);