albertlast / SMF2.1

Sources/Security.php

Spacing +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// Posting the password... check it.
-	if (isset($_POST[$type. '_pass']))
+	if (isset($_POST[$type . '_pass']))
 	{
 		// Check to ensure we're forcing SSL for authentication
 		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
@@ -179,7 +179,7 @@ 
 		{
 			if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip'])
 				continue;
-			$ban_query[] = ' {inet:'.$ip_number.'} BETWEEN bi.ip_low and bi.ip_high';
+			$ban_query[] = ' {inet:' . $ip_number . '} BETWEEN bi.ip_low and bi.ip_high';
 			$ban_query_vars[$ip_number] = $user_info[$ip_number];
 			// IP was valid, maybe there's also a hostname...
 			if (empty($modSettings['disableHostnameLookup']) && $user_info[$ip_number] != 'unknown')
@@ -187,8 +187,8 @@ 
 				$hostname = host_from_ip($user_info[$ip_number]);
 				if (strlen($hostname) > 0)
 				{
-					$ban_query[] = '({string:hostname'.$ip_number.'} LIKE bi.hostname)';
-					$ban_query_vars['hostname'.$ip_number] = $hostname;
+					$ban_query[] = '({string:hostname' . $ip_number . '} LIKE bi.hostname)';
+					$ban_query_vars['hostname' . $ip_number] = $hostname;
 				}
 			}
 		}
@@ -912,7 +912,7 @@ 
 		return true;
 
 	// Let's ensure this is an array.
-	$permission = (array)$permission;
+	$permission = (array) $permission;
 
 	// Are we checking the _current_ board, or some other boards?
 	if ($boards === null)

Braces +263 added lines, -203 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Check if the user is who he/she says he is
@@ -42,12 +43,14 @@ 
 	$refreshTime = isset($_GET['xml']) ? 4200 : 3600;
 
 	// Is the security option off?
-	if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')]))
-		return;
+	if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) {
+			return;
+	}
 
 	// Or are they already logged in?, Moderator or admin session is need for this area
-	if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time()))
-		return;
+	if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-Auth.php');
 
@@ -55,8 +58,9 @@ 
 	if (isset($_POST[$type. '_pass']))
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+					fatal_lang_error('login_ssl_required');
+		}
 
 		checkSession();
 
@@ -72,17 +76,19 @@ 
 	}
 
 	// Better be sure to remember the real referer
-	if (empty($_SESSION['request_referer']))
-		$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
-	elseif (empty($_POST))
-		unset($_SESSION['request_referer']);
+	if (empty($_SESSION['request_referer'])) {
+			$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
+	} elseif (empty($_POST)) {
+			unset($_SESSION['request_referer']);
+	}
 
 	// Need to type in a password for that, man.
