albertlast / SMF2.1

other/upgrade.php

Braces +6 added lines, -3 removed lines

@@ -295,7 +295,8 @@ 
 		// Call the step and if it returns false that means pause!
 		if (function_exists($step[2]) && $step[2]() === false)
 			break;
-		elseif (function_exists($step[2])) {
+		elseif (function_exists($step[2]))
+		{
 			//Start each new step with this unset, so the 'normal' template is called first
 			unset($_GET['xml']);
 			//Clear out warnings at the start of each step
@@ -2915,7 +2916,8 @@ 
 		$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 
 		// Make sure we're ready & have painted the template before proceeding
-		if ($support_js && !isset($_GET['xml'])) {
+		if ($support_js && !isset($_GET['xml']))
+		{
 			$_GET['substep'] = 0;
 			return false;
 		}
@@ -2968,7 +2970,8 @@ 
 						list($charset) = explode('_', $collation);
 
 						// Build structure of columns to operate on organized by charset; only operate on columns not yet utf8
-						if ($charset != 'utf8') {
+						if ($charset != 'utf8')
+						{
 							if (!isset($table_charsets[$charset]))
 								$table_charsets[$charset] = array();
 

other/install.php

Braces +16 added lines, -8 removed lines

@@ -36,7 +36,8 @@ 
 		'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',
@@ -44,7 +45,8 @@ 
 		'utf8_default' => true,
 		'utf8_required' => true,
 		'alter_support' => true,
-		'validate_prefix' => function(&$value) {
+		'validate_prefix' => function(&$value)
+		{
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 			return true;
 		},
@@ -58,7 +60,8 @@ 
 		'always_has_db' => true,
 		'utf8_default' => true,
 		'utf8_required' => true,
-		'utf8_support' => function() {
+		'utf8_support' => function()
+		{
 			$request = pg_query('SHOW SERVER_ENCODING');
 
 			list ($charcode) = pg_fetch_row($request);
@@ -70,7 +73,8 @@ 
 		},
 		'utf8_version' => '8.0',
 		'utf8_version_check' => '$request = pg_query(\'SELECT version()\'); list ($version) = pg_fetch_row($request); list($pgl, $version) = explode(" ", $version); return $version;',
-		'validate_prefix' => function(&$value) {
+		'validate_prefix' => function(&$value)
+		{
 			global $txt;
 
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
@@ -963,13 +967,15 @@ 
 
 	// If redirect in effect, force ssl ON
 	require_once(dirname(__FILE__) . '/Sources/Subs.php');
-	if (https_redirect_active($incontext['detected_url'])) {
+	if (https_redirect_active($incontext['detected_url']))
+	{
 		$incontext['ssl_chkbx_protected'] = true;
 		$incontext['ssl_chkbx_checked'] = true;
 		$_POST['force_ssl'] = true;
 	}
 	// If no cert, make sure ssl stays OFF
-	if (!ssl_cert_found($incontext['detected_url'])) {
+	if (!ssl_cert_found($incontext['detected_url']))
+	{
 		$incontext['ssl_chkbx_protected'] = true;
 		$incontext['ssl_chkbx_checked'] = false;
 	}
@@ -1438,7 +1444,8 @@ 
 	reloadSettings();
 
 	// We need this to properly hash the password for Admin
-	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string) {
+	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string)
+	{
 			global $sourcedir;
 			if (function_exists('mb_strtolower'))
 				return mb_strtolower($string, 'UTF-8');
@@ -1696,7 +1703,8 @@ 
 
 	// This function is needed to do the updateStats('subject') call.
 	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
-		function($string){
+		function($string)
+		{
 			global $sourcedir;
 			if (function_exists('mb_strtolower'))
 				return mb_strtolower($string, 'UTF-8');

Sources/Subs.php

Braces +20 added lines, -12 removed lines

@@ -302,7 +302,6 @@ 
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
 	}
-
 	elseif ($members === null)
 		$condition = '1=1';
 
@@ -1739,7 +1738,7 @@ 
 				'before' => '<span style="text-shadow: $1 $2">',
 				'after' => '</span>',
 				'validate' => function(&$tag, &$data, $disabled)
-					{
+				{
 
 						if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50))
 							$data[1] = '0 -2px 1px';
@@ -1901,7 +1900,8 @@ 
 		{
 			if (isset($temp_bbc))
 				$bbc_codes = $temp_bbc;
-			usort($codes, function ($a, $b) {
+			usort($codes, function ($a, $b)
+			{
 				return strcmp($a['tag'], $b['tag']);
 			});
 			return $codes;
@@ -2185,7 +2185,8 @@ 
 						)?
 						';
 
-						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches) {
+						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches)
+						{
 							$url = array_shift($matches);
 
 							// If this isn't a clean URL, bail out
@@ -2274,7 +2275,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();
@@ -3759,7 +3762,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 				echo '
 	<script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '', '></script>';
@@ -3909,7 +3911,9 @@ 
 		return $data;
 
 	// Different pages include different files, so we use a hash to label the different combinations
-	$hash = md5(implode(' ', array_map(function($file) { return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
+	$hash = md5(implode(' ', array_map(function($file)
+	{
+return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
 
 	// Is this a deferred or asynchonous JavaScript file?
 	$async = $type === 'js';
@@ -5907,7 +5911,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}
@@ -6077,7 +6080,8 @@ 
 	if (!empty($tlds))
 	{
 		// Clean $tlds and convert it to an array
-		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line) {
+		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line)
+		{
 			$line = trim($line);
 			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false)
 				return false;
@@ -6088,7 +6092,9 @@ 
 		// Convert Punycode to Unicode
 		require_once($sourcedir . '/Class-Punycode.php');
 		$Punycode = new Punycode();
-		$tlds = array_map(function ($input) use ($Punycode) { return $Punycode->decode($input); }, $tlds);
+		$tlds = array_map(function ($input) use ($Punycode)
+		{
+return $Punycode->decode($input); }, $tlds);
 	}
 	// Otherwise, use the 2012 list of gTLDs and ccTLDs for now and schedule a background update
 	else
@@ -6255,7 +6261,8 @@ 
 		}
 
 		// Sort by key length and then alphabetically
-		uksort($regex, function($k1, $k2) use (&$strlen) {
+		uksort($regex, function($k1, $k2) use (&$strlen)
+		{
 			$l1 = $strlen($k1);
 			$l2 = $strlen($k2);
 
@@ -6509,7 +6516,8 @@ 
 function sanitize_iri($iri)
 {
 	// Encode any non-ASCII characters (but not space or control characters of any sort)
-	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches) {
+	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches)
+	{
 		return rawurlencode($matches[0]);
 	}, $iri);
 

Sources/QueryString.php

Braces +2 added lines, -1 removed lines

@@ -440,7 +440,8 @@
 		$ip_address = inet_pton($ip_address);
 		$cidr_network = inet_pton($cidr_network);
 		$binMask = str_repeat("f", $cidr_subnetmask / 4);
-		switch ($cidr_subnetmask % 4) {
+		switch ($cidr_subnetmask % 4)
+		{
 		  case 0:
 			break;
 		  case 1:

Sources/Themes.php

Braces -1 removed lines

@@ -1364,7 +1364,6 @@
 		// return all the info.
 		return $context['to_install'];
 	}
-
 	else
 		fatal_lang_error('theme_install_error_title', false);
 }

Sources/ManageMaintenance.php

Braces -1 removed lines

@@ -2291,7 +2291,6 @@
 		list ($hookData['class'], $hookData['method']) = explode('::', $modFunc);
 		$hookData['pureFunc'] = $hookData['method'];
 	}
-
 	else
 		$hookData['pureFunc'] = $modFunc;
 

Sources/Register.php

Braces -1 removed lines

@@ -849,7 +849,6 @@
 			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 		}
 	}
-
 	elseif ($_REQUEST['format'] === '.wav')
 	{
 		require_once($sourcedir . '/Subs-Sound.php');

Sources/Subs-Package.php

Braces +4 added lines, -3 removed lines

@@ -253,9 +253,10 @@ 
 
 		// Phar doesn't handle open_basedir restrictions very well and throws a PHP Warning. Ignore that.
 		set_error_handler(function($errno, $errstr, $errfile, $errline)
-			{
+		{
 				// error was suppressed with the @-operator
-				if (0 === error_reporting()) {
+				if (0 === error_reporting())
+				{
 					return false;
 				}
 				if (strpos($errstr, 'PharData::__construct(): open_basedir') === false)
@@ -269,7 +270,7 @@ 
 
 		// go though each file in the archive
 		foreach ($iterator as $file_info)
-			{
+		{
 				$i = $iterator->getSubPathname();
 				// If this is a file, and it doesn't exist.... happy days!
 				if (substr($i, -1) != '/' && !file_exists($destination . '/' . $i))

Sources/Subs-BoardIndex.php

Braces +1 added lines, -1 removed lines

@@ -419,7 +419,7 @@
 					$board['last_post']['last_post_message'] = sprintf($txt['last_post_message'], $board['last_post']['member']['link'], $board['last_post']['link'], $board['last_post']['time'] > 0 ? timeformat($board['last_post']['time']) : $txt['not_applicable']);
 			}
 		}
-	else
+		else
 		foreach ($this_category as &$board )
 		{
 			if (!empty($moderators[$board['id']]))