SimpleMachines / SMF2.1

Sources/Subs.php

Spacing +39 added lines, -39 removed lines

@@ -378,7 +378,7 @@ 
 			{
 				$val = 'CASE ';
 				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
 
 				$val = $val . ' END';
 				$type = 'raw';
@@ -1045,11 +1045,11 @@ 
 			// Anything that isn't a specification, punctuation mark, or whitespace.
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
 			// A series of punctuation marks (except %), possibly separated by whitespace.
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
 			// Unwanted trailing punctuation and whitespace.
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
 			// Unwanted opening punctuation and whitespace.
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
 		),
 		array(
 			'',
@@ -1139,7 +1139,7 @@ 
 	elseif (!empty($context['character_set']) && is_callable('mb_decode_numericentity'))
 	{
 		// Get whatever the default replacement character is for this encoding.
-		$substitute = mb_decode_numericentity('&#xFFFD;', array(0xFFFD,0xFFFD,0,0xFFFF), $context['character_set']);
+		$substitute = mb_decode_numericentity('&#xFFFD;', array(0xFFFD, 0xFFFD, 0, 0xFFFF), $context['character_set']);
 	}
 	else
 		$substitute = '?';
@@ -1624,7 +1624,7 @@ 
 								$returnContext .= '<img src="' . $currentAttachment['href'] . '"' . $alt . $title . ' class="bbc_img">';
 							else
 							{
-								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"': '';
+								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
 								$height = !empty($params['{height}']) ? 'height="' . $params['{height}'] . '"' : '';
 								$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img resized"/>';
 							}
@@ -1635,7 +1635,7 @@ 
 							$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
 							$height = !empty($params['{height}']) ? ' height="' . $params['{height}'] . '"' : '';
 
-							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="'. $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
+							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="' . $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
 						}
 						// Audio.
 						elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0)
@@ -1643,7 +1643,7 @@ 
 							$width = 'max-width:100%; width: ' . (!empty($params['{width}']) ? $params['{width}'] : '400') . 'px;';
 							$height = !empty($params['{height}']) ? 'height: ' . $params['{height}'] . 'px;' : '';
 
-							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="'. $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
+							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="' . $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
 						}
 						// Anything else.
 						else
@@ -1812,7 +1812,7 @@ 
 				'type' => 'unparsed_commas_content',
 				'test' => '\d+,\d+\]',
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data[0] = normalize_iri($data[0]);
 
@@ -1938,8 +1938,8 @@ 
 					else
 						$url = get_proxied_url($url);
 
-					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}']. '"' : ' alt=""';
-					$title = !empty($params['{title}']) ? ' title="' . $params['{title}']. '"' : '';
+					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}'] . '"' : ' alt=""';
+					$title = !empty($params['{title}']) ? ' title="' . $params['{title}'] . '"' : '';
 
 					$data = isset($disabled[$tag['tag']]) ? $url : '<img src="' . $url . '"' . $alt . $title . $params['{width}'] . $params['{height}'] . ' class="bbc_img' . (!empty($params['{width}']) || !empty($params['{height}']) ? ' resized' : '') . '" loading="lazy">';
 				},