-	if (!isset($_GET['xml']))
-		adminLogin($type);
-	else
-		return 'session_verify_fail';
-}
+	if (!isset($_GET['xml'])) {
+			adminLogin($type);
+	} else {
+			return 'session_verify_fail';
+	}
+	}
 
 /**
  * Require a user who is logged in. (not a guest.)
@@ -96,25 +102,30 @@ 
 	global $user_info, $txt, $context, $scripturl, $modSettings;
 
 	// Luckily, this person isn't a guest.
-	if (!$user_info['is_guest'])
-		return;
+	if (!$user_info['is_guest']) {
+			return;
+	}
 
 	// Log what they were trying to do didn't work)
-	if (!empty($modSettings['who_enabled']))
-		$_GET['error'] = 'guest_login';
+	if (!empty($modSettings['who_enabled'])) {
+			$_GET['error'] = 'guest_login';
+	}
 	writeLog(true);
 
 	// Just die.
-	if (isset($_REQUEST['xml']))
-		obExit(false);
+	if (isset($_REQUEST['xml'])) {
+			obExit(false);
+	}
 
 	// Attempt to detect if they came from dlattach.
-	if (SMF != 'SSI' && empty($context['theme_loaded']))
-		loadTheme();
+	if (SMF != 'SSI' && empty($context['theme_loaded'])) {
+			loadTheme();
+	}
 
 	// Never redirect to an attachment
-	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false)
-		$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) {
+			$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+	}
 
 	// Load the Login template and language file.
 	loadLanguage('Login');
@@ -124,8 +135,7 @@ 
 	{
 		$_SESSION['login_url'] = $scripturl . '?' . $_SERVER['QUERY_STRING'];
 		redirectexit('action=login');
-	}
-	else
+	} else
 	{
 		loadTemplate('Login');
 		$context['sub_template'] = 'kick_guest';
@@ -155,8 +165,9 @@ 
 	global $sourcedir, $cookiename, $user_settings, $smcFunc;
 
 	// You cannot be banned if you are an admin - doesn't help if you log out.
-	if ($user_info['is_admin'])
-		return;
+	if ($user_info['is_admin']) {
+			return;
+	}
 
 	// Only check the ban every so often. (to reduce load.)
 	if ($forceCheck || !isset($_SESSION['ban']) || empty($modSettings['banLastUpdated']) || ($_SESSION['ban']['last_checked'] < $modSettings['banLastUpdated']) || $_SESSION['ban']['id_member'] != $user_info['id'] || $_SESSION['ban']['ip'] != $user_info['ip'] || $_SESSION['ban']['ip2'] != $user_info['ip2'] || (isset($user_info['email'], $_SESSION['ban']['email']) && $_SESSION['ban']['email'] != $user_info['email']))
@@ -177,8 +188,9 @@ 
 		// Check both IP addresses.
 		foreach (array('ip', 'ip2') as $ip_number)
 		{
-			if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip'])
-				continue;
+			if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) {
+							continue;
+			}
 			$ban_query[] = ' {inet:'.$ip_number.'} BETWEEN bi.ip_low and bi.ip_high';
 			$ban_query_vars[$ip_number] = $user_info[$ip_number];
 			// IP was valid, maybe there's also a hostname...
@@ -228,24 +240,28 @@ 
 			// Store every type of ban that applies to you in your session.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				foreach ($restrictions as $restriction)
-					if (!empty($row[$restriction]))
+				foreach ($restrictions as $restriction) {
+									if (!empty($row[$restriction]))
 					{
 						$_SESSION['ban'][$restriction]['reason'] = $row['reason'];
+				}
 						$_SESSION['ban'][$restriction]['ids'][] = $row['id_ban'];
-						if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time'])))
-							$_SESSION['ban']['expire_time'] = $row['expire_time'];
+						if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) {
+													$_SESSION['ban']['expire_time'] = $row['expire_time'];
+						}
 
-						if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email']))
-							$flag_is_activated = true;
+						if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) {
+													$flag_is_activated = true;
+						}
 					}
 			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Mark the cannot_access and cannot_post bans as being 'hit'.
-		if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login']))
-			log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array()));
+		if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) {
+					log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array()));
+		}
 
 		// If for whatever reason the is_activated flag seems wrong, do a little work to clear it up.
 		if ($user_info['id'] && (($user_settings['is_activated'] >= 10 && !$flag_is_activated)
@@ -260,8 +276,9 @@ 
 	if (!isset($_SESSION['ban']['cannot_access']) && !empty($_COOKIE[$cookiename . '_']))
 	{
 		$bans = explode(',', $_COOKIE[$cookiename . '_']);
-		foreach ($bans as $key => $value)
-			$bans[$key] = (int) $value;
+		foreach ($bans as $key => $value) {
+					$bans[$key] = (int) $value;
+		}
 		$request = $smcFunc['db_query']('', '
 			SELECT bi.id_ban, bg.reason
 			FROM {db_prefix}ban_items AS bi
@@ -297,14 +314,15 @@ 
 	if (isset($_SESSION['ban']['cannot_access']))
 	{
 		// We don't wanna see you!
-		if (!$user_info['is_guest'])
-			$smcFunc['db_query']('', '
+		if (!$user_info['is_guest']) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_online
 				WHERE id_member = {int:current_member}',
 				array(
 					'current_member' => $user_info['id'],
 				)
 			);
+		}
 
 		// 'Log' the user out.  Can't have any funny business... (save the name!)
 		$old_name = isset($user_info['name']) && $user_info['name'] != '' ? $user_info['name'] : $txt['guest_title'];
@@ -390,9 +408,10 @@ 
 	}
 
 	// Fix up the banning permissions.
-	if (isset($user_info['permissions']))
-		banPermissions();
-}
+	if (isset($user_info['permissions'])) {
+			banPermissions();
+	}
+	}
 
 /**
  * Fix permissions according to ban status.
@@ -403,8 +422,9 @@ 
 	global $user_info, $sourcedir, $modSettings, $context;
 
 	// Somehow they got here, at least take away all permissions...
-	if (isset($_SESSION['ban']['cannot_access']))
-		$user_info['permissions'] = array();
+	if (isset($_SESSION['ban']['cannot_access'])) {
+			$user_info['permissions'] = array();
+	}
 	// Okay, well, you can watch, but don't touch a thing.
 	elseif (isset($_SESSION['ban']['cannot_post']) || (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $user_info['warning']))
 	{
@@ -446,44 +466,45 @@ 
 		call_integration_hook('integrate_warn_permissions', array(&$permission_change));
 		foreach ($permission_change as $old => $new)
 		{
-			if (!in_array($old, $user_info['permissions']))
-				unset($permission_change[$old]);
-			else
-				$user_info['permissions'][] = $new;
+			if (!in_array($old, $user_info['permissions'])) {
+							unset($permission_change[$old]);
+			} else {
+							$user_info['permissions'][] = $new;
+			}
 		}
 		$user_info['permissions'] = array_diff($user_info['permissions'], array_keys($permission_change));
 	}
 
 	// @todo Find a better place to call this? Needs to be after permissions loaded!
 	// Finally, some bits we cache in the session because it saves queries.
-	if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id'])
-		$user_info['mod_cache'] = $_SESSION['mc'];
-	else
+	if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) {
+			$user_info['mod_cache'] = $_SESSION['mc'];
+	} else
 	{
 		require_once($sourcedir . '/Subs-Auth.php');
 		rebuildModCache();
 	}
 
 	// Now that we have the mod cache taken care of lets setup a cache for the number of mod reports still open
-	if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id'])
-		$context['open_mod_reports'] = $_SESSION['rc']['reports'];
-	elseif ($_SESSION['mc']['bq'] != '0=1')
+	if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) {
+			$context['open_mod_reports'] = $_SESSION['rc']['reports'];
+	} elseif ($_SESSION['mc']['bq'] != '0=1')
 	{
 		require_once($sourcedir . '/Subs-ReportedContent.php');
 		recountOpenReports('posts');
+	} else {
+			$context['open_mod_reports'] = 0;
 	}
-	else
-		$context['open_mod_reports'] = 0;
 
-	if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id'])
-		$context['open_member_reports'] = !empty($_SESSION['rc']['member_reports']) ? $_SESSION['rc']['member_reports'] : 0;
-	elseif (allowedTo('moderate_forum'))
+	if (!empty($_SESSION['rc']) && $_SESSION['rc']['time'] > $modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $user_info['id']) {
+			$context['open_member_reports'] = !empty($_SESSION['rc']['member_reports']) ? $_SESSION['rc']['member_reports'] : 0;
+	} elseif (allowedTo('moderate_forum'))
 	{
 		require_once($sourcedir . '/Subs-ReportedContent.php');
 		recountOpenReports('members');
+	} else {
+			$context['open_member_reports'] = 0;
 	}
-	else
-		$context['open_member_reports'] = 0;
 
 }
 
@@ -500,8 +521,9 @@ 
 	global $user_info, $smcFunc;
 
 	// Don't log web accelerators, it's very confusing...
-	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-		return;
+	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
+			return;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}log_banned',
@@ -511,8 +533,8 @@ 
 	);
 
 	// One extra point for these bans.
-	if (!empty($ban_ids))
-		$smcFunc['db_query']('', '
+	if (!empty($ban_ids)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}ban_items
 			SET hits = hits + 1
 			WHERE id_ban IN ({array_int:ban_ids})',
@@ -520,7 +542,8 @@ 
 				'ban_ids' => $ban_ids,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Checks if a given email address might be banned.
@@ -536,8 +559,9 @@ 
 	global $txt, $smcFunc;
 
 	// Can't ban an empty email
-	if (empty($email) || trim($email) == '')
-		return;
+	if (empty($email) || trim($email) == '') {
+			return;
+	}
 
 	// Let's start with the bans based on your IP/hostname/memberID...
 	$ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : array();
@@ -610,16 +634,18 @@ 
 	if ($type == 'post')
 	{
 		$check = isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null);
-		if ($check !== $sc)
-			$error = 'session_timeout';
+		if ($check !== $sc) {
+					$error = 'session_timeout';
+		}
 	}
 
 	// How about $_GET['sesc']?
 	elseif ($type == 'get')
 	{
 		$check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : null);
-		if ($check !== $sc)
-			$error = 'session_verify_fail';
+		if ($check !== $sc) {
+					$error = 'session_verify_fail';
+		}
 	}
 
 	// Or can it be in either?
@@ -627,13 +653,15 @@ 
 	{
 		$check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : (isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null)));
 
-		if ($check !== $sc)
-			$error = 'session_verify_fail';
+		if ($check !== $sc) {
+					$error = 'session_verify_fail';
+		}
 	}
 
 	// Verify that they aren't changing user agents on us - that could be bad.
-	if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA']))
-		$error = 'session_verify_fail';
+	if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) {
+			$error = 'session_verify_fail';
+	}
 
 	// Make sure a page with session check requirement is not being prefetched.
 	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
@@ -644,30 +672,35 @@ 
 	}
 
 	// Check the referring site - it should be the same server at least!
-	if (isset($_SESSION['request_referer']))
-		$referrer = $_SESSION['request_referer'];
-	else
-		$referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
+	if (isset($_SESSION['request_referer'])) {
+			$referrer = $_SESSION['request_referer'];
+	} else {
+			$referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
+	}
 	if (!empty($referrer['host']))
 	{
-		if (strpos($_SERVER['HTTP_HOST'], ':') !== false)
-			$real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':'));
-		else
-			$real_host = $_SERVER['HTTP_HOST'];
+		if (strpos($_SERVER['HTTP_HOST'], ':') !== false) {
+					$real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':'));
+		} else {
+					$real_host = $_SERVER['HTTP_HOST'];
+		}
 
 		$parsed_url = parse_url($boardurl);
 
 		// Are global cookies on?  If so, let's check them ;).
 		if (!empty($modSettings['globalCookies']))
 		{
-			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-				$parsed_url['host'] = $parts[1];
+			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) {
+							$parsed_url['host'] = $parts[1];
+			}
 
-			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1)
-				$referrer['host'] = $parts[1];
+			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) {
+							$referrer['host'] = $parts[1];
+			}
 
-			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1)
-				$real_host = $parts[1];
+			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) {
+							$real_host = $parts[1];
+			}
 		}
 
 		// Okay: referrer must either match parsed_url or real_host.
@@ -685,12 +718,14 @@ 
 		$log_error = true;
 	}
 
-	if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker')
-		fatal_error('Sound the alarm!  It\'s a hacker!  Close the castle gates!!', false);
+	if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') {
+			fatal_error('Sound the alarm!  It\'s a hacker!  Close the castle gates!!', false);
+	}
 
 	// Everything is ok, return an empty string.
-	if (!isset($error))
-		return '';
+	if (!isset($error)) {
+			return '';
+	}
 	// A session error occurred, show the error.
 	elseif ($is_fatal)
 	{
@@ -699,13 +734,14 @@ 
 			ob_end_clean();
 			header('HTTP/1.1 403 Forbidden - Session timeout');
 			die;
+		} else {
+					fatal_lang_error($error, isset($log_error) ? 'user' : false);
 		}
-		else
-			fatal_lang_error($error, isset($log_error) ? 'user' : false);
 	}
 	// A session error occurred, return the error to the calling function.
-	else
-		return $error;
+	else {
+			return $error;
+	}
 
 	// We really should never fall through here, for very important reasons.  Let's make sure.
 	trigger_error('Hacking attempt...', E_USER_ERROR);
@@ -721,10 +757,9 @@ 
 {
 	global $modSettings;
 
-	if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action])
-		return true;
-
-	else
+	if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) {
+			return true;
+	} else
 	{
 		$token = md5(mt_rand() . session_id() . (string) microtime() . $modSettings['rand_seed']);
 		$_SESSION['confirm_' . $action] = md5($token . $_SERVER['HTTP_USER_AGENT']);
@@ -775,9 +810,9 @@ 
 			$return = $_SESSION['token'][$type . '-' . $action][3];
 			unset($_SESSION['token'][$type . '-' . $action]);
 			return $return;
+		} else {
+					return '';
 		}
-		else
-			return '';
 	}
 
 	// This nasty piece of code validates a token.
@@ -808,12 +843,14 @@ 
 		fatal_lang_error('token_verify_fail', false);
 	}
 	// Remove this token as its useless
-	else
-		unset($_SESSION['token'][$type . '-' . $action]);
+	else {
+			unset($_SESSION['token'][$type . '-' . $action]);
+	}
 
 	// Randomly check if we should remove some older tokens.
-	if (mt_rand(0, 138) == 23)
-		cleanTokens();
+	if (mt_rand(0, 138) == 23) {
+			cleanTokens();
+	}
 
 	return false;
 }
@@ -828,14 +865,16 @@ 
 function cleanTokens($complete = false)
 {
 	// We appreciate cleaning up after yourselves.
-	if (!isset($_SESSION['token']))
-		return;
+	if (!isset($_SESSION['token'])) {
+			return;
+	}
 
 	// Clean up tokens, trying to give enough time still.
-	foreach ($_SESSION['token'] as $key => $data)
-		if ($data[2] + 10800 < time() || $complete)
+	foreach ($_SESSION['token'] as $key => $data) {
+			if ($data[2] + 10800 < time() || $complete)
 			unset($_SESSION['token'][$key]);
-}
+	}
+	}
 
 /**
  * Check whether a form has been submitted twice.
@@ -853,37 +892,40 @@ 
 {
 	global $context;
 
-	if (!isset($_SESSION['forms']))
-		$_SESSION['forms'] = array();
+	if (!isset($_SESSION['forms'])) {
+			$_SESSION['forms'] = array();
+	}
 
 	// Register a form number and store it in the session stack. (use this on the page that has the form.)
 	if ($action == 'register')
 	{
 		$context['form_sequence_number'] = 0;
-		while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms']))
-			$context['form_sequence_number'] = mt_rand(1, 16000000);
+		while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) {
+					$context['form_sequence_number'] = mt_rand(1, 16000000);
+		}
 	}
 	// Check whether the submitted number can be found in the session.
 	elseif ($action == 'check')
 	{
-		if (!isset($_REQUEST['seqnum']))
-			return true;
-		elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms']))
+		if (!isset($_REQUEST['seqnum'])) {
+					return true;
+		} elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms']))
 		{
 			$_SESSION['forms'][] = (int) $_REQUEST['seqnum'];
 			return true;
+		} elseif ($is_fatal) {
+					fatal_lang_error('error_form_already_submitted', false);
+		} else {
+					return false;
 		}
-		elseif ($is_fatal)
-			fatal_lang_error('error_form_already_submitted', false);
-		else
-			return false;
 	}
 	// Don't check, just free the stack number.
-	elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms']))
-		$_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum']));
-	elseif ($action != 'free')
-		trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING);
-}
+	elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) {
+			$_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum']));
+	} elseif ($action != 'free') {
+			trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING);
+	}
+	}
 
 /**
  * Check the user's permissions.
@@ -900,16 +942,19 @@ 
 	global $user_info, $smcFunc;
 
 	// You're always allowed to do nothing. (unless you're a working man, MR. LAZY :P!)
-	if (empty($permission))
-		return true;
+	if (empty($permission)) {
+			return true;
+	}
 
 	// You're never allowed to do something if your data hasn't been loaded yet!
-	if (empty($user_info))
-		return false;
+	if (empty($user_info)) {
+			return false;
+	}
 
 	// Administrators are supermen :P.
-	if ($user_info['is_admin'])
-		return true;
+	if ($user_info['is_admin']) {
+			return true;
+	}
 
 	// Let's ensure this is an array.
 	$permission = (array)$permission;
@@ -917,14 +962,16 @@ 
 	// Are we checking the _current_ board, or some other boards?
 	if ($boards === null)
 	{
-		if (count(array_intersect($permission, $user_info['permissions'])) != 0)
-			return true;
+		if (count(array_intersect($permission, $user_info['permissions'])) != 0) {
+					return true;
+		}
 		// You aren't allowed, by default.
-		else
-			return false;
+		else {
+					return false;
+		}
+	} elseif (!is_array($boards)) {
+			$boards = array($boards);
 	}
-	elseif (!is_array($boards))
-		$boards = array($boards);
 
 	$request = $smcFunc['db_query']('', '
 		SELECT MIN(bp.add_deny) AS add_deny
@@ -947,12 +994,14 @@ 
 	);
 
 	// Make sure they can do it on all of the boards.
-	if ($smcFunc['db_num_rows']($request) != count($boards))
-		return false;
+	if ($smcFunc['db_num_rows']($request) != count($boards)) {
+			return false;
+	}
 
 	$result = true;
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$result &= !empty($row['add_deny']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$result &= !empty($row['add_deny']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If the query returned 1, they can do it... otherwise, they can't.
@@ -1017,9 +1066,10 @@ 
 
 	// If you're doing something on behalf of some "heavy" permissions, validate your session.
 	// (take out the heavy permissions, and if you can't do anything but those, you need a validated session.)
-	if (!allowedTo(array_diff($permission, $heavy_permissions), $boards))
-		validateSession();
-}
+	if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) {
+			validateSession();
+	}
+	}
 
 /**
  * Return the boards a user has a certain (board) permission on. (array(0) if all.)
@@ -1038,8 +1088,9 @@ 
 	global $user_info, $smcFunc;
 
 	// Arrays are nice, most of the time.
-	if (!is_array($permissions))
-		$permissions = array($permissions);
+	if (!is_array($permissions)) {
+			$permissions = array($permissions);
+	}
 
 	/*
 	 * Set $simple to true to use this function as it were in SMF 2.0.x.
@@ -1051,13 +1102,14 @@ 
 	// Administrators are all powerful, sorry.
 	if ($user_info['is_admin'])
 	{
-		if ($simple)
-			return array(0);
-		else
+		if ($simple) {
+					return array(0);
+		} else
 		{
 			$boards = array();
-			foreach ($permissions as $permission)
-				$boards[$permission] = array(0);
+			foreach ($permissions as $permission) {
+							$boards[$permission] = array(0);
+			}
 
 			return $boards;
 		}
@@ -1089,31 +1141,32 @@ 
 	{
 		if ($simple)
 		{
-			if (empty($row['add_deny']))
-				$deny_boards[] = $row['id_board'];
-			else
-				$boards[] = $row['id_board'];
-		}
-		else
+			if (empty($row['add_deny'])) {
+							$deny_boards[] = $row['id_board'];
+			} else {
+							$boards[] = $row['id_board'];
+			}
+		} else
 		{
-			if (empty($row['add_deny']))
-				$deny_boards[$row['permission']][] = $row['id_board'];
-			else
-				$boards[$row['permission']][] = $row['id_board'];
+			if (empty($row['add_deny'])) {
+							$deny_boards[$row['permission']][] = $row['id_board'];
+			} else {
+							$boards[$row['permission']][] = $row['id_board'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if ($simple)
-		$boards = array_unique(array_values(array_diff($boards, $deny_boards)));
-	else
+	if ($simple) {
+			$boards = array_unique(array_values(array_diff($boards, $deny_boards)));
+	} else
 	{
 		foreach ($permissions as $permission)
 		{
 			// never had it to start with
-			if (empty($boards[$permission]))
-				$boards[$permission] = array();
-			else
+			if (empty($boards[$permission])) {
+							$boards[$permission] = array();
+			} else
 			{
 				// Or it may have been removed
 				$deny_boards[$permission] = isset($deny_boards[$permission]) ? $deny_boards[$permission] : array();
@@ -1149,10 +1202,11 @@ 
 
 
 	// Moderators are free...
-	if (!allowedTo('moderate_board'))
-		$timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime'];
-	else
-		$timeLimit = 2;
+	if (!allowedTo('moderate_board')) {
+			$timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime'];
+	} else {
+			$timeLimit = 2;
+	}
 
 	call_integration_hook('integrate_spam_protection', array(&$timeOverrides, &$timeLimit));
 
@@ -1179,8 +1233,9 @@ 
 	if ($smcFunc['db_affected_rows']() != 1)
 	{
 		// Spammer!  You only have to wait a *few* seconds!
-		if (!$only_return_result)
-			fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit));
+		if (!$only_return_result) {
+					fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit));
+		}
 
 		return true;
 	}
@@ -1198,11 +1253,13 @@ 
  */
 function secureDirectory($path, $attachments = false)
 {
-	if (empty($path))
-		return 'empty_path';
+	if (empty($path)) {
+			return 'empty_path';
+	}
 
-	if (!is_writable($path))
-		return 'path_not_writable';
+	if (!is_writable($path)) {
+			return 'path_not_writable';
+	}
 
 	$directoryname = basename($path);
 
@@ -1214,9 +1271,9 @@ 
 
 RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml';
 
-	if (file_exists($path . '/.htaccess'))
-		$errors[] = 'htaccess_exists';
-	else
+	if (file_exists($path . '/.htaccess')) {
+			$errors[] = 'htaccess_exists';
+	} else
 	{
 		$fh = @fopen($path . '/.htaccess', 'w');
 		if ($fh) {
@@ -1228,9 +1285,9 @@ 
 		$errors[] = 'htaccess_cannot_create_file';
 	}
 
-	if (file_exists($path . '/index.php'))
-		$errors[] = 'index-php_exists';
-	else
+	if (file_exists($path . '/index.php')) {
+			$errors[] = 'index-php_exists';
+	} else
 	{
 		$fh = @fopen($path . '/index.php', 'w');
 		if ($fh) {
@@ -1257,11 +1314,12 @@ 
 		$errors[] = 'index-php_cannot_create_file';
 	}
 
-	if (!empty($errors))
-		return $errors;
-	else
-		return true;
-}
+	if (!empty($errors)) {
+			return $errors;
+	} else {
+			return true;
+	}
+	}
 
 /**
 * This sets the X-Frame-Options header.
@@ -1274,14 +1332,16 @@ 
 	global $modSettings;
 
 	$option = 'SAMEORIGIN';
-	if (is_null($override) && !empty($modSettings['frame_security']))
-		$option = $modSettings['frame_security'];
-	elseif (in_array($override, array('SAMEORIGIN', 'DENY')))
-		$option = $override;
+	if (is_null($override) && !empty($modSettings['frame_security'])) {
+			$option = $modSettings['frame_security'];
+	} elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) {
+			$option = $override;
+	}
 
 	// Don't bother setting the header if we have disabled it.
-	if ($option == 'DISABLE')
-		return;
+	if ($option == 'DISABLE') {
+			return;
+	}
 
 	// Finally set it.
 	header('X-Frame-Options: ' . $option);

Sources/PostModeration.php

Spacing +5 added lines, -5 removed lines

@@ -176,11 +176,11 @@ 
 		{
 			if ($curAction == 'approve')
 			{
-				approveMessages ($toAction, $details, $context['current_view']);
+				approveMessages($toAction, $details, $context['current_view']);
 			}
 			else
 			{
-				removeMessages ($toAction, $details, $context['current_view']);
+				removeMessages($toAction, $details, $context['current_view']);
 			}
 		}
 	}
@@ -437,7 +437,7 @@ 
 					'value' => $txt['mc_unapproved_attach_poster'],
 				),
 				'data' => array(
-					'function' => function ($data)
+					'function' => function($data)
 					{
 						return $data['poster']['link'];
 					},
@@ -467,7 +467,7 @@ 
 					'value' => $txt['post'],
 				),
 				'data' => array(
-					'function' => function ($data)
+					'function' => function($data)
 					{
 						return '<a href="' . $data['message']['href'] . '">' . shorten_subject($data['message']['subject'], 20) . '</a>';
 					},
@@ -693,7 +693,7 @@ 
 			logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
 	}
 
-	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg']. '#msg' . $_REQUEST['msg']);
+	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
 }
 
 /**

Braces +100 added lines, -79 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is a handling function for all things post moderation.
@@ -39,8 +40,9 @@ 
 	);
 
 	// Pick something valid...
-	if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
-		$_REQUEST['sa'] = 'replies';
+	if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']])) {
+			$_REQUEST['sa'] = 'replies';
+	}
 
 	call_integration_hook('integrate_post_moderation', array(&$subActions));
 
@@ -68,13 +70,15 @@ 
 		$approve_boards = $approve_boards == array(0) ? $filter_board : array_intersect($approve_boards, $filter_board);
 	}
 
-	if ($approve_boards == array(0))
-		$approve_query = '';
-	elseif (!empty($approve_boards))
-		$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	if ($approve_boards == array(0)) {
+			$approve_query = '';
+	} elseif (!empty($approve_boards)) {
+			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	}
 	// Nada, zip, etc...
-	else
-		$approve_query = ' AND 1=0';
+	else {
+			$approve_query = ' AND 1=0';
+	}
 
 	// We also need to know where we can delete topics and/or replies to.
 	if ($context['current_view'] == 'topics')
@@ -82,8 +86,7 @@ 
 		$delete_own_boards = boardsAllowedTo('remove_own');
 		$delete_any_boards = boardsAllowedTo('remove_any');
 		$delete_own_replies = array();
-	}
-	else
+	} else
 	{
 		$delete_own_boards = boardsAllowedTo('delete_own');
 		$delete_any_boards = boardsAllowedTo('delete_any');
@@ -92,21 +95,25 @@ 
 
 	$toAction = array();
 	// Check if we have something to do?
-	if (isset($_GET['approve']))
-		$toAction[] = (int) $_GET['approve'];
+	if (isset($_GET['approve'])) {
+			$toAction[] = (int) $_GET['approve'];
+	}
 	// Just a deletion?
-	elseif (isset($_GET['delete']))
-		$toAction[] = (int) $_GET['delete'];
+	elseif (isset($_GET['delete'])) {
+			$toAction[] = (int) $_GET['delete'];
+	}
 	// Lots of approvals?
-	elseif (isset($_POST['item']))
-		foreach ($_POST['item'] as $item)
+	elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item)
 			$toAction[] = (int) $item;
+	}
 
 	// What are we actually doing.
-	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		$curAction = 'approve';
-	elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		$curAction = 'delete';
+	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
+			$curAction = 'approve';
+	} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
+			$curAction = 'delete';
+	}
 
 	// Right, so we have something to do?
 	if (!empty($toAction) && isset($curAction))
@@ -135,8 +142,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If it's not within what our view is ignore it...
-			if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies'))
-				continue;
+			if (($row['id_msg'] == $row['id_first_msg'] && $context['current_view'] != 'topics') || ($row['id_msg'] != $row['id_first_msg'] && $context['current_view'] != 'replies')) {
+							continue;
+			}
 
 			$can_add = false;
 			// If we're approving this is simple.
@@ -148,18 +156,22 @@ 
 			elseif ($curAction == 'delete')
 			{
 				// Own post is easy!
-				if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards)))
-					$can_add = true;
+				if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) {
+									$can_add = true;
+				}
 				// Is it a reply to their own topic?
-				elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies)))
-					$can_add = true;
+				elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) {
+									$can_add = true;
+				}
 				// Someone elses?
-				elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards)))
-					$can_add = true;
+				elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) {
+									$can_add = true;
+				}
 			}
 
-			if ($can_add)
-				$anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg'];
+			if ($can_add) {
+							$anItem = $context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg'];
+			}
 			$toAction[] = $anItem;
 
 			// All clear. What have we got now, what, what?
@@ -177,8 +189,7 @@ 
 			if ($curAction == 'approve')
 			{
 				approveMessages ($toAction, $details, $context['current_view']);
-			}
-			else
+			} else
 			{
 				removeMessages ($toAction, $details, $context['current_view']);
 			}
@@ -265,16 +276,19 @@ 
 	for ($i = 1; $row = $smcFunc['db_fetch_assoc']($request); $i++)
 	{
 		// Can delete is complicated, let's solve it first... is it their own post?
-		if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards)))
-			$can_delete = true;
+		if ($row['id_member'] == $user_info['id'] && ($delete_own_boards == array(0) || in_array($row['id_board'], $delete_own_boards))) {
+					$can_delete = true;
+		}
 		// Is it a reply to their own topic?
-		elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies)))
-			$can_delete = true;
+		elseif ($row['id_member'] == $row['id_member_started'] && $row['id_msg'] != $row['id_first_msg'] && ($delete_own_replies == array(0) || in_array($row['id_board'], $delete_own_replies))) {
+					$can_delete = true;
+		}
 		// Someone elses?
-		elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards)))
-			$can_delete = true;
-		else
-			$can_delete = false;
+		elseif ($row['id_member'] != $user_info['id'] && ($delete_any_boards == array(0) || in_array($row['id_board'], $delete_any_boards))) {
+					$can_delete = true;
+		} else {
+					$can_delete = false;
+		}
 
 		$context['unapproved_items'][] = array(
 			'id' => $row['id_msg'],
@@ -323,28 +337,31 @@ 
 	// Once again, permissions are king!
 	$approve_boards = boardsAllowedTo('approve_posts');
 
-	if ($approve_boards == array(0))
-		$approve_query = '';
-	elseif (!empty($approve_boards))
-		$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
-	else
-		$approve_query = ' AND 1=0';
+	if ($approve_boards == array(0)) {
+			$approve_query = '';
+	} elseif (!empty($approve_boards)) {
+			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+	} else {
+			$approve_query = ' AND 1=0';
+	}
 
 	// Get together the array of things to act on, if any.
 	$attachments = array();
-	if (isset($_GET['approve']))
-		$attachments[] = (int) $_GET['approve'];
-	elseif (isset($_GET['delete']))
-		$attachments[] = (int) $_GET['delete'];
-	elseif (isset($_POST['item']))
-		foreach ($_POST['item'] as $item)
+	if (isset($_GET['approve'])) {
+			$attachments[] = (int) $_GET['approve'];
+	} elseif (isset($_GET['delete'])) {
+			$attachments[] = (int) $_GET['delete'];
+	} elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item)
 			$attachments[] = (int) $item;
+	}
 
 	// Are we approving or deleting?
-	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		$curAction = 'approve';
-	elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		$curAction = 'delete';
+	if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
+			$curAction = 'approve';
+	} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
+			$curAction = 'delete';
+	}
 
 	// Something to do, let's do it!
 	if (!empty($attachments) && isset($curAction))
@@ -372,17 +389,19 @@ 
 			)
 		);
 		$attachments = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$attachments[] = $row['id_attach'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$attachments[] = $row['id_attach'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Assuming it wasn't all like, proper illegal, we can do the approving.
 		if (!empty($attachments))
 		{
-			if ($curAction == 'approve')
-				ApproveAttachments($attachments);
-			else
-				removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+			if ($curAction == 'approve') {
+							ApproveAttachments($attachments);
+			} else {
+							removeAttachments(array('id_attach' => $attachments, 'do_logging' => true));
+			}
 		}
 	}
 
@@ -682,15 +701,16 @@ 
 	{
 		approveTopics($topic, !$approved);
 
-		if ($starter != $user_info['id'])
-			logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
-	}
-	else
+		if ($starter != $user_info['id']) {
+					logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => $topic, 'subject' => $subject, 'member' => $starter, 'board' => $board));
+		}
+	} else
 	{
 		approvePosts($_REQUEST['msg'], !$approved);
 
-		if ($poster != $user_info['id'])
-			logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+		if ($poster != $user_info['id']) {
+					logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
+		}
 	}
 
 	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg']. '#msg' . $_REQUEST['msg']);
@@ -716,8 +736,7 @@ 
 		{
 			logAction('approve_topic', array('topic' => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']));
 		}
-	}
-	else
+	} else
 	{
 		approvePosts($messages);
 		// and tell the world about it again
@@ -745,8 +764,9 @@ 
 		)
 	);
 	$msgs = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$msgs[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$msgs[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($msgs))
@@ -765,8 +785,9 @@ 
 		)
 	);
 	$attaches = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$attaches[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$attaches[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($attaches))
@@ -794,12 +815,12 @@ 
 	{
 		removeTopics($messages);
 		// and tell the world about it
-		foreach ($messages as $topic)
-			// Note, only log topic ID in native form if it's not gone forever.
+		foreach ($messages as $topic) {
+					// Note, only log topic ID in native form if it's not gone forever.
 			logAction('remove', array(
 				(empty($modSettings['recycle_enable']) || $modSettings['recycle_board'] != $messageDetails[$topic]['board'] ? 'topic' : 'old_topic_id') => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']));
-	}
-	else
+		}
+	} else
 	{
 		foreach ($messages as $post)
 		{

Sources/PackageGet.php

Spacing +2 added lines, -2 removed lines

@@ -181,14 +181,14 @@
 		{
 			collapsedDiv.show(\'slow\');
 			icon.removeClass(\'toggle_down\').addClass(\'toggle_up\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . ');
 		}
 
 		else
 		{
 			collapsedDiv.hide(\'slow\');
 			icon.removeClass(\'toggle_up\').addClass(\'toggle_down\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . ');
 		}
 
 	});', true);

Braces +200 added lines, -156 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Browse the list of package servers, add servers...
@@ -43,13 +44,15 @@ 
 	);
 
 	// Now let's decide where we are taking this...
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	}
 	// We need to support possible old javascript links...
-	elseif (isset($_GET['pgdownload']))
-		$context['sub_action'] = 'download';
-	else
-		$context['sub_action'] = 'servers';
+	elseif (isset($_GET['pgdownload'])) {
+			$context['sub_action'] = 'download';
+	} else {
+			$context['sub_action'] = 'servers';
+	}
 
 	// We need to force the "Download" tab as selected.
 	$context['menu_data_' . $context['admin_menu_id']]['current_subsection'] = 'packageget';
@@ -141,17 +144,19 @@ 
 			{
 				require_once($sourcedir . '/Class-Package.php');
 				$ftp = new ftp_connection(null);
+			} elseif ($ftp->error !== false && !isset($ftp_error)) {
+							$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 			}
-			elseif ($ftp->error !== false && !isset($ftp_error))
-				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path($packagesdir);
 
-			if ($found_path || !isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = $detect_path;
+			if ($found_path || !isset($_POST['ftp_path'])) {
+							$_POST['ftp_path'] = $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 
 			$context['package_ftp'] = array(
 				'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset($modSettings['package_server']) ? $modSettings['package_server'] : 'localhost'),
@@ -160,8 +165,7 @@ 
 				'path' => $_POST['ftp_path'],
 				'error' => empty($ftp_error) ? null : $ftp_error,
 			);
-		}
-		else
+		} else
 		{
 			$context['package_download_broken'] = false;
 
@@ -203,8 +207,9 @@ 
 
 	if (isset($_GET['server']))
 	{
-		if ($_GET['server'] == '')
-			redirectexit('action=admin;area=packages;get');
+		if ($_GET['server'] == '') {
+					redirectexit('action=admin;area=packages;get');
+		}
 
 		$server = (int) $_GET['server'];
 
@@ -222,17 +227,18 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If the server does not exist, dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		// If there is a relative link, append to the stored server url.
-		if (isset($_GET['relative']))
-			$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		if (isset($_GET['relative'])) {
+					$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		}
 
 		// Clear any "absolute" URL.  Since "server" is present, "absolute" is garbage.
 		unset($_GET['absolute']);
-	}
-	elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
+	} elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
 	{
 		// Initialize the requried variables.
 		$server = '';
@@ -256,16 +262,19 @@ 
 		}
 	}
 	// Minimum required parameter did not exist so dump out.
-	else
-		fatal_lang_error('couldnt_connect', false);
+	else {
+			fatal_lang_error('couldnt_connect', false);
+	}
 
 	// Attempt to connect.  If unsuccessful... try the URL.
-	if (!isset($_GET['package']) || file_exists($_GET['package']))
-		$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	if (!isset($_GET['package']) || file_exists($_GET['package'])) {
+			$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	}
 
 	// Check to be sure the packages.xml file actually exists where it is should be... or dump out.
-	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package']))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package'])) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// Might take some time.
 	@set_time_limit(600);
@@ -275,8 +284,9 @@ 
 	$listing = new xmlArray(fetch_web_data($_GET['package']), true);
 
 	// Errm.... empty file?  Try the URL....
-	if (!$listing->exists('package-list'))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if (!$listing->exists('package-list')) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// List out the packages...
 	$context['package_list'] = array();
@@ -284,8 +294,9 @@ 
 	$listing = $listing->path('package-list[0]');
 
 	// Use the package list's name if it exists.
-	if ($listing->exists('list-title'))
-		$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	if ($listing->exists('list-title')) {
+			$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	}
 
 	// Pick the correct template.
 	$context['sub_template'] = 'package_list';
@@ -300,28 +311,32 @@ 
 
 	$installed_mods = array();
 	// Look through the list of installed mods...
-	foreach ($instmods as $installed_mod)
-		$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	foreach ($instmods as $installed_mod) {
+			$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	}
 
 	// Get default author and email if they exist.
 	if ($listing->exists('default-author'))
 	{
 		$default_author = $smcFunc['htmlspecialchars']($listing->fetch('default-author'));
-		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL))
-			$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL)) {
+					$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		}
 	}
 
 	// Get default web site if it exists.
 	if ($listing->exists('default-website'))
 	{
 		$default_website = $smcFunc['htmlspecialchars']($listing->fetch('default-website'));
-		if ($listing->exists('default-website/@title'))
-			$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		if ($listing->exists('default-website/@title')) {
+					$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		}
 	}
 
 	$the_version = strtr($forum_version, array('SMF ' => ''));
-	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	if (!empty($_SESSION['version_emulate'])) {
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	$packageNum = 0;
 	$packageSection = 0;
@@ -342,11 +357,13 @@ 
 				'type' => $thisPackage->name(),
 			);
 
-			if (in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			if (in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Title, Heading, Rule or Text.
-			elseif (in_array($package['type'], array('heading', 'rule')))
-				$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			elseif (in_array($package['type'], array('heading', 'rule'))) {
+							$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Remote link.
 			elseif ($package['type'] == 'remote')
 			{
@@ -354,20 +371,21 @@ 
 
 				if ($remote_type == 'relative' && substr($thisPackage->fetch('@href'), 0, 7) != 'http://' && substr($thisPackage->fetch('@href'), 0, 8) != 'https://')
 				{
-					if (isset($_GET['absolute']))
-						$current_url = $_GET['absolute'] . '/';
-					elseif (isset($_GET['relative']))
-						$current_url = $_GET['relative'] . '/';
-					else
-						$current_url = '';
+					if (isset($_GET['absolute'])) {
+											$current_url = $_GET['absolute'] . '/';
+					} elseif (isset($_GET['relative'])) {
+											$current_url = $_GET['relative'] . '/';
+					} else {
+											$current_url = '';
+					}
 
 					$current_url .= $thisPackage->fetch('@href');
-					if (isset($_GET['absolute']))
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
-					else
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
-				}
-				else
+					if (isset($_GET['absolute'])) {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
+					} else {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
+					}
+				} else
 				{
 					$current_url = $thisPackage->fetch('@href');
 					$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
@@ -379,25 +397,28 @@ 
 			// It's a package...
 			else
 			{
-				if (isset($_GET['absolute']))
-					$current_url = $_GET['absolute'] . '/';
-				elseif (isset($_GET['relative']))
-					$current_url = $_GET['relative'] . '/';
-				else
-					$current_url = '';
+				if (isset($_GET['absolute'])) {
+									$current_url = $_GET['absolute'] . '/';
+				} elseif (isset($_GET['relative'])) {
+									$current_url = $_GET['relative'] . '/';
+				} else {
+									$current_url = '';
+				}
 
 				$server_att = $server != '' ? ';server=' . $server : '';
 
 				$package += $thisPackage->to_array();
 
-				if (isset($package['website']))
-					unset($package['website']);
+				if (isset($package['website'])) {
+									unset($package['website']);
+				}
 				$package['author'] = array();
 
-				if ($package['description'] == '')
-					$package['description'] = $txt['package_no_description'];
-				else
-					$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				if ($package['description'] == '') {
+									$package['description'] = $txt['package_no_description'];
+				} else {
+									$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				}
 
 				$package['is_installed'] = isset($installed_mods[$package['id']]);
 				$package['is_current'] = $package['is_installed'] && ($installed_mods[$package['id']] == $package['version']);
@@ -406,12 +427,14 @@ 
 				// This package is either not installed, or installed but old.  Is it supported on this version of SMF?
 				if (!$package['is_installed'] || (!$package['is_current'] && !$package['is_newer']))
 				{
-					if ($thisPackage->exists('version/@for'))
-						$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					if ($thisPackage->exists('version/@for')) {
+											$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					}
 				}
 				// Okay, it's already installed AND up to date.
-				else
-					$package['can_install'] = false;
+				else {
+									$package['can_install'] = false;
+				}
 
 				$already_exists = getPackageInfo(basename($package['filename']));
 				$package['download_conflict'] = is_array($already_exists) && $already_exists['id'] == $package['id'] && $already_exists['version'] != $package['version'];
@@ -423,40 +446,44 @@ 
 
 				if ($thisPackage->exists('author') || isset($default_author))
 				{
-					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL))
-						$package['author']['email'] = $thisPackage->fetch('author/@email');
-					elseif (isset($default_email))
-						$package['author']['email'] = $default_email;
-
-					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '')
-						$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
-					else
-						$package['author']['name'] = $default_author;
-
-					if (!empty($package['author']['email']))
-						$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL)) {
+											$package['author']['email'] = $thisPackage->fetch('author/@email');
+					} elseif (isset($default_email)) {
+											$package['author']['email'] = $default_email;
+					}
+
+					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '') {
+											$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
+					} else {
+											$package['author']['name'] = $default_author;
+					}
+
+					if (!empty($package['author']['email'])) {
+											$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					}
 				}
 
 				if ($thisPackage->exists('website') || isset($default_website))
 				{
-					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
-					elseif (isset($default_title))
-						$package['author']['website']['name'] = $default_title;
-					elseif ($thisPackage->exists('website'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$package['author']['website']['name'] = $default_website;
-
-					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '')
-						$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$authorhompage = $default_website;
+					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
+					} elseif (isset($default_title)) {
+											$package['author']['website']['name'] = $default_title;
+					} elseif ($thisPackage->exists('website')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$package['author']['website']['name'] = $default_website;
+					}
+
+					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '') {
+											$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$authorhompage = $default_website;
+					}
 
 					$package['author']['website']['href'] = $authorhompage;
 					$package['author']['website']['link'] = '<a href="' . $authorhompage . '">' . $package['author']['website']['name'] . '</a>';
-				}
-				else
+				} else
 				{
 					$package['author']['website']['href'] = '';
 					$package['author']['website']['link'] = '';
@@ -472,11 +499,13 @@ 
 			$packageNum = in_array($package['type'], array('title', 'heading', 'text', 'remote', 'rule')) ? 0 : $packageNum + 1;
 			$package['count'] = $packageNum;
 
-			if (!in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection]['items'][] = $package;
+			if (!in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection]['items'][] = $package;
+			}
 
-			if ($package['count'] > 1)
-				$context['list_type'] = 'ol';
+			if ($package['count'] > 1) {
+							$context['list_type'] = 'ol';
+			}
 		}
 
 		$packageSection++;
@@ -489,8 +518,9 @@ 
 	{
 		foreach ($packageSection['items'] as $i => $package)
 		{
-			if ($package['count'] == 0 || isset($package['can_install']))
-				continue;
+			if ($package['count'] == 0 || isset($package['can_install'])) {
+							continue;
+			}
 
 			$context['package_list'][$ps_id]['items'][$i]['can_install'] = false;
 
@@ -539,8 +569,9 @@ 
 	checkSession('get');
 
 	// To download something, we need a valid server or url.
-	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package'])))
-		fatal_lang_error('package_get_error_is_zero', false);
+	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package']))) {
+			fatal_lang_error('package_get_error_is_zero', false);
+	}
 
 	if (isset($_GET['server']))
 	{
@@ -560,22 +591,23 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If server does not exist then dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		$url = $url . '/';
-	}
-	else
+	} else
 	{
 		// Initialize the requried variables.
 		$server = '';
 		$url = '';
 	}
 
-	if (isset($_REQUEST['byurl']) && !empty($_POST['filename']))
-		$package_name = basename($_REQUEST['filename']);
-	else
-		$package_name = basename($_REQUEST['package']);
+	if (isset($_REQUEST['byurl']) && !empty($_POST['filename'])) {
+			$package_name = basename($_REQUEST['filename']);
+	} else {
+			$package_name = basename($_REQUEST['package']);
+	}
 
 	if (isset($_REQUEST['conflict']) || (isset($_REQUEST['auto']) && file_exists($packagesdir . '/' . $package_name)))
 	{
@@ -584,14 +616,15 @@ 
 		{
 			$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 			$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
+		} else {
+					$ext = '';
 		}
-		else
-			$ext = '';
 
 		// Find the first available.
 		$i = 1;
-		while (file_exists($packagesdir . '/' . $package_name . $i . $ext))
-			$i++;
+		while (file_exists($packagesdir . '/' . $package_name . $i . $ext)) {
+					$i++;
+		}
 
 		$package_name = $package_name . $i . $ext;
 	}
@@ -601,25 +634,28 @@ 
 	package_put_contents($packagesdir . '/' . $package_name, fetch_web_data($url . $_REQUEST['package']));
 
 	// Done!  Did we get this package automatically?
-	if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto']))
-		redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto'])) {
+			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	}
 
 	// You just downloaded a mod from SERVER_NAME_GOES_HERE.
 	$context['package_server'] = $server;
 
 	$context['package'] = getPackageInfo($package_name);
 
-	if (!is_array($context['package']))
-		fatal_lang_error('package_cant_download', false);
+	if (!is_array($context['package'])) {
+			fatal_lang_error('package_cant_download', false);
+	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_download');
@@ -645,16 +681,18 @@ 
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
-	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-		fatal_lang_error('package_upload_error_nofile');
-	elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-		fatal_lang_error('package_upload_error_failed');
+	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '') {
+			fatal_lang_error('package_upload_error_nofile');
+	} elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name']))) {
+			fatal_lang_error('package_upload_error_failed');
+	}
 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 
-	if (strtolower(substr($_FILES['package']['name'], -4)) != '.zip' && strtolower(substr($_FILES['package']['name'], -4)) != '.tgz' && strtolower(substr($_FILES['package']['name'], -7)) != '.tar.gz')
-		fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+	if (strtolower(substr($_FILES['package']['name'], -4)) != '.zip' && strtolower(substr($_FILES['package']['name'], -4)) != '.tgz' && strtolower(substr($_FILES['package']['name'], -7)) != '.tar.gz') {
+			fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+	}
 
 	// We only need the filename...
 	$packageName = basename($_FILES['package']['name']);
@@ -662,8 +700,9 @@ 
 	// Setup the destination and throw an error if the file is already there!
 	$destination = $packagesdir . '/' . $packageName;
 	// @todo Maybe just roll it like we do for downloads?
-	if (file_exists($destination))
-		fatal_lang_error('package_upload_error_exists');
+	if (file_exists($destination)) {
+			fatal_lang_error('package_upload_error_exists');
+	}
 
 	// Now move the file.
 	move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -686,12 +725,14 @@ 
 	{
 		while ($package = readdir($dir))
 		{
-			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
-				continue;
+			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
+							continue;
+			}
 
 			$packageInfo = getPackageInfo($package);
-			if (!is_array($packageInfo))
-				continue;
+			if (!is_array($packageInfo)) {
+							continue;
+			}
 
 			if ($packageInfo['id'] == $context['package']['id'] && $packageInfo['version'] == $context['package']['version'])
 			{
@@ -703,14 +744,15 @@ 
 		closedir($dir);
 	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_upload');
@@ -733,16 +775,18 @@ 
 	checkSession();
 
 	// If they put a slash on the end, get rid of it.
-	if (substr($_POST['serverurl'], -1) == '/')
-		$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	if (substr($_POST['serverurl'], -1) == '/') {
+			$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	}
 
 	// Are they both nice and clean?
 	$servername = trim($smcFunc['htmlspecialchars']($_POST['servername']));
 	$serverurl = trim($smcFunc['htmlspecialchars']($_POST['serverurl']));
 
 	// Make sure the URL has the correct prefix.
-	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0)
-		$serverurl = 'http://' . $serverurl;
+	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0) {
+			$serverurl = 'http://' . $serverurl;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}package_servers',

Sources/minify/src/JS.php

Indentation +397 added lines, -397 removed lines

@@ -14,122 +14,122 @@ 
  */
 class JS extends Minify
 {
-    /**
-     * Var-matching regex based on http://stackoverflow.com/a/9337047/802993.
-     *
-     * Note that regular expressions using that bit must have the PCRE_UTF8
-     * pattern modifier (/u) set.
-     *
-     * @var string
-     */
-    const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b';
-
-    /**
-     * Full list of JavaScript reserved words.
-     * Will be loaded from /data/js/keywords_reserved.txt.
-     *
-     * @see https://mathiasbynens.be/notes/reserved-keywords
-     *
-     * @var string[]
-     */
-    protected $keywordsReserved = array();
-
-    /**
-     * List of JavaScript reserved words that accept a <variable, value, ...>
-     * after them. Some end of lines are not the end of a statement, like with
-     * these keywords.
-     *
-     * E.g.: we shouldn't insert a ; after this else
-     * else
-     *     console.log('this is quite fine')
-     *
-     * Will be loaded from /data/js/keywords_before.txt
-     *
-     * @var string[]
-     */
-    protected $keywordsBefore = array();
-
-    /**
-     * List of JavaScript reserved words that accept a <variable, value, ...>
-     * before them. Some end of lines are not the end of a statement, like when
-     * continued by one of these keywords on the newline.
-     *
-     * E.g.: we shouldn't insert a ; before this instanceof
-     * variable
-     *     instanceof String
-     *
-     * Will be loaded from /data/js/keywords_after.txt
-     *
-     * @var string[]
-     */
-    protected $keywordsAfter = array();
-
-    /**
-     * List of JavaScript operators that accept a <variable, value, ...> after
-     * them. Some end of lines are not the end of a statement, like with these
-     * operators.
-     *
-     * Note: Most operators are fine, we've only removed !, ++ and --.
-     * There can't be a newline separating ! and whatever it is negating.
-     * ++ & -- have to be joined with the value they're in-/decrementing.
-     *
-     * Will be loaded from /data/js/operators_before.txt
-     *
-     * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
-     *
-     * @var string[]
-     */
-    protected $operatorsBefore = array();
-
-    /**
-     * List of JavaScript operators that accept a <variable, value, ...> before
-     * them. Some end of lines are not the end of a statement, like when
-     * continued by one of these operators on the newline.
-     *
-     * Note: Most operators are fine, we've only removed ), ], ++ and --.
-     * ++ & -- have to be joined with the value they're in-/decrementing.
-     * ) & ] are "special" in that they have lots or usecases. () for example
-     * is used for function calls, for grouping, in if () and for (), ...
-     *
-     * Will be loaded from /data/js/operators_after.txt
-     *
-     * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
-     *
-     * @var string[]
-     */
-    protected $operatorsAfter = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct()
-    {
-        call_user_func_array(array('parent', '__construct'), func_get_args());
-
-        $dataDir = __DIR__.'/../data/js/';
-        $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
-        $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
-        $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
-        $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
-        $this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
-        $this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
-    }
-
-    /**
-     * Minify the data.
-     * Perform JS optimizations.
-     *
-     * @param string[optional] $path Path to write the data to.
-     *
-     * @return string The minified data.
-     */
-    public function execute($path = null)
-    {
-        $content = '';
-
-        // loop files
-        foreach ($this->data as $source => $js) {
-            /*
+	/**
+	 * Var-matching regex based on http://stackoverflow.com/a/9337047/802993.
+	 *
+	 * Note that regular expressions using that bit must have the PCRE_UTF8
+	 * pattern modifier (/u) set.
+	 *
+	 * @var string
+	 */
+	const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b';
+
+	/**
+	 * Full list of JavaScript reserved words.
+	 * Will be loaded from /data/js/keywords_reserved.txt.
+	 *
+	 * @see https://mathiasbynens.be/notes/reserved-keywords
+	 *
+	 * @var string[]
+	 */
+	protected $keywordsReserved = array();
+
+	/**
+	 * List of JavaScript reserved words that accept a <variable, value, ...>
+	 * after them. Some end of lines are not the end of a statement, like with
+	 * these keywords.
+	 *
+	 * E.g.: we shouldn't insert a ; after this else
+	 * else
+	 *     console.log('this is quite fine')
+	 *
+	 * Will be loaded from /data/js/keywords_before.txt
+	 *
+	 * @var string[]
+	 */
+	protected $keywordsBefore = array();
+
+	/**
+	 * List of JavaScript reserved words that accept a <variable, value, ...>
+	 * before them. Some end of lines are not the end of a statement, like when
+	 * continued by one of these keywords on the newline.
+	 *
+	 * E.g.: we shouldn't insert a ; before this instanceof
+	 * variable
+	 *     instanceof String
+	 *
+	 * Will be loaded from /data/js/keywords_after.txt
+	 *
+	 * @var string[]
+	 */
+	protected $keywordsAfter = array();
+
+	/**
+	 * List of JavaScript operators that accept a <variable, value, ...> after
+	 * them. Some end of lines are not the end of a statement, like with these
+	 * operators.
+	 *
+	 * Note: Most operators are fine, we've only removed !, ++ and --.
+	 * There can't be a newline separating ! and whatever it is negating.
+	 * ++ & -- have to be joined with the value they're in-/decrementing.
+	 *
+	 * Will be loaded from /data/js/operators_before.txt
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
+	 *
+	 * @var string[]
+	 */
+	protected $operatorsBefore = array();
+
+	/**
+	 * List of JavaScript operators that accept a <variable, value, ...> before
+	 * them. Some end of lines are not the end of a statement, like when
+	 * continued by one of these operators on the newline.
+	 *
+	 * Note: Most operators are fine, we've only removed ), ], ++ and --.
+	 * ++ & -- have to be joined with the value they're in-/decrementing.
+	 * ) & ] are "special" in that they have lots or usecases. () for example
+	 * is used for function calls, for grouping, in if () and for (), ...
+	 *
+	 * Will be loaded from /data/js/operators_after.txt
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
+	 *
+	 * @var string[]
+	 */
+	protected $operatorsAfter = array();
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct()
+	{
+		call_user_func_array(array('parent', '__construct'), func_get_args());
+
+		$dataDir = __DIR__.'/../data/js/';
+		$options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
+		$this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
+		$this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
+		$this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
+		$this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
+		$this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
+	}
+
+	/**
+	 * Minify the data.
+	 * Perform JS optimizations.
+	 *
+	 * @param string[optional] $path Path to write the data to.
+	 *
+	 * @return string The minified data.
+	 */
+	public function execute($path = null)
+	{
+		$content = '';
+
+		// loop files
+		foreach ($this->data as $source => $js) {
+			/*
              * Combine js: separating the scripts by a ;
              * I'm also adding a newline: it will be eaten when whitespace is
              * stripped, but we need to make sure we're not just appending
@@ -137,10 +137,10 @@ 
              * singe-line comment on the last line (in which case it would also
              * be seen as part of that comment)
              */
-            $content .= $js."\n;";
-        }
+			$content .= $js."\n;";
+		}
 
-        /*
+		/*
          * Let's first take out strings, comments and regular expressions.
          * All of these can contain JS code-like characters, and we should make
          * sure any further magic ignores anything inside of these.
@@ -151,159 +151,159 @@ 
          * Comments will be removed altogether, strings and regular expressions
          * will be replaced by placeholder text, which we'll restore later.
          */
-        $this->extractStrings('\'"`');
-        $this->stripComments();
-        $this->extractRegex();
-        $content = $this->replace($content);
+		$this->extractStrings('\'"`');
+		$this->stripComments();
+		$this->extractRegex();
+		$content = $this->replace($content);
 
-        $content = $this->stripWhitespace($content);
-        $content = $this->propertyNotation($content);
-        $content = $this->shortenBools($content);
+		$content = $this->stripWhitespace($content);
+		$content = $this->propertyNotation($content);
+		$content = $this->shortenBools($content);
 
-        /*
+		/*
          * Earlier, we extracted strings & regular expressions and replaced them
          * with placeholder text. This will restore them.
          */
-        $content = $this->restoreExtractedData($content);
-
-        return $content;
-    }
-
-    /**
-     * Strip comments from source code.
-     */
-    protected function stripComments()
-    {
-        // single-line comments
-        $this->registerPattern('/\/\/.*$/m', '');
-
-        // multi-line comments
-        $this->registerPattern('/\/\*.*?\*\//s', '');
-    }
-
-    /**
-     * JS can have /-delimited regular expressions, like: /ab+c/.match(string).
-     *
-     * The content inside the regex can contain characters that may be confused
-     * for JS code: e.g. it could contain whitespace it needs to match & we
-     * don't want to strip whitespace in there.
-     *
-     * The regex can be pretty simple: we don't have to care about comments,
-     * (which also use slashes) because stripComments() will have stripped those
-     * already.
-     *
-     * This method will replace all string content with simple REGEX#
-     * placeholder text, so we've rid all regular expressions from characters
-     * that may be misinterpreted. Original regex content will be saved in
-     * $this->extracted and after doing all other minifying, we can restore the
-     * original content via restoreRegex()
-     */
-    protected function extractRegex()
-    {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $callback = function ($match) use ($minifier) {
-            $count = count($minifier->extracted);
-            $placeholder = '/'.$count.'/';
-            $minifier->extracted[$placeholder] = $match[1];
-
-            return $placeholder;
-        };
-
-        // it's a regex if we can find an opening and (not escaped) closing /,
-        // include \n because it may be there for a reason
-        // (https://github.com/matthiasmullie/minify/issues/56)
-        $pattern = '(\/.*?(?<!\\\\)(\\\\\\\\)*+\/\n?)';
-
-        // / can't be preceded by variable, value, or similar because then
-        // it's going to be division
-        // checking for that is complex, so we'll do inverse:
-        // * at the beginning of the file, it's not division, but regex
-        $this->registerPattern('/^\s*\K'.$pattern.'/', $callback);
-        // * following another operator, it's not division, but regex
-        $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
-        $operators += $this->getKeywordsForRegex($this->keywordsReserved, '/');
-        $this->registerPattern('/(?:'.implode('|', $operators).')\s*\K'.$pattern.'/', $callback);
-    }
-
-    /**
-     * Strip whitespace.
-     *
-     * We won't strip *all* whitespace, but as much as possible. The thing that
-     * we'll preserve are newlines we're unsure about.
-     * JavaScript doesn't require statements to be terminated with a semicolon.
-     * It will automatically fix missing semicolons with ASI (automatic semi-
-     * colon insertion) at the end of line causing errors (without semicolon.)
-     *
-     * Because it's sometimes hard to tell if a newline is part of a statement
-     * that should be terminated or not, we'll just leave some of them alone.
-     *
-     * @param string $content The content to strip the whitespace for.
-     *
-     * @return string
-     */
-    protected function stripWhitespace($content)
-    {
-        // uniform line endings, make them all line feed
-        $content = str_replace(array("\r\n", "\r"), "\n", $content);
-
-        // collapse all non-line feed whitespace into a single space
-        $content = preg_replace('/[^\S\n]+/', ' ', $content);
-
-        // strip leading & trailing whitespace
-        $content = str_replace(array(" \n", "\n "), "\n", $content);
-
-        // collapse consecutive line feeds into just 1
-        $content = preg_replace('/\n+/', "\n", $content);
-
-        $before = $this->getOperatorsForRegex($this->operatorsBefore, '/');
-        $after = $this->getOperatorsForRegex($this->operatorsAfter, '/');
-        $operators = $before + $after;
-
-        // strip whitespace that ends in (or next line begin with) an operator
-        // that allows statements to be broken up over multiple lines
-        unset($before['+'], $before['-'], $after['+'], $after['-']);
-        $content = preg_replace(
-            array(
-                '/('.implode('|', $before).')\s+/',
-                '/\s+('.implode('|', $after).')/',
-            ), '\\1', $content
-        );
-
-        // make sure + and - can't be mistaken for, or joined into ++ and --
-        $content = preg_replace(
-            array(
-                '/(?<![\+\-])\s*([\+\-])(?![\+\-])/',
-                '/(?<![\+\-])([\+\-])\s*(?![\+\-])/',
-            ), '\\1', $content
-        );
-
-        /*
+		$content = $this->restoreExtractedData($content);
+
+		return $content;
+	}
+
+	/**
+	 * Strip comments from source code.
+	 */
+	protected function stripComments()
+	{
+		// single-line comments
+		$this->registerPattern('/\/\/.*$/m', '');
+
+		// multi-line comments
+		$this->registerPattern('/\/\*.*?\*\//s', '');
+	}
+
+	/**
+	 * JS can have /-delimited regular expressions, like: /ab+c/.match(string).
+	 *
+	 * The content inside the regex can contain characters that may be confused
+	 * for JS code: e.g. it could contain whitespace it needs to match & we
+	 * don't want to strip whitespace in there.
+	 *
+	 * The regex can be pretty simple: we don't have to care about comments,
+	 * (which also use slashes) because stripComments() will have stripped those
+	 * already.
+	 *
+	 * This method will replace all string content with simple REGEX#
+	 * placeholder text, so we've rid all regular expressions from characters
+	 * that may be misinterpreted. Original regex content will be saved in
+	 * $this->extracted and after doing all other minifying, we can restore the
+	 * original content via restoreRegex()
+	 */
+	protected function extractRegex()
+	{
+		// PHP only supports $this inside anonymous functions since 5.4
+		$minifier = $this;
+		$callback = function ($match) use ($minifier) {
+			$count = count($minifier->extracted);
+			$placeholder = '/'.$count.'/';
+			$minifier->extracted[$placeholder] = $match[1];
+
+			return $placeholder;
+		};
+
+		// it's a regex if we can find an opening and (not escaped) closing /,
+		// include \n because it may be there for a reason
+		// (https://github.com/matthiasmullie/minify/issues/56)
+		$pattern = '(\/.*?(?<!\\\\)(\\\\\\\\)*+\/\n?)';
+
+		// / can't be preceded by variable, value, or similar because then
+		// it's going to be division
+		// checking for that is complex, so we'll do inverse:
+		// * at the beginning of the file, it's not division, but regex
+		$this->registerPattern('/^\s*\K'.$pattern.'/', $callback);
+		// * following another operator, it's not division, but regex
+		$operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
+		$operators += $this->getKeywordsForRegex($this->keywordsReserved, '/');
+		$this->registerPattern('/(?:'.implode('|', $operators).')\s*\K'.$pattern.'/', $callback);
+	}
+
+	/**
+	 * Strip whitespace.
+	 *
+	 * We won't strip *all* whitespace, but as much as possible. The thing that
+	 * we'll preserve are newlines we're unsure about.
+	 * JavaScript doesn't require statements to be terminated with a semicolon.
+	 * It will automatically fix missing semicolons with ASI (automatic semi-
+	 * colon insertion) at the end of line causing errors (without semicolon.)
+	 *
+	 * Because it's sometimes hard to tell if a newline is part of a statement
+	 * that should be terminated or not, we'll just leave some of them alone.
+	 *
+	 * @param string $content The content to strip the whitespace for.
+	 *
+	 * @return string
+	 */
+	protected function stripWhitespace($content)
+	{
+		// uniform line endings, make them all line feed
+		$content = str_replace(array("\r\n", "\r"), "\n", $content);
+
+		// collapse all non-line feed whitespace into a single space
+		$content = preg_replace('/[^\S\n]+/', ' ', $content);
+
+		// strip leading & trailing whitespace
+		$content = str_replace(array(" \n", "\n "), "\n", $content);
+
+		// collapse consecutive line feeds into just 1
+		$content = preg_replace('/\n+/', "\n", $content);
+
+		$before = $this->getOperatorsForRegex($this->operatorsBefore, '/');
+		$after = $this->getOperatorsForRegex($this->operatorsAfter, '/');
+		$operators = $before + $after;
+
+		// strip whitespace that ends in (or next line begin with) an operator
+		// that allows statements to be broken up over multiple lines
+		unset($before['+'], $before['-'], $after['+'], $after['-']);
+		$content = preg_replace(
+			array(
+				'/('.implode('|', $before).')\s+/',
+				'/\s+('.implode('|', $after).')/',
+			), '\\1', $content
+		);
+
+		// make sure + and - can't be mistaken for, or joined into ++ and --
+		$content = preg_replace(
+			array(
+				'/(?<![\+\-])\s*([\+\-])(?![\+\-])/',
+				'/(?<![\+\-])([\+\-])\s*(?![\+\-])/',
+			), '\\1', $content
+		);
+
+		/*
          * We didn't strip whitespace after a couple of operators because they
          * could be used in different contexts and we can't be sure it's ok to
          * strip the newlines. However, we can safely strip any non-line feed
          * whitespace that follows them.
          */
-        $content = preg_replace('/([\}\)\]])[^\S\n]+(?!'.implode('|', $operators).')/', '\\1', $content);
+		$content = preg_replace('/([\}\)\]])[^\S\n]+(?!'.implode('|', $operators).')/', '\\1', $content);
 
-        // collapse whitespace around reserved words into single space
-        $before = $this->getKeywordsForRegex($this->keywordsBefore, '/');
-        $after = $this->getKeywordsForRegex($this->keywordsAfter, '/');
-        $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $before).')\s+/', '\\2 ', $content);
-        $content = preg_replace('/\s+('.implode('|', $after).')(?=([;\{\s]|$))/', ' \\1', $content);
+		// collapse whitespace around reserved words into single space
+		$before = $this->getKeywordsForRegex($this->keywordsBefore, '/');
+		$after = $this->getKeywordsForRegex($this->keywordsAfter, '/');
+		$content = preg_replace('/(^|[;\}\s])\K('.implode('|', $before).')\s+/', '\\2 ', $content);
+		$content = preg_replace('/\s+('.implode('|', $after).')(?=([;\{\s]|$))/', ' \\1', $content);
 
-        /*
+		/*
          * Get rid of double semicolons, except where they can be used like:
          * "for(v=1,_=b;;)", "for(v=1;;v++)" or "for(;;ja||(ja=true))".
          * I'll safeguard these double semicolons inside for-loops by
          * temporarily replacing them with an invalid condition: they won't have
          * a double semicolon and will be easy to spot to restore afterwards.
          */
-        $content = preg_replace('/\bfor\(([^;]*);;([^;]*)\)/', 'for(\\1;-;\\2)', $content);
-        $content = preg_replace('/;+/', ';', $content);
-        $content = preg_replace('/\bfor\(([^;]*);-;([^;]*)\)/', 'for(\\1;;\\2)', $content);
+		$content = preg_replace('/\bfor\(([^;]*);;([^;]*)\)/', 'for(\\1;-;\\2)', $content);
+		$content = preg_replace('/;+/', ';', $content);
+		$content = preg_replace('/\bfor\(([^;]*);-;([^;]*)\)/', 'for(\\1;;\\2)', $content);
 
-        /*
+		/*
          * Next, we'll be removing all semicolons where ASI kicks in.
          * for-loops however, can have an empty body (ending in only a
          * semicolon), like: `for(i=1;i<3;i++);`
@@ -313,9 +313,9 @@ 
          * I'm going to double that semicolon (if any) so after the next line,
          * which strips semicolons here & there, we're still left with this one.
          */
-        $content = preg_replace('/(for\([^;]*;[^;]*;[^;\{]*\));(\}|$)/s', '\\1;;\\2', $content);
+		$content = preg_replace('/(for\([^;]*;[^;]*;[^;\{]*\));(\}|$)/s', '\\1;;\\2', $content);
 
-        /*
+		/*
          * We also can't strip empty else-statements. Even though they're
          * useless and probably shouldn't be in the code in the first place, we
          * shouldn't be stripping the `;` that follows it as it breaks the code.
@@ -323,114 +323,114 @@ 
          *
          * @see https://github.com/matthiasmullie/minify/issues/91
          */
-        $content = preg_replace('/else;/s', '', $content);
+		$content = preg_replace('/else;/s', '', $content);
 
-        /*
+		/*
          * We also don't really want to terminate statements followed by closing
          * curly braces (which we've ignored completely up until now) or end-of-
          * script: ASI will kick in here & we're all about minifying.
          * Semicolons at beginning of the file don't make any sense either.
          */
-        $content = preg_replace('/;(\}|$)/s', '\\1', $content);
-        $content = ltrim($content, ';');
-
-        // get rid of remaining whitespace af beginning/end
-        return trim($content);
-    }
-
-    /**
-     * We'll strip whitespace around certain operators with regular expressions.
-     * This will prepare the given array by escaping all characters.
-     *
-     * @param string[] $operators
-     * @param string   $delimiter
-     *
-     * @return string[]
-     */
-    protected function getOperatorsForRegex(array $operators, $delimiter = '/')
-    {
-        // escape operators for use in regex
-        $delimiter = array_fill(0, count($operators), $delimiter);
-        $escaped = array_map('preg_quote', $operators, $delimiter);
-
-        $operators = array_combine($operators, $escaped);
-
-        // ignore + & - for now, they'll get special treatment
-        unset($operators['+'], $operators['-']);
-
-        // dot can not just immediately follow a number; it can be confused for
-        // decimal point, or calling a method on it, e.g. 42 .toString()
-        $operators['.'] = '(?<![0-9]\s)\.';
-
-        // don't confuse = with other assignment shortcuts (e.g. +=)
-        $chars = preg_quote('+-*\=<>%&|');
-        $operators['='] = '(?<!['.$chars.'])\=';
-
-        return $operators;
-    }
-
-    /**
-     * We'll strip whitespace around certain keywords with regular expressions.
-     * This will prepare the given array by escaping all characters.
-     *
-     * @param string[] $keywords
-     * @param string   $delimiter
-     *
-     * @return string[]
-     */
-    protected function getKeywordsForRegex(array $keywords, $delimiter = '/')
-    {
-        // escape keywords for use in regex
-        $delimiter = array_fill(0, count($keywords), $delimiter);
-        $escaped = array_map('preg_quote', $keywords, $delimiter);
-
-        // add word boundaries
-        array_walk($keywords, function ($value) {
-            return '\b'.$value.'\b';
-        });
-
-        $keywords = array_combine($keywords, $escaped);
-
-        return $keywords;
-    }
-
-    /**
-     * Replaces all occurrences of array['key'] by array.key.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function propertyNotation($content)
-    {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $keywords = $this->keywordsReserved;
-        $callback = function ($match) use ($minifier, $keywords) {
-            $property = trim($minifier->extracted[$match[1]], '\'"');
-
-            /*
+		$content = preg_replace('/;(\}|$)/s', '\\1', $content);
+		$content = ltrim($content, ';');
+
+		// get rid of remaining whitespace af beginning/end
+		return trim($content);
+	}
+
+	/**
+	 * We'll strip whitespace around certain operators with regular expressions.
+	 * This will prepare the given array by escaping all characters.
+	 *
+	 * @param string[] $operators
+	 * @param string   $delimiter
+	 *
+	 * @return string[]
+	 */
+	protected function getOperatorsForRegex(array $operators, $delimiter = '/')
+	{
+		// escape operators for use in regex
+		$delimiter = array_fill(0, count($operators), $delimiter);
+		$escaped = array_map('preg_quote', $operators, $delimiter);
+
+		$operators = array_combine($operators, $escaped);
+
+		// ignore + & - for now, they'll get special treatment
+		unset($operators['+'], $operators['-']);
+
+		// dot can not just immediately follow a number; it can be confused for
+		// decimal point, or calling a method on it, e.g. 42 .toString()
+		$operators['.'] = '(?<![0-9]\s)\.';
+
+		// don't confuse = with other assignment shortcuts (e.g. +=)
+		$chars = preg_quote('+-*\=<>%&|');
+		$operators['='] = '(?<!['.$chars.'])\=';
+
+		return $operators;
+	}
+
+	/**
+	 * We'll strip whitespace around certain keywords with regular expressions.
+	 * This will prepare the given array by escaping all characters.
+	 *
+	 * @param string[] $keywords
+	 * @param string   $delimiter
+	 *
+	 * @return string[]
+	 */
+	protected function getKeywordsForRegex(array $keywords, $delimiter = '/')
+	{
+		// escape keywords for use in regex
+		$delimiter = array_fill(0, count($keywords), $delimiter);
+		$escaped = array_map('preg_quote', $keywords, $delimiter);
+
+		// add word boundaries
+		array_walk($keywords, function ($value) {
+			return '\b'.$value.'\b';
+		});
+
+		$keywords = array_combine($keywords, $escaped);
+
+		return $keywords;
+	}
+
+	/**
+	 * Replaces all occurrences of array['key'] by array.key.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function propertyNotation($content)
+	{
+		// PHP only supports $this inside anonymous functions since 5.4
+		$minifier = $this;
+		$keywords = $this->keywordsReserved;
+		$callback = function ($match) use ($minifier, $keywords) {
+			$property = trim($minifier->extracted[$match[1]], '\'"');
+
+			/*
              * Check if the property is a reserved keyword. In this context (as
              * property of an object literal/array) it shouldn't matter, but IE8
              * freaks out with "Expected identifier".
              */
-            if (in_array($property, $keywords)) {
-                return $match[0];
-            }
+			if (in_array($property, $keywords)) {
+				return $match[0];
+			}
 
-            /*
+			/*
              * See if the property is in a variable-like format (e.g.
              * array['key-here'] can't be replaced by array.key-here since '-'
              * is not a valid character there.
              */
-            if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
-                return $match[0];
-            }
+			if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
+				return $match[0];
+			}
 
