albertlast / SMF2.1

other/update_version_numbers.php

Spacing +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 $files = array_unique(array_merge($always_update, array_filter(
 	explode("\n", shell_exec('git diff --name-only v' . $prev_version . '...HEAD')),
-	function ($filename)
+	function($filename)
 	{
 		return file_exists($filename) && strpos(mime_content_type($filename), 'text/') === 0;
 	}

other/upgrade-helper.php

Spacing +1 added lines, -1 removed lines

@@ -448,7 +448,7 @@
 	function array_column($input, $column_key, $index_key = null)
 	{
 		$arr = array_map(
-			function ($d) use ($column_key, $index_key) {
+			function($d) use ($column_key, $index_key) {
 				if (!isset($d[$column_key])) {
 					return;
 				}

other/upgrade.php

Spacing +96 added lines, -96 removed lines

@@ -54,7 +54,7 @@ 
 	'mysql' => [
 		'name' => 'MySQL',
 		'version' => '5.6.0',
-		'version_check' => function () {
+		'version_check' => function() {
 			if (!function_exists('mysqli_fetch_row')) {
 				return false;
 			}
@@ -66,7 +66,7 @@ 
 	'postgresql' => [
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function () {
+		'version_check' => function() {
 			if (!function_exists('pg_version')) {
 				return false;
 			}
@@ -596,7 +596,7 @@ 
 		$to = explode('/', $lang_dir);
 		$relPath = $to;
 
-		foreach($from as $depth => $dir) {
+		foreach ($from as $depth => $dir) {
 			if ($dir === $to[$depth]) {
 				array_shift($relPath);
 			} else {
@@ -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(Config::$modSettings['attachmentUploadDir']);
@@ -1135,7 +1135,7 @@ 
 	}
 	// An array already?
 	elseif (is_array(Config::$modSettings['attachmentUploadDir'])) {
-		foreach(Config::$modSettings['attachmentUploadDir'] as $dir) {
+		foreach (Config::$modSettings['attachmentUploadDir'] as $dir) {
 			if (!empty($dir) && !is_dir($dir)) {
 				$attdr_problem_found = true;
 			}
@@ -1144,7 +1144,7 @@ 
 	// Serialized?
 	elseif ($ser_test !== false) {
 		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;
 				}
@@ -1158,7 +1158,7 @@ 
 	// Json?  Note the test returns null if encoding was unsuccessful
 	elseif ($json_test !== null) {
 		if (is_array($json_test)) {
-			foreach($json_test as $dir) {
+			foreach ($json_test as $dir) {
 				if (!is_dir($dir)) {
 					$attdr_problem_found = true;
 				}
@@ -2231,7 +2231,7 @@ 
 	// will return 4437 (E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE)
 	// as it does so.
 	set_error_handler(
-		function ($errno, $errstr, $errfile, $errline) use ($support_js) {
+		function($errno, $errstr, $errfile, $errline) use ($support_js) {
 			if ($support_js) {
 				return true;
 			}
@@ -3254,101 +3254,101 @@ 
 		];
 
 		// Default to ISO-8859-1 unless we detected another supported charset
-		$upcontext['charset_detected'] = (isset($lang_charsets[Config::$language], $charsets[strtr(strtolower($upcontext['charset_detected']),['utf' => 'UTF', 'iso' => 'ISO'])])) ? $lang_charsets[Config::$language] : 'ISO-8859-1';
+		$upcontext['charset_detected'] = (isset($lang_charsets[Config::$language], $charsets[strtr(strtolower($upcontext['charset_detected']), ['utf' => 'UTF', 'iso' => 'ISO'])])) ? $lang_charsets[Config::$language] : 'ISO-8859-1';
 
 		$upcontext['charset_list'] = array_keys($charsets);
 
 		// Translation table for the character sets not native for MySQL.
 		$translation_tables = [
 			'windows-1255' => [
-				'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' => [
-				'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',
 			],
 		];
 
@@ -3365,7 +3365,7 @@ 
 		// Get a list of table names ahead of time... This makes it easier to set our substep and such
 		$queryTables = Db::$db->list_tables(false, Config::$db_prefix . '%');
 
-		$queryTables = array_values(array_filter($queryTables, function ($v) {
+		$queryTables = array_values(array_filter($queryTables, function($v) {
 			return stripos($v, 'backup_') !== 0;
 		}));
 
@@ -3619,7 +3619,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] . '";';
 				},
 				$string,

other/install.php

Spacing +8 added lines, -8 removed lines

@@ -68,7 +68,7 @@ 
 	'mysql' => [
 		'name' => 'MySQL',
 		'version' => '5.6.0',
-		'version_check' => function () {
+		'version_check' => function() {
 			if (!function_exists('mysqli_fetch_row')) {
 				return false;
 			}
@@ -80,15 +80,15 @@ 
 		'default_password' => 'mysql.default_password',
 		'default_host' => 'mysql.default_host',
 		'default_port' => 'mysql.default_port',
-		'utf8_support' => function () {
+		'utf8_support' => function() {
 			return true;
 		},
 		'utf8_version' => '5.0.22',
-		'utf8_version_check' => function () {
+		'utf8_version_check' => function() {
 			return mysqli_get_server_info(Db::$db->connection);
 		},
 		'alter_support' => true,
-		'validate_prefix' => function (&$value) {
+		'validate_prefix' => function(&$value) {
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			return true;
@@ -97,7 +97,7 @@ 
 	'postgresql' => [
 		'name' => 'PostgreSQL',
 		'version' => '9.6',
-		'version_check' => function () {
+		'version_check' => function() {
 			$request = pg_query(Db::$db->connection, 'SELECT version()');
 			list($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
@@ -106,7 +106,7 @@ 
 		},
 		'supported' => function_exists('pg_connect'),
 		'always_has_db' => true,
-		'utf8_support' => function () {
+		'utf8_support' => function() {
 			$request = pg_query(Db::$db->connection, 'SHOW SERVER_ENCODING');
 
 			list($charcode) = pg_fetch_row($request);
@@ -114,14 +114,14 @@ 
 			return (bool) ($charcode == 'UTF8');
 		},
 		'utf8_version' => '8.0',
-		'utf8_version_check' => function () {
+		'utf8_version_check' => function() {
 			$request = pg_query(Db::$db->connection, 'SELECT version()');
 			list($version) = pg_fetch_row($request);
 			list($pgl, $version) = explode(' ', $version);
 
 			return $version;
 		},
-		'validate_prefix' => function (&$value) {
+		'validate_prefix' => function(&$value) {
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			// Is it reserved?

Themes/default/Profile.template.php

Spacing +2 added lines, -3 removed lines

@@ -1692,7 +1692,7 @@ 
 		{
 			// Avoid double separators and empty titled sections
 			$empty_section = true;
-			for ($j=$i+1; $j < count(Utils::$context['theme_options']); $j++)
+			for ($j = $i + 1; $j < count(Utils::$context['theme_options']); $j++)
 			{
 				// Found another separator, so we're done
 				if (!is_array(Utils::$context['theme_options'][$j]))
@@ -2687,8 +2687,7 @@ 
 		foreach (Utils::$context['post_errors'] as $error)
 		{
 			$text_key_error = $error == 'password_short' ?
-				sprintf(Lang::$txt['profile_error_' . $error], (empty(Config::$modSettings['password_strength']) ? 4 : 8)) :
-				(isset(Lang::$txt['profile_error_' . $error]) ? Lang::$txt['profile_error_' . $error] : '');
+				sprintf(Lang::$txt['profile_error_' . $error], (empty(Config::$modSettings['password_strength']) ? 4 : 8)) : (isset(Lang::$txt['profile_error_' . $error]) ? Lang::$txt['profile_error_' . $error] : '');
 
 			echo '
 				<li>', isset(Lang::$txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>';

Themes/default/Packages.template.php

Spacing +1 added lines, -1 removed lines

@@ -456,7 +456,7 @@
 
 	elseif (Utils::$context['uninstalling'])
 		echo '
-			', Lang::$txt['package_uninstall_done'] .' <br>
+			', Lang::$txt['package_uninstall_done'] . ' <br>
 			', '<a href="', Utils::$context['keep_url'], '" class="button">', Lang::$txt['package_keep'], '</a>', '<a href="', Utils::$context['remove_url'], '" class="button">', Lang::$txt['package_delete2'], '</a>';
 
 	elseif (Utils::$context['install_finished'])

Themes/default/ReportedContent.template.php

Spacing +4 added lines, -4 removed lines

@@ -197,14 +197,14 @@ 
 	$report_buttons = array(
 		'ignore' => array(
 			'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedposts;sa=handle;ignore='.(int) !Utils::$context['report']['ignore'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-ignore_token_var'].'='.Utils::$context['mod-report-ignore_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
 			'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
 			'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::$txt['mc_reportedp_ignore_confirm'] . '"' : '',
 			'icon' => 'ignore'
 		),
 		'close' => array(
 			'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedposts;sa=handle;closed='.(int) !Utils::$context['report']['closed'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-closed_token_var'].'='.Utils::$context['mod-report-closed_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
 			'icon' => 'close'
 		)
 	);
@@ -479,14 +479,14 @@ 
 	$report_buttons = array(
 		'ignore' => array(
 			'text' => !Utils::$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedmembers;sa=handle;ignore='.(int)!Utils::$context['report']['ignore'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-ignore_token_var'].'='.Utils::$context['mod-report-ignore_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;ignore=' . (int) !Utils::$context['report']['ignore'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
 			'class' => !Utils::$context['report']['ignore'] ? ' you_sure' : '',
 			'custom' => !Utils::$context['report']['ignore'] ? ' data-confirm="' . Lang::$txt['mc_reportedp_ignore_confirm'] . '"' : '',
 			'icon' => 'ignore'
 		),
 		'close' => array(
 			'text' => Utils::$context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
-			'url' => Config::$scripturl.'?action=moderate;area=reportedmembers;sa=handle;closed='.(int)!Utils::$context['report']['closed'].';rid='.Utils::$context['report']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-closed_token_var'].'='.Utils::$context['mod-report-closed_token'],
+			'url' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=handle;closed=' . (int) !Utils::$context['report']['closed'] . ';rid=' . Utils::$context['report']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
 			'icon' => 'close'
 		)
 	);

Themes/default/index.template.php

Spacing +3 added lines, -3 removed lines

@@ -275,7 +275,7 @@ 
 					', sprintf(Lang::$txt['welcome_to_forum'], Utils::$context['forum_name_html_safe']), '
 				</li>
 				<li class="button_login">
-					<a href="', Config::$scripturl, '?action=login" class="', Utils::$context['current_action'] == 'login' ? 'active' : 'open','" onclick="return reqOverlayDiv(this.href, ' . Utils::JavaScriptEscape(Lang::$txt['login']) . ', \'login\');">
+					<a href="', Config::$scripturl, '?action=login" class="', Utils::$context['current_action'] == 'login' ? 'active' : 'open', '" onclick="return reqOverlayDiv(this.href, ' . Utils::JavaScriptEscape(Lang::$txt['login']) . ', \'login\');">
 						<span class="main_icons login"></span>
 						<span class="textmenu">', Lang::$txt['login'], '</span>
 					</a>
@@ -284,7 +284,7 @@ 
 			if (Utils::$context['can_register'])
 				echo '
 				<li class="button_signup">
-					<a href="', Config::$scripturl, '?action=signup" class="', Utils::$context['current_action'] == 'signup' ? 'active' : 'open','">
+					<a href="', Config::$scripturl, '?action=signup" class="', Utils::$context['current_action'] == 'signup' ? 'active' : 'open', '">
 						<span class="main_icons regcenter"></span>
 						<span class="textmenu">', Lang::$txt['register'], '</span>
 					</a>
@@ -632,7 +632,7 @@ 
 				$value['id'] = $key;
 
 			$button = '
-				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>'.(!empty($value['icon']) ? '<span class="main_icons '.$value['icon'].'"></span>' : '').'' . Lang::$txt[$value['text']] . '</a>';
+				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . (!empty($value['icon']) ? '<span class="main_icons ' . $value['icon'] . '"></span>' : '') . '' . Lang::$txt[$value['text']] . '</a>';
 
 			if (!empty($value['sub_buttons']))
 			{

Themes/default/ModerationCenter.template.php

Spacing +4 added lines, -4 removed lines

@@ -399,18 +399,18 @@ 
 		$quickbuttons = array(
 			'approve' => array(
 				'label' => Lang::$txt['approve'],
-				'href' => Config::$scripturl.'?action=moderate;area=postmod;sa='.Utils::$context['current_view'].';start='.Utils::$context['start'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';approve='.$item['id'],
+				'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=' . Utils::$context['current_view'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';approve=' . $item['id'],
 				'icon' => 'approve',
 			),
 			'delete' => array(
 				'label' => Lang::$txt['remove'],
-				'href' => Config::$scripturl.'?action=moderate;area=postmod;sa='.Utils::$context['current_view'].';start='.Utils::$context['start'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';delete='.$item['id'],
+				'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=' . Utils::$context['current_view'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';delete=' . $item['id'],
 				'icon' => 'remove_button',
 				'show' => $item['can_delete']
 			),
 			'quickmod' => array(
 				'class' => 'inline_mod_check',
-				'content' => '<input type="checkbox" name="item[]" value="'.$item['id'].'" checked>',
+				'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>',
 				'show' => !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1
 			),
 		);
@@ -471,7 +471,7 @@ 
 	$quickbuttons = array(
 		'delete' => array(
 			'label' => Lang::$txt['remove_message'],
-			'href' => Config::$scripturl.'?action=moderate;area=userwatch;sa=post;delete='.$post['id'].';start='.Utils::$context['start'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'],
+			'href' => Config::$scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 			'javascript' => 'data-confirm="' . Lang::$txt['mc_watched_users_delete_post'] . '"',
 			'class' => 'you_sure',
 			'icon' => 'remove_button',