SimpleMachines / SMF2.1

Sources/Subs-Auth.php

Spacing +1 added lines, -1 removed lines

@@ -862,7 +862,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

@@ -174,7 +174,7 @@ 
 			}
 		}
 
-		$unnotified = array_filter($this->members['watching'], function ($member) {
+		$unnotified = array_filter($this->members['watching'], function($member) {
 			return empty($member['sent']);
 		});
 
@@ -187,7 +187,7 @@ 
 			$this->members['mentioned'] = array_intersect_key($this->members['mentioned'], $unnotified);
 
 			// 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']))
@@ -497,8 +497,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;
 
@@ -517,8 +516,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';
 

index.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 require_once($sourcedir . '/Security.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();
 }
@@ -94,7 +94,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/Subs-Admin.php

Spacing +6 added lines, -6 removed lines

@@ -859,7 +859,7 @@ 
 				'if (!is_dir(realpath($cachedir)) && is_dir($boarddir . \'/cache\'))',
 				'	$cachedir = $boarddir . \'/cache\';',
 			)),
-			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
+			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
 		),
 		'db_character_set' => array(
 			'text' => implode("\n", array(
@@ -958,8 +958,8 @@ 
 		'boolean' =>  '(?i:TRUE|FALSE|(["\']?)[01]\b\\1)',
 		'NULL' =>  '(?i:NULL)',
 		// These use a PCRE subroutine to match nested arrays.
-		'array' =>  'array\s*(\((?'.'>[^()]|(?1))*\))',
-		'object' =>  '\w+::__set_state\(array\s*(\((?'.'>[^()]|(?1))*\))\)',
+		'array' =>  'array\s*(\((?' . '>[^()]|(?1))*\))',
+		'object' =>  '\w+::__set_state\(array\s*(\((?' . '>[^()]|(?1))*\))\)',
 	);
 
 	/*
@@ -992,7 +992,7 @@ 
 		),
 		// Remove the code that redirects to the installer.
 		$neg_index-- => array(
-			'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?'.'>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
+			'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?' . '>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
 			'placeholder' => '',
 		),
 	);
@@ -1755,7 +1755,7 @@ 
 	// Prevents warnings about constants that are already defined.
 	$settingsText = preg_replace_callback(
 		'~\bdefine\s*\(\s*(["\'])(\w+)\1~',
-		function ($matches)
+		function($matches)
 		{
 			return 'define(\'' . md5(mt_rand()) . '\'';
 		},
@@ -1765,7 +1765,7 @@ 
 	// Handle eval errors gracefully in both PHP 5 and PHP 7
 	try
 	{
-		if($settingsText !== '' && @eval($settingsText) === false)
+		if ($settingsText !== '' && @eval($settingsText) === false)
 			throw new ErrorException('eval error');
 
 		unset($mtime, $settingsFile, $settingsText);

Sources/MessageIndex.php

Spacing +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 		WHERE t.id_board = {int:current_board} '
 			. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
 			AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . (!empty($message_index_topic_wheres) ? '
-			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : ''). '
+			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : '') . '
 		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
 		LIMIT {int:maxindex}
 			OFFSET {int:start} ';

Sources/News.php

Spacing +8 added lines, -8 removed lines

@@ -91,7 +91,7 @@ 
 	);
 	foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var)
 		if (isset($_GET[$var]))
-			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var];
+			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';') . $var . '=' . $_GET[$var];
 
 	// Handle the cases where a board, boards, or category is asked for.
 	$query_this_board = 1;
@@ -303,17 +303,17 @@ 
 	 * namespaces, which could cause it to mangle the XML horrifically
 	 * during processing.
 	 */
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/' . $subaction;
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/' . $subaction;
 
 	// Allow mods to add extra namespaces and tags to the feed/channel
 	$namespaces = array(
 		'rss' => array(),
-		'rss2' => array('atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
-		'atom' => array('' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
+		'rss2' => array('atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
+		'atom' => array('' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
 		'rdf' => array(
-			'' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/',
-			'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#',
-			'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/',
+			'' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/',
+			'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#',
+			'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/',
 		),
 		'smf' => array(
 			'smf' => $smf_ns,
@@ -2127,7 +2127,7 @@ 
 			m.id_msg, m.id_topic, m.id_board, m.id_member, m.poster_email, m.poster_ip,
 			m.poster_time, m.subject, m.modified_time, m.modified_name, m.modified_reason, m.body,
 			m.likes, m.approved, m.smileys_enabled
-		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ?'
+		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ? '
 			INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
 		WHERE m.id_member = {int:uid}
 			AND m.id_msg > {int:start_after}

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/Subs-Db-postgresql.php

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