-            return '.'.$property;
-        };
+			return '.'.$property;
+		};
 
-        /*
+		/*
          * Figure out if previous character is a variable name (of the array
          * we want to use property notation on) - this is to make sure
          * standalone ['value'] arrays aren't confused for keys-of-an-array.
@@ -438,61 +438,61 @@ 
          * regex implementation doesn't allow unfixed-length look-behind
          * assertions.
          */
-        preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar);
-        $previousChar = $previousChar[1];
+		preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar);
+		$previousChar = $previousChar[1];
 
-        /*
+		/*
          * Make sure word preceding the ['value'] is not a keyword, e.g.
          * return['x']. Because -again- PHP's regex implementation doesn't allow
          * unfixed-length look-behind assertions, I'm just going to do a lot of
          * separate look-behind assertions, one for each keyword.
          */
-        $keywords = $this->getKeywordsForRegex($keywords);
-        $keywords = '(?<!'.implode(')(?<!', $keywords).')';
-
-        return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[(([\'"])[0-9]+\\2)\]/u', $callback, $content);
-    }
-
-    /**
-     * Replaces true & false by !0 and !1.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function shortenBools($content)
-    {
-        $content = preg_replace('/\btrue\b/', '!0', $content);
-        $content = preg_replace('/\bfalse\b/', '!1', $content);
-
-        // for(;;) is exactly the same as while(true)
-        $content = preg_replace('/\bwhile\(!0\){/', 'for(;;){', $content);
-
-        // now make sure we didn't turn any do ... while(true) into do ... for(;;)
-        preg_match_all('/\bdo\b/', $content, $dos, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-
-        // go backward to make sure positional offsets aren't altered when $content changes
-        $dos = array_reverse($dos);
-        foreach ($dos as $do) {
-            $offsetDo = $do[0][1];
-
-            // find all `while` (now `for`) following `do`: one of those must be
-            // associated with the `do` and be turned back into `while`
-            preg_match_all('/\bfor\(;;\)/', $content, $whiles, PREG_OFFSET_CAPTURE | PREG_SET_ORDER, $offsetDo);
-            foreach ($whiles as $while) {
-                $offsetWhile = $while[0][1];
-
-                $open = substr_count($content, '{', $offsetDo, $offsetWhile - $offsetDo);
-                $close = substr_count($content, '}', $offsetDo, $offsetWhile - $offsetDo);
-                if ($open === $close) {
-                    // only restore `while` if amount of `{` and `}` are the same;
-                    // otherwise, that `for` isn't associated with this `do`
-                    $content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)'));
-                    break;
-                }
-            }
-        }
-
-        return $content;
-    }
+		$keywords = $this->getKeywordsForRegex($keywords);
+		$keywords = '(?<!'.implode(')(?<!', $keywords).')';
+
+		return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[(([\'"])[0-9]+\\2)\]/u', $callback, $content);
+	}
+
+	/**
+	 * Replaces true & false by !0 and !1.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function shortenBools($content)
+	{
+		$content = preg_replace('/\btrue\b/', '!0', $content);
+		$content = preg_replace('/\bfalse\b/', '!1', $content);
+
+		// for(;;) is exactly the same as while(true)
+		$content = preg_replace('/\bwhile\(!0\){/', 'for(;;){', $content);
+
+		// now make sure we didn't turn any do ... while(true) into do ... for(;;)
+		preg_match_all('/\bdo\b/', $content, $dos, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+
+		// go backward to make sure positional offsets aren't altered when $content changes
+		$dos = array_reverse($dos);
+		foreach ($dos as $do) {
+			$offsetDo = $do[0][1];
+
+			// find all `while` (now `for`) following `do`: one of those must be
+			// associated with the `do` and be turned back into `while`
+			preg_match_all('/\bfor\(;;\)/', $content, $whiles, PREG_OFFSET_CAPTURE | PREG_SET_ORDER, $offsetDo);
+			foreach ($whiles as $while) {
+				$offsetWhile = $while[0][1];
+
+				$open = substr_count($content, '{', $offsetDo, $offsetWhile - $offsetDo);
+				$close = substr_count($content, '}', $offsetDo, $offsetWhile - $offsetDo);
+				if ($open === $close) {
+					// only restore `while` if amount of `{` and `}` are the same;
+					// otherwise, that `for` isn't associated with this `do`
+					$content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)'));
+					break;
+				}
+			}
+		}
+
+		return $content;
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -106,13 +106,13 @@ 
     {
         call_user_func_array(array('parent', '__construct'), func_get_args());
 
-        $dataDir = __DIR__.'/../data/js/';
+        $dataDir = __DIR__ . '/../data/js/';
         $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
-        $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
-        $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
-        $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
-        $this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
-        $this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
+        $this->keywordsReserved = file($dataDir . 'keywords_reserved.txt', $options);
+        $this->keywordsBefore = file($dataDir . 'keywords_before.txt', $options);
+        $this->keywordsAfter = file($dataDir . 'keywords_after.txt', $options);
+        $this->operatorsBefore = file($dataDir . 'operators_before.txt', $options);
+        $this->operatorsAfter = file($dataDir . 'operators_after.txt', $options);
     }
 
     /**
@@ -137,7 +137,7 @@ 
              * singe-line comment on the last line (in which case it would also
              * be seen as part of that comment)
              */
-            $content .= $js."\n;";
+            $content .= $js . "\n;";
         }
 
         /*
@@ -202,9 +202,9 @@ 
     {
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
-        $callback = function ($match) use ($minifier) {
+        $callback = function($match) use ($minifier) {
             $count = count($minifier->extracted);
-            $placeholder = '/'.$count.'/';
+            $placeholder = '/' . $count . '/';
             $minifier->extracted[$placeholder] = $match[1];
 
             return $placeholder;
@@ -219,11 +219,11 @@ 
         // it's going to be division
         // checking for that is complex, so we'll do inverse:
         // * at the beginning of the file, it's not division, but regex
-        $this->registerPattern('/^\s*\K'.$pattern.'/', $callback);
+        $this->registerPattern('/^\s*\K' . $pattern . '/', $callback);
         // * following another operator, it's not division, but regex
         $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
         $operators += $this->getKeywordsForRegex($this->keywordsReserved, '/');
-        $this->registerPattern('/(?:'.implode('|', $operators).')\s*\K'.$pattern.'/', $callback);
+        $this->registerPattern('/(?:' . implode('|', $operators) . ')\s*\K' . $pattern . '/', $callback);
     }
 
     /**
@@ -265,8 +265,8 @@ 
         unset($before['+'], $before['-'], $after['+'], $after['-']);
         $content = preg_replace(
             array(
-                '/('.implode('|', $before).')\s+/',
-                '/\s+('.implode('|', $after).')/',
+                '/(' . implode('|', $before) . ')\s+/',
+                '/\s+(' . implode('|', $after) . ')/',
             ), '\\1', $content
         );
 
@@ -284,13 +284,13 @@ 
          * strip the newlines. However, we can safely strip any non-line feed
          * whitespace that follows them.
          */
-        $content = preg_replace('/([\}\)\]])[^\S\n]+(?!'.implode('|', $operators).')/', '\\1', $content);
+        $content = preg_replace('/([\}\)\]])[^\S\n]+(?!' . implode('|', $operators) . ')/', '\\1', $content);
 
         // collapse whitespace around reserved words into single space
         $before = $this->getKeywordsForRegex($this->keywordsBefore, '/');
         $after = $this->getKeywordsForRegex($this->keywordsAfter, '/');
-        $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $before).')\s+/', '\\2 ', $content);
-        $content = preg_replace('/\s+('.implode('|', $after).')(?=([;\{\s]|$))/', ' \\1', $content);
+        $content = preg_replace('/(^|[;\}\s])\K(' . implode('|', $before) . ')\s+/', '\\2 ', $content);
+        $content = preg_replace('/\s+(' . implode('|', $after) . ')(?=([;\{\s]|$))/', ' \\1', $content);
 
         /*
          * Get rid of double semicolons, except where they can be used like:
@@ -364,7 +364,7 @@ 
 
         // don't confuse = with other assignment shortcuts (e.g. +=)
         $chars = preg_quote('+-*\=<>%&|');
-        $operators['='] = '(?<!['.$chars.'])\=';
+        $operators['='] = '(?<![' . $chars . '])\=';
 
         return $operators;
     }
@@ -385,8 +385,8 @@ 
         $escaped = array_map('preg_quote', $keywords, $delimiter);
 
         // add word boundaries
-        array_walk($keywords, function ($value) {
-            return '\b'.$value.'\b';
+        array_walk($keywords, function($value) {
+            return '\b' . $value . '\b';
         });
 
         $keywords = array_combine($keywords, $escaped);
@@ -406,7 +406,7 @@ 
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
         $keywords = $this->keywordsReserved;
-        $callback = function ($match) use ($minifier, $keywords) {
+        $callback = function($match) use ($minifier, $keywords) {
             $property = trim($minifier->extracted[$match[1]], '\'"');
 
             /*
@@ -423,11 +423,11 @@ 
              * array['key-here'] can't be replaced by array.key-here since '-'
              * is not a valid character there.
              */
