SimpleMachines / SMF2.1

Sources/ManageMaintenance.php

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

@@ -616,7 +616,7 @@
 		);
 
 	// Next, loop thru & fix each table
-	foreach ($db_tables AS $cur_table)
+	foreach ($db_tables as $cur_table)
 	{
 		$request = $smcFunc['db_query']('', '
 			ALTER TABLE ' . $cur_table . ' CONVERT TO CHARACTER SET \'utf8mb4\' COLLATE \'utf8mb4_unicode_ci\'',

Sources/Subs.php

Spacing +40 added lines, -40 removed lines

@@ -379,7 +379,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';
@@ -871,11 +871,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(
 			'',
@@ -1178,7 +1178,7 @@ 
 	{
 		$dates[$tzid . '_' . $timestamp]['results'][$format] = preg_replace_callback(
 			'/\xEE\x84\xA0([\d_]+)(\xEE\x84(?:[\xA1-\xAF]))/',
-			function ($matches)
+			function($matches)
 			{
 				switch ($matches[2])
 				{
@@ -1306,7 +1306,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 = '?';
@@ -1777,7 +1777,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"/>';
 							}
@@ -1788,7 +1788,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)
@@ -1796,7 +1796,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
@@ -1965,7 +1965,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]);
 
@@ -2091,8 +2091,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">';
 				},
@@ -2523,12 +2523,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);
 					},
@@ -4233,7 +4233,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);
@@ -4829,7 +4829,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);
 		}
@@ -6130,7 +6130,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
@@ -6140,7 +6140,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
@@ -6389,24 +6389,24 @@ 
 
 	// 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
 	);
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
 	);
 
 	$string = str_replace($findchars_utf8, $replacechars, $string);
@@ -6751,7 +6751,7 @@ 
 		// We don't want abbreviations like '+03' or '-11'.
 		$abbrs = array_filter(
 			$tzvalue['abbrs'],
-			function ($abbr)
+			function($abbr)
 			{
 				return !strspn($abbr, '+-');
 			}
@@ -7740,7 +7740,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
 			)';
@@ -7750,7 +7750,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
 			)';
@@ -8157,8 +8157,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;
 	}
@@ -8168,8 +8168,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;
 	}
@@ -8347,7 +8347,7 @@ 
 	if (empty($stringSubject))
 		return '';
 
-	$translatable_tokens = preg_match_all('/{(.*?)}/' , $stringSubject, $matches);
+	$translatable_tokens = preg_match_all('/{(.*?)}/', $stringSubject, $matches);
 	$toFind = array();
 	$replaceWith = array();