SimpleMachines / SMF2.1

Sources/Subs.php

Braces +20 added lines, -12 removed lines

@@ -302,7 +302,6 @@ 
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
 	}
-
 	elseif ($members === null)
 		$condition = '1=1';
 
@@ -1739,7 +1738,7 @@ 
 				'before' => '<span style="text-shadow: $1 $2">',
 				'after' => '</span>',
 				'validate' => function(&$tag, &$data, $disabled)
-					{
+				{
 
 						if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50))
 							$data[1] = '0 -2px 1px';
@@ -1901,7 +1900,8 @@ 
 		{
 			if (isset($temp_bbc))
 				$bbc_codes = $temp_bbc;
-			usort($codes, function ($a, $b) {
+			usort($codes, function ($a, $b)
+			{
 				return strcmp($a['tag'], $b['tag']);
 			});
 			return $codes;
@@ -2185,7 +2185,8 @@ 
 						)?
 						';
 
-						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches) {
+						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches)
+						{
 							$url = array_shift($matches);
 
 							// If this isn't a clean URL, bail out
@@ -2274,7 +2275,9 @@ 
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
 
 			// A closing tag that doesn't match any open tags? Skip it.
-			if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags)))
+			if (!in_array($look_for, array_map(function($code)
+			{
+return $code['tag'];}, $open_tags)))
 				continue;
 
 			$to_close = array();
@@ -3759,7 +3762,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 				echo '
 	<script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '', '></script>';
@@ -3909,7 +3911,9 @@ 
 		return $data;
 
 	// Different pages include different files, so we use a hash to label the different combinations
-	$hash = md5(implode(' ', array_map(function($file) { return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
+	$hash = md5(implode(' ', array_map(function($file)
+	{
+return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
 
 	// Did we already do this?
 	list($toCache, $async, $defer) = array_pad((array) cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, 86400), 3, null);
@@ -5914,7 +5918,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}
@@ -6084,7 +6087,8 @@ 
 	if (!empty($tlds))
 	{
 		// Clean $tlds and convert it to an array
-		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line) {
+		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line)
+		{
 			$line = trim($line);
 			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false)
 				return false;
@@ -6095,7 +6099,9 @@ 
 		// Convert Punycode to Unicode
 		require_once($sourcedir . '/Class-Punycode.php');
 		$Punycode = new Punycode();
-		$tlds = array_map(function ($input) use ($Punycode) { return $Punycode->decode($input); }, $tlds);
+		$tlds = array_map(function ($input) use ($Punycode)
+		{
+return $Punycode->decode($input); }, $tlds);
 	}
 	// Otherwise, use the 2012 list of gTLDs and ccTLDs for now and schedule a background update
 	else
@@ -6262,7 +6268,8 @@ 
 		}
 
 		// Sort by key length and then alphabetically
-		uksort($regex, function($k1, $k2) use (&$strlen) {
+		uksort($regex, function($k1, $k2) use (&$strlen)
+		{
 			$l1 = $strlen($k1);
 			$l2 = $strlen($k2);
 
@@ -6516,7 +6523,8 @@ 
 function sanitize_iri($iri)
 {
 	// Encode any non-ASCII characters (but not space or control characters of any sort)
-	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches) {
+	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches)
+	{
 		return rawurlencode($matches[0]);
 	}, $iri);
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -2932,7 +2932,7 @@
 		}
 
 		// Set proper extensions; do this post caching so cache doesn't become extension-specific
-		foreach($smileysto AS $ix=>$file)
+		foreach($smileysto as $ix=>$file)
 			// Need to use the default if user selection is disabled
 			if (empty($modSettings['smiley_sets_enable']))
 				$smileysto[$ix] = $file . $context['user']['smiley_set_default_ext'];

Sources/Load.php

Braces +1 added lines, -6 removed lines

@@ -78,7 +78,7 @@ 
 	// Set a list of common functions.
 	$ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);';
 	$ent_check = empty($modSettings['disableEntityCheck']) ? function($string)
-		{
+	{
 			$string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string);
 			return $string;
 		} : function($string)
@@ -2131,7 +2131,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?
@@ -2510,14 +2509,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2618,14 +2615,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);