-            if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
+            if (!preg_match('/^' . $minifier::REGEX_VARIABLE . '$/u', $property)) {
                 return $match[0];
             }
 
-            return '.'.$property;
+            return '.' . $property;
         };
 
         /*
@@ -448,9 +448,9 @@ 
          * separate look-behind assertions, one for each keyword.
          */
         $keywords = $this->getKeywordsForRegex($keywords);
-        $keywords = '(?<!'.implode(')(?<!', $keywords).')';
+        $keywords = '(?<!' . implode(')(?<!', $keywords) . ')';
 
-        return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[(([\'"])[0-9]+\\2)\]/u', $callback, $content);
+        return preg_replace_callback('/(?<=' . $previousChar . '|\])' . $keywords . '\[(([\'"])[0-9]+\\2)\]/u', $callback, $content);
     }
 
     /**

Sources/minify/src/Converter.php

Indentation +169 added lines, -169 removed lines

@@ -18,178 +18,178 @@
  */
 class Converter
 {
-    /**
-     * @var string
-     */
-    protected $from;
-
-    /**
-     * @var string
-     */
-    protected $to;
-
-    /**
-     * @param string $from The original base path (directory, not file!)
-     * @param string $to   The new base path (directory, not file!)
-     */
-    public function __construct($from, $to)
-    {
-        $shared = $this->shared($from, $to);
-        if ($shared === '') {
-            // when both paths have nothing in common, one of them is probably
-            // absolute while the other is relative
-            $cwd = getcwd();
-            $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
-            $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
-
-            // or traveling the tree via `..`
-            // attempt to resolve path, or assume it's fine if it doesn't exist
-            $from = realpath($from) ?: $from;
-            $to = realpath($to) ?: $to;
-        }
-
-        $from = $this->normalize($from);
-        $to = $this->normalize($to);
-
-        $from = $this->dirname($from);
-        $to = $this->dirname($to);
-
-        $this->from = $from;
-        $this->to = $to;
-    }
-
-    /**
-     * Normalize path.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    protected function normalize($path)
-    {
-        // deal with different operating systems' directory structure
-        $path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/');
-
-        /*
+	/**
+	 * @var string
+	 */
+	protected $from;
+
+	/**
+	 * @var string
+	 */
+	protected $to;
+
+	/**
+	 * @param string $from The original base path (directory, not file!)
+	 * @param string $to   The new base path (directory, not file!)
+	 */
+	public function __construct($from, $to)
+	{
+		$shared = $this->shared($from, $to);
+		if ($shared === '') {
+			// when both paths have nothing in common, one of them is probably
+			// absolute while the other is relative
+			$cwd = getcwd();
+			$from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
+			$to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
+
+			// or traveling the tree via `..`
+			// attempt to resolve path, or assume it's fine if it doesn't exist
+			$from = realpath($from) ?: $from;
+			$to = realpath($to) ?: $to;
+		}
+
+		$from = $this->normalize($from);
+		$to = $this->normalize($to);
+
+		$from = $this->dirname($from);
+		$to = $this->dirname($to);
+
+		$this->from = $from;
+		$this->to = $to;
+	}
+
+	/**
+	 * Normalize path.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	protected function normalize($path)
+	{
+		// deal with different operating systems' directory structure
+		$path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/');
+
+		/*
          * Example:
          *     /home/forkcms/frontend/cache/compiled_templates/../../core/layout/css/../images/img.gif
          * to
          *     /home/forkcms/frontend/core/layout/images/img.gif
          */
-        do {
-            $path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count);
-        } while ($count);
-
-        return $path;
-    }
-
-    /**
-     * Figure out the shared path of 2 locations.
-     *
-     * Example:
-     *     /home/forkcms/frontend/core/layout/images/img.gif
-     * and
-     *     /home/forkcms/frontend/cache/minified_css
-     * share
-     *     /home/forkcms/frontend
-     *
-     * @param string $path1
-     * @param string $path2
-     *
-     * @return string
-     */
-    protected function shared($path1, $path2)
-    {
-        // $path could theoretically be empty (e.g. no path is given), in which
-        // case it shouldn't expand to array(''), which would compare to one's
-        // root /
-        $path1 = $path1 ? explode('/', $path1) : array();
-        $path2 = $path2 ? explode('/', $path2) : array();
-
-        $shared = array();
-
-        // compare paths & strip identical ancestors
-        foreach ($path1 as $i => $chunk) {
-            if (isset($path2[$i]) && $path1[$i] == $path2[$i]) {
-                $shared[] = $chunk;
-            } else {
-                break;
-            }
-        }
-
-        return implode('/', $shared);
-    }
-
-    /**
-     * Convert paths relative from 1 file to another.
-     *
-     * E.g.
-     *     ../images/img.gif relative to /home/forkcms/frontend/core/layout/css
-     * should become:
-     *     ../../core/layout/images/img.gif relative to
-     *     /home/forkcms/frontend/cache/minified_css
-     *
-     * @param string $path The relative path that needs to be converted.
-     *
-     * @return string The new relative path.
-     */
-    public function convert($path)
-    {
-        // quit early if conversion makes no sense
-        if ($this->from === $this->to) {
-            return $path;
-        }
-
-        $path = $this->normalize($path);
-        // if we're not dealing with a relative path, just return absolute
-        if (strpos($path, '/') === 0) {
-            return $path;
-        }
-
-        // normalize paths
-        $path = $this->normalize($this->from.'/'.$path);
-
-        // strip shared ancestor paths
-        $shared = $this->shared($path, $this->to);
-        $path = mb_substr($path, mb_strlen($shared));
-        $to = mb_substr($this->to, mb_strlen($shared));
-
-        // add .. for every directory that needs to be traversed to new path
-        $to = str_repeat('../', mb_substr_count($to, '/'));
-
-        return $to.ltrim($path, '/');
-    }
-
-    /**
-     * Attempt to get the directory name from a path.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    public function dirname($path)
-    {
-        if (is_file($path)) {
-            return dirname($path);
-        }
-
-        if (is_dir($path)) {
-            return rtrim($path, '/');
-        }
-
-        // no known file/dir, start making assumptions
-
-        // ends in / = dir
-        if (mb_substr($path, -1) === '/') {
-            return rtrim($path, '/');
-        }
-
-        // has a dot in the name, likely a file
-        if (preg_match('/.*\..*$/', basename($path)) !== 0) {
-            return dirname($path);
-        }
-
-        // you're on your own here!
-        return $path;
-    }
+		do {
+			$path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count);
+		} while ($count);
+
+		return $path;
+	}
+
+	/**
+	 * Figure out the shared path of 2 locations.
+	 *
+	 * Example:
+	 *     /home/forkcms/frontend/core/layout/images/img.gif
+	 * and
+	 *     /home/forkcms/frontend/cache/minified_css
+	 * share
+	 *     /home/forkcms/frontend
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 *
+	 * @return string
+	 */
+	protected function shared($path1, $path2)
+	{
+		// $path could theoretically be empty (e.g. no path is given), in which
+		// case it shouldn't expand to array(''), which would compare to one's
+		// root /
+		$path1 = $path1 ? explode('/', $path1) : array();
+		$path2 = $path2 ? explode('/', $path2) : array();
+
+		$shared = array();
+
+		// compare paths & strip identical ancestors
+		foreach ($path1 as $i => $chunk) {
+			if (isset($path2[$i]) && $path1[$i] == $path2[$i]) {
+				$shared[] = $chunk;
+			} else {
+				break;
+			}
+		}
+
+		return implode('/', $shared);
+	}
+
+	/**
+	 * Convert paths relative from 1 file to another.
+	 *
+	 * E.g.
+	 *     ../images/img.gif relative to /home/forkcms/frontend/core/layout/css
+	 * should become:
+	 *     ../../core/layout/images/img.gif relative to
+	 *     /home/forkcms/frontend/cache/minified_css
+	 *
+	 * @param string $path The relative path that needs to be converted.
+	 *
+	 * @return string The new relative path.
+	 */
+	public function convert($path)
+	{
+		// quit early if conversion makes no sense
+		if ($this->from === $this->to) {
+			return $path;
+		}
+
+		$path = $this->normalize($path);
+		// if we're not dealing with a relative path, just return absolute
+		if (strpos($path, '/') === 0) {
+			return $path;
+		}
+
+		// normalize paths
+		$path = $this->normalize($this->from.'/'.$path);
+
+		// strip shared ancestor paths
+		$shared = $this->shared($path, $this->to);
+		$path = mb_substr($path, mb_strlen($shared));
+		$to = mb_substr($this->to, mb_strlen($shared));
+
+		// add .. for every directory that needs to be traversed to new path
+		$to = str_repeat('../', mb_substr_count($to, '/'));
+
+		return $to.ltrim($path, '/');
+	}
+
+	/**
+	 * Attempt to get the directory name from a path.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	public function dirname($path)
+	{
+		if (is_file($path)) {
+			return dirname($path);
+		}
+
+		if (is_dir($path)) {
+			return rtrim($path, '/');
+		}
+
+		// no known file/dir, start making assumptions
+
+		// ends in / = dir
+		if (mb_substr($path, -1) === '/') {
+			return rtrim($path, '/');
+		}
+
+		// has a dot in the name, likely a file
+		if (preg_match('/.*\..*$/', basename($path)) !== 0) {
+			return dirname($path);
+		}
+
+		// you're on your own here!
+		return $path;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
             // when both paths have nothing in common, one of them is probably
             // absolute while the other is relative
             $cwd = getcwd();
-            $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
-            $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
+            $from = strpos($from, $cwd) === 0 ? $from : $cwd . '/' . $from;
+            $to = strpos($to, $cwd) === 0 ? $to : $cwd . '/' . $to;
 
             // or traveling the tree via `..`
             // attempt to resolve path, or assume it's fine if it doesn't exist
@@ -147,7 +147,7 @@ 
         }
 
         // normalize paths
-        $path = $this->normalize($this->from.'/'.$path);
+        $path = $this->normalize($this->from . '/' . $path);
 
         // strip shared ancestor paths
         $shared = $this->shared($path, $this->to);
@@ -157,7 +157,7 @@ 
         // add .. for every directory that needs to be traversed to new path
         $to = str_repeat('../', mb_substr_count($to, '/'));
 
-        return $to.ltrim($path, '/');
+        return $to . ltrim($path, '/');
     }
 
     /**

Sources/minify/src/CSS.php

Indentation +412 added lines, -412 removed lines

@@ -17,97 +17,97 @@ 
  */
 class CSS extends Minify
 {
-    /**
-     * @var int
-     */
-    protected $maxImportSize = 5;
-
-    /**
-     * @var string[]
-     */
-    protected $importExtensions = array(
-        'gif' => 'data:image/gif',
-        'png' => 'data:image/png',
-        'jpe' => 'data:image/jpeg',
-        'jpg' => 'data:image/jpeg',
-        'jpeg' => 'data:image/jpeg',
-        'svg' => 'data:image/svg+xml',
-        'woff' => 'data:application/x-font-woff',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'xbm' => 'image/x-xbitmap',
-    );
-
-    /**
-     * Set the maximum size if files to be imported.
-     *
-     * Files larger than this size (in kB) will not be imported into the CSS.
-     * Importing files into the CSS as data-uri will save you some connections,
-     * but we should only import relatively small decorative images so that our
-     * CSS file doesn't get too bulky.
-     *
-     * @param int $size Size in kB
-     */
-    public function setMaxImportSize($size)
-    {
-        $this->maxImportSize = $size;
-    }
-
-    /**
-     * Set the type of extensions to be imported into the CSS (to save network
-     * connections).
-     * Keys of the array should be the file extensions & respective values
-     * should be the data type.
-     *
-     * @param string[] $extensions Array of file extensions
-     */
-    public function setImportExtensions(array $extensions)
-    {
-        $this->importExtensions = $extensions;
-    }
-
-    /**
-     * Move any import statements to the top.
-     *
-     * @param string $content Nearly finished CSS content
-     *
-     * @return string
-     */
-    protected function moveImportsToTop($content)
-    {
-        if (preg_match_all('/@import[^;]+;/', $content, $matches)) {
-
-            // remove from content
-            foreach ($matches[0] as $import) {
-                $content = str_replace($import, '', $content);
-            }
-
-            // add to top
-            $content = implode('', $matches[0]).$content;
-        };
-
-        return $content;
-    }
-
-    /**
-     * Combine CSS from import statements.
-     *
-     * @import's will be loaded and their content merged into the original file,
-     * to save HTTP requests.
-     *
-     * @param string   $source  The file to combine imports for.
-     * @param string   $content The CSS content to combine imports for.
-     * @param string[] $parents Parent paths, for circular reference checks.
-     *
-     * @return string
-     *
-     * @throws FileImportException
-     */
-    protected function combineImports($source, $content, $parents)
-    {
-        $importRegexes = array(
-            // @import url(xxx)
-            '/
+	/**
+	 * @var int
+	 */
+	protected $maxImportSize = 5;
+
+	/**
+	 * @var string[]
+	 */
+	protected $importExtensions = array(
+		'gif' => 'data:image/gif',
+		'png' => 'data:image/png',
+		'jpe' => 'data:image/jpeg',
+		'jpg' => 'data:image/jpeg',
+		'jpeg' => 'data:image/jpeg',
+		'svg' => 'data:image/svg+xml',
+		'woff' => 'data:application/x-font-woff',
+		'tif' => 'image/tiff',
+		'tiff' => 'image/tiff',
+		'xbm' => 'image/x-xbitmap',
+	);
+
+	/**
+	 * Set the maximum size if files to be imported.
+	 *
+	 * Files larger than this size (in kB) will not be imported into the CSS.
+	 * Importing files into the CSS as data-uri will save you some connections,
+	 * but we should only import relatively small decorative images so that our
+	 * CSS file doesn't get too bulky.
+	 *
+	 * @param int $size Size in kB
+	 */
+	public function setMaxImportSize($size)
+	{
+		$this->maxImportSize = $size;
+	}
+
+	/**
+	 * Set the type of extensions to be imported into the CSS (to save network
+	 * connections).
+	 * Keys of the array should be the file extensions & respective values
+	 * should be the data type.
+	 *
+	 * @param string[] $extensions Array of file extensions
+	 */
+	public function setImportExtensions(array $extensions)
+	{
+		$this->importExtensions = $extensions;
+	}
+
+	/**
+	 * Move any import statements to the top.
+	 *
+	 * @param string $content Nearly finished CSS content
+	 *
+	 * @return string
+	 */
+	protected function moveImportsToTop($content)
+	{
+		if (preg_match_all('/@import[^;]+;/', $content, $matches)) {
+
+			// remove from content
+			foreach ($matches[0] as $import) {
+				$content = str_replace($import, '', $content);
+			}
+
+			// add to top
+			$content = implode('', $matches[0]).$content;
+		};
+
+		return $content;
+	}
+
+	/**
+	 * Combine CSS from import statements.
+	 *
+	 * @import's will be loaded and their content merged into the original file,
+	 * to save HTTP requests.
+	 *
+	 * @param string   $source  The file to combine imports for.
+	 * @param string   $content The CSS content to combine imports for.
+	 * @param string[] $parents Parent paths, for circular reference checks.
+	 *
+	 * @return string
+	 *
+	 * @throws FileImportException
+	 */
+	protected function combineImports($source, $content, $parents)
+	{
+		$importRegexes = array(
+			// @import url(xxx)
+			'/
             # import statement
             @import
 
@@ -152,8 +152,8 @@ 
 
             /ix',
 
-            // @import 'xxx'
-            '/
+			// @import 'xxx'
+			'/
 
             # import statement
             @import
@@ -192,172 +192,172 @@ 
             ;?
 
             /ix',
-        );
-
-        // find all relative imports in css
-        $matches = array();
-        foreach ($importRegexes as $importRegex) {
-            if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) {
-                $matches = array_merge($matches, $regexMatches);
-            }
-        }
-
-        $search = array();
-        $replace = array();
-
-        // loop the matches
-        foreach ($matches as $match) {
-            // get the path for the file that will be imported
-            $importPath = dirname($source).'/'.$match['path'];
-
-            // only replace the import with the content if we can grab the
-            // content of the file
-            if ($this->canImportFile($importPath)) {
-                // check if current file was not imported previously in the same
-                // import chain.
-                if (in_array($importPath, $parents)) {
-                    throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
-                }
-
-                // grab referenced file & minify it (which may include importing
-                // yet other @import statements recursively)
-                $minifier = new static($importPath);
-                $importContent = $minifier->execute($source, $parents);
-
-                // check if this is only valid for certain media
-                if (!empty($match['media'])) {
-                    $importContent = '@media '.$match['media'].'{'.$importContent.'}';
-                }
-
-                // add to replacement array
-                $search[] = $match[0];
-                $replace[] = $importContent;
-            }
-        }
-
-        // replace the import statements
-        $content = str_replace($search, $replace, $content);
-
-        return $content;
-    }
-
-    /**
-     * Import files into the CSS, base64-ized.
-     *
-     * @url(image.jpg) images will be loaded and their content merged into the
-     * original file, to save HTTP requests.
-     *
-     * @param string $source  The file to import files for.
-     * @param string $content The CSS content to import files for.
-     *
-     * @return string
-     */
-    protected function importFiles($source, $content)
-    {
-        $extensions = array_keys($this->importExtensions);
-        $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i';
-        if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
-            $search = array();
-            $replace = array();
-
-            // loop the matches
-            foreach ($matches as $match) {
-                // get the path for the file that will be imported
-                $path = $match[2];
-                $path = dirname($source).'/'.$path;
-                $extension = $match[3];
-
-                // only replace the import with the content if we're able to get
-                // the content of the file, and it's relatively small
-                if ($this->canImportFile($path) && $this->canImportBySize($path)) {
-                    // grab content && base64-ize
-                    $importContent = $this->load($path);
-                    $importContent = base64_encode($importContent);
-
-                    // build replacement
-                    $search[] = $match[0];
-                    $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
-                }
-            }
-
-            // replace the import statements
-            $content = str_replace($search, $replace, $content);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Minify the data.
-     * Perform CSS optimizations.
-     *
-     * @param string[optional] $path    Path to write the data to.
-     * @param string[]         $parents Parent paths, for circular reference checks.
-     *
-     * @return string The minified data.
-     */
-    public function execute($path = null, $parents = array())
-    {
-        $content = '';
-
-        // loop css data (raw data and files)
-        foreach ($this->data as $source => $css) {
-            /*
+		);
+
+		// find all relative imports in css
+		$matches = array();
+		foreach ($importRegexes as $importRegex) {
+			if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) {
+				$matches = array_merge($matches, $regexMatches);
+			}
+		}
+
+		$search = array();
+		$replace = array();
+
+		// loop the matches
+		foreach ($matches as $match) {
+			// get the path for the file that will be imported
+			$importPath = dirname($source).'/'.$match['path'];
+
+			// only replace the import with the content if we can grab the
+			// content of the file
+			if ($this->canImportFile($importPath)) {
+				// check if current file was not imported previously in the same
+				// import chain.
+				if (in_array($importPath, $parents)) {
+					throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
+				}
+
+				// grab referenced file & minify it (which may include importing
+				// yet other @import statements recursively)
+				$minifier = new static($importPath);
+				$importContent = $minifier->execute($source, $parents);
+
+				// check if this is only valid for certain media
+				if (!empty($match['media'])) {
+					$importContent = '@media '.$match['media'].'{'.$importContent.'}';
+				}
+
+				// add to replacement array
+				$search[] = $match[0];
+				$replace[] = $importContent;
+			}
+		}
+
+		// replace the import statements
+		$content = str_replace($search, $replace, $content);
+
+		return $content;
+	}
+
+	/**
+	 * Import files into the CSS, base64-ized.
+	 *
+	 * @url(image.jpg) images will be loaded and their content merged into the
+	 * original file, to save HTTP requests.
+	 *
+	 * @param string $source  The file to import files for.
+	 * @param string $content The CSS content to import files for.
+	 *
+	 * @return string
+	 */
+	protected function importFiles($source, $content)
+	{
+		$extensions = array_keys($this->importExtensions);
+		$regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i';
+		if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
+			$search = array();
+			$replace = array();
+
+			// loop the matches
+			foreach ($matches as $match) {
+				// get the path for the file that will be imported
+				$path = $match[2];
+				$path = dirname($source).'/'.$path;
+				$extension = $match[3];
+
+				// only replace the import with the content if we're able to get
+				// the content of the file, and it's relatively small
+				if ($this->canImportFile($path) && $this->canImportBySize($path)) {
+					// grab content && base64-ize
+					$importContent = $this->load($path);
+					$importContent = base64_encode($importContent);
+
+					// build replacement
+					$search[] = $match[0];
+					$replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
+				}
+			}
+
+			// replace the import statements
+			$content = str_replace($search, $replace, $content);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Minify the data.
+	 * Perform CSS optimizations.
+	 *
+	 * @param string[optional] $path    Path to write the data to.
+	 * @param string[]         $parents Parent paths, for circular reference checks.
+	 *
+	 * @return string The minified data.
+	 */
+	public function execute($path = null, $parents = array())
+	{
+		$content = '';
+
+		// loop css data (raw data and files)
+		foreach ($this->data as $source => $css) {
+			/*
              * Let's first take out strings & comments, since we can't just remove
              * whitespace anywhere. If whitespace occurs inside a string, we should
              * leave it alone. E.g.:
              * p { content: "a   test" }
              */
-            $this->extractStrings();
-            $this->stripComments();
-            $css = $this->replace($css);
+			$this->extractStrings();
+			$this->stripComments();
+			$css = $this->replace($css);
 
-            $css = $this->stripWhitespace($css);
-            $css = $this->shortenHex($css);
-            $css = $this->shortenZeroes($css);
-            $css = $this->stripEmptyTags($css);
+			$css = $this->stripWhitespace($css);
+			$css = $this->shortenHex($css);
+			$css = $this->shortenZeroes($css);
+			$css = $this->stripEmptyTags($css);
 
-            // restore the string we've extracted earlier
-            $css = $this->restoreExtractedData($css);
+			// restore the string we've extracted earlier
+			$css = $this->restoreExtractedData($css);
 
-            $source = is_int($source) ? '' : $source;
-            $parents = $source ? array_merge($parents, array($source)) : $parents;
-            $css = $this->combineImports($source, $css, $parents);
-            $css = $this->importFiles($source, $css);
+			$source = is_int($source) ? '' : $source;
+			$parents = $source ? array_merge($parents, array($source)) : $parents;
+			$css = $this->combineImports($source, $css, $parents);
+			$css = $this->importFiles($source, $css);
 
-            /*
+			/*
              * If we'll save to a new path, we'll have to fix the relative paths
              * to be relative no longer to the source file, but to the new path.
              * If we don't write to a file, fall back to same path so no
              * conversion happens (because we still want it to go through most
              * of the move code...)
              */
-            $converter = new Converter($source, $path ?: $source);
-            $css = $this->move($converter, $css);
-
-            // combine css
-            $content .= $css;
-        }
-
-        $content = $this->moveImportsToTop($content);
-
-        return $content;
-    }
-
-    /**
-     * Moving a css file should update all relative urls.
-     * Relative references (e.g. ../images/image.gif) in a certain css file,
-     * will have to be updated when a file is being saved at another location
-     * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper).
-     *
-     * @param Converter $converter Relative path converter
-     * @param string    $content   The CSS content to update relative urls for.
-     *
-     * @return string
-     */
-    protected function move(Converter $converter, $content)
-    {
-        /*
+			$converter = new Converter($source, $path ?: $source);
+			$css = $this->move($converter, $css);
+
+			// combine css
+			$content .= $css;
+		}
+
+		$content = $this->moveImportsToTop($content);
+
+		return $content;
+	}
+
+	/**
+	 * Moving a css file should update all relative urls.
+	 * Relative references (e.g. ../images/image.gif) in a certain css file,
+	 * will have to be updated when a file is being saved at another location
+	 * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper).
+	 *
+	 * @param Converter $converter Relative path converter
+	 * @param string    $content   The CSS content to update relative urls for.
+	 *
+	 * @return string
+	 */
+	protected function move(Converter $converter, $content)
+	{
+		/*
          * Relative path references will usually be enclosed by url(). @import
          * is an exception, where url() is not necessary around the path (but is
          * allowed).
@@ -368,9 +368,9 @@ 
          * recent PCRE version. That's why I'm doing 2 separate regular
          * expressions & combining the matches after executing of both.
          */
-        $relativeRegexes = array(
-            // url(xxx)
-            '/
+		$relativeRegexes = array(
+			// url(xxx)
+			'/
             # open url()
             url\(
 
@@ -402,8 +402,8 @@ 
 
             /ix',
 
-            // @import "xxx"
-            '/
+			// @import "xxx"
+			'/
             # import statement
             @import
 
@@ -432,167 +432,167 @@ 
                 (?P=quotes)
 
             /ix',
-        );
-
-        // find all relative urls in css
-        $matches = array();
-        foreach ($relativeRegexes as $relativeRegex) {
-            if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) {
-                $matches = array_merge($matches, $regexMatches);
-            }
-        }
-
-        $search = array();
-        $replace = array();
-
-        // loop all urls
-        foreach ($matches as $match) {
-            // determine if it's a url() or an @import match
-            $type = (strpos($match[0], '@import') === 0 ? 'import' : 'url');
-
-            // attempting to interpret GET-params makes no sense, so let's discard them for awhile
-            $params = strrchr($match['path'], '?');
-            $url = $params ? substr($match['path'], 0, -strlen($params)) : $match['path'];
-
-            // fix relative url
-            $url = $converter->convert($url);
-
-            // now that the path has been converted, re-apply GET-params
-            $url .= $params;
-
-            // build replacement
-            $search[] = $match[0];
-            if ($type == 'url') {
-                $replace[] = 'url('.$url.')';
-            } elseif ($type == 'import') {
-                $replace[] = '@import "'.$url.'"';
-            }
-        }
-
-        // replace urls
-        $content = str_replace($search, $replace, $content);
-
-        return $content;
-    }
-
-    /**
-     * Shorthand hex color codes.
-     * #FF0000 -> #F00.
-     *
-     * @param string $content The CSS content to shorten the hex color codes for.
-     *
-     * @return string
-     */
-    protected function shortenHex($content)
-    {
-        $content = preg_replace('/(?<![\'"])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?![\'"])/i', '#$1$2$3', $content);
-
-        return $content;
-    }
-
-    /**
-     * Shorthand 0 values to plain 0, instead of e.g. -0em.
-     *
-     * @param string $content The CSS content to shorten the zero values for.
-     *
-     * @return string
-     */
-    protected function shortenZeroes($content)
-    {
-        // reusable bits of code throughout these regexes:
-        // before & after are used to make sure we don't match lose unintended
-        // 0-like values (e.g. in #000, or in http://url/1.0)
-        // units can be stripped from 0 values, or used to recognize non 0
-        // values (where wa may be able to strip a .0 suffix)
-        $before = '(?<=[:(, ])';
-        $after = '(?=[ ,);}])';
-        $units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)';
-
-        // strip units after zeroes (0px -> 0)
-        // NOTE: it should be safe to remove all units for a 0 value, but in
-        // practice, Webkit (especially Safari) seems to stumble over at least
-        // 0%, potentially other units as well. Only stripping 'px' for now.
-        // @see https://github.com/matthiasmullie/minify/issues/60
-        $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
-
-        // strip 0-digits (.0 -> 0)
-        $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
-        // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
-        $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
-        // strip trailing 0: 50.00 -> 50, 50.00px -> 50px
-        $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
-        // strip leading 0: 0.1 -> .1, 01.1 -> 1.1
-        $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
-
-        // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
-        $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
-
-        return $content;
-    }
-
-    /**
-     * Strip comments from source code.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function stripEmptyTags($content)
-    {
-        return preg_replace('/(^|\})[^\{\}]+\{\s*\}/', '\\1', $content);
-    }
-
-    /**
-     * Strip comments from source code.
-     */
-    protected function stripComments()
-    {
-        $this->registerPattern('/\/\*.*?\*\//s', '');
-    }
-
-    /**
-     * Strip whitespace.
-     *
-     * @param string $content The CSS content to strip the whitespace for.
-     *
-     * @return string
-     */
-    protected function stripWhitespace($content)
-    {
-        // remove leading & trailing whitespace
-        $content = preg_replace('/^\s*/m', '', $content);
-        $content = preg_replace('/\s*$/m', '', $content);
-
-        // replace newlines with a single space
-        $content = preg_replace('/\s+/', ' ', $content);
-
-        // remove whitespace around meta characters
-        // inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex
-        $content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content);
-        $content = preg_replace('/([\[(:])\s+/', '$1', $content);
-        $content = preg_replace('/\s+([\]\)])/', '$1', $content);
-        $content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content);
-
-        // whitespace around + and - can only be stripped in selectors, like
-        // :nth-child(3+2n), not in things like calc(3px + 2px) or shorthands
-        // like 3px -2px
-        $content = preg_replace('/\s*([+-])\s*(?=[^}]*{)/', '$1', $content);
-
-        // remove semicolon/whitespace followed by closing bracket
-        $content = str_replace(';}', '}', $content);
-
-        return trim($content);
-    }
-
-    /**
-     * Check if file is small enough to be imported.
-     *
-     * @param string $path The path to the file.
-     *
-     * @return bool
-     */
-    protected function canImportBySize($path)
-    {
-        return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024;
-    }
+		);
+
+		// find all relative urls in css
+		$matches = array();
+		foreach ($relativeRegexes as $relativeRegex) {
+			if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) {
+				$matches = array_merge($matches, $regexMatches);
+			}
+		}
+
+		$search = array();
+		$replace = array();
+
+		// loop all urls
+		foreach ($matches as $match) {
+			// determine if it's a url() or an @import match
+			$type = (strpos($match[0], '@import') === 0 ? 'import' : 'url');
+
+			// attempting to interpret GET-params makes no sense, so let's discard them for awhile
+			$params = strrchr($match['path'], '?');
+			$url = $params ? substr($match['path'], 0, -strlen($params)) : $match['path'];
+
+			// fix relative url
+			$url = $converter->convert($url);
+
+			// now that the path has been converted, re-apply GET-params
+			$url .= $params;
+
+			// build replacement
+			$search[] = $match[0];
+			if ($type == 'url') {
+				$replace[] = 'url('.$url.')';
+			} elseif ($type == 'import') {
+				$replace[] = '@import "'.$url.'"';
+			}
+		}
+
+		// replace urls
+		$content = str_replace($search, $replace, $content);
+
+		return $content;
+	}
+
+	/**
+	 * Shorthand hex color codes.
+	 * #FF0000 -> #F00.
+	 *
+	 * @param string $content The CSS content to shorten the hex color codes for.
+	 *
+	 * @return string
+	 */
+	protected function shortenHex($content)
+	{
+		$content = preg_replace('/(?<![\'"])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?![\'"])/i', '#$1$2$3', $content);
+
+		return $content;
+	}
+
+	/**
+	 * Shorthand 0 values to plain 0, instead of e.g. -0em.
+	 *
+	 * @param string $content The CSS content to shorten the zero values for.
+	 *
+	 * @return string
+	 */
+	protected function shortenZeroes($content)
+	{
+		// reusable bits of code throughout these regexes:
+		// before & after are used to make sure we don't match lose unintended
+		// 0-like values (e.g. in #000, or in http://url/1.0)
+		// units can be stripped from 0 values, or used to recognize non 0
+		// values (where wa may be able to strip a .0 suffix)
+		$before = '(?<=[:(, ])';
+		$after = '(?=[ ,);}])';
+		$units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)';
+
+		// strip units after zeroes (0px -> 0)
+		// NOTE: it should be safe to remove all units for a 0 value, but in
+		// practice, Webkit (especially Safari) seems to stumble over at least
+		// 0%, potentially other units as well. Only stripping 'px' for now.
+		// @see https://github.com/matthiasmullie/minify/issues/60
+		$content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
+
+		// strip 0-digits (.0 -> 0)
+		$content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
+		// strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
+		$content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+		// strip trailing 0: 50.00 -> 50, 50.00px -> 50px
+		$content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+		// strip leading 0: 0.1 -> .1, 01.1 -> 1.1
+		$content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
+
+		// strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
+		$content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
+
+		return $content;
+	}
+
+	/**
+	 * Strip comments from source code.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function stripEmptyTags($content)
+	{
+		return preg_replace('/(^|\})[^\{\}]+\{\s*\}/', '\\1', $content);
+	}
+
+	/**
+	 * Strip comments from source code.
+	 */
+	protected function stripComments()
+	{
+		$this->registerPattern('/\/\*.*?\*\//s', '');
+	}
+
+	/**
+	 * Strip whitespace.
+	 *
+	 * @param string $content The CSS content to strip the whitespace for.
+	 *
+	 * @return string
+	 */
+	protected function stripWhitespace($content)
+	{
+		// remove leading & trailing whitespace
+		$content = preg_replace('/^\s*/m', '', $content);
+		$content = preg_replace('/\s*$/m', '', $content);
+
+		// replace newlines with a single space
+		$content = preg_replace('/\s+/', ' ', $content);
+
+		// remove whitespace around meta characters
+		// inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex
+		$content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content);
+		$content = preg_replace('/([\[(:])\s+/', '$1', $content);
+		$content = preg_replace('/\s+([\]\)])/', '$1', $content);
+		$content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content);
+
+		// whitespace around + and - can only be stripped in selectors, like
+		// :nth-child(3+2n), not in things like calc(3px + 2px) or shorthands
+		// like 3px -2px
+		$content = preg_replace('/\s*([+-])\s*(?=[^}]*{)/', '$1', $content);
+
+		// remove semicolon/whitespace followed by closing bracket
+		$content = str_replace(';}', '}', $content);
+
+		return trim($content);
+	}
+
+	/**
+	 * Check if file is small enough to be imported.
+	 *
+	 * @param string $path The path to the file.
+	 *
+	 * @return bool
+	 */
+	protected function canImportBySize($path)
+	{
+		return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -83,7 +83,7 @@ 
             }
 
             // add to top
