SimpleMachines / SMF2.1

Sources/Subs-Charset.php

Spacing +6 added lines, -6 removed lines

@@ -249,7 +249,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")
@@ -283,7 +283,7 @@ 
 		{
 			$temp = $chars[$i];
 			$chars[$i] = $chars[$i - 1];
-			$chars[$i -1] = $temp;
+			$chars[$i - 1] = $temp;
 
 			// Backtrack and check again.
 			if ($i > 1)
@@ -527,7 +527,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}' .
@@ -556,7 +556,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
@@ -587,7 +587,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]];
@@ -667,7 +667,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'])
 	{

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']('', '

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';
 

Sources/ReportedContent.php

Spacing +7 added lines, -7 removed lines

@@ -93,14 +93,14 @@ 
 				),
 				'ignore' => array(
 					'label' => $report['ignore'] ? $txt['mc_reportedp_unignore'] : $txt['mc_reportedp_ignore'],
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;ignore='.(int)!$report['ignore'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'],
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;ignore=' . (int) !$report['ignore'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'],
 					'javascript' => !$report['ignore'] ? ' data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '',
 					'class' => 'you_sure',
 					'icon' => 'ignore'
 				),
 				'close' => array(
 					'label' => $context['view_closed'] ? $txt['mc_reportedp_open'] : $txt['mc_reportedp_close'],
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;closed='.(int)!$report['closed'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'],
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;closed=' . (int) !$report['closed'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'],
 					'icon' => $context['view_closed'] ? 'folder' : 'close',
 				),
 			);
@@ -109,8 +109,8 @@ 
 			if ($context['report_type'] == 'posts')
 				$context['reports'][$key]['quickbuttons']['delete'] = array(
 					'label' => $txt['mc_reportedp_delete'],
-					'href' => $scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.$context['session_var'].'='.$context['session_id'],
-					'javascript' => 'data-confirm="'.$txt['mc_reportedp_delete_confirm'].'"',
+					'href' => $scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . $context['session_var'] . '=' . $context['session_id'],
+					'javascript' => 'data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'delete',
 					'show' => !$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards']))
@@ -118,9 +118,9 @@ 
 
 			// Ban reported member/post author link
 			if ($context['report_type'] == 'members')
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.$context['session_var'].'='.$context['session_id'];
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 			else
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add'.(!empty($report['author']['id']) ? ';u='.$report['author']['id'] : ';msg='.$report['topic']['id_msg']).';'.$context['session_var'].'='.$context['session_id'];
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add' . (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']) . ';' . $context['session_var'] . '=' . $context['session_id'];
 
 			$context['reports'][$key]['quickbuttons'] += array(
 				'ban' => array(
@@ -131,7 +131,7 @@ 
 				),
 				'quickmod' => array(
 					'class' => 'inline_mod_check',
-					'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">',
+					'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">',
 					'show' => !$context['view_closed'] && !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1
 				)
 			);

Themes/default/PersonalMessage.template.php

Spacing +2 added lines, -2 removed lines

@@ -277,7 +277,7 @@ 
 	global $context, $scripturl, $txt, $settings, $options, $modSettings;
 
 	echo '
-	<div class="windowbg" id="msg', $message['id'],'">
+	<div class="windowbg" id="msg', $message['id'], '">
 		<div class="post_wrapper">
 			<div class="poster">';
 
@@ -1959,7 +1959,7 @@ 
 				<div class="smalltext">
 					<div class="recipient_to"><strong>', $txt['to'], ':</strong> ', implode(', ', $draft['recipients']['to']), '</div>';
 
-			if(!empty($draft['recipients']['bcc']))
+			if (!empty($draft['recipients']['bcc']))
 				echo'
 					<div class="pm_bbc"><strong>', $txt['pm_bcc'], ':</strong> ', implode(', ', $draft['recipients']['bcc']), '</div>';
 

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>

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');

Sources/ManageServer.php

Spacing +3 added lines, -3 removed lines

@@ -477,7 +477,7 @@ 
 		// Cookies...
 		array('cookiename', $txt['cookie_name'], 'file', 'text', 20),
 		array('cookieTime', $txt['cookieTime'], 'db', 'select', array_filter(array_map(
-			function ($str) use ($txt)
+			function($str) use ($txt)
 			{
 				return isset($txt[$str]) ? $txt[$str] : '';
 			},
@@ -1439,7 +1439,7 @@ 
 				// Obviously, we don't need null here.
 				$def['type'] = array_filter(
 					$def['type'],
-					function ($type)
+					function($type)
 					{
 						return $type !== 'NULL';
 					}
@@ -1765,7 +1765,7 @@ 
 	$cacheAPIdir = $sourcedir . '/Cache';
 
 	$loadedApis = array();
-	$apis_dir = $cacheAPIdir .'/'. CacheApi::APIS_FOLDER;
+	$apis_dir = $cacheAPIdir . '/' . CacheApi::APIS_FOLDER;
 
 	$api_classes = new GlobIterator($apis_dir . '/*.php', FilesystemIterator::NEW_CURRENT_AND_KEY);