SimpleMachines / SMF2.1

other/install.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 				return false;
 		},
 		'utf8_version' => '8.0',
-		'utf8_version_check' => function (){
+		'utf8_version_check' => function() {
 			$request = pg_query('SELECT version()');
 			list ($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
@@ -981,7 +981,7 @@ 
 	$incontext['continue'] = 1;
 
 	// Check Postgres setting
-	if ( $db_type === 'postgresql')
+	if ($db_type === 'postgresql')
 	{
 		load_database();
 		$result = $smcFunc['db_query']('', '

Braces +9 added lines, -5 removed lines

@@ -40,7 +40,8 @@ 
 	'mysql' => array(
 		'name' => 'MySQL',
 		'version' => '5.6.0',
-		'version_check' => function() {
+		'version_check' => function()
+		{
 			global $db_connection;
 			if (!function_exists('mysqli_fetch_row'))
 				return false;
@@ -56,7 +57,8 @@ 
 			return true;
 		},
 		'utf8_version' => '5.0.22',
-		'utf8_version_check' => function() {
+		'utf8_version_check' => function()
+		{
 			global $db_connection;
 			return mysqli_get_server_info($db_connection);
 		},
@@ -70,7 +72,8 @@ 
 	'postgresql' => array(
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function() {
+		'version_check' => function()
+		{
 			$request = pg_query('SELECT version()');
 			list ($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
@@ -90,7 +93,8 @@ 
 				return false;
 		},
 		'utf8_version' => '8.0',
-		'utf8_version_check' => function (){
+		'utf8_version_check' => function ()
+		{
 			$request = pg_query('SELECT version()');
 			list ($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
@@ -995,7 +999,7 @@ 
 		{
 			$row = $smcFunc['db_fetch_assoc']($result);
 			if ($row['standard_conforming_strings'] !== 'on')
-				{
+			{
 					$incontext['continue'] = 0;
 					$incontext['error'] = $txt['error_pg_scs'];
 				}

other/update_unicode_data.php

Spacing +2 added lines, -2 removed lines

@@ -241,7 +241,7 @@ 
 		if ($func_name !== 'utf8_default_ignorables') {
 			$func_text .= '"';
 
-			$key = mb_decode_numericentity(str_replace(' ', '', $key), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
+			$key = mb_decode_numericentity(str_replace(' ', '', $key), array(0, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
 
 			foreach (unpack('C*', $key) as $byte_value) {
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
@@ -255,7 +255,7 @@ 
 		} else {
 			$func_text .= '"';
 
-			$value = mb_decode_numericentity(str_replace(' ', '', $value), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
+			$value = mb_decode_numericentity(str_replace(' ', '', $value), array(0, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
 			foreach (unpack('C*', $value) as $byte_value) {
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
 			}

Braces +79 added lines, -37 removed lines

@@ -34,14 +34,16 @@ 
 $utf8_arrays['utf8_casefold_maps'] = array('file' => 'CaseFold.php', 'data' => array());
 $utf8_arrays['utf8_default_ignorables'] = array('file' => 'DefaultIgnorables.php', 'data' => array());
 
-foreach ($utf8_arrays as $func_name => $func_info) {
+foreach ($utf8_arrays as $func_name => $func_info)
+{
 	if (!is_file($unicodedir . '/' . $func_info['file']) || !is_writable($unicodedir . '/' . $func_info['file']))
 		die($unicodedir . '/' . $func_info['file'] . ' not found or not writable.');
 }
 
 // We need some of these for further analysis below.
 $derived_normalization_props = array();
-foreach (file($unicode_data_url . '/DerivedNormalizationProps.txt') as $line) {
+foreach (file($unicode_data_url . '/DerivedNormalizationProps.txt') as $line)
+{
 	$line = substr($line, 0, strcspn($line, '#'));
 
 	if (strpos($line, ';') === false)
@@ -49,17 +51,22 @@ 
 
 	$fields = explode(';', $line);
 
-	foreach ($fields as $key => $value) {
+	foreach ($fields as $key => $value)
+	{
 		$fields[$key] = trim($value);
 	}
 
-	if (!isset($derived_normalization_props[$fields[1]])) {
+	if (!isset($derived_normalization_props[$fields[1]]))
+	{
 		$derived_normalization_props[$fields[1]] = array();
 	}
 
-	if (strpos($fields[0], '..') === false) {
+	if (strpos($fields[0], '..') === false)
+	{
 		$entities = array('&#x' . $fields[0] . ';');
-	} else {
+	}
+	else
+	{
 		$entities = array();
 
 		list($start, $end) = explode('..', $fields[0]);
@@ -68,27 +75,35 @@ 
 		$ord_e = hexdec($end);
 
 		$ord = $ord_s;
-		while ($ord <= $ord_e) {
+		while ($ord <= $ord_e)
+		{
 			$entities[] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
 		}
 	}
 
 	$value = '';
-	if (!isset($fields[2])) {
+	if (!isset($fields[2]))
+	{
 		$value = 'SAME';
-	} elseif (in_array($fields[1], array('FC_NFKC', 'NFKC_CF'))) {
+	}
+	elseif (in_array($fields[1], array('FC_NFKC', 'NFKC_CF')))
+	{
 		$value = trim($fields[2]) !== '' ? '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';' : '';
-	} else {
+	}
+	else
+	{
 		$value = $fields[2];
 	}
 
-	foreach ($entities as $entity) {
+	foreach ($entities as $entity)
+	{
 		$derived_normalization_props[$fields[1]][$entity] = $value === 'SAME' ? $entity : $value;
 	}
 }
 
 // Go through all the characters in the Unicode database.
-foreach (file($unicode_data_url . '/UnicodeData.txt') as $line) {
+foreach (file($unicode_data_url . '/UnicodeData.txt') as $line)
+{
 	$fields = explode(';', $line);
 
 	if (!empty($fields[3]))
@@ -109,12 +124,14 @@ 
 	$full_decomposition_maps['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim(strip_tags($fields[5]))) . ';';
 
 	// Just the canonical decompositions.
-	if (strpos($fields[5], '<') === false) {
+	if (strpos($fields[5], '<') === false)
+	{
 		$utf8_arrays['utf8_normalize_d_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[5])) . ';';
 	}
 }
 
-foreach (file($unicode_data_url . '/CaseFolding.txt') as $line) {
+foreach (file($unicode_data_url . '/CaseFolding.txt') as $line)
+{
 	$line = substr($line, 0, strcspn($line, '#'));
 
 	if (strpos($line, ';') === false)
@@ -122,12 +139,14 @@ 
 
 	$fields = explode(';', $line);
 
-	foreach ($fields as $key => $value) {
+	foreach ($fields as $key => $value)
+	{
 		$fields[$key] = trim($value);
 	}
 
 	// Full casefolding.
-	if (in_array($fields[1], array('C', 'F'))) {
+	if (in_array($fields[1], array('C', 'F')))
+	{
 		$utf8_arrays['utf8_casefold_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';';
 	}
 
@@ -141,13 +160,17 @@ 
 // This is necessary because some characters decompose to other characters that
 // themselves decompose further.
 $changed = true;
-while ($changed) {
+while ($changed)
+{
 	$temp = array();
-	foreach ($full_decomposition_maps as $composed => $decomposed) {
+	foreach ($full_decomposition_maps as $composed => $decomposed)
+	{
 		$parts = strpos($decomposed, ' ') !== false ? explode(' ', $decomposed) : (array) $decomposed;
 
-		foreach ($parts as $partnum => $hex) {
-			if (isset($full_decomposition_maps[$hex])) {
+		foreach ($parts as $partnum => $hex)
+		{
+			if (isset($full_decomposition_maps[$hex]))
+			{
 				$parts[$partnum] = $full_decomposition_maps[$hex];
 			}
 		}
@@ -166,17 +189,22 @@ 
 // Same as above, but using only canonical decompositions.
 $changed = true;
 $iteration = 0;
-while ($changed) {
+while ($changed)
+{
 	$temp = array();
-	foreach ($utf8_arrays['utf8_normalize_d_maps']['data'] as $composed => $decomposed) {
-		if ($iteration === 0 && !in_array($composed, $derived_normalization_props['Full_Composition_Exclusion'])) {
+	foreach ($utf8_arrays['utf8_normalize_d_maps']['data'] as $composed => $decomposed)
+	{
+		if ($iteration === 0 && !in_array($composed, $derived_normalization_props['Full_Composition_Exclusion']))
+		{
 			$utf8_arrays['utf8_compose_maps']['data'][$decomposed] = $composed;
 		}
 
 		$parts = strpos($decomposed, ' ') !== false ? explode(' ', $decomposed) : (array) $decomposed;
 
-		foreach ($parts as $partnum => $hex) {
-			if (isset($utf8_arrays['utf8_normalize_d_maps']['data'][$hex])) {
+		foreach ($parts as $partnum => $hex)
+		{
+			if (isset($utf8_arrays['utf8_normalize_d_maps']['data'][$hex]))
+			{
 				$parts[$partnum] = $utf8_arrays['utf8_normalize_d_maps']['data'][$hex];
 			}
 		}
@@ -196,7 +224,8 @@ 
 $utf8_arrays['utf8_normalize_kd_maps']['data'] = array_diff_assoc($full_decomposition_maps, $utf8_arrays['utf8_normalize_d_maps']['data']);
 
 // Some characters have the 'Default_Ignorable_Code_Point' property.
-foreach (file($unicode_data_url . '/DerivedCoreProperties.txt') as $line) {
+foreach (file($unicode_data_url . '/DerivedCoreProperties.txt') as $line)
+{
 	if (strpos($line, 'Default_Ignorable_Code_Point') === false)
 		continue;
 
@@ -207,13 +236,17 @@ 
 
 	$fields = explode(';', $line);
 
-	foreach ($fields as $key => $value) {
+	foreach ($fields as $key => $value)
+	{
 		$fields[$key] = trim($value);
 	}
 
-	if (strpos($fields[0], '..') === false) {
+	if (strpos($fields[0], '..') === false)
+	{
 		$utf8_arrays['utf8_default_ignorables']['data'][] = '&#x' . $fields[0] . ';';
-	} else {
+	}
+	else
+	{
 		$entities = array();
 
 		list($start, $end) = explode('..', $fields[0]);
@@ -222,13 +255,15 @@ 
 		$ord_e = hexdec($end);
 
 		$ord = $ord_s;
-		while ($ord <= $ord_e) {
+		while ($ord <= $ord_e)
+		{
 			$utf8_arrays['utf8_default_ignorables']['data'][] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
 		}
 	}
 }
 
-foreach ($utf8_arrays as $func_name => $func_info) {
+foreach ($utf8_arrays as $func_name => $func_info)
+{
 	// Now update the file.
 	$file_contents = file_get_contents($unicodedir . '/' . $func_info['file']);
 
@@ -238,28 +273,35 @@ 
 
 	$func_text .= "\n\t" . 'return array(' . "\n";
 
-	foreach ($func_info['data'] as $key => $value) {
+	foreach ($func_info['data'] as $key => $value)
+	{
 		$func_text .= "\t\t";
 
-		if ($func_name !== 'utf8_default_ignorables') {
+		if ($func_name !== 'utf8_default_ignorables')
+		{
 			$func_text .= '"';
 
 			$key = mb_decode_numericentity(str_replace(' ', '', $key), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
 
-			foreach (unpack('C*', $key) as $byte_value) {
+			foreach (unpack('C*', $key) as $byte_value)
+			{
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
 			}
 
 			$func_text .= '" => ';
 		}
 
-		if ($func_name == 'utf8_combining_classes') {
+		if ($func_name == 'utf8_combining_classes')
+		{
 			$func_text .= $value;
-		} else {
+		}
+		else
+		{
 			$func_text .= '"';
 
 			$value = mb_decode_numericentity(str_replace(' ', '', $value), array(0,0x10FFFF,0,0xFFFFFF), 'UTF-8');
-			foreach (unpack('C*', $value) as $byte_value) {
+			foreach (unpack('C*', $value) as $byte_value)
+			{
 				$func_text .= '\\x' . strtoupper(dechex($byte_value));
 			}
 

Sources/Subs-Charset.php

Spacing +5 added lines, -5 removed lines

@@ -249,7 +249,7 @@ 
 	$combining_classes = utf8_combining_classes();
 
 	// Replace characters with decomposed forms.
-	for ($i=0; $i < count($chars); $i++)
+	for ($i = 0; $i < count($chars); $i++)
 	{
 		// Hangul characters.
 		if ($chars[$i] >= "\xEA\xB0\x80" && $chars[$i] <= "\xED\x9E\xA3")
@@ -283,7 +283,7 @@ 
 		{
 			$temp = $chars[$i];
 			$chars[$i] = $chars[$i - 1];
-			$chars[$i -1] = $temp;
+			$chars[$i - 1] = $temp;
 
 			// Backtrack and check again.
 			if ($i > 1)
@@ -534,7 +534,7 @@ 
 
 		Regex source is https://unicode.org/reports/tr51/#EBNF_and_Regex
 	*/
-	$string  = mb_ereg_replace_callback(
+	$string = mb_ereg_replace_callback(
 		'\p{Regional_Indicator}\p{Regional_Indicator}' .
 		'|' .
 		'\p{Emoji}' .
@@ -555,7 +555,7 @@ 
 				'[\x{E0020}-\x{E007E}]+\x{E007F}' .
 			')?' .
 		')*',
-		function ($matches) use (&$placeholders)
+		function($matches) use (&$placeholders)
 		{
 			// Skip lone ASCII characters that are not actully part of an emoji sequence.
 			// This can happen because the digits 0-9 and the '*' and '#' characters are
@@ -930,7 +930,7 @@ 
 			// Do the thing.
 			$temp = @mb_ereg_replace_callback(
 				$pattern,
-				function ($matches) use ($placeholders)
+				function($matches) use ($placeholders)
 				{
 					return strtr($matches[0], $placeholders);
 				},