-            $content = implode('', $matches[0]).$content;
+            $content = implode('', $matches[0]) . $content;
         };
 
         return $content;
@@ -208,7 +208,7 @@ 
         // loop the matches
         foreach ($matches as $match) {
             // get the path for the file that will be imported
-            $importPath = dirname($source).'/'.$match['path'];
+            $importPath = dirname($source) . '/' . $match['path'];
 
             // only replace the import with the content if we can grab the
             // content of the file
@@ -216,7 +216,7 @@ 
                 // check if current file was not imported previously in the same
                 // import chain.
                 if (in_array($importPath, $parents)) {
-                    throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
+                    throw new FileImportException('Failed to import file "' . $importPath . '": circular reference detected.');
                 }
 
                 // grab referenced file & minify it (which may include importing
@@ -226,7 +226,7 @@ 
 
                 // check if this is only valid for certain media
                 if (!empty($match['media'])) {
-                    $importContent = '@media '.$match['media'].'{'.$importContent.'}';
+                    $importContent = '@media ' . $match['media'] . '{' . $importContent . '}';
                 }
 
                 // add to replacement array
@@ -255,7 +255,7 @@ 
     protected function importFiles($source, $content)
     {
         $extensions = array_keys($this->importExtensions);
-        $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i';
+        $regex = '/url\((["\']?)((?!["\']?data:).*?\.(' . implode('|', $extensions) . '))\\1\)/i';
         if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
             $search = array();
             $replace = array();
@@ -264,7 +264,7 @@ 
             foreach ($matches as $match) {
                 // get the path for the file that will be imported
                 $path = $match[2];
-                $path = dirname($source).'/'.$path;
+                $path = dirname($source) . '/' . $path;
                 $extension = $match[3];
 
                 // only replace the import with the content if we're able to get
@@ -276,7 +276,7 @@ 
 
                     // build replacement
                     $search[] = $match[0];
-                    $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
+                    $replace[] = 'url(' . $this->importExtensions[$extension] . ';base64,' . $importContent . ')';
                 }
             }
 
@@ -463,9 +463,9 @@ 
             // build replacement
             $search[] = $match[0];
             if ($type == 'url') {
-                $replace[] = 'url('.$url.')';
+                $replace[] = 'url(' . $url . ')';
             } elseif ($type == 'import') {
-                $replace[] = '@import "'.$url.'"';
+                $replace[] = '@import "' . $url . '"';
             }
         }
 
