albertlast / SMF2.1

Sources/Subs-Auth.php

Spacing +1 added lines, -1 removed lines

@@ -871,7 +871,7 @@
 	// Intercept cookie?
 	call_integration_hook('integrate_cookie', array($name, $value, $expire, $path, $domain, $secure, $httponly, $samesite));
 
-	if(PHP_VERSION_ID < 70300)
+	if (PHP_VERSION_ID < 70300)
 		return setcookie($name, $value, $expire, $path . ';samesite=' . $samesite, $domain, $secure, $httponly);
 	else
 		return setcookie($name, $value, array(

Sources/tasks/CreatePost-Notify.php

Spacing +4 added lines, -6 removed lines

@@ -187,7 +187,7 @@ 
 			}
 		}
 
-		$unnotified = array_filter($this->members['watching'], function ($member) {
+		$unnotified = array_filter($this->members['watching'], function($member) {
 			return empty($member['sent']);
 		});
 
@@ -196,7 +196,7 @@ 
 		if ($type == 'edit' || !empty($this->_details['respawns']))
 		{
 			// Notifications about modified posts only go to members who were mentioned or quoted
-			$this->members['watching'] = $type == 'edit' ? array(): $unnotified;
+			$this->members['watching'] = $type == 'edit' ? array() : $unnotified;
 
 			// If this post has no quotes or mentions, just delete any obsolete alerts and bail out.
 			if (empty($this->members['quoted']) && empty($this->members['mentioned']))
@@ -512,8 +512,7 @@ 
 			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($this->prefs[$member_id]))
 			{
 				$pref = !empty($this->prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ?
-					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] :
-					(!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
+					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
 
 				$message_type = 'notification_' . $type;
 
@@ -532,8 +531,7 @@ 
 			elseif ($type == 'topic')
 			{
 				$pref = !empty($this->prefs[$member_id]['board_notify_' . $topicOptions['board']]) ?
-					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] :
-					(!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
+					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
 
 				$content_type = 'board';
 

Braces +10 added lines, -5 removed lines

@@ -170,11 +170,14 @@ 
 
 			// If this user subscribes both to the topic and the board there will be two records returned.
 			// Copy board/topic data to the new record or it will be lost.
-			if (!empty($this->members['watching'][$row['id_member']])) {
-				if ($this->members['watching'][$row['id_member']]['id_board'] > 0) {
+			if (!empty($this->members['watching'][$row['id_member']]))
+			{
+				if ($this->members['watching'][$row['id_member']]['id_board'] > 0)
+				{
 					$row['id_board'] = $this->members['watching'][$row['id_member']]['id_board'];
 				}
-				if ($this->members['watching'][$row['id_member']]['id_topic'] > 0) {
+				if ($this->members['watching'][$row['id_member']]['id_topic'] > 0)
+				{
 					$row['id_topic'] = $this->members['watching'][$row['id_member']]['id_topic'];
 				}
 			}
@@ -191,7 +194,8 @@ 
 				foreach ($this->members[$member_type] as $member_id => $member_data)
 				{
 					// The member receiving the alert has ignored the member mentioning them.
-					if (!empty($member_data['mentioned_by']['ignored'])) {
+					if (!empty($member_data['mentioned_by']['ignored']))
+					{
 						unset($this->members[$member_type][$member_id], $msgOptions[$member_type . '_members'][$member_id]);
 					}
 
@@ -202,7 +206,8 @@ 
 			}
 		}
 
-		$unnotified = array_filter($this->members['watching'], function ($member) {
+		$unnotified = array_filter($this->members['watching'], function ($member)
+		{
 			return empty($member['sent']);
 		});
 

Themes/default/Admin.template.php

Spacing +2 added lines, -2 removed lines

@@ -758,7 +758,7 @@ 
 	// Filter out any redundant separators before we start the loop
 	$context['config_vars'] = array_filter(
 		$context['config_vars'],
-		function ($v) use ($context)
+		function($v) use ($context)
 		{
 			static $config_vars, $prev;
 
@@ -1659,7 +1659,7 @@ 
 		echo '
 								<form action="' . $scripturl . '?action=admin;area=search" method="post" accept-charset="' . $context['character_set'] . '" class="admin_search">
 									<span class="main_icons filter centericon"></span>
-									<input type="search" name="search_term" placeholder="', $txt['admin_search'], '"', isset($context['search_term']) ? ' value="' . $context['search_term'] . '"' : '','>
+									<input type="search" name="search_term" placeholder="', $txt['admin_search'], '"', isset($context['search_term']) ? ' value="' . $context['search_term'] . '"' : '', '>
 									<select name="search_type">
 										<option value="internal"', (empty($context['admin_preferences']['sb']) || $context['admin_preferences']['sb'] == 'internal' ? ' selected' : ''), '>', $txt['admin_search_type_internal'], '</option>
 										<option value="member"', (!empty($context['admin_preferences']['sb']) && $context['admin_preferences']['sb'] == 'member' ? ' selected' : ''), '>', $txt['admin_search_type_member'], '</option>

index.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
 	require_once($sourcedir . '/Subs-Compat.php');
 
 // If $maintenance is set specifically to 2, then we're upgrading or something.
-if (!empty($maintenance) &&  2 === $maintenance)
+if (!empty($maintenance) && 2 === $maintenance)
 {
 	display_maintenance_message();
 }
@@ -98,7 +98,7 @@ 
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class) use ($sourcedir)
+spl_autoload_register(function($class) use ($sourcedir)
 {
 	$classMap = array(
 		'ReCaptcha\\' => 'ReCaptcha/',

Sources/ShowAttachments.php

Spacing +1 added lines, -2 removed lines

@@ -165,8 +165,7 @@
 	}
 
 	// No access if you don't have permission to see this attachment.
-	if
-	(
+	if (
 		// This was from SMF or a hook didn't claim it.
 		(
 			empty($file['source'])

Braces +1 added lines, -2 removed lines

@@ -191,8 +191,7 @@
 		)
 		// We are not previewing an attachment.
 		&& !isset($_SESSION['attachments_can_preview'][$attachId])
-	)
-	{
+	) {
 		send_http_status(404, 'File Not Found');
 		die('404 File Not Found');
 	}

Sources/Class-Punycode.php

Spacing +2 added lines, -2 removed lines

@@ -241,7 +241,7 @@ 
 				}
 				if ($c === $n) {
 					$q = $delta;
-					for ($k = static::BASE;; $k += static::BASE) {
+					for ($k = static::BASE; ; $k += static::BASE) {
 						$t = $this->calculateThreshold($k, $bias);
 						if ($q < $t) {
 							break;
@@ -344,7 +344,7 @@ 
 			$oldi = $i;
 			$w = 1;
 
-			for ($k = static::BASE;; $k += static::BASE)
+			for ($k = static::BASE; ; $k += static::BASE)
 			{
 				if (!isset($input[$pos]) || !isset(static::$decodeTable[$input[$pos]]))
 					return false;

Braces +24 added lines, -12 removed lines

@@ -157,12 +157,14 @@ 
 		}
 
 		$parts = explode('.', $preprocessed);
-		foreach ($parts as $p => &$part) {
+		foreach ($parts as $p => &$part)
+		{
 			$part = $this->encodePart($part);
 
 			$validation_status = $this->validateLabel($part, true);
 
-			switch ($validation_status) {
+			switch ($validation_status)
+			{
 				case self::IDNA_ERROR_LABEL_TOO_LONG:
 				case self::IDNA_ERROR_LEADING_HYPHEN:
 				case self::IDNA_ERROR_TRAILING_HYPHEN:
@@ -215,13 +217,16 @@ 
 		$h = $b = count($codePoints['basic']);
 
 		$output = '';
-		foreach ($codePoints['basic'] as $code) {
+		foreach ($codePoints['basic'] as $code)
+		{
 			$output .= $this->codePointToChar($code);
 		}
-		if ($input === $output) {
+		if ($input === $output)
+		{
 			return $output;
 		}
-		if ($b > 0) {
+		if ($b > 0)
+		{
 			$output .= static::DELIMITER;
 		}
 
@@ -230,20 +235,26 @@ 
 
 		$i = 0;
 		$length = mb_strlen($input, $this->encoding);
-		while ($h < $length) {
+		while ($h < $length)
+		{
 			$m = $codePoints['nonBasic'][$i++];
 			$delta = $delta + ($m - $n) * ($h + 1);
 			$n = $m;
 
-			foreach ($codePoints['all'] as $c) {
-				if ($c < $n || $c < static::INITIAL_N) {
+			foreach ($codePoints['all'] as $c)
+			{
+				if ($c < $n || $c < static::INITIAL_N)
+				{
 					$delta++;
 				}
-				if ($c === $n) {
+				if ($c === $n)
+				{
 					$q = $delta;
-					for ($k = static::BASE;; $k += static::BASE) {
+					for ($k = static::BASE;; $k += static::BASE)
+					{
 						$t = $this->calculateThreshold($k, $bias);
-						if ($q < $t) {
+						if ($q < $t)
+						{
 							break;
 						}
 
@@ -530,7 +541,8 @@ 
 
 		$labels = explode('.', $domain);
 
-		foreach ($labels as $l => $label) {
+		foreach ($labels as $l => $label)
+		{
 			$label = preg_replace('/[' . $regexes['ignored'] . ']/u', '', $label);
 
 			$label = utf8_normalize_c(strtr($label, $maps));

other/upgrade.php

Indentation +1 added lines, -1 removed lines

@@ -1092,7 +1092,7 @@
 	// PHP currently has a terrible handling with unserialize in which errors are fatal and not catchable.  Lets borrow some code from the RFC that intends to fix this
 	// https://wiki.php.net/rfc/improve_unserialize_error_handling
 	try {
-    	set_error_handler(static function ($severity, $message, $file, $line) {
+		set_error_handler(static function ($severity, $message, $file, $line) {
 			throw new \ErrorException($message, 0, $severity, $file, $line);
 		});
 		$ser_test = @unserialize($modSettings['attachmentUploadDir']);

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

@@ -1121,7 +1121,7 @@ 
 	// An array already?
 	elseif (is_array($modSettings['attachmentUploadDir']))
 	{
-		foreach($modSettings['attachmentUploadDir'] AS $dir)
+		foreach($modSettings['attachmentUploadDir'] as $dir)
 			if (!empty($dir) && !is_dir($dir))
 				$attdr_problem_found = true;
 	}
@@ -1130,7 +1130,7 @@ 
 	{
 		if (is_array($ser_test))
 		{
-			foreach($ser_test AS $dir)
+			foreach($ser_test as $dir)
 			{
 				if (!empty($dir) && !is_dir($dir))
 					$attdr_problem_found = true;
@@ -1147,7 +1147,7 @@ 
 	{
 		if (is_array($json_test))
 		{
-			foreach($json_test AS $dir)
+			foreach($json_test as $dir)
 			{
 				if (!is_dir($dir))
 					$attdr_problem_found = true;

Spacing +92 added lines, -92 removed lines

@@ -546,7 +546,7 @@ 
 		$to = explode('/', $lang_dir);
 		$relPath = $to;
 
-		foreach($from as $depth => $dir)
+		foreach ($from as $depth => $dir)
 		{
 			if ($dir === $to[$depth])
 				array_shift($relPath);
@@ -1108,7 +1108,7 @@ 
 	// PHP currently has a terrible handling with unserialize in which errors are fatal and not catchable.  Lets borrow some code from the RFC that intends to fix this
 	// https://wiki.php.net/rfc/improve_unserialize_error_handling
 	try {
-    	set_error_handler(static function ($severity, $message, $file, $line) {
+    	set_error_handler(static function($severity, $message, $file, $line) {
 			throw new \ErrorException($message, 0, $severity, $file, $line);
 		});
 		$ser_test = @unserialize($modSettings['attachmentUploadDir']);
@@ -1137,7 +1137,7 @@ 
 	// An array already?
 	elseif (is_array($modSettings['attachmentUploadDir']))
 	{
-		foreach($modSettings['attachmentUploadDir'] AS $dir)
+		foreach ($modSettings['attachmentUploadDir'] AS $dir)
 			if (!empty($dir) && !is_dir($dir))
 				$attdr_problem_found = true;
 	}
@@ -1146,7 +1146,7 @@ 
 	{
 		if (is_array($ser_test))
 		{
-			foreach($ser_test AS $dir)
+			foreach ($ser_test AS $dir)
 			{
 				if (!empty($dir) && !is_dir($dir))
 					$attdr_problem_found = true;
@@ -1163,7 +1163,7 @@ 
 	{
 		if (is_array($json_test))
 		{
-			foreach($json_test AS $dir)
+			foreach ($json_test AS $dir)
 			{
 				if (!is_dir($dir))
 					$attdr_problem_found = true;
@@ -3163,94 +3163,94 @@ 
 		// Translation table for the character sets not native for MySQL.
 		$translation_tables = array(
 			'windows-1255' => array(
-				'0x81' => '\'\'',		'0x8A' => '\'\'',		'0x8C' => '\'\'',
-				'0x8D' => '\'\'',		'0x8E' => '\'\'',		'0x8F' => '\'\'',
-				'0x90' => '\'\'',		'0x9A' => '\'\'',		'0x9C' => '\'\'',
-				'0x9D' => '\'\'',		'0x9E' => '\'\'',		'0x9F' => '\'\'',
-				'0xCA' => '\'\'',		'0xD9' => '\'\'',		'0xDA' => '\'\'',
-				'0xDB' => '\'\'',		'0xDC' => '\'\'',		'0xDD' => '\'\'',
-				'0xDE' => '\'\'',		'0xDF' => '\'\'',		'0xFB' => '0xD792',
-				'0xFC' => '0xE282AC',		'0xFF' => '0xD6B2',		'0xC2' => '0xFF',
-				'0x80' => '0xFC',		'0xE2' => '0xFB',		'0xA0' => '0xC2A0',
-				'0xA1' => '0xC2A1',		'0xA2' => '0xC2A2',		'0xA3' => '0xC2A3',
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
-				'0xAF' => '0xC2AF',		'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',
-				'0xB2' => '0xC2B2',		'0xB3' => '0xC2B3',		'0xB4' => '0xC2B4',
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
-				'0xB8' => '0xC2B8',		'0xB9' => '0xC2B9',		'0xBB' => '0xC2BB',
-				'0xBC' => '0xC2BC',		'0xBD' => '0xC2BD',		'0xBE' => '0xC2BE',
-				'0xBF' => '0xC2BF',		'0xD7' => '0xD7B3',		'0xD1' => '0xD781',
-				'0xD4' => '0xD7B0',		'0xD5' => '0xD7B1',		'0xD6' => '0xD7B2',
-				'0xE0' => '0xD790',		'0xEA' => '0xD79A',		'0xEC' => '0xD79C',
-				'0xED' => '0xD79D',		'0xEE' => '0xD79E',		'0xEF' => '0xD79F',
-				'0xF0' => '0xD7A0',		'0xF1' => '0xD7A1',		'0xF2' => '0xD7A2',
-				'0xF3' => '0xD7A3',		'0xF5' => '0xD7A5',		'0xF6' => '0xD7A6',
-				'0xF7' => '0xD7A7',		'0xF8' => '0xD7A8',		'0xF9' => '0xD7A9',
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
-				'0x86' => '0xE280A0',	'0x87' => '0xE280A1',	'0x89' => '0xE280B0',
-				'0x8B' => '0xE280B9',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
-				'0x95' => '0xE280A2',	'0x97' => '0xE28094',	'0x99' => '0xE284A2',
-				'0xC0' => '0xD6B0',		'0xC1' => '0xD6B1',		'0xC3' => '0xD6B3',
-				'0xC4' => '0xD6B4',		'0xC5' => '0xD6B5',		'0xC6' => '0xD6B6',
-				'0xC7' => '0xD6B7',		'0xC8' => '0xD6B8',		'0xC9' => '0xD6B9',
-				'0xCB' => '0xD6BB',		'0xCC' => '0xD6BC',		'0xCD' => '0xD6BD',
-				'0xCE' => '0xD6BE',		'0xCF' => '0xD6BF',		'0xD0' => '0xD780',
-				'0xD2' => '0xD782',		'0xE3' => '0xD793',		'0xE4' => '0xD794',
-				'0xE5' => '0xD795',		'0xE7' => '0xD797',		'0xE9' => '0xD799',
-				'0xFD' => '0xE2808E',	'0xFE' => '0xE2808F',	'0x92' => '0xE28099',
-				'0x83' => '0xC692',		'0xD3' => '0xD783',		'0x88' => '0xCB86',
-				'0x98' => '0xCB9C',		'0x91' => '0xE28098',	'0x96' => '0xE28093',
-				'0xBA' => '0xC3B7',		'0x9B' => '0xE280BA',	'0xAA' => '0xC397',
-				'0xA4' => '0xE282AA',	'0xE1' => '0xD791',		'0xE6' => '0xD796',
-				'0xE8' => '0xD798',		'0xEB' => '0xD79B',		'0xF4' => '0xD7A4',
+				'0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
+				'0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
+				'0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
+				'0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
+				'0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
+				'0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
+				'0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792',
+				'0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF',
+				'0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0',
+				'0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3',
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
+				'0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1',
+				'0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4',
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
+				'0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB',
+				'0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE',
+				'0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781',
+				'0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2',
+				'0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C',
+				'0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F',
+				'0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2',
+				'0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6',
+				'0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9',
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
+				'0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0',
+				'0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
+				'0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2',
+				'0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3',
+				'0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6',
+				'0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9',
+				'0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD',
+				'0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780',
+				'0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794',
+				'0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799',
+				'0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099',
+				'0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86',
+				'0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093',
+				'0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397',
+				'0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796',
+				'0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4',
 				'0xFA' => '0xD7AA',
 			),
 			'windows-1253' => array(
-				'0x81' => '\'\'',			'0x88' => '\'\'',			'0x8A' => '\'\'',
-				'0x8C' => '\'\'',			'0x8D' => '\'\'',			'0x8E' => '\'\'',
-				'0x8F' => '\'\'',			'0x90' => '\'\'',			'0x98' => '\'\'',
-				'0x9A' => '\'\'',			'0x9C' => '\'\'',			'0x9D' => '\'\'',
-				'0x9E' => '\'\'',			'0x9F' => '\'\'',			'0xAA' => '\'\'',
-				'0xD2' => '0xE282AC',			'0xFF' => '0xCE92',			'0xCE' => '0xCE9E',
-				'0xB8' => '0xCE88',		'0xBA' => '0xCE8A',		'0xBC' => '0xCE8C',
-				'0xBE' => '0xCE8E',		'0xBF' => '0xCE8F',		'0xC0' => '0xCE90',
-				'0xC8' => '0xCE98',		'0xCA' => '0xCE9A',		'0xCC' => '0xCE9C',
-				'0xCD' => '0xCE9D',		'0xCF' => '0xCE9F',		'0xDA' => '0xCEAA',
-				'0xE8' => '0xCEB8',		'0xEA' => '0xCEBA',		'0xEC' => '0xCEBC',
-				'0xEE' => '0xCEBE',		'0xEF' => '0xCEBF',		'0xC2' => '0xFF',
-				'0xBD' => '0xC2BD',		'0xED' => '0xCEBD',		'0xB2' => '0xC2B2',
-				'0xA0' => '0xC2A0',		'0xA3' => '0xC2A3',		'0xA4' => '0xC2A4',
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
-				'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',		'0xB3' => '0xC2B3',
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
-				'0xBB' => '0xC2BB',		'0xE2' => '0xCEB2',		'0x80' => '0xD2',
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
-				'0x86' => '0xE280A0',	'0xA1' => '0xCE85',		'0xA2' => '0xCE86',
-				'0x87' => '0xE280A1',	'0x89' => '0xE280B0',	'0xB9' => '0xCE89',
-				'0x8B' => '0xE280B9',	'0x91' => '0xE28098',	'0x99' => '0xE284A2',
-				'0x92' => '0xE28099',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
-				'0x95' => '0xE280A2',	'0x96' => '0xE28093',	'0x97' => '0xE28094',
-				'0x9B' => '0xE280BA',	'0xAF' => '0xE28095',	'0xB4' => '0xCE84',
-				'0xC1' => '0xCE91',		'0xC3' => '0xCE93',		'0xC4' => '0xCE94',
-				'0xC5' => '0xCE95',		'0xC6' => '0xCE96',		'0x83' => '0xC692',
-				'0xC7' => '0xCE97',		'0xC9' => '0xCE99',		'0xCB' => '0xCE9B',
-				'0xD0' => '0xCEA0',		'0xD1' => '0xCEA1',		'0xD3' => '0xCEA3',
-				'0xD4' => '0xCEA4',		'0xD5' => '0xCEA5',		'0xD6' => '0xCEA6',
-				'0xD7' => '0xCEA7',		'0xD8' => '0xCEA8',		'0xD9' => '0xCEA9',
-				'0xDB' => '0xCEAB',		'0xDC' => '0xCEAC',		'0xDD' => '0xCEAD',
-				'0xDE' => '0xCEAE',		'0xDF' => '0xCEAF',		'0xE0' => '0xCEB0',
-				'0xE1' => '0xCEB1',		'0xE3' => '0xCEB3',		'0xE4' => '0xCEB4',
-				'0xE5' => '0xCEB5',		'0xE6' => '0xCEB6',		'0xE7' => '0xCEB7',
-				'0xE9' => '0xCEB9',		'0xEB' => '0xCEBB',		'0xF0' => '0xCF80',
-				'0xF1' => '0xCF81',		'0xF2' => '0xCF82',		'0xF3' => '0xCF83',
-				'0xF4' => '0xCF84',		'0xF5' => '0xCF85',		'0xF6' => '0xCF86',
-				'0xF7' => '0xCF87',		'0xF8' => '0xCF88',		'0xF9' => '0xCF89',
-				'0xFA' => '0xCF8A',		'0xFB' => '0xCF8B',		'0xFC' => '0xCF8C',
-				'0xFD' => '0xCF8D',		'0xFE' => '0xCF8E',
+				'0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
+				'0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
+				'0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
+				'0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
+				'0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
+				'0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E',
+				'0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C',
+				'0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90',
+				'0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C',
+				'0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA',
+				'0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC',
+				'0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF',
+				'0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2',
+				'0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4',
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
+				'0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3',
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
+				'0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2',
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
+				'0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86',
+				'0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89',
+				'0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2',
+				'0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
+				'0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094',
+				'0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84',
+				'0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94',
+				'0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692',
+				'0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B',
+				'0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3',
+				'0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6',
+				'0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9',
+				'0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD',
+				'0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0',
+				'0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4',
+				'0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7',
+				'0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80',
+				'0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83',
+				'0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86',
+				'0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89',
+				'0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C',
+				'0xFD' => '0xCF8D', '0xFE' => '0xCF8E',
 			),
 		);
 
@@ -3268,7 +3268,7 @@ 
 		db_extend();
 		$queryTables = $smcFunc['db_list_tables'](false, $db_prefix . '%');
 
-		$queryTables = array_values(array_filter($queryTables, function($v){
+		$queryTables = array_values(array_filter($queryTables, function($v) {
 			return stripos($v, 'backup_') !== 0;
 		}));
 
@@ -3514,7 +3514,7 @@ 
 			// This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8)
 			$new_string = preg_replace_callback(
 				'~\bs:(\d+):"(.*?)";(?=$|[bidsaO]:|[{}}]|N;)~s',
-				function ($matches)
+				function($matches)
 				{
 					return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';
 				},

Braces +20 added lines, -9 removed lines

@@ -41,7 +41,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;
@@ -52,7 +53,8 @@ 
 	'postgresql' => array(
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function() {
+		'version_check' => function()
+		{
 			if (!function_exists('pg_version'))
 				return false;
 			$version = pg_version();
@@ -1107,22 +1109,30 @@ 
 
 	// PHP currently has a terrible handling with unserialize in which errors are fatal and not catchable.  Lets borrow some code from the RFC that intends to fix this
 	// https://wiki.php.net/rfc/improve_unserialize_error_handling
-	try {
-    	set_error_handler(static function ($severity, $message, $file, $line) {
+	try
+	{
+    	set_error_handler(static function ($severity, $message, $file, $line)
+    	{
 			throw new \ErrorException($message, 0, $severity, $file, $line);
 		});
 		$ser_test = @unserialize($modSettings['attachmentUploadDir']);
-	} catch (\Throwable $e) {
+	}
+	catch (\Throwable $e)
+	{
 		$ser_test = false;
 	}
-	finally {
+	finally
+	{
 	 	restore_error_handler();
 	}
 
 	// Json is simple, it can be caught.
-	try {
+	try
+	{
 		$json_test = @json_decode($modSettings['attachmentUploadDir'], true);
-	} catch (\Throwable $e) {
+	}
+	catch (\Throwable $e)
+	{
 		$json_test = null;
 	}
 
@@ -3268,7 +3278,8 @@ 
 		db_extend();
 		$queryTables = $smcFunc['db_list_tables'](false, $db_prefix . '%');
 
-		$queryTables = array_values(array_filter($queryTables, function($v){
+		$queryTables = array_values(array_filter($queryTables, function($v)
+		{
 			return stripos($v, 'backup_') !== 0;
 		}));
 

Sources/PersonalMessage.php

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

@@ -3309,7 +3309,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)
 			{
 				if (array_key_exists($label, $the_labels))
 				{
@@ -3353,7 +3353,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());
@@ -3362,7 +3362,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

Sources/Errors.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
 
 	// Send a custom header if we have a custom message.
 	if (isset($_REQUEST['js']) || isset($_REQUEST['xml']) || isset($_RQEUEST['ajax']))
-		header('X-SMF-errormsg: ' .  $error_message);
+		header('X-SMF-errormsg: ' . $error_message);
 
 	// If we have no theme stuff we can't have the language file...
 	if (empty($context['theme_loaded']))

Braces +2 added lines, -1 removed lines

@@ -348,7 +348,8 @@
 
 	$message = $txt[$e->getMessage()] ?? $e->getMessage();
 
-	if (!empty($modSettings['enableErrorLogging'])) {
+	if (!empty($modSettings['enableErrorLogging']))
+	{
 		log_error($message, 'general', $e->getFile(), $e->getLine());
 	}