SimpleMachines / SMF2.1

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

Sources/Display.php

Spacing +17 added lines, -17 removed lines

@@ -1535,14 +1535,14 @@ 
 	$output['quickbuttons'] = array(
 		'quote' => array(
 			'label' => $txt['quote_action'],
-			'href' => $scripturl.'?action=post;quote='.$output['id'].';topic='.$context['current_topic'], '.'.$context['start'].';last_msg='.$context['topic_last_message'],
-			'javascript' => 'onclick="return oQuickReply.quote('.$output['id'].');"',
+			'href' => $scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . $context['current_topic'], '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'],
+			'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"',
 			'icon' => 'quote',
 			'show' => $context['can_quote']
 		),
 		'quote_selected' => array(
 			'label' => $txt['quote_selected_action'],
-			'id' => 'quoteSelected_'. $output['id'],
+			'id' => 'quoteSelected_' . $output['id'],
 			'href' => 'javascript:void(0)',
 			'custom' => 'style="display:none"',
 			'icon' => 'quote_selected',
@@ -1551,74 +1551,74 @@ 
 		'quick_edit' => array(
 			'label' => $txt['quick_edit'],
 			'class' => 'quick_edit',
-			'id' => 'modify_button_'. $output['id'],
-			'custom' => 'onclick="oQuickModify.modifyMsg(\''.$output['id'].'\', \''.!empty($modSettings['toggle_subject']).'\')"',
+			'id' => 'modify_button_' . $output['id'],
+			'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty($modSettings['toggle_subject']) . '\')"',
 			'icon' => 'quick_edit_button',
 			'show' => $output['can_modify']
 		),
 		'more' => array(
 			'modify' => array(
 				'label' => $txt['modify'],
-				'href' => $scripturl.'?action=post;msg='.$output['id'].';topic='.$context['current_topic'].'.'.$context['start'],
+				'href' => $scripturl . '?action=post;msg=' . $output['id'] . ';topic=' . $context['current_topic'] . '.' . $context['start'],
 				'icon' => 'modify_button',
 				'show' => $output['can_modify']
 			),
 			'remove_topic' => array(
 				'label' => $txt['remove_topic'],
-				'href' => $scripturl.'?action=removetopic2;topic='.$context['current_topic'].'.'.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
-				'javascript' => 'data-confirm="'.$txt['are_sure_remove_topic'].'"',
+				'href' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+				'javascript' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"',
 				'class' => 'you_sure',
 				'icon' => 'remove_button',
 				'show' => $context['can_delete'] && ($context['topic_first_message'] == $output['id'])
 			),
 			'remove' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=deletemsg;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
-				'javascript' => 'data-confirm="'.$txt['remove_message_question'].'"',
+				'href' => $scripturl . '?action=deletemsg;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+				'javascript' => 'data-confirm="' . $txt['remove_message_question'] . '"',
 				'class' => 'you_sure',
 				'icon' => 'remove_button',
 				'show' => $output['can_remove'] && ($context['topic_first_message'] != $output['id'])
 			),
 			'split' => array(
 				'label' => $txt['split'],
-				'href' => $scripturl.'?action=splittopics;topic='.$context['current_topic'].'.0;at='.$output['id'],
+				'href' => $scripturl . '?action=splittopics;topic=' . $context['current_topic'] . '.0;at=' . $output['id'],
 				'icon' => 'split_button',
 				'show' => $context['can_split'] && !empty($context['real_num_replies'])
 			),
 			'report' => array(
 				'label' => $txt['report_to_mod'],
-				'href' => $scripturl.'?action=reporttm;topic='.$context['current_topic'].'.'.$output['counter'].';msg='.$output['id'],
+				'href' => $scripturl . '?action=reporttm;topic=' . $context['current_topic'] . '.' . $output['counter'] . ';msg=' . $output['id'],
 				'icon' => 'error',
 				'show' => $context['can_report_moderator']
 			),
 			'warn' => array(
 				'label' => $txt['issue_warning'],
-				'href' => $scripturl.'?action=profile;area=issuewarning;u='.$output['member']['id'].';msg='.$output['id'],
+				'href' => $scripturl . '?action=profile;area=issuewarning;u=' . $output['member']['id'] . ';msg=' . $output['id'],
 				'icon' => 'warn_button',
 				'show' => $context['can_issue_warning'] && !$output['is_message_author'] && !$output['member']['is_guest']
 			),
 			'restore' => array(
 				'label' => $txt['restore_message'],
-				'href' => $scripturl.'?action=restoretopic;msgs='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=restoretopic;msgs=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'icon' => 'restore_button',
 				'show' => $context['can_restore_msg']
 			),
 			'approve' => array(
 				'label' => $txt['approve'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'icon' => 'approve_button',
 				'show' => $output['can_approve']
 			),
 			'unapprove' => array(
 				'label' => $txt['unapprove'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				'icon' => 'unapprove_button',
 				'show' => $output['can_unapprove']
 			),
 		),
 		'quickmod' => array(
 			'class' => 'inline_mod_check',
-			'id' => 'in_topic_mod_check_'. $output['id'],
+			'id' => 'in_topic_mod_check_' . $output['id'],
 			'custom' => 'style="display: none;"',
 			'content' => '',
 			'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $output['can_remove']

Sources/Cache/APIs/MemcacheImplementation.php

Spacing +5 added lines, -5 removed lines

@@ -149,16 +149,16 @@ 
 	{
 		global $context, $txt;
 
-		if (!in_array($txt[self::CLASS_KEY .'_settings'], $config_vars))
+		if (!in_array($txt[self::CLASS_KEY . '_settings'], $config_vars))
 		{
-			$config_vars[] = $txt[self::CLASS_KEY .'_settings'];
+			$config_vars[] = $txt[self::CLASS_KEY . '_settings'];
 			$config_vars[] = array(
 				self::CLASS_KEY,
-				$txt[self::CLASS_KEY .'_servers'],
+				$txt[self::CLASS_KEY . '_servers'],
 				'file',
 				'text',
 				0,
-				'subtext' => $txt[self::CLASS_KEY .'_servers_subtext']);
+				'subtext' => $txt[self::CLASS_KEY . '_servers_subtext']);
 		}
 
 		if (!isset($context['settings_post_javascript']))
@@ -167,7 +167,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
+				$("#'. self::CLASS_KEY . '").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
 			});';
 	}
 

