albertlast / SMF2.1

Sources/Subs.php

Braces +11 added lines, -11 removed lines

@@ -280,7 +280,6 @@ 
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
 	}
-
 	elseif ($members === null)
 		$condition = '1=1';
 
@@ -383,11 +382,9 @@ 
 				$val = $val . ' END';
 				$type = 'raw';
 			}
-
 			else
 				$val = alert_count($members, true);
 		}
-
 		elseif ($type == 'int' && ($val === '+' || $val === '-'))
 		{
 			$val = $var . ' ' . $val . ' 1';
@@ -2344,12 +2341,12 @@ 
 			'tag' => 'cowsay',
 			'parameters' => array(
 				'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)
-					{
+				{
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
 					},
 				),
@@ -2711,7 +2708,8 @@ 
 
 							foreach (array('path', 'query', 'fragment') as $part)
 							{
-								switch ($part) {
+								switch ($part)
+								{
 									case 'path':
 										$part_disallowed_chars = '\h\v<>' . $bracket_quote_chars . $excluded_trailing_chars . '/#&';
 										$part_excluded_trailing_chars = str_replace('?', '', $excluded_trailing_chars);
@@ -3048,7 +3046,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();
@@ -4588,7 +4588,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 			{
 				echo '
@@ -6513,7 +6512,8 @@ 
 			$zones[$tzkey]['tzid'] = $tzid;
 			$zones[$tzkey]['dst_type'] = count($tzinfo) > 1 ? 1 : ($tzinfo[0]['isdst'] ? 2 : 0);
 
-			foreach ($tzinfo as $transition) {
+			foreach ($tzinfo as $transition)
+			{
 				$zones[$tzkey]['abbrs'][] = $transition['abbr'];
 			}
 
@@ -7035,7 +7035,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}
@@ -8125,7 +8124,8 @@ 
 	$replaceWith = array();
 
 	if (!empty($matches[1]))
-		foreach ($matches[1] as $token) {
+		foreach ($matches[1] as $token)
+		{
 			$toFind[] = '{' . $token . '}';
 			$replaceWith[] = isset($txt[$token]) ? $txt[$token] : $token;
 		}

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])
 				{
@@ -1312,7 +1312,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 = '?';
@@ -1787,7 +1787,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"/>';
 							}
@@ -1798,7 +1798,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)
@@ -1806,7 +1806,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
@@ -1975,7 +1975,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]);
 
@@ -2101,8 +2101,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">';
 				},
@@ -2533,12 +2533,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);
 					},
@@ -4243,7 +4243,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);
@@ -4839,7 +4839,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);
 		}
@@ -6136,7 +6136,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
@@ -6146,7 +6146,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
@@ -6395,13 +6395,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
@@ -6417,13 +6417,13 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
 	);
 
 	if ($context['utf8'])
@@ -6786,7 +6786,7 @@ 
 		// We don't want abbreviations like '+03' or '-11'.
 		$abbrs = array_filter(
 			$tzvalue['abbrs'],
-			function ($abbr)
+			function($abbr)
 			{
 				return !strspn($abbr, '+-');
 			}
@@ -7776,7 +7776,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
 			)';
@@ -7786,7 +7786,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
 			)';
@@ -8193,8 +8193,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;
 	}
@@ -8204,8 +8204,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;
 	}
@@ -8383,7 +8383,7 @@ 
 	if (empty($stringSubject))
 		return '';
 
-	$translatable_tokens = preg_match_all('/{(.*?)}/' , $stringSubject, $matches);
+	$translatable_tokens = preg_match_all('/{(.*?)}/', $stringSubject, $matches);
 	$toFind = array();
 	$replaceWith = array();
 

Sources/Search.php

Indentation +1 added lines, -1 removed lines

@@ -1107,7 +1107,7 @@
 						'left_join' => array(),
 						'where' => array(
 							't.id_redirect_topic = {int:not_redirected}',
-						    't.redirect_expires = {int:never_expires}',
+							't.redirect_expires = {int:never_expires}',
 						),
 					);
 

Sources/Cache/APIs/Sqlite.php

Spacing +5 added lines, -5 removed lines