@@ -2370,12 +2370,12 @@ 
 		$codes[] = array(
 			'tag' => 'cowsay',
 			'parameters' => array(
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
 					{
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
 					},
 				),
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
 					{
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
 					},
@@ -4080,7 +4080,7 @@ 
 		if ($fp != false)
 		{
 			// Send the HEAD request (since we don't have to worry about chunked, HTTP/1.1 is fine here.)
-			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: '. SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
+			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: ' . SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
 
 			// Read in the HTTP/1.1 or whatever.
 			$test = substr(fgets($fp, 11), -1);
@@ -4676,7 +4676,7 @@ 
 
 	uasort(
 		$context['css_files'],
-		function ($a, $b)
+		function($a, $b)
 		{
 			return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
 		}
@@ -5973,7 +5973,7 @@ 
 			{
 				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
 				if ($keep_alive)
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
 				else
@@ -5983,7 +5983,7 @@ 
 			{
 				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
 				if ($keep_alive)
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
 				else
@@ -6232,13 +6232,13 @@ 
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
-		"\xe2\x80\x9a",	// single low-9 quotation mark
-		"\xe2\x80\x9e",	// double low-9 quotation mark
-		"\xe2\x80\xa6",	// horizontal ellipsis
-		"\xe2\x80\x98",	// left single curly quote
-		"\xe2\x80\x99",	// right single curly quote
-		"\xe2\x80\x9c",	// left double curly quote
-		"\xe2\x80\x9d",	// right double curly quote
+		"\xe2\x80\x9a", // single low-9 quotation mark
+		"\xe2\x80\x9e", // double low-9 quotation mark
+		"\xe2\x80\xa6", // horizontal ellipsis
+		"\xe2\x80\x98", // left single curly quote
+		"\xe2\x80\x99", // right single curly quote
+		"\xe2\x80\x9c", // left double curly quote
+		"\xe2\x80\x9d", // right double curly quote
 	);
 
 	// windows 1252 / iso equivalents
@@ -6254,13 +6254,13 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
 	);
 
 	if ($context['utf8'])
@@ -6621,7 +6621,7 @@ 
 		// We don't want abbreviations like '+03' or '-11'.
 		$abbrs = array_filter(
 			$tzvalue['abbrs'],
-			function ($abbr)
+			function($abbr)
 			{
 				return !strspn($abbr, '+-');
 			}
@@ -7610,7 +7610,7 @@ 
 			EXISTS (
 				SELECT bpv.id_board
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
 					AND bpv.deny = 0
 					AND bpv.id_board = b.id_board
 			)';
@@ -7620,7 +7620,7 @@ 
 			AND NOT EXISTS (
 				SELECT bpv.id_board
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
 					AND bpv.deny = 1
 					AND bpv.id_board = b.id_board
 			)';
@@ -8027,8 +8027,8 @@ 
 	$i = 0;
 	while (empty($done))
 	{
-		if (strpos($format, '{'. --$i . '}') !== false)
-			$replacements['{'. $i . '}'] = array_pop($list);
+		if (strpos($format, '{' . --$i . '}') !== false)
+			$replacements['{' . $i . '}'] = array_pop($list);
 		else
 			$done = true;
 	}
@@ -8038,8 +8038,8 @@ 
 	$i = 0;
 	while (empty($done))
 	{
-		if (strpos($format, '{'. ++$i . '}') !== false)
-			$replacements['{'. $i . '}'] = array_shift($list);
+		if (strpos($format, '{' . ++$i . '}') !== false)
+			$replacements['{' . $i . '}'] = array_shift($list);
 		else
 			$done = true;
 	}
@@ -8217,7 +8217,7 @@ 
 	if (empty($stringSubject))
 		return '';
 
-	$translatable_tokens = preg_match_all('/{(.*?)}/' , $stringSubject, $matches);
+	$translatable_tokens = preg_match_all('/{(.*?)}/', $stringSubject, $matches);
 	$toFind = array();
 	$replaceWith = array();
 

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 +77 added lines, -36 removed lines

@@ -38,7 +38,8 @@ 
 
 // 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)
@@ -46,17 +47,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]);
@@ -65,27 +71,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]))
@@ -106,12 +120,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']['&#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)
@@ -119,12 +135,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']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';';
 	}
 
@@ -138,13 +156,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];
 			}
 		}
@@ -163,17 +185,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'] as $composed => $decomposed) {
-		if ($iteration === 0 && !in_array($composed, $derived_normalization_props['Full_Composition_Exclusion'])) {
+	foreach ($utf8_arrays['utf8_normalize_d_maps'] as $composed => $decomposed)
+	{
+		if ($iteration === 0 && !in_array($composed, $derived_normalization_props['Full_Composition_Exclusion']))
+		{
 			$utf8_arrays['utf8_compose_maps'][$decomposed] = $composed;
 		}
 
 		$parts = strpos($decomposed, ' ') !== false ? explode(' ', $decomposed) : (array) $decomposed;
 
-		foreach ($parts as $partnum => $hex) {
-			if (isset($utf8_arrays['utf8_normalize_d_maps'][$hex])) {
+		foreach ($parts as $partnum => $hex)
+		{
+			if (isset($utf8_arrays['utf8_normalize_d_maps'][$hex]))
+			{
 				$parts[$partnum] = $utf8_arrays['utf8_normalize_d_maps'][$hex];
 			}
 		}
@@ -193,7 +220,8 @@ 
 $utf8_arrays['utf8_normalize_kd_maps'] = array_diff_assoc($full_decomposition_maps, $utf8_arrays['utf8_normalize_d_maps']);
 
 // 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;
 
@@ -204,13 +232,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'][] = '&#x' . $fields[0] . ';';
-	} else {
+	}
+	else
+	{
 		$entities = array();
 
 		list($start, $end) = explode('..', $fields[0]);
@@ -219,7 +251,8 @@ 
 		$ord_e = hexdec($end);
 
 		$ord = $ord_s;
-		while ($ord <= $ord_e) {
+		while ($ord <= $ord_e)
+		{
 			$utf8_arrays['utf8_default_ignorables'][] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
 		}
 	}
@@ -228,35 +261,43 @@ 
 // Now update the file.
 $subs_charset_contents = file_get_contents($sourcedir . '/Subs-Charset.php');
 
-foreach ($utf8_arrays as $func_name => $arr) {
+foreach ($utf8_arrays as $func_name => $arr)
+{
 	$func_text = 'function ' . $func_name . '()' . "\n" . '{';
 
 	$func_regex = '/' . preg_quote($func_text, '/') . '[^}]*}/';
 
 	$func_text .= "\n\t" . 'return array(' . "\n";
 
-	foreach ($arr as $key => $value) {
+	foreach ($arr 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));
 			}