Passed
Push — release-2.1 ( 7515da...71b454 )
by Jon
05:28 queued 12s
created
Sources/Subs.php 2 patches
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 			{
379 379
 				$val = 'CASE ';
380 380
 				foreach ($members as $k => $v)
381
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
381
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
382 382
 
383 383
 				$val = $val . ' END';
384 384
 				$type = 'raw';
@@ -1045,11 +1045,11 @@  discard block
 block discarded – undo
1045 1045
 			// Anything that isn't a specification, punctuation mark, or whitespace.
1046 1046
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
1047 1047
 			// A series of punctuation marks (except %), possibly separated by whitespace.
1048
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
1048
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
1049 1049
 			// Unwanted trailing punctuation and whitespace.
1050
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1050
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1051 1051
 			// Unwanted opening punctuation and whitespace.
1052
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1052
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1053 1053
 		),
1054 1054
 		array(
1055 1055
 			'',
@@ -1447,7 +1447,7 @@  discard block
 block discarded – undo
1447 1447
 								$returnContext .= '<img src="' . $currentAttachment['href'] . '"' . $alt . $title . ' class="bbc_img">';
1448 1448
 							else
1449 1449
 							{
1450
-								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"': '';
1450
+								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
1451 1451
 								$height = !empty($params['{height}']) ? 'height="' . $params['{height}'] . '"' : '';
1452 1452
 								$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img resized"/>';
1453 1453
 							}
@@ -1458,7 +1458,7 @@  discard block
 block discarded – undo
1458 1458
 							$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
1459 1459
 							$height = !empty($params['{height}']) ? ' height="' . $params['{height}'] . '"' : '';
1460 1460
 
1461
-							$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>' : '');
1461
+							$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>' : '');
1462 1462
 						}
1463 1463
 						// Audio.
1464 1464
 						elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0)
@@ -1466,7 +1466,7 @@  discard block
 block discarded – undo
1466 1466
 							$width = 'max-width:100%; width: ' . (!empty($params['{width}']) ? $params['{width}'] : '400') . 'px;';
1467 1467
 							$height = !empty($params['{height}']) ? 'height: ' . $params['{height}'] . 'px;' : '';
1468 1468
 
1469
-							$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>';
1469
+							$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>';
1470 1470
 						}
1471 1471
 						// Anything else.
1472 1472
 						else
@@ -1635,7 +1635,7 @@  discard block
 block discarded – undo
1635 1635
 				'type' => 'unparsed_commas_content',
1636 1636
 				'test' => '\d+,\d+\]',
1637 1637
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
1638
-				'validate' => function (&$tag, &$data, $disabled)
1638
+				'validate' => function(&$tag, &$data, $disabled)
1639 1639
 				{
1640 1640
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
1641 1641
 					if (empty($scheme))
@@ -1748,8 +1748,8 @@  discard block
 block discarded – undo
1748 1748
 					else
1749 1749
 						$url = get_proxied_url($url);
1750 1750
 
1751
-					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}']. '"' : ' alt=""';
1752
-					$title = !empty($params['{title}']) ? ' title="' . $params['{title}']. '"' : '';
1751
+					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}'] . '"' : ' alt=""';
1752
+					$title = !empty($params['{title}']) ? ' title="' . $params['{title}'] . '"' : '';
1753 1753
 
1754 1754
 					$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">';
1755 1755
 				},
@@ -2166,12 +2166,12 @@  discard block
 block discarded – undo