@@ -131,14 +131,14 @@ 
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
 		$config_vars[] = array(
-			'cachedir_'. $class_name_txt_key,
-			$txt['cachedir_'. $class_name_txt_key],
+			'cachedir_' . $class_name_txt_key,
+			$txt['cachedir_' . $class_name_txt_key],
 			'file',
 			'text',
 			36,
-			'cache_'. $class_name_txt_key .'_cachedir',
+			'cache_' . $class_name_txt_key . '_cachedir',
 		);
 
 		if (!isset($context['settings_post_javascript']))
@@ -147,7 +147,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#cachedir_'. $class_name_txt_key .'").prop("disabled", cache_type != "'. $class_name .'");
+				$("#cachedir_'. $class_name_txt_key . '").prop("disabled", cache_type != "' . $class_name . '");
 			});';
 	}
 

Sources/Subs-Charset.php

Spacing +6 added lines, -6 removed lines

@@ -265,7 +265,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")
@@ -299,7 +299,7 @@ 
 		{
 			$temp = $chars[$i];
 			$chars[$i] = $chars[$i - 1];
-			$chars[$i -1] = $temp;
+			$chars[$i - 1] = $temp;
 
 			// Backtrack and check again.
 			if ($i > 1)
@@ -543,7 +543,7 @@ 
 
 	// Use placeholders to preserve known emoji from further processing.
 	// Regex source is https://unicode.org/reports/tr51/#EBNF_and_Regex
-	$string  = preg_replace_callback(
+	$string = preg_replace_callback(
 		'/' .
 		// Flag emojis
 		'[' . $prop_classes['Regional_Indicator'] . ']{2}' .
@@ -572,7 +572,7 @@ 
 			')?' .
 		')*' .
 		'/u',
-		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
@@ -603,7 +603,7 @@ 
 		// Use placeholders for sanctioned variation selectors.
 		$string = preg_replace_callback(
 			$patterns,
-			function ($matches) use (&$placeholders)
+			function($matches) use (&$placeholders)
 			{
 				$placeholders[$matches[0]] = "\xEE\xB3\x9B" . md5($matches[0]) . "\xEE\xB3\x9C";
 				return $placeholders[$matches[0]];
@@ -683,7 +683,7 @@ 
 			// Do the thing.
 			$string = preg_replace_callback(
 				'/' . $pattern . '/u',
-				function ($matches) use ($placeholders)
+				function($matches) use ($placeholders)
 				{
 					return strtr($matches[0], $placeholders);
 				},

other/update_unicode_data.php

Spacing +2 added lines, -2 removed lines

@@ -752,7 +752,7 @@ 
 	}
 }
 // This sort works decently well to ensure widely used scripts are ranked before rare scripts.
-uasort($funcs['utf8_regex_joining_type']['data'], function ($a, $b)
+uasort($funcs['utf8_regex_joining_type']['data'], function($a, $b)
 {
 	if ($a['stats']['age'] == $b['stats']['age'])
 	{
@@ -828,7 +828,7 @@ 
 	}
 }
 // Again, sort commonly used scripts before rare scripts.
-uasort($funcs['utf8_regex_indic']['data'], function ($a, $b)
+uasort($funcs['utf8_regex_indic']['data'], function($a, $b)
 {
 	if ($a['stats']['age'] == $b['stats']['age'])
 	{

Sources/Profile-Modify.php

Braces +1 added lines, -3 removed lines

@@ -156,7 +156,6 @@ 
 					$diff = $cur_profile['date_registered'] - strtotime(smf_strftime('%Y-%m-%d', $cur_profile['date_registered']));
 					$value = $value + $diff;
 				}
-
 				else
 					$value = $cur_profile['date_registered'];
 
@@ -507,7 +506,7 @@ 
 						log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])]));
 
 						$context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set)
-							{
+						{
 								return $v != $set;
 							});
 					}
@@ -3518,7 +3517,6 @@ 
 			}
 		}
 	}
-
 	elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
 	{
 		if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar)

other/install.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 				return false;
 		},
 		'utf8_version' => '8.0',
