Passed
Pull Request — release-2.1 (#6260)
by Mathias
03:58
created
Themes/default/ReportedContent.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -185,14 +185,14 @@  discard block
 block discarded – undo
185 185
 	$report_buttons = array(
186 186
 		'ignore' => array(
187 187
 			'text' => !$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
188
-			'url' => $scripturl.'?action=moderate;area=reportedposts;sa=handle;ignore='.(int) !$context['report']['ignore'].';rid='.$context['report']['id'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'],
188
+			'url' => $scripturl . '?action=moderate;area=reportedposts;sa=handle;ignore=' . (int) !$context['report']['ignore'] . ';rid=' . $context['report']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'],
189 189
 			'class' => !$context['report']['ignore'] ? ' you_sure' : '',
190 190
 			'custom' => !$context['report']['ignore'] ? ' data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '',
191 191
 			'icon' => 'ignore'
192 192
 		),
193 193
 		'close' => array(
194 194
 			'text' => $context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
195
-			'url' => $scripturl.'?action=moderate;area=reportedposts;sa=handle;closed='.(int) !$context['report']['closed'].';rid='.$context['report']['id'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'],
195
+			'url' => $scripturl . '?action=moderate;area=reportedposts;sa=handle;closed=' . (int) !$context['report']['closed'] . ';rid=' . $context['report']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'],
196 196
 			'icon' => 'close'
197 197
 		)
198 198
 	);
@@ -465,14 +465,14 @@  discard block
 block discarded – undo
465 465
 	$report_buttons = array(
466 466
 		'ignore' => array(
467 467
 			'text' => !$context['report']['ignore'] ? 'mc_reportedp_ignore' : 'mc_reportedp_unignore',
468
-			'url' => $scripturl.'?action=moderate;area=reportedmembers;sa=handle;ignore='.(int)!$context['report']['ignore'].';rid='.$context['report']['id'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'],
468
+			'url' => $scripturl . '?action=moderate;area=reportedmembers;sa=handle;ignore=' . (int) !$context['report']['ignore'] . ';rid=' . $context['report']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'],
469 469
 			'class' => !$context['report']['ignore'] ? ' you_sure' : '',
470 470
 			'custom' => !$context['report']['ignore'] ? ' data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '',
471 471
 			'icon' => 'ignore'
472 472
 		),
473 473
 		'close' => array(
474 474
 			'text' => $context['report']['closed'] ? 'mc_reportedp_open' : 'mc_reportedp_close',
475
-			'url' => $scripturl.'?action=moderate;area=reportedmembers;sa=handle;closed='.(int)!$context['report']['closed'].';rid='.$context['report']['id'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'],
475
+			'url' => $scripturl . '?action=moderate;area=reportedmembers;sa=handle;closed=' . (int) !$context['report']['closed'] . ';rid=' . $context['report']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'],
476 476
 			'icon' => 'close'
477 477
 		)
478 478
 	);
Please login to merge, or discard this patch.
Sources/Profile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -619,7 +619,7 @@
 block discarded – undo
619 619
 			if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
620 620
 				fatal_lang_error('login_ssl_required', false);
621 621
 
622
-			$password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] :  '';
622
+			$password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] : '';
623 623
 
624 624
 			// You didn't even enter a password!
625 625
 			if (trim($password) == '')
Please login to merge, or discard this patch.
Themes/default/GenericControls.template.php 1 patch
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -100,18 +100,22 @@
 block discarded – undo
100 100
 	$tempTab++;
101 101
 	$context['tabindex'] = $tempTab;
102 102
 
103
-	foreach ($context['richedit_buttons'] as $name => $button) {
104
-		if ($name == 'spell_check') {
103
+	foreach ($context['richedit_buttons'] as $name => $button)
104
+	{
105
+		if ($name == 'spell_check')
106
+		{
105 107
 			$button['onclick'] = 'oEditorHandle_' . $editor_id . '.spellCheckStart();';
106 108
 		}
107 109
 
108
-		if ($name == 'preview') {
110
+		if ($name == 'preview')
111
+		{
109 112
 			$button['value'] = isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $button['value'];
110 113
 			$button['onclick'] = $editor_context['preview_type'] == 2 ? '' : 'return submitThisOnce(this);';
111 114
 			$button['show'] = $editor_context['preview_type'];
112 115
 		}
113 116
 
114
-		if ($button['show']) {
117
+		if ($button['show'])
118
+		{
115 119
 			echo '
116 120
 		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', $button['type'] != 'hidden' ? ' tabindex="' . --$tempTab . '"' : '', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
117 121
 		}
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 require_once($sourcedir . '/Load.php');
54 54
 
55 55
 // If $maintenance is set specifically to 2, then we're upgrading or something.
56
-if (!empty($maintenance) &&  2 === $maintenance)
56
+if (!empty($maintenance) && 2 === $maintenance)
57 57
 	display_maintenance_message();
58 58
 
59 59
 // Create a variable to store some SMF specific functions in.
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
  *
105 105
  * @param string $class The fully-qualified class name.
106 106
  */
107
-spl_autoload_register(function ($class) use ($sourcedir)
107
+spl_autoload_register(function($class) use ($sourcedir)
108 108
 {
109 109
 	$classMap = array(
110 110
 		'ReCaptcha\\' => 'ReCaptcha/',
Please login to merge, or discard this patch.
Sources/Security.php 1 patch
Braces   -4 removed lines patch added patch discarded remove patch
@@ -1257,7 +1257,6 @@  discard block
 block discarded – undo
1257 1257
 
1258 1258
 			continue;
1259 1259
 		}
1260
-
1261 1260
 		else
1262 1261
 		{
1263 1262
 			$fh = @fopen($path . '/.htaccess', 'w');
@@ -1269,7 +1268,6 @@  discard block
 block discarded – undo
1269 1268
 	Deny from all' . $close);
1270 1269
 				fclose($fh);
1271 1270
 			}
1272
-
1273 1271
 			else
1274 1272
 				$errors[] = 'htaccess_cannot_create_file';
1275 1273
 		}
@@ -1280,7 +1278,6 @@  discard block
 block discarded – undo
1280 1278
 
1281 1279
 			continue;
1282 1280
 		}
1283
-
1284 1281
 		else
1285 1282
 		{
1286 1283
 			$fh = @fopen($path . '/index.php', 'w');
@@ -1307,7 +1304,6 @@  discard block
 block discarded – undo
1307 1304
 ?' . '>');
1308 1305
 				fclose($fh);
1309 1306
 			}
1310
-
1311 1307
 			else
1312 1308
 				$errors[] = 'index-php_cannot_create_file';
1313 1309
 		}
Please login to merge, or discard this patch.
Sources/Stats.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -816,7 +816,7 @@
 block discarded – undo
816 816
 
817 817
 			$out = 'POST /smf/stats/collect_stats.php HTTP/1.1' . "\r\n";
818 818
 			$out .= 'Host: www.simplemachines.org' . "\r\n";
819
-			$out .= 'user-agent: '. SMF_USER_AGENT . "\r\n";
819
+			$out .= 'user-agent: ' . SMF_USER_AGENT . "\r\n";
820 820
 			$out .= 'content-type: application/x-www-form-urlencoded' . "\r\n";
821 821
 			$out .= 'connection: Close' . "\r\n";
822 822
 			$out .= 'content-length: ' . $length . "\r\n\r\n";
Please login to merge, or discard this patch.
Sources/Subs-Sound.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@
 block discarded – undo
67 67
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
68 68
 		switch ($word[$i] === 's' ? 0 : mt_rand(0, 2))
69 69
 		{
70
-			case 0 :
71
-				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
70
+			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
72 71
 					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
73 72
 						$sound_word .= $word[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
74 73
 				break;
Please login to merge, or discard this patch.
other/install.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -959,7 +959,7 @@
 block discarded – undo
959 959
 	$incontext['continue'] = 1;
960 960
 
961 961
 	// Check Postgres setting
962
-	if ( $db_type === 'postgresql')
962
+	if ($db_type === 'postgresql')
963 963
 	{
964 964
 		load_database();
965 965
 		$result = $smcFunc['db_query']('', '
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -973,7 +973,7 @@
 block discarded – undo
973 973
 		{
974 974
 			$row = $smcFunc['db_fetch_assoc']($result);
975 975
 			if ($row['standard_conforming_strings'] !== 'on')
976
-				{
976
+			{
977 977
 					$incontext['continue'] = 0;
978 978
 					$incontext['error'] = $txt['error_pg_scs'];
979 979
 				}
Please login to merge, or discard this patch.
Sources/ScheduledTasks.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	clean_cache();
170 170
 
171 171
 	// If warning decrement is enabled and we have people who have not had a new warning in 24 hours, lower their warning level.
172
-	list (, , $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
172
+	list (,, $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
173 173
 	if ($modSettings['warning_decrement'])
174 174
 	{
175 175
 		// Find every member who has a warning level...
@@ -1622,7 +1622,7 @@  discard block
 block discarded – undo
1622 1622
 	// Determine action based on last_login...
1623 1623
 	$purgeMembers = array();
1624 1624
 	$markReadMembers = array();
1625
-	foreach($members as $member)
1625
+	foreach ($members as $member)
1626 1626
 	{
1627 1627
 		if ($member['last_login'] <= $cleanupBeyond)
1628 1628
 			$purgeMembers[] = $member['id_member'];
Please login to merge, or discard this patch.