SimpleMachines / SMF2.1

Sources/Drafts.php

Spacing +6 added lines, -6 removed lines

@@ -644,13 +644,13 @@ 
 			'quickbuttons' => array(
 				'edit' => array(
 					'label' => $txt['draft_edit'],
-					'href' => $scripturl.'?action=post;'.(empty($row['id_topic']) ? 'board='.$row['id_board'] : 'topic='.$row['id_topic']).'.0;id_draft='.$row['id_draft'],
+					'href' => $scripturl . '?action=post;' . (empty($row['id_topic']) ? 'board=' . $row['id_board'] : 'topic=' . $row['id_topic']) . '.0;id_draft=' . $row['id_draft'],
 					'icon' => 'modify_button'
 				),
 				'delete' => array(
 					'label' => $txt['draft_delete'],
-					'href' => $scripturl.'?action=profile;u='.$context['member']['id'].';area=showdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
-					'javascript' => 'data-confirm="'.$txt['draft_remove'].'"',
+					'href' => $scripturl . '?action=profile;u=' . $context['member']['id'] . ';area=showdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+					'javascript' => 'data-confirm="' . $txt['draft_remove'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button'
 				),
@@ -837,13 +837,13 @@ 
 			'quickbuttons' => array(
 				'edit' => array(
 					'label' => $txt['draft_edit'],
-					'href' => $scripturl.'?action=pm;sa=showpmdrafts;id_draft='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
+					'href' => $scripturl . '?action=pm;sa=showpmdrafts;id_draft=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 					'icon' => 'modify_button'
 				),
 				'delete' => array(
 					'label' => $txt['draft_delete'],
-					'href' => $scripturl.'?action=pm;sa=showpmdrafts;delete='.$row['id_draft'].';'.$context['session_var'].'='.$context['session_id'],
-					'javascript' => 'data-confirm="'.$txt['draft_remove'].'?"',
+					'href' => $scripturl . '?action=pm;sa=showpmdrafts;delete=' . $row['id_draft'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+					'javascript' => 'data-confirm="' . $txt['draft_remove'] . '?"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button'
 				),

Sources/Cache/APIs/FileBased.php

Spacing +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
 		$config_vars[] = array('cachedir', $txt['cachedir'], 'file', 'text', 36, 'cache_cachedir');
 
 		if (!isset($context['settings_post_javascript']))
@@ -193,7 +193,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#cachedir").prop("disabled", cache_type != "'. $class_name .'");
+				$("#cachedir").prop("disabled", cache_type != "'. $class_name . '");
 			});';
 	}
 

Sources/Cache/APIs/Sqlite.php

Spacing +5 added lines, -5 removed lines

@@ -131,14 +131,14 @@ 
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
 		$config_vars[] = array(
-			'cachedir_'. $class_name_txt_key,
-			$txt['cachedir_'. $class_name_txt_key],
+			'cachedir_' . $class_name_txt_key,
+			$txt['cachedir_' . $class_name_txt_key],
 			'file',
 			'text',
 			36,
-			'cache_'. $class_name_txt_key .'_cachedir');
+			'cache_' . $class_name_txt_key . '_cachedir');
 
 		if (!isset($context['settings_post_javascript']))
 			$context['settings_post_javascript'] = '';
@@ -146,7 +146,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#cachedir_'. $class_name_txt_key .'").prop("disabled", cache_type != "'. $class_name .'");
+				$("#cachedir_'. $class_name_txt_key . '").prop("disabled", cache_type != "' . $class_name . '");
 			});';
 	}
 

Themes/default/Profile.template.php

Spacing +2 added lines, -3 removed lines

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

Sources/Subs-Db-postgresql.php

Spacing +3 added lines, -3 removed lines

@@ -75,11 +75,11 @@ 
 		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(function($errno, $errstr) {
-		throw new ErrorException($errstr, $errno);});
+		throw new ErrorException($errstr, $errno); });
 	try
 	{
 		if (!empty($db_options['persist']))
@@ -938,7 +938,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',

Sources/Subs-Admin.php

Spacing +8 added lines, -8 removed lines

@@ -846,7 +846,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(
@@ -945,8 +945,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))*\))\)',
 	);
 
 	/*
@@ -979,7 +979,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' => '',
 		),
 	);
@@ -1742,7 +1742,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()) . '\'';
 		},
@@ -1752,7 +1752,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);
@@ -1955,7 +1955,7 @@ 
 	}
 
 	// Everything is simpler if we convert heredocs to normal strings first.
-	if (preg_match_all('/<<<(\'?)(\w+)\'?'. $line_ending . '(.*?)'. $line_ending . '\2;$/m', $code_str, $matches))
+	if (preg_match_all('/<<<(\'?)(\w+)\'?' . $line_ending . '(.*?)' . $line_ending . '\2;$/m', $code_str, $matches))
 	{
 		foreach ($matches[0] as $mkey => $heredoc)
 		{
@@ -1969,7 +1969,7 @@ 
 	}
 
 	// Split before everything that could possibly delimit a comment or a string.
-	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|'. $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
+	$parts = preg_split('~(?=#+|/(?=/|\*)|\*/|' . $line_ending . '|(?<!\\\)[\'"])~m', $code_str);
 
 	$in_string = 0;
 	$in_comment = 0;

Sources/ManageServer.php

Spacing +1 added lines, -1 removed lines

@@ -1638,7 +1638,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);
 

Sources/Subs-BoardIndex.php

Spacing +1 added lines, -2 removed lines

@@ -195,8 +195,7 @@
 				);
 
 				$categories[$row_board['id_cat']]['link'] = '<a id="c' . $row_board['id_cat'] . '"></a>' . (!$context['user']['is_guest'] ?
-						'<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' :
-						$row_board['cat_name']);
+						'<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' : $row_board['cat_name']);
 
 			}
 

Sources/Subs-Boards.php

Spacing +2 added lines, -2 removed lines

@@ -851,7 +851,7 @@ 
 
 	clean_cache('data');
 
-	cache_put_data('parsed_boards_descriptions_'. $parsed_boards_cat_id, $already_parsed_boards, 864000);
+	cache_put_data('parsed_boards_descriptions_' . $parsed_boards_cat_id, $already_parsed_boards, 864000);
 
 	if (empty($boardOptions['dont_log']))
 		logAction('edit_board', array('board' => $board_id), 'admin');
@@ -1579,7 +1579,7 @@ 
 			$context['description_allowed_tags']
 		);
 
-	cache_put_data('parsed_boards_descriptions_'. $category_id, $already_parsed_boards, 864000);
+	cache_put_data('parsed_boards_descriptions_' . $category_id, $already_parsed_boards, 864000);
 
 	return $already_parsed_boards;
 }