2166 2166
 		$codes[] = array(
2167 2167
 			'tag' => 'cowsay',
2168 2168
 			'parameters' => array(
2169
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2169
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
2170 2170
 					{
2171 2171
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2172 2172
 					},
2173 2173
 				),
2174
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2174
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
2175 2175
 					{
2176 2176
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2177 2177
 					},
@@ -3843,7 +3843,7 @@  discard block
 block discarded – undo
3843 3843
 		if ($fp != false)
3844 3844
 		{
3845 3845
 			// Send the HEAD request (since we don't have to worry about chunked, HTTP/1.1 is fine here.)
3846
-			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");
3846
+			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");
3847 3847
 
3848 3848
 			// Read in the HTTP/1.1 or whatever.
3849 3849
 			$test = substr(fgets($fp, 11), -1);
@@ -4439,7 +4439,7 @@  discard block
 block discarded – undo
4439 4439
 
4440 4440
 	uasort(
4441 4441
 		$context['css_files'],
4442
-		function ($a, $b)
4442
+		function($a, $b)
4443 4443
 		{
4444 4444
 			return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
4445 4445
 		}
@@ -5741,7 +5741,7 @@  discard block
 block discarded – undo
5741 5741
 			{
5742 5742
 				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
5743 5743
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5744
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5744
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5745 5745
 				if ($keep_alive)
5746 5746
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
5747 5747
 				else
@@ -5751,7 +5751,7 @@  discard block
 block discarded – undo
5751 5751
 			{
5752 5752
 				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
5753 5753
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5754
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5754
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5755 5755
 				if ($keep_alive)
5756 5756
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
5757 5757
 				else
@@ -6000,13 +6000,13 @@  discard block
 block discarded – undo
6000 6000
 
6001 6001
 	// UTF-8 occurences of MS special characters
6002 6002
 	$findchars_utf8 = array(
6003
-		"\xe2\x80\x9a",	// single low-9 quotation mark
6004
-		"\xe2\x80\x9e",	// double low-9 quotation mark
6005
-		"\xe2\x80\xa6",	// horizontal ellipsis
6006
-		"\xe2\x80\x98",	// left single curly quote
6007
-		"\xe2\x80\x99",	// right single curly quote
6008
-		"\xe2\x80\x9c",	// left double curly quote
6009
-		"\xe2\x80\x9d",	// right double curly quote
6003
+		"\xe2\x80\x9a", // single low-9 quotation mark
6004
+		"\xe2\x80\x9e", // double low-9 quotation mark
6005
+		"\xe2\x80\xa6", // horizontal ellipsis
6006
+		"\xe2\x80\x98", // left single curly quote
6007
+		"\xe2\x80\x99", // right single curly quote
6008
+		"\xe2\x80\x9c", // left double curly quote
6009
+		"\xe2\x80\x9d", // right double curly quote
6010 6010
 	);
6011 6011
 
6012 6012
 	// windows 1252 / iso equivalents
@@ -6022,13 +6022,13 @@  discard block
 block discarded – undo
6022 6022
 
6023 6023
 	// safe replacements
6024 6024
 	$replacechars = array(
6025
-		',',	// &sbquo;
6026
-		',,',	// &bdquo;
6027
-		'...',	// &hellip;
6028
-		"'",	// &lsquo;
6029
-		"'",	// &rsquo;
6030
-		'"',	// &ldquo;
6031
-		'"',	// &rdquo;
6025
+		',', // &sbquo;
6026
+		',,', // &bdquo;
6027
+		'...', // &hellip;
6028
+		"'", // &lsquo;
6029
+		"'", // &rsquo;
6030
+		'"', // &ldquo;
6031
+		'"', // &rdquo;
6032 6032
 	);
6033 6033
 
6034 6034
 	if ($context['utf8'])
@@ -6389,7 +6389,7 @@  discard block
 block discarded – undo
6389 6389
 		// We don't want abbreviations like '+03' or '-11'.
6390 6390
 		$abbrs = array_filter(
6391 6391
 			$tzvalue['abbrs'],
6392
-			function ($abbr)
6392
+			function($abbr)
6393 6393
 			{
6394 6394
 				return !strspn($abbr, '+-');
6395 6395
 			}
@@ -7364,7 +7364,7 @@  discard block
 block discarded – undo
7364 7364
 			EXISTS (
7365 7365
 				SELECT bpv.id_board
7366 7366
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7367
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
7367
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
7368 7368
 					AND bpv.deny = 0
7369 7369
 					AND bpv.id_board = b.id_board
7370 7370
 			)';
@@ -7374,7 +7374,7 @@  discard block
 block discarded – undo
7374 7374
 			AND NOT EXISTS (
7375 7375
 				SELECT bpv.id_board
7376 7376
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7377
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
7377
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
7378 7378
 					AND bpv.deny = 1
7379 7379
 					AND bpv.id_board = b.id_board
7380 7380
 			)';
@@ -7686,8 +7686,8 @@  discard block
 block discarded – undo
7686 7686
 	$i = 0;
7687 7687
 	while (empty($done))
7688 7688
 	{
7689
-		if (strpos($format, '{'. --$i . '}') !== false)
7690
-			$replacements['{'. $i . '}'] = array_pop($list);
7689
+		if (strpos($format, '{' . --$i . '}') !== false)
7690
+			$replacements['{' . $i . '}'] = array_pop($list);
7691 7691
 		else
7692 7692
 			$done = true;
7693 7693
 	}
@@ -7697,8 +7697,8 @@  discard block
 block discarded – undo
7697 7697
 	$i = 0;
7698 7698
 	while (empty($done))
7699 7699
 	{
7700
-		if (strpos($format, '{'. ++$i . '}') !== false)
7701
-			$replacements['{'. $i . '}'] = array_shift($list);
7700
+		if (strpos($format, '{' . ++$i . '}') !== false)
7701
+			$replacements['{' . $i . '}'] = array_shift($list);
7702 7702
 		else
7703 7703
 			$done = true;
7704 7704
 	}
@@ -7876,7 +7876,7 @@  discard block
 block discarded – undo
7876 7876
 	if (empty($stringSubject))
7877 7877
 		return '';
7878 7878
 
7879
-	$translatable_tokens = preg_match_all('/{(.*?)}/' , $stringSubject, $matches);
7879
+	$translatable_tokens = preg_match_all('/{(.*?)}/', $stringSubject, $matches);
7880 7880
 	$toFind = array();
7881 7881
 	$replaceWith = array();
7882 7882
 
Please login to merge, or discard this patch.
Braces   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -280,7 +280,6 @@  discard block
 block discarded – undo
280 280
 		$condition = 'id_member IN ({array_int:members})';
281 281
 		$parameters['members'] = $members;
282 282
 	}
283
-
284 283
 	elseif ($members === null)
285 284
 		$condition = '1=1';
286 285
 
@@ -383,11 +382,9 @@  discard block
 block discarded – undo
383 382
 				$val = $val . ' END';
384 383
 				$type = 'raw';
385 384
 			}
386
-
387 385
 			else
388 386
 				$val = alert_count($members, true);
389 387
 		}
390
-
391 388
 		elseif ($type == 'int' && ($val === '+' || $val === '-'))
392 389
 		{
393 390
 			$val = $var . ' ' . $val . ' 1';
@@ -2167,12 +2164,12 @@  discard block
 block discarded – undo
2167 2164
 			'tag' => 'cowsay',
2168 2165
 			'parameters' => array(
2169 2166
 				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2170
-					{
2167
+				{
2171 2168
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2172 2169
 					},
2173 2170
 				),
2174 2171
 				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2175
-					{
2172
+				{
2176 2173
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2177 2174
 					},
2178 2175
 				),
@@ -2501,7 +2498,8 @@  discard block
 block discarded – undo
2501 2498
 
2502 2499
 							foreach (array('path', 'query', 'fragment') as $part)
2503 2500
 							{
2504
-								switch ($part) {
2501
+								switch ($part)
2502
+								{
2505 2503
 									case 'path':
2506 2504
 										$part_disallowed_chars = '<>' . $bracket_quote_chars . $space_chars . $excluded_trailing_chars . '/#&';
2507 2505
 										$part_excluded_trailing_chars = str_replace('?', '', $excluded_trailing_chars);
@@ -2818,7 +2816,9 @@  discard block
 block discarded – undo
2818 2816
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
2819 2817
 
2820 2818
 			// A closing tag that doesn't match any open tags? Skip it.
2821
-			if (!in_array($look_for, array_map(function($code) { return $code['tag']; }, $open_tags)))
2819
+			if (!in_array($look_for, array_map(function($code)
2820
+			{
2821
+return $code['tag']; }, $open_tags)))
2822 2822
 				continue;
2823 2823
 
2824 2824
 			$to_close = array();
@@ -4358,7 +4358,6 @@  discard block
 block discarded – undo
4358 4358
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
4359 4359
 					$minSeed = $js_file['options']['seed'];
4360 4360
 			}
4361
-
4362 4361
 			else
4363 4362
 			{
4364 4363
 				echo '
@@ -6288,7 +6287,8 @@  discard block
 block discarded – undo
6288 6287
 			$zones[$tzkey]['tzid'] = $tzid;
6289 6288
 			$zones[$tzkey]['dst_type'] = count($tzinfo) > 1 ? 1 : ($tzinfo[0]['isdst'] ? 2 : 0);
6290 6289
 
6291
-			foreach ($tzinfo as $transition) {
6290
+			foreach ($tzinfo as $transition)
6291
+			{
6292 6292
 				$zones[$tzkey]['abbrs'][] = $transition['abbr'];
6293 6293
 			}
6294 6294
 
@@ -6792,7 +6792,6 @@  discard block
 block discarded – undo
6792 6792
 			$isWritable = true;
6793 6793
 			break;
6794 6794
 		}
6795
-
6796 6795
 		else
6797 6796
 			@chmod($file, $val);
6798 6797
 	}
@@ -7881,7 +7880,8 @@  discard block
 block discarded – undo
7881 7880
 	$replaceWith = array();
7882 7881
 
7883 7882
 	if (!empty($matches[1]))
7884
-		foreach ($matches[1] as $token) {
7883
+		foreach ($matches[1] as $token)
7884
+		{
7885 7885
 			$toFind[] = '{' . $token . '}';
7886 7886
 			$replaceWith[] = isset($txt[$token]) ? $txt[$token] : $token;
7887 7887
 		}
Please login to merge, or discard this patch.