SimpleMachines / SMF2.1

Sources/Subs-Db-postgresql.php

Braces +4 added lines, -2 removed lines

@@ -979,7 +979,8 @@ 
 		$error_array[2] = null;
 
 	if(empty($db_persist))
-	{ // without pooling
+	{
+// without pooling
 		if (empty($pg_error_data_prep))
 			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
 				'INSERT INTO ' . $db_prefix . 'log_errors
@@ -990,7 +991,8 @@ 
 		pg_execute($db_connection, 'smf_log_errors', $error_array);
 	}
 	else
-	{ //with pooling
+	{
+//with pooling
 		$pg_error_data_prep = pg_prepare($db_connection, '',
 			'INSERT INTO ' . $db_prefix . 'log_errors
 				(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 		display_db_error();
 
 	// We need to escape ' and \
-	$db_passwd = str_replace(array('\\','\''), array('\\\\','\\\''), $db_passwd);
+	$db_passwd = str_replace(array('\\', '\''), array('\\\\', '\\\''), $db_passwd);
 
 	// Since pg_connect doesn't feed error info to pg_last_error, we have to catch issues with a try/catch.
 	set_error_handler(
@@ -910,7 +910,7 @@ 
 	if (filter_var($error_array[2], FILTER_VALIDATE_IP) === false)
 		$error_array[2] = null;
 
-	if(empty($db_persist))
+	if (empty($db_persist))
 	{ // without pooling
 		if (empty($pg_error_data_prep))
 			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',

Themes/default/Admin.template.php

Spacing +1 added lines, -1 removed lines

@@ -756,7 +756,7 @@
 	}
 
 	// Filter out any redundant separators before we start the loop
-	$context['config_vars'] = array_filter($context['config_vars'], function ($v) use ($context)
+	$context['config_vars'] = array_filter($context['config_vars'], function($v) use ($context)
 	{
 		static $config_vars, $prev;
 

Sources/Profile-Export.php

Spacing +9 added lines, -9 removed lines

@@ -469,7 +469,7 @@ 
 	// Figure out the filename we'll tell the browser.
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
 	$included_desc = array_map(
-		function ($datatype) use ($txt)
+		function($datatype) use ($txt)
 		{
 			return $txt[$datatype];
 		},
@@ -789,9 +789,9 @@ 
 	$xslt_variables = array();
 
 	// Do not change any of these to HTTPS URLs. For explanation, see comments in the buildXmlFeed() function.
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/profile';
-	$xslt_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform';
-	$html_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/xhtml';
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/profile';
+	$xslt_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform';
+	$html_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/xhtml';
 
 	require_once($sourcedir . DIRECTORY_SEPARATOR . 'News.php');
 
@@ -1696,14 +1696,14 @@ 
 
 		if (!empty($context['export_css_header']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<style><![CDATA[' . "\n" . implode("\n", $context['export_css_header']) . "\n" . ']]>
 			</style>';
 		}
 
 		if (!empty($context['export_javascript_vars']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<script><![CDATA[';
 
 			foreach ($context['export_javascript_vars'] as $var => $val)
@@ -1739,7 +1739,7 @@ 
 
 		if (!empty($context['export_javascript_inline']['standard']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<script><![CDATA[' . "\n" . implode("\n", $context['export_javascript_inline']['standard']) . "\n" . ']]>
 			</script>';
 		}
@@ -1751,7 +1751,7 @@ 
 
 			$stylesheet['css_js'] .= "\n\t" . str_replace("\n", "\n\t", implode("\n", $context['export_javascript_inline']['defer']));
 
-			$stylesheet['css_js'] .= "\n" . '});'. "\n" . ']]>
+			$stylesheet['css_js'] .= "\n" . '});' . "\n" . ']]>
 			</script>';
 		}
 
@@ -1832,7 +1832,7 @@ 
 	$css_to_minify = array();
 	$normal_css_files = array();
 
-	usort($context['css_files'], function ($a, $b)
+	usort($context['css_files'], function($a, $b)
 	{
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
 	});

Sources/Profile-View.php

Spacing +6 added lines, -6 removed lines

@@ -262,7 +262,7 @@ 
 			AND a.is_read = 0' : '') . (!empty($alertIDs) ? '
 			AND a.id_alert IN ({array_int:alertIDs})' : '') . '
 		ORDER BY id_alert DESC' . (!empty($limit) ? '
-		LIMIT {int:limit}' : '') . (!empty($offset) ?'
+		LIMIT {int:limit}' : '') . (!empty($offset) ? '
 		OFFSET {int:offset}' : ''),
 		array(
 			'id_member' => $memID,
@@ -361,7 +361,7 @@ 
 
 	// Substitute $scripturl into the link formats. (Done here to make life easier for hooked mods.)
 	$formats = array_map(
-		function ($format) use ($scripturl)
+		function($format) use ($scripturl)
 		{
 			$format['link'] = str_replace('{scripturl}', $scripturl, $format['link']);
 			$format['text'] = str_replace('{scripturl}', $scripturl, $format['text']);
@@ -1172,20 +1172,20 @@ 
 		$context['posts'][$key]['quickbuttons'] = array(
 			'reply' => array(
 				'label' => $txt['reply'],
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'],
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
 				'icon' => 'reply_button',
 				'show' => $post['can_reply']
 			),
 			'quote' => array(
 				'label' => $txt['quote_action'],
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'],
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
 				'icon' => 'quote',
 				'show' => $post['can_quote']
 			),
 			'remove' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';profile;u='.$context['member']['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
-				'javascript' => 'data-confirm="'.$txt['remove_message'].'"',
+				'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . $context['member']['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+				'javascript' => 'data-confirm="' . $txt['remove_message'] . '"',
 				'class' => 'you_sure',
 				'icon' => 'remove_button',
 				'show' => $post['can_delete']

Sources/tasks/ExportProfileData.php

Spacing +2 added lines, -2 removed lines

@@ -204,7 +204,7 @@ 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
 			'desc' => sentence_list(array_map(
-				function ($datatype) use ($txt)
+				function($datatype) use ($txt)
 				{
 					return $txt[$datatype];
 				},
@@ -726,7 +726,7 @@ 
 					'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
 				),
 				$returnContext
-			) . $hidden_orig_link . '</span>' ;
+			) . $hidden_orig_link . '</span>';
 		}
 		elseif (strpos($currentAttachment['mime_type'], 'video/') === 0)
 		{

Sources/Post.php

Spacing +1 added lines, -1 removed lines

@@ -1277,7 +1277,7 @@
 	if ($context['can_post_attachment'])
 	{
 		$acceptedFiles = empty($context['allowed_extensions']) ? '' : implode(',', array_map(
-			function ($val) use ($smcFunc)
+			function($val) use ($smcFunc)
 			{
 				return !empty($val) ? ('.' . $smcFunc['htmltrim']($val)) : '';
 			},

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';
@@ -2160,12 +2157,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);
 					},
 				),
@@ -2494,7 +2491,8 @@ 
 
 							foreach (array('path', 'query', 'fragment') as $part)
 							{
-								switch ($part) {
+								switch ($part)
+								{
 									case 'path':
 										$part_disallowed_chars = '<>' . $bracket_quote_chars . $space_chars . $excluded_trailing_chars . '/#&';
 										$part_excluded_trailing_chars = str_replace('?', '', $excluded_trailing_chars);
@@ -2811,7 +2809,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();
@@ -4362,7 +4362,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 			{
 				echo '
@@ -6288,7 +6287,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'];
 			}
 
@@ -6373,7 +6373,8 @@ 
 			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
 
 		// We don't want abbreviations like '+03' or '-11'.
-		$abbrs = array_filter($tzvalue['abbrs'], function ($abbr) {
+		$abbrs = array_filter($tzvalue['abbrs'], function ($abbr)
+		{
 			return !strspn($abbr, '+-');
 		});
 		$abbrs = count($abbrs) == count($tzvalue['abbrs']) ? array_unique($abbrs) : array();
@@ -6774,7 +6775,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}

Sources/Subs-Admin.php

Braces +8 added lines, -3 removed lines

@@ -1232,7 +1232,8 @@ 
 	}
 
 	// It's important to do the numbered ones before the named ones, or messes happen.
-	uksort($substitutions, function($a, $b) {
+	uksort($substitutions, function($a, $b)
+	{
 		if (is_int($a) && is_int($b))
 			return $a > $b ? 1 : ($a < $b ? -1 : 0);
 		elseif (is_int($a))
@@ -1771,8 +1772,12 @@ 
 		unset($mtime, $settingsFile, $settingsText);
 		$defined_vars = get_defined_vars();
 	}
-	catch (Throwable $e) {}
-	catch (ErrorException $e) {}
+	catch (Throwable $e)
+	{
+}
+	catch (ErrorException $e)
+	{
+}
 	if (isset($e))
 		return false;