-		'utf8_version_check' => function (){
+		'utf8_version_check' => function() {
 			global $db_connection;
 			$request = pg_query($db_connection, 'SELECT version()');
 			list ($version) = pg_fetch_row($request);
@@ -987,7 +987,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()
+		{
 			global $db_connection;
 			$request = pg_query($db_connection, 'SELECT version()');
 			list ($version) = pg_fetch_row($request);
@@ -92,7 +95,8 @@ 
 				return false;
 		},
 		'utf8_version' => '8.0',
-		'utf8_version_check' => function (){
+		'utf8_version_check' => function ()
+		{
 			global $db_connection;
 			$request = pg_query($db_connection, 'SELECT version()');
 			list ($version) = pg_fetch_row($request);
@@ -1001,7 +1005,7 @@ 
 		{
 			$row = $smcFunc['db_fetch_assoc']($result);
 			if ($row['standard_conforming_strings'] !== 'on')
-				{
+			{
 					$incontext['continue'] = 0;
 					$incontext['error'] = $txt['error_pg_scs'];
 				}

Sources/Load.php

Spacing +6 added lines, -9 removed lines

@@ -853,7 +853,7 @@ 
 			'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'],
 			'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1,
 			'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0,
-			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0,
+			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0,
 			'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0,
 		),
 		'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '',
@@ -2539,7 +2539,7 @@ 
 	);
 
 	// Add the JQuery library to the list of files to load.
-	$jQueryUrls = array ('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/'. JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-'. JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-'. JQUERY_VERSION . '.min.js');
+	$jQueryUrls = array('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-' . JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-' . JQUERY_VERSION . '.min.js');
 
 	if (isset($modSettings['jquery_source']) && array_key_exists($modSettings['jquery_source'], $jQueryUrls))
 		loadJavaScriptFile($jQueryUrls[$modSettings['jquery_source']], array('external' => true, 'seed' => false), 'smf_jquery');
@@ -2780,8 +2780,7 @@ 
 		$context['css_files_order'] = array();
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true;
@@ -2896,8 +2895,7 @@ 
 	global $settings, $context, $modSettings;
 
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['async'] = isset($params['async']) ? $params['async'] : false;
@@ -3687,8 +3685,7 @@ 
 
 	// What accelerator we are going to try.
 	$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT;
-	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache :
-		CacheApi::APIS_NAMESPACE . $cache_class_name;
+	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name;
 
 	// Do some basic tests.
 	if (class_exists($fully_qualified_class_name))
@@ -3992,7 +3989,7 @@ 
 			$auth_secret = hash_file('sha256', $boarddir . '/Settings.php');
 
 			// Set the last error to now, but only every 15 minutes.  Don't need to flood the logs.
-			if (empty($db_last_error) || ($db_last_error + 60*15) <= time())
+			if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time())
 			{
 				updateDbLastError(time());
 				loadLanguage('Errors');

Braces +3 added lines, -3 removed lines

@@ -107,7 +107,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) $string);
 			return $string;
 		} : function($string)
@@ -2422,7 +2422,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?
@@ -2976,7 +2975,8 @@ 
 	// Take care of escaping the value for JavaScript?
 	if (!empty($escape))
 	{
-		switch (gettype($value)) {
+		switch (gettype($value))
+		{
 			// Illegal.
 			case 'resource':
 				break;

Sources/PersonalMessage.php

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

@@ -3304,7 +3304,7 @@ 
 		// Deleting an existing label?
 		elseif (isset($_POST['delete'], $_POST['delete_label']))
 		{
-			foreach ($_POST['delete_label'] AS $label => $dummy)
+			foreach ($_POST['delete_label'] as $label => $dummy)
 			{
 				unset($the_labels[$label]);
 				$labels_to_remove[] = $label;
@@ -3345,7 +3345,7 @@ 
 		if (!empty($labels_to_add))
 		{
 			$inserts = array();
-			foreach ($labels_to_add AS $label)
+			foreach ($labels_to_add as $label)
 				$inserts[] = array($user_info['id'], $label);
 
 			$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
@@ -3354,7 +3354,7 @@ 
 		// Update existing labels as needed
 		if (!empty($label_updates))
 		{
-			foreach ($label_updates AS $id => $name)
+			foreach ($label_updates as $id => $name)
 			{
 				$smcFunc['db_query']('', '
 					UPDATE {db_prefix}pm_labels