SimpleMachines / SMF2.1

Sources/Load.php

Spacing +9 added lines, -12 removed lines

@@ -113,7 +113,7 @@ 
 			array_values(get_html_translation_table(HTML_ENTITIES, ENT_QUOTES | ENT_HTML5)),
 		));
 
-	$ent_list = '&(?'.'>#(?'.'>\d+|x[0-9a-fA-F]+)|' . build_regex(array_map(function ($ent) {
+	$ent_list = '&(?' . '>#(?' . '>\d+|x[0-9a-fA-F]+)|' . build_regex(array_map(function($ent) {
 		return substr($ent, 1, -1);
 	}, $named_entities), '~') . ');';
 
@@ -130,10 +130,10 @@ 
 		'htmltrim' => function($string) use ($utf8)
 		{
 			// Find all possible versions of  
-			$nbsp = '&(?'.'>nbsp|#(?'.'>x0*A0|0*160));';
+			$nbsp = '&(?' . '>nbsp|#(?' . '>x0*A0|0*160));';
 
 			// Interesting fact: Unicode properties work even when not in UTF-8 mode.
-			return preg_replace('~^(?'.'>[\p{Z}\p{C}]|' . $nbsp . ')+|(?'.'>[\p{Z}\p{C}]|' . $nbsp . ')+$~' . ($utf8 ? 'u' : ''), '', sanitize_entities($string));
+			return preg_replace('~^(?' . '>[\p{Z}\p{C}]|' . $nbsp . ')+|(?' . '>[\p{Z}\p{C}]|' . $nbsp . ')+$~' . ($utf8 ? 'u' : ''), '', sanitize_entities($string));
 		},
 		'strlen' => function($string) use ($ent_list, $utf8)
 		{
@@ -777,7 +777,7 @@ 
 			'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'],
 			'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1,
 			'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0,
-			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0,
+			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0,
 			'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0,
 		),
 		'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '',
@@ -1725,7 +1725,7 @@ 
 		if (!empty($image))
 			$memberContext[$user]['avatar'] = array(
 				'name' => $profile['avatar'],
-				'image' => '<img class="avatar" src="' . $image . '" alt="" loading="lazy" width="' . $profile['attachment_width'] . '" height = "'. $profile['attachment_height'] . '">',
+				'image' => '<img class="avatar" src="' . $image . '" alt="" loading="lazy" width="' . $profile['attachment_width'] . '" height = "' . $profile['attachment_height'] . '">',
 				'href' => $image,
 				'url' => $image,
 			);
@@ -2690,8 +2690,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;
@@ -2805,8 +2804,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;
@@ -3549,8 +3547,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))
@@ -3854,7 +3851,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');