albertlast / SMF2.1

Sources/Subs-Admin.php

Spacing +8 added lines, -8 removed lines

@@ -856,7 +856,7 @@ 
 				'if (!is_dir(realpath($cachedir)) && is_dir($boarddir . \'/cache\'))',
 				'	$cachedir = $boarddir . \'/cache\';',
 			)),
-			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
+			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
 		),
 		'db_character_set' => array(
 			'text' => implode("\n", array(
@@ -955,8 +955,8 @@ 
 		'boolean' =>  '(?i:TRUE|FALSE|(["\']?)[01]\b\\1)',
 		'NULL' =>  '(?i:NULL)',
 		// These use a PCRE subroutine to match nested arrays.
-		'array' =>  'array\s*(\((?'.'>[^()]|(?1))*\))',
-		'object' =>  '\w+::__set_state\(array\s*(\((?'.'>[^()]|(?1))*\))\)',
+		'array' =>  'array\s*(\((?' . '>[^()]|(?1))*\))',
+		'object' =>  '\w+::__set_state\(array\s*(\((?' . '>[^()]|(?1))*\))\)',
 	);
 
 	/*
@@ -989,7 +989,7 @@ 
 		),
 		// Remove the code that redirects to the installer.
 		$neg_index-- => array(
-			'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?'.'>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
+			'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?' . '>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
 			'placeholder' => '',
 		),
 	);
@@ -1752,7 +1752,7 @@ 
 	// Prevents warnings about constants that are already defined.
 	$settingsText = preg_replace_callback(
 		'~\bdefine\s*\(\s*(["\'])(\w+)\1~',
-		function ($matches)
+		function($matches)
 		{
 			return 'define(\'' . md5(mt_rand()) . '\'';
 		},
@@ -1762,7 +1762,7 @@ 
 	// Handle eval errors gracefully in both PHP 5 and PHP 7
 	try
 	{
-		if($settingsText !== '' && @eval($settingsText) === false)
+		if ($settingsText !== '' && @eval($settingsText) === false)
 			throw new ErrorException('eval error');
 
 		unset($mtime, $settingsFile, $settingsText);
@@ -1965,7 +1965,7 @@ 
 	}
 
 	// Everything is simpler if we convert heredocs to normal strings first.
-	if (preg_match_all('/<<<(\'?)(\w+)\'?'. $line_ending . '(.*?)'. $line_ending . '\2;$/m', $code_str, $matches))
+	if (preg_match_all('/<<<(\'?)(\w+)\'?' . $line_ending . '(.*?)' . $line_ending . '\2;$/m', $code_str, $matches))
 	{
 		foreach ($matches[0] as $mkey => $heredoc)
 		{
@@ -1979,7 +1979,7 @@ 
 	}
 
 	// Split before everything that could possibly delimit a comment or a string.
-	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|'. $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
+	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|' . $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
 
 	$in_string = 0;
 	$in_comment = 0;

Sources/Load.php

Spacing +4 added lines, -7 removed lines

@@ -2718,8 +2718,7 @@ 
 		$context['css_files_order'] = array();
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true;
@@ -2833,8 +2832,7 @@ 
 	global $settings, $context, $modSettings;
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['async'] = isset($params['async']) ? $params['async'] : false;
@@ -3577,8 +3575,7 @@ 
 
 	// What accelerator we are going to try.
 	$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT;
-	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache :
-		CacheApi::APIS_NAMESPACE . $cache_class_name;
+	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name;
 
 	// Do some basic tests.
 	if (class_exists($fully_qualified_class_name))
@@ -3882,7 +3879,7 @@ 
 			$auth_secret = hash_file('sha256', $boarddir . '/Settings.php');
 
 			// Set the last error to now, but only every 15 minutes.  Don't need to flood the logs.
-			if (empty($db_last_error) || ($db_last_error + 60*15) <= time())
+			if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time())
 			{
 				updateDbLastError(time());
 				loadLanguage('Errors');

Sources/Subs-Timezones.php

Spacing +1 added lines, -1 removed lines

@@ -1704,7 +1704,7 @@
 		// Missing, but we have a fallback.
 		else
 		{
-			usort($fallbacks[$tzid], function ($a, $b) {
+			usort($fallbacks[$tzid], function($a, $b) {
 				return $a['ts'] > $b['ts'];
 			});
 

Braces +2 added lines, -1 removed lines

@@ -1704,7 +1704,8 @@
 		// Missing, but we have a fallback.
 		else
 		{
-			usort($fallbacks[$tzid], function ($a, $b) {
+			usort($fallbacks[$tzid], function ($a, $b)
+			{
 				return $a['ts'] > $b['ts'];
 			});