Sources/Cache/APIs/MemcachedImplementation.php

Spacing +5 added lines, -5 removed lines

@@ -149,16 +149,16 @@ 
 	{
 		global $context, $txt;
 
-		if (!in_array($txt[self::CLASS_KEY .'_settings'], $config_vars))
+		if (!in_array($txt[self::CLASS_KEY . '_settings'], $config_vars))
 		{
-			$config_vars[] = $txt[self::CLASS_KEY .'_settings'];
+			$config_vars[] = $txt[self::CLASS_KEY . '_settings'];
 			$config_vars[] = array(
 				self::CLASS_KEY,
-				$txt[self::CLASS_KEY .'_servers'],
+				$txt[self::CLASS_KEY . '_servers'],
 				'file',
 				'text',
 				0,
-				'subtext' => $txt[self::CLASS_KEY .'_servers_subtext']);
+				'subtext' => $txt[self::CLASS_KEY . '_servers_subtext']);
 		}
 
 		if (!isset($context['settings_post_javascript']))
@@ -167,7 +167,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
+				$("#'. self::CLASS_KEY . '").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
 			});';
 	}
 

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)) :
-				(isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : '');
+				sprintf($txt['profile_error_' . $error], (empty($modSettings['password_strength']) ? 4 : 8)) : (isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : '');
 
 			echo '
 				<li>', isset($txt['profile_error_' . $error]) ? $text_key_error : $error, '</li>';

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}