@@ -513,19 +513,19 @@ 
         // practice, Webkit (especially Safari) seems to stumble over at least
         // 0%, potentially other units as well. Only stripping 'px' for now.
         // @see https://github.com/matthiasmullie/minify/issues/60
-        $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
+        $content = preg_replace('/' . $before . '(-?0*(\.0+)?)(?<=0)px' . $after . '/', '\\1', $content);
 
         // strip 0-digits (.0 -> 0)
-        $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '\.0+' . $units . '?' . $after . '/', '0\\1', $content);
         // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
-        $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+\.[0-9]+)0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip trailing 0: 50.00 -> 50, 50.00px -> 50px
-        $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+)\.0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip leading 0: 0.1 -> .1, 01.1 -> 1.1
-        $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
+        $content = preg_replace('/' . $before . '(-?)0+([0-9]*\.[0-9]+)' . $units . '?' . $after . '/', '\\1\\2\\3', $content);
 
         // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
-        $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '-?0+' . $units . '?' . $after . '/', '0\\1', $content);
 
         return $content;
     }

Sources/minify/src/Minify.php

Indentation +383 added lines, -383 removed lines

@@ -16,326 +16,326 @@ 
  */
 abstract class Minify
 {
-    /**
-     * The data to be minified.
-     *
-     * @var string[]
-     */
-    protected $data = array();
-
-    /**
-     * Array of patterns to match.
-     *
-     * @var string[]
-     */
-    protected $patterns = array();
-
-    /**
-     * This array will hold content of strings and regular expressions that have
-     * been extracted from the JS source code, so we can reliably match "code",
-     * without having to worry about potential "code-like" characters inside.
-     *
-     * @var string[]
-     */
-    public $extracted = array();
-
-    /**
-     * Init the minify class - optionally, code may be passed along already.
-     */
-    public function __construct(/* $data = null, ... */)
-    {
-        // it's possible to add the source through the constructor as well ;)
-        if (func_num_args()) {
-            call_user_func_array(array($this, 'add'), func_get_args());
-        }
-    }
-
-    /**
-     * Add a file or straight-up code to be minified.
-     *
-     * @param string $data
-     */
-    public function add($data /* $data = null, ... */)
-    {
-        // bogus "usage" of parameter $data: scrutinizer warns this variable is
-        // not used (we're using func_get_args instead to support overloading),
-        // but it still needs to be defined because it makes no sense to have
-        // this function without argument :)
-        $args = array($data) + func_get_args();
-
-        // this method can be overloaded
-        foreach ($args as $data) {
-            // redefine var
-            $data = (string) $data;
-
-            // load data
-            $value = $this->load($data);
-            $key = ($data != $value) ? $data : count($this->data);
-
-            // store data
-            $this->data[$key] = $value;
-        }
-    }
-
-    /**
-     * Minify the data & (optionally) saves it to a file.
-     *
-     * @param string[optional] $path Path to write the data to.
-     *
-     * @return string The minified data.
-     */
-    public function minify($path = null)
-    {
-        $content = $this->execute($path);
-
-        // save to path
-        if ($path !== null) {
-            $this->save($content, $path);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Minify & gzip the data & (optionally) saves it to a file.
-     *
-     * @param string[optional] $path  Path to write the data to.
-     * @param int[optional]    $level Compression level, from 0 to 9.
-     *
-     * @return string The minified & gzipped data.
-     */
-    public function gzip($path = null, $level = 9)
-    {
-        $content = $this->execute($path);
-        $content = gzencode($content, $level, FORCE_GZIP);
-
-        // save to path
-        if ($path !== null) {
-            $this->save($content, $path);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Minify the data & write it to a CacheItemInterface object.
-     *
-     * @param CacheItemInterface $item Cache item to write the data to.
-     *
-     * @return CacheItemInterface Cache item with the minifier data.
-     */
-    public function cache(CacheItemInterface $item)
-    {
-        $content = $this->execute();
-        $item->set($content);
-
-        return $item;
-    }
-
-    /**
-     * Minify the data.
-     *
-     * @param string[optional] $path Path to write the data to.
-     *
-     * @return string The minified data.
-     */
-    abstract public function execute($path = null);
-
-    /**
-     * Load data.
-     *
-     * @param string $data Either a path to a file or the content itself.
-     *
-     * @return string
-     */
-    protected function load($data)
-    {
-        // check if the data is a file
-        if ($this->canImportFile($data)) {
-            $data = file_get_contents($data);
-
-            // strip BOM, if any
-            if (substr($data, 0, 3) == "\xef\xbb\xbf") {
-                $data = substr($data, 3);
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * Save to file.
-     *
-     * @param string $content The minified data.
-     * @param string $path    The path to save the minified data to.
-     *
-     * @throws IOException
-     */
-    protected function save($content, $path)
-    {
-        $handler = $this->openFileForWriting($path);
-
-        $this->writeToFile($handler, $content);
-
-        @fclose($handler);
-    }
-
-    /**
-     * Register a pattern to execute against the source content.
-     *
-     * @param string          $pattern     PCRE pattern.
-     * @param string|callable $replacement Replacement value for matched pattern.
-     */
-    protected function registerPattern($pattern, $replacement = '')
-    {
-        // study the pattern, we'll execute it more than once
-        $pattern .= 'S';
-
-        $this->patterns[] = array($pattern, $replacement);
-    }
-
-    /**
-     * We can't "just" run some regular expressions against JavaScript: it's a
-     * complex language. E.g. having an occurrence of // xyz would be a comment,
-     * unless it's used within a string. Of you could have something that looks
-     * like a 'string', but inside a comment.
-     * The only way to accurately replace these pieces is to traverse the JS one
-     * character at a time and try to find whatever starts first.
-     *
-     * @param string $content The content to replace patterns in.
-     *
-     * @return string The (manipulated) content.
-     */
-    protected function replace($content)
-    {
-        $processed = '';
-        $positions = array_fill(0, count($this->patterns), -1);
-        $matches = array();
-
-        while ($content) {
-            // find first match for all patterns
-            foreach ($this->patterns as $i => $pattern) {
-                list($pattern, $replacement) = $pattern;
-
-                // no need to re-run matches that are still in the part of the
-                // content that hasn't been processed
-                if ($positions[$i] >= 0) {
-                    continue;
-                }
-
-                $match = null;
-                if (preg_match($pattern, $content, $match)) {
-                    $matches[$i] = $match;
-
-                    // we'll store the match position as well; that way, we
-                    // don't have to redo all preg_matches after changing only
-                    // the first (we'll still know where those others are)
-                    $positions[$i] = strpos($content, $match[0]);
-                } else {
-                    // if the pattern couldn't be matched, there's no point in
-                    // executing it again in later runs on this same content;
-                    // ignore this one until we reach end of content
-                    unset($matches[$i]);
-                    $positions[$i] = strlen($content);
-                }
-            }
-
-            // no more matches to find: everything's been processed, break out
-            if (!$matches) {
-                $processed .= $content;
-                break;
-            }
-
-            // see which of the patterns actually found the first thing (we'll
-            // only want to execute that one, since we're unsure if what the
-            // other found was not inside what the first found)
-            $discardLength = min($positions);
-            $firstPattern = array_search($discardLength, $positions);
-            $match = $matches[$firstPattern][0];
-
-            // execute the pattern that matches earliest in the content string
-            list($pattern, $replacement) = $this->patterns[$firstPattern];
-            $replacement = $this->replacePattern($pattern, $replacement, $content);
-
-            // figure out which part of the string was unmatched; that's the
-            // part we'll execute the patterns on again next
-            $content = substr($content, $discardLength);
-            $unmatched = (string) substr($content, strpos($content, $match) + strlen($match));
-
-            // move the replaced part to $processed and prepare $content to
-            // again match batch of patterns against
-            $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched));
-            $content = $unmatched;
-
-            // first match has been replaced & that content is to be left alone,
-            // the next matches will start after this replacement, so we should
-            // fix their offsets
-            foreach ($positions as $i => $position) {
-                $positions[$i] -= $discardLength + strlen($match);
-            }
-        }
-
-        return $processed;
-    }
-
-    /**
-     * This is where a pattern is matched against $content and the matches
-     * are replaced by their respective value.
-     * This function will be called plenty of times, where $content will always
-     * move up 1 character.
-     *
-     * @param string          $pattern     Pattern to match.
-     * @param string|callable $replacement Replacement value.
-     * @param string          $content     Content to match pattern against.
-     *
-     * @return string
-     */
-    protected function replacePattern($pattern, $replacement, $content)
-    {
-        if (is_callable($replacement)) {
-            return preg_replace_callback($pattern, $replacement, $content, 1, $count);
-        } else {
-            return preg_replace($pattern, $replacement, $content, 1, $count);
-        }
-    }
-
-    /**
-     * Strings are a pattern we need to match, in order to ignore potential
-     * code-like content inside them, but we just want all of the string
-     * content to remain untouched.
-     *
-     * This method will replace all string content with simple STRING#
-     * placeholder text, so we've rid all strings from characters that may be
-     * misinterpreted. Original string content will be saved in $this->extracted
-     * and after doing all other minifying, we can restore the original content
-     * via restoreStrings().
-     *
-     * @param string[optional] $chars
-     */
-    protected function extractStrings($chars = '\'"')
-    {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $callback = function ($match) use ($minifier) {
-            // check the second index here, because the first always contains a quote
-            if (!$match[2]) {
-                /*
+	/**
+	 * The data to be minified.
+	 *
+	 * @var string[]
+	 */
+	protected $data = array();
+
+	/**
+	 * Array of patterns to match.
+	 *
+	 * @var string[]
+	 */
+	protected $patterns = array();
+
+	/**
+	 * This array will hold content of strings and regular expressions that have
+	 * been extracted from the JS source code, so we can reliably match "code",
+	 * without having to worry about potential "code-like" characters inside.
+	 *
+	 * @var string[]
+	 */
+	public $extracted = array();
+
+	/**
+	 * Init the minify class - optionally, code may be passed along already.
+	 */
+	public function __construct(/* $data = null, ... */)
+	{
+		// it's possible to add the source through the constructor as well ;)
+		if (func_num_args()) {
+			call_user_func_array(array($this, 'add'), func_get_args());
+		}
+	}
+
+	/**
+	 * Add a file or straight-up code to be minified.
+	 *
+	 * @param string $data
+	 */
+	public function add($data /* $data = null, ... */)
+	{
+		// bogus "usage" of parameter $data: scrutinizer warns this variable is
+		// not used (we're using func_get_args instead to support overloading),
+		// but it still needs to be defined because it makes no sense to have
+		// this function without argument :)
+		$args = array($data) + func_get_args();
+
+		// this method can be overloaded
+		foreach ($args as $data) {
+			// redefine var
+			$data = (string) $data;
+
+			// load data
+			$value = $this->load($data);
+			$key = ($data != $value) ? $data : count($this->data);
+
+			// store data
+			$this->data[$key] = $value;
+		}
+	}
+
+	/**
+	 * Minify the data & (optionally) saves it to a file.
+	 *
+	 * @param string[optional] $path Path to write the data to.
+	 *
+	 * @return string The minified data.
+	 */
+	public function minify($path = null)
+	{
+		$content = $this->execute($path);
+
+		// save to path
+		if ($path !== null) {
+			$this->save($content, $path);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Minify & gzip the data & (optionally) saves it to a file.
+	 *
+	 * @param string[optional] $path  Path to write the data to.
+	 * @param int[optional]    $level Compression level, from 0 to 9.
+	 *
+	 * @return string The minified & gzipped data.
+	 */
+	public function gzip($path = null, $level = 9)
+	{
+		$content = $this->execute($path);
+		$content = gzencode($content, $level, FORCE_GZIP);
+
+		// save to path
+		if ($path !== null) {
+			$this->save($content, $path);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Minify the data & write it to a CacheItemInterface object.
+	 *
+	 * @param CacheItemInterface $item Cache item to write the data to.
+	 *
+	 * @return CacheItemInterface Cache item with the minifier data.
+	 */
+	public function cache(CacheItemInterface $item)
+	{
+		$content = $this->execute();
+		$item->set($content);
+
+		return $item;
+	}
+
+	/**
+	 * Minify the data.
+	 *
+	 * @param string[optional] $path Path to write the data to.
+	 *
+	 * @return string The minified data.
+	 */
+	abstract public function execute($path = null);
+
+	/**
+	 * Load data.
+	 *
+	 * @param string $data Either a path to a file or the content itself.
+	 *
+	 * @return string
+	 */
+	protected function load($data)
+	{
+		// check if the data is a file
+		if ($this->canImportFile($data)) {
+			$data = file_get_contents($data);
+
+			// strip BOM, if any
+			if (substr($data, 0, 3) == "\xef\xbb\xbf") {
+				$data = substr($data, 3);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Save to file.
+	 *
+	 * @param string $content The minified data.
+	 * @param string $path    The path to save the minified data to.
+	 *
+	 * @throws IOException
+	 */
+	protected function save($content, $path)
+	{
+		$handler = $this->openFileForWriting($path);
+
+		$this->writeToFile($handler, $content);
+
+		@fclose($handler);
+	}
+
+	/**
+	 * Register a pattern to execute against the source content.
+	 *
+	 * @param string          $pattern     PCRE pattern.
+	 * @param string|callable $replacement Replacement value for matched pattern.
+	 */
+	protected function registerPattern($pattern, $replacement = '')
+	{
+		// study the pattern, we'll execute it more than once
+		$pattern .= 'S';
+
+		$this->patterns[] = array($pattern, $replacement);
+	}
+
+	/**
+	 * We can't "just" run some regular expressions against JavaScript: it's a
+	 * complex language. E.g. having an occurrence of // xyz would be a comment,
+	 * unless it's used within a string. Of you could have something that looks
+	 * like a 'string', but inside a comment.
+	 * The only way to accurately replace these pieces is to traverse the JS one
+	 * character at a time and try to find whatever starts first.
+	 *
+	 * @param string $content The content to replace patterns in.
+	 *
+	 * @return string The (manipulated) content.
+	 */
+	protected function replace($content)
+	{
+		$processed = '';
+		$positions = array_fill(0, count($this->patterns), -1);
+		$matches = array();
+
+		while ($content) {
+			// find first match for all patterns
+			foreach ($this->patterns as $i => $pattern) {
+				list($pattern, $replacement) = $pattern;
+
+				// no need to re-run matches that are still in the part of the
+				// content that hasn't been processed
+				if ($positions[$i] >= 0) {
+					continue;
+				}
+
+				$match = null;
+				if (preg_match($pattern, $content, $match)) {
+					$matches[$i] = $match;
+
+					// we'll store the match position as well; that way, we
+					// don't have to redo all preg_matches after changing only
+					// the first (we'll still know where those others are)
+					$positions[$i] = strpos($content, $match[0]);
+				} else {
+					// if the pattern couldn't be matched, there's no point in
+					// executing it again in later runs on this same content;
+					// ignore this one until we reach end of content
+					unset($matches[$i]);
+					$positions[$i] = strlen($content);
+				}
+			}
+
+			// no more matches to find: everything's been processed, break out
+			if (!$matches) {
+				$processed .= $content;
+				break;
+			}
+
+			// see which of the patterns actually found the first thing (we'll
+			// only want to execute that one, since we're unsure if what the
+			// other found was not inside what the first found)
+			$discardLength = min($positions);
+			$firstPattern = array_search($discardLength, $positions);
+			$match = $matches[$firstPattern][0];
+
+			// execute the pattern that matches earliest in the content string
+			list($pattern, $replacement) = $this->patterns[$firstPattern];
+			$replacement = $this->replacePattern($pattern, $replacement, $content);
+
+			// figure out which part of the string was unmatched; that's the
+			// part we'll execute the patterns on again next
+			$content = substr($content, $discardLength);
+			$unmatched = (string) substr($content, strpos($content, $match) + strlen($match));
+
+			// move the replaced part to $processed and prepare $content to
+			// again match batch of patterns against
+			$processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched));
+			$content = $unmatched;
+
+			// first match has been replaced & that content is to be left alone,
+			// the next matches will start after this replacement, so we should
+			// fix their offsets
+			foreach ($positions as $i => $position) {
+				$positions[$i] -= $discardLength + strlen($match);
+			}
+		}
+
+		return $processed;
+	}
+
+	/**
+	 * This is where a pattern is matched against $content and the matches
+	 * are replaced by their respective value.
+	 * This function will be called plenty of times, where $content will always
+	 * move up 1 character.
+	 *
+	 * @param string          $pattern     Pattern to match.
+	 * @param string|callable $replacement Replacement value.
+	 * @param string          $content     Content to match pattern against.
+	 *
+	 * @return string
+	 */
+	protected function replacePattern($pattern, $replacement, $content)
+	{
+		if (is_callable($replacement)) {
+			return preg_replace_callback($pattern, $replacement, $content, 1, $count);
+		} else {
+			return preg_replace($pattern, $replacement, $content, 1, $count);
+		}
+	}
+
+	/**
+	 * Strings are a pattern we need to match, in order to ignore potential
+	 * code-like content inside them, but we just want all of the string
+	 * content to remain untouched.
+	 *
+	 * This method will replace all string content with simple STRING#
+	 * placeholder text, so we've rid all strings from characters that may be
+	 * misinterpreted. Original string content will be saved in $this->extracted
+	 * and after doing all other minifying, we can restore the original content
+	 * via restoreStrings().
+	 *
+	 * @param string[optional] $chars
+	 */
+	protected function extractStrings($chars = '\'"')
+	{
+		// PHP only supports $this inside anonymous functions since 5.4
+		$minifier = $this;
+		$callback = function ($match) use ($minifier) {
+			// check the second index here, because the first always contains a quote
+			if (!$match[2]) {
+				/*
                  * Empty strings need no placeholder; they can't be confused for
                  * anything else anyway.
                  * But we still needed to match them, for the extraction routine
                  * to skip over this particular string.
                  */
-                return $match[0];
-            }
+				return $match[0];
+			}
 
-            $count = count($minifier->extracted);
-            $placeholder = $match[1].$count.$match[1];
-            $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1];
+			$count = count($minifier->extracted);
+			$placeholder = $match[1].$count.$match[1];
+			$minifier->extracted[$placeholder] = $match[1].$match[2].$match[1];
 
-            return $placeholder;
-        };
+			return $placeholder;
+		};
 
-        /*
+		/*
          * The \\ messiness explained:
          * * Don't count ' or " as end-of-string if it's escaped (has backslash
          * in front of it)
@@ -347,75 +347,75 @@ 
          * considered as escape-char (times 2) and to get it in the regex,
          * escaped (times 2)
          */
-        $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
-    }
-
-    /**
-     * This method will restore all extracted data (strings, regexes) that were
-     * replaced with placeholder text in extract*(). The original content was
-     * saved in $this->extracted.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function restoreExtractedData($content)
-    {
-        if (!$this->extracted) {
-            // nothing was extracted, nothing to restore
-            return $content;
-        }
-
-        $content = strtr($content, $this->extracted);
-
-        $this->extracted = array();
-
-        return $content;
-    }
-
-    /**
-     * Check if the path is a regular file and can be read.
-     *
-     * @param string $path
-     *
-     * @return bool
-     */
-    protected function canImportFile($path)
-    {
-        return strlen($path) < PHP_MAXPATHLEN && is_file($path) && is_readable($path);
-    }
-
-    /**
-     * Attempts to open file specified by $path for writing.
-     *
-     * @param string $path The path to the file.
-     *
-     * @return resource Specifier for the target file.
-     *
-     * @throws IOException
-     */
-    protected function openFileForWriting($path)
-    {
-        if (($handler = @fopen($path, 'w')) === false) {
-            throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.');
-        }
-
-        return $handler;
-    }
-
-    /**
-     * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions.
-     *
-     * @param resource $handler The resource to write to.
-     * @param string   $content The content to write.
-     * @param string   $path    The path to the file (for exception printing only).
-     *
-     * @throws IOException
-     */
-    protected function writeToFile($handler, $content, $path = '')
-    {
-        if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) {
-            throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.');
-        }
-    }
+		$this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
+	}
+
+	/**
+	 * This method will restore all extracted data (strings, regexes) that were
+	 * replaced with placeholder text in extract*(). The original content was
+	 * saved in $this->extracted.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function restoreExtractedData($content)
+	{
+		if (!$this->extracted) {
+			// nothing was extracted, nothing to restore
+			return $content;
+		}
+
+		$content = strtr($content, $this->extracted);
+
+		$this->extracted = array();
+
+		return $content;
+	}
+
+	/**
+	 * Check if the path is a regular file and can be read.
+	 *
+	 * @param string $path
+	 *
+	 * @return bool
+	 */
+	protected function canImportFile($path)
+	{
+		return strlen($path) < PHP_MAXPATHLEN && is_file($path) && is_readable($path);
+	}
+
+	/**
+	 * Attempts to open file specified by $path for writing.
+	 *
+	 * @param string $path The path to the file.
+	 *
+	 * @return resource Specifier for the target file.
+	 *
+	 * @throws IOException
+	 */
+	protected function openFileForWriting($path)
+	{
+		if (($handler = @fopen($path, 'w')) === false) {
+			throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.');
+		}
+
+		return $handler;
+	}
+
+	/**
+	 * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions.
+	 *
+	 * @param resource $handler The resource to write to.
+	 * @param string   $content The content to write.
+	 * @param string   $path    The path to the file (for exception printing only).
+	 *
+	 * @throws IOException
+	 */
+	protected function writeToFile($handler, $content, $path = '')
+	{
+		if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) {
+			throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.');
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -316,7 +316,7 @@ 
     {
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
-        $callback = function ($match) use ($minifier) {
+        $callback = function($match) use ($minifier) {
             // check the second index here, because the first always contains a quote
             if (!$match[2]) {
                 /*
@@ -329,8 +329,8 @@ 
             }
 
             $count = count($minifier->extracted);
-            $placeholder = $match[1].$count.$match[1];
-            $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1];
+            $placeholder = $match[1] . $count . $match[1];
+            $minifier->extracted[$placeholder] = $match[1] . $match[2] . $match[1];
 
             return $placeholder;
         };
@@ -347,7 +347,7 @@ 
          * considered as escape-char (times 2) and to get it in the regex,
          * escaped (times 2)
          */
-        $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
+        $this->registerPattern('/([' . $chars . '])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
     }
 
     /**
@@ -397,7 +397,7 @@ 
     protected function openFileForWriting($path)
     {
         if (($handler = @fopen($path, 'w')) === false) {
-            throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.');
+            throw new IOException('The file "' . $path . '" could not be opened for writing. Check if PHP has enough permissions.');
         }
 
         return $handler;
@@ -415,7 +415,7 @@ 
     protected function writeToFile($handler, $content, $path = '')
     {
         if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) {
-            throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.');
+            throw new IOException('The file "' . $path . '" could not be written to. Check your disk space and file permissions.');
         }
     }
 }

Sources/SplitTopics.php

Spacing +4 added lines, -4 removed lines

@@ -360,7 +360,7 @@ 
 		)
 	);
 	$context['messages'] = array();
-	for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter ++)
+	for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter++)
 	{
 		censorText($row['subject']);
 		censorText($row['body']);
@@ -400,7 +400,7 @@ 
 			)
 		);
 		$context['messages'] = array();
-		for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter ++)
+		for ($counter = 0; $row = $smcFunc['db_fetch_assoc']($request); $counter++)
 		{
 			censorText($row['subject']);
 			censorText($row['body']);
@@ -1098,7 +1098,7 @@ 
 			$firstTopic = $row['id_topic'];
 
 		// Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic)
-		if($row['id_topic'] < $lowestTopicId || empty($lowestTopicId) )
+		if ($row['id_topic'] < $lowestTopicId || empty($lowestTopicId))
 		{
 			$lowestTopicId = $row['id_topic'];
 			$lowestTopicBoard = $row['id_board'];
@@ -1404,7 +1404,7 @@ 
 			}
 
 			// Update subject search index
-			updateStats('subject',$this_old_topic,$redirect_subject);
+			updateStats('subject', $this_old_topic, $redirect_subject);
 		}
 	}
 

Braces +260 added lines, -186 removed lines

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

Sources/ManageBoards.php

Indentation +1 added lines, -1 removed lines

@@ -842,7 +842,7 @@
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($recycle_boards);
 
-        $recycle_boards = array('') + $recycle_boards;
+		$recycle_boards = array('') + $recycle_boards;
 
 	// Here and the board settings...
 	$config_vars = array(

Braces +145 added lines, -112 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main dispatcher; doesn't do anything, just delegates.
@@ -92,18 +93,19 @@ 
 		checkSession('get');
 		validateToken('admin-bm-' . (int) $_REQUEST['src_board'], 'request');
 
-		if ($_REQUEST['move_to'] === 'top')
-			$boardOptions = array(
+		if ($_REQUEST['move_to'] === 'top') {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_category' => (int) $_REQUEST['target_cat'],
 				'move_first_child' => true,
 			);
-		else
-			$boardOptions = array(
+		} else {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_board' => (int) $_REQUEST['target_board'],
 				'move_first_child' => true,
 			);
+		}
 		modifyBoard((int) $_REQUEST['src_board'], $boardOptions);
 	}
 
@@ -148,15 +150,16 @@ 
 			$security = $context['session_var'] . '=' . $context['session_id'] . ';' . $context['admin-bm-' . $context['move_board'] . '_token_var'] . '=' . $context['admin-bm-' . $context['move_board'] . '_token'];
 			foreach ($boardList[$catid] as $boardid)
 			{
-				if (!isset($context['categories'][$catid]['move_link']))
-					$context['categories'][$catid]['move_link'] = array(
+				if (!isset($context['categories'][$catid]['move_link'])) {
+									$context['categories'][$catid]['move_link'] = array(
 						'child_level' => 0,
 						'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
 						'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security,
 					);
+				}
 
-				if (!$context['categories'][$catid]['boards'][$boardid]['move'])
-				$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
+				if (!$context['categories'][$catid]['boards'][$boardid]['move']) {
+								$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
 					array(
 						'child_level' => $boards[$boardid]['level'],
 						'label' => $txt['mboards_order_after'] . '\'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
@@ -170,34 +173,39 @@ 
 						'class' => 'here',
 					),
 				);
+				}
 
 				$difference = $boards[$boardid]['level'] - $prev_child_level;
-				if ($difference == 1)
-					array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
-				elseif ($difference < 0)
+				if ($difference == 1) {
+									array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+				} elseif ($difference < 0)
 				{
-					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-						$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
-					for ($i = 0; $i < -$difference; $i++)
-						if (($temp = array_pop($stack)) != null)
+					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+											$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+					}
+					for ($i = 0; $i < -$difference; $i++) {
+											if (($temp = array_pop($stack)) != null)
 							array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp);
+					}
 				}
 
 				$prev_board = $boardid;
 				$prev_child_level = $boards[$boardid]['level'];
 
 			}
-			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
-			elseif (!empty($stack))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+			} elseif (!empty($stack)) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			}
 
-			if (empty($boardList[$catid]))
-				$context['categories'][$catid]['move_link'] = array(
+			if (empty($boardList[$catid])) {
+							$context['categories'][$catid]['move_link'] = array(
 					'child_level' => 0,
 					'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($tree['node']['name']) . '\'',
 					'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security,
 				);
+			}
 		}
 	}
 
@@ -253,9 +261,9 @@ 
 		);
 	}
 	// Category doesn't exist, man... sorry.
-	elseif (!isset($cat_tree[$_REQUEST['cat']]))
-		redirectexit('action=admin;area=manageboards');
-	else
+	elseif (!isset($cat_tree[$_REQUEST['cat']])) {
+			redirectexit('action=admin;area=manageboards');
+	} else
 	{
 		$context['category'] = array(
 			'id' => $_REQUEST['cat'],
@@ -267,30 +275,31 @@ 
 			'is_empty' => empty($cat_tree[$_REQUEST['cat']]['children'])
 		);
 
-		foreach ($boardList[$_REQUEST['cat']] as $child_board)
-			$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		foreach ($boardList[$_REQUEST['cat']] as $child_board) {
+					$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		}
 	}
 
 	$prevCat = 0;
 	foreach ($cat_tree as $catid => $tree)
 	{
-		if ($catid == $_REQUEST['cat'] && $prevCat > 0)
-			$context['category_order'][$prevCat]['selected'] = true;
-		elseif ($catid != $_REQUEST['cat'])
-			$context['category_order'][$catid] = array(
+		if ($catid == $_REQUEST['cat'] && $prevCat > 0) {
+					$context['category_order'][$prevCat]['selected'] = true;
+		} elseif ($catid != $_REQUEST['cat']) {
+					$context['category_order'][$catid] = array(
 				'id' => $catid,
 				'name' => $txt['mboards_order_after'] . $tree['node']['name'],
 				'selected' => false,
 				'true_name' => $tree['node']['name']
 			);
+		}
 		$prevCat = $catid;
 	}
 	if (!isset($_REQUEST['delete']))
 	{
 		$context['sub_template'] = 'modify_category';
 		$context['page_title'] = $_REQUEST['sa'] == 'newcat' ? $txt['mboards_new_cat_name'] : $txt['catEdit'];
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_category_delete';
 		$context['page_title'] = $txt['mboards_delete_cat'];
@@ -327,8 +336,9 @@ 
 	{
 		$catOptions = array();
 
-		if (isset($_POST['cat_order']))
-			$catOptions['move_after'] = (int) $_POST['cat_order'];
+		if (isset($_POST['cat_order'])) {
+					$catOptions['move_after'] = (int) $_POST['cat_order'];
+		}
 
 		// Change "This & That" to "This &amp; That" but don't change "&cent" to "&amp;cent;"...
 		$catOptions['cat_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['cat_name']), false, '', $context['description_allowed_tags']);
@@ -336,10 +346,11 @@ 
 
 		$catOptions['is_collapsible'] = isset($_POST['collapse']);
 
-		if (isset($_POST['add']))
-			createCategory($catOptions);
-		else
-			modifyCategory($_POST['cat'], $catOptions);
+		if (isset($_POST['add'])) {
+					createCategory($catOptions);
+		} else {
+					modifyCategory($_POST['cat'], $catOptions);
+		}
 	}
 	// If they want to delete - first give them confirmation.
 	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty']))
@@ -353,13 +364,14 @@ 
 		// First off - check if we are moving all the current boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['cat_to']))
-				fatal_lang_error('mboards_delete_error');
+			if (empty($_POST['cat_to'])) {
+							fatal_lang_error('mboards_delete_error');
+			}
 
 			deleteCategories(array($_POST['cat']), (int) $_POST['cat_to']);
+		} else {
+					deleteCategories(array($_POST['cat']));
 		}
-		else
-			deleteCategories(array($_POST['cat']));
 	}
 
 	redirectexit('action=admin;area=manageboards');
@@ -404,8 +416,9 @@ 
 	if ($_REQUEST['sa'] == 'newboard')
 	{
 		// Category doesn't exist, man... sorry.
-		if (empty($_REQUEST['cat']))
-			redirectexit('action=admin;area=manageboards');
+		if (empty($_REQUEST['cat'])) {
+					redirectexit('action=admin;area=manageboards');
+		}
 
 		// Some things that need to be setup for a new board.
 		$curBoard = array(
@@ -429,8 +442,7 @@ 
 			'category' => (int) $_REQUEST['cat'],
 			'no_children' => true,
 		);
-	}
-	else
+	} else
 	{
 		// Just some easy shortcuts.
 		$curBoard = &$boards[$_REQUEST['boardid']];
@@ -478,8 +490,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1)
-			$curBoard['member_groups'][] = $row['id_group'];
+		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) {
+					$curBoard['member_groups'][] = $row['id_group'];
+		}
 
 		$context['groups'][(int) $row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -492,8 +505,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Category doesn't exist, man... sorry.
-	if (!isset($boardList[$curBoard['category']]))
-		redirectexit('action=admin;area=manageboards');
+	if (!isset($boardList[$curBoard['category']])) {
+			redirectexit('action=admin;area=manageboards');
+	}
 
 	foreach ($boardList[$curBoard['category']] as $boardid)
 	{
@@ -507,8 +521,7 @@ 
 				'is_child' => false,
 				'selected' => true
 			);
-		}
-		else
+		} else
 		{
 			$context['board_order'][] = array(
 				'id' => $boardid,
@@ -525,19 +538,21 @@ 
 		$context['can_move_children'] = false;
 		$context['children'] = $boards[$_REQUEST['boardid']]['tree']['children'];
 
-		foreach ($context['board_order'] as $lBoard)
-			if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
+		foreach ($context['board_order'] as $lBoard) {
+					if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
 				$context['can_move_children'] = true;
+		}
 	}
 
 	// Get other available categories.
 	$context['categories'] = array();
-	foreach ($cat_tree as $catID => $tree)
-		$context['categories'][] = array(
+	foreach ($cat_tree as $catID => $tree) {
+			$context['categories'][] = array(
 			'id' => $catID == $curBoard['category'] ? 0 : $catID,
 			'name' => $tree['node']['name'],
 			'selected' => $catID == $curBoard['category']
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mem.id_member, mem.real_name
@@ -549,14 +564,16 @@ 
 		)
 	);
 	$context['board']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['board']['moderators']) . '&quot;';
 
-	if (!empty($context['board']['moderators']))
-		list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	if (!empty($context['board']['moderators'])) {
+			list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	}
 
 	// Get all the groups assigned as moderators
 	$request = $smcFunc['db_query']('', '
@@ -568,14 +585,16 @@ 
 		)
 	);
 	$context['board']['moderator_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_groups_list'] = empty($context['board']['moderator_groups']) ? '' : '&quot;' . implode('&quot;, &qout;', $context['board']['moderator_groups']) . '&quot;';
 
-	if (!empty($context['board']['moderator_groups']))
-		list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	if (!empty($context['board']['moderator_groups'])) {
+			list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	}
 
 	// Get all the themes...
 	$request = $smcFunc['db_query']('', '
@@ -587,8 +606,9 @@ 
 		)
 	);
 	$context['themes'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['themes'][] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['themes'][] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!isset($_REQUEST['delete']))
@@ -596,8 +616,7 @@ 
 		$context['sub_template'] = 'modify_board';
 		$context['page_title'] = $txt['boardsEdit'];
 		loadJavaScriptFile('suggest.js', array('defer' => false), 'smf_suggest');
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_board_delete';
 		$context['page_title'] = $txt['mboards_delete_board'];
@@ -641,8 +660,9 @@ 
 		// Change the boardorder of this board?
 		elseif (!empty($_POST['placement']) && !empty($_POST['board_order']))
 		{
-			if (!in_array($_POST['placement'], array('before', 'after', 'child')))
-				fatal_lang_error('mangled_post', false);
+			if (!in_array($_POST['placement'], array('before', 'after', 'child'))) {
+							fatal_lang_error('mangled_post', false);
+			}
 
 			$boardOptions['move_to'] = $_POST['placement'];
 			$boardOptions['target_board'] = (int) $_POST['board_order'];
@@ -655,13 +675,14 @@ 
 		$boardOptions['access_groups'] = array();
 		$boardOptions['deny_groups'] = array();
 
-		if (!empty($_POST['groups']))
-			foreach ($_POST['groups'] as $group => $action)
+		if (!empty($_POST['groups'])) {
+					foreach ($_POST['groups'] as $group => $action)
 			{
 				if ($action == 'allow')
 					$boardOptions['access_groups'][] = (int) $group;
-				elseif ($action == 'deny')
-					$boardOptions['deny_groups'][] = (int) $group;
+		} elseif ($action == 'deny') {
+									$boardOptions['deny_groups'][] = (int) $group;
+				}
 			}
 
 		// People with manage-boards are special.
@@ -673,8 +694,9 @@ 
 		// Secondly, make sure those with super cow powers (like apt-get, or in this case manage boards) are upgraded.
 		$boardOptions['access_groups'] = array_unique(array_merge($boardOptions['access_groups'], $board_managers));
 
-		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255)
-			fatal_lang_error('too_many_groups', false);
+		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) {
+					fatal_lang_error('too_many_groups', false);
+		}
 
 		// Do not allow HTML tags. Parse the string.
 		$boardOptions['board_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['board_name']), false, '', $context['description_allowed_tags']);
@@ -685,8 +707,9 @@ 
 		if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list']))
 		{
 			$moderators = array();
-			foreach ($_POST['moderator_list'] as $moderator)
-				$moderators[(int) $moderator] = (int) $moderator;
+			foreach ($_POST['moderator_list'] as $moderator) {
+							$moderators[(int) $moderator] = (int) $moderator;
+			}
 			$boardOptions['moderators'] = $moderators;
 		}
 
@@ -695,8 +718,9 @@ 
 		if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list']))
 		{
 			$moderator_groups = array();
-			foreach ($_POST['moderator_group_list'] as $moderator_group)
-				$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			foreach ($_POST['moderator_group_list'] as $moderator_group) {
+							$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			}
 			$boardOptions['moderator_groups'] = $moderator_groups;
 		}
 
@@ -722,56 +746,62 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board.
-			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts)
-				unset($boardOptions['redirect']);
+			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) {
+							unset($boardOptions['redirect']);
+			}
 			// Reset the redirection count when switching on/off.
-			elseif (empty($boardOptions['redirect']) != empty($oldRedirect))
-				$boardOptions['num_posts'] = 0;
+			elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) {
+							$boardOptions['num_posts'] = 0;
+			}
 			// Resetting the count?
-			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect']))
-				$boardOptions['num_posts'] = 0;
+			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) {
+							$boardOptions['num_posts'] = 0;
+			}
 		}
 
 		// Create a new board...
 		if (isset($_POST['add']))
 		{
 			// New boards by default go to the bottom of the category.
-			if (empty($_POST['new_cat']))
-				$boardOptions['target_category'] = (int) $_POST['cur_cat'];
-			if (!isset($boardOptions['move_to']))
-				$boardOptions['move_to'] = 'bottom';
+			if (empty($_POST['new_cat'])) {
+							$boardOptions['target_category'] = (int) $_POST['cur_cat'];
+			}
+			if (!isset($boardOptions['move_to'])) {
+							$boardOptions['move_to'] = 'bottom';
+			}
 
 			createBoard($boardOptions);
 		}
 
 		// ...or update an existing board.
-		else
-			modifyBoard($_POST['boardid'], $boardOptions);
-	}
-	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
+		else {
+					modifyBoard($_POST['boardid'], $boardOptions);
+		}
+	} elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
 	{
 		EditBoard();
 		return;
-	}
-	elseif (isset($_POST['delete']))
+	} elseif (isset($_POST['delete']))
 	{
 		// First off - check if we are moving all the current child boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['board_to']))
-				fatal_lang_error('mboards_delete_board_error');
+			if (empty($_POST['board_to'])) {
+							fatal_lang_error('mboards_delete_board_error');
+			}
 
 			deleteBoards(array($_POST['boardid']), (int) $_POST['board_to']);
+		} else {
+					deleteBoards(array($_POST['boardid']), 0);
 		}
-		else
-			deleteBoards(array($_POST['boardid']), 0);
 	}
 
-	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions')
-		redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
-	else
-		redirectexit('action=admin;area=manageboards');
-}
+	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') {
+			redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
+	} else {
+			redirectexit('action=admin;area=manageboards');
+	}
+	}
 
 /**
  * Used to retrieve data for modifying a board category
@@ -808,8 +838,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This would probably never happen, but just to be sure.
-	if ($cat .= $allowed_sa[1])
-		die(str_replace(',', ' to', $cat));
+	if ($cat .= $allowed_sa[1]) {
+			die(str_replace(',', ' to', $cat));
+	}
 
 	redirectexit();
 }
@@ -835,8 +866,9 @@ 
 			'empty_string' => '',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
@@ -860,8 +892,9 @@ 
 
 	call_integration_hook('integrate_modify_board_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Needed for the settings template.
 	require_once($sourcedir . '/ManageServer.php');