Passed
Pull Request — release-2.1 (#6540)
by Jeremy
05:08
created
Sources/ManageSettings.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -364,8 +364,8 @@  discard block
 block discarded – undo
364 364
 		}
365 365
 
366 366
 		// Clean up tags with children
367
-		foreach($bbcTagsChildren as $parent_tag => $children)
368
-			foreach($children as $index => $child_tag)
367
+		foreach ($bbcTagsChildren as $parent_tag => $children)
368
+			foreach ($children as $index => $child_tag)
369 369
 			{
370 370
 				// Remove entries where parent and child tag is the same
371 371
 				if ($child_tag == $parent_tag)
@@ -1888,25 +1888,25 @@  discard block
 block discarded – undo
1888 1888
 		$fields = array();
1889 1889
 		$new_sort = array();
1890 1890
 
1891
-		while($row = $smcFunc['db_fetch_assoc']($request))
1891
+		while ($row = $smcFunc['db_fetch_assoc']($request))
1892 1892
 				$fields[] = $row['id_field'];
1893 1893
 		$smcFunc['db_free_result']($request);
1894 1894
 
1895 1895
 		$idx = array_search($context['fid'], $fields);
1896 1896
 
1897
-		if ($_GET['move'] == 'down' && count($fields) - 1 > $idx )
1897
+		if ($_GET['move'] == 'down' && count($fields) - 1 > $idx)
1898 1898
 		{
1899
-				$new_sort = array_slice($fields ,0 ,$idx ,true);
1899
+				$new_sort = array_slice($fields, 0, $idx, true);
1900 1900
 				$new_sort[] = $fields[$idx + 1];
1901 1901
 				$new_sort[] = $fields[$idx];
1902
-				$new_sort += array_slice($fields ,$idx + 2 ,count($fields) ,true);
1902
+				$new_sort += array_slice($fields, $idx + 2, count($fields), true);
1903 1903
 		}
1904 1904
 		elseif ($context['fid'] > 0 and $idx < count($fields))
1905 1905
 		{
1906
-				$new_sort = array_slice($fields ,0 ,($idx - 1) ,true);
1906
+				$new_sort = array_slice($fields, 0, ($idx - 1), true);
1907 1907
 				$new_sort[] = $fields[$idx];
1908 1908
 				$new_sort[] = $fields[$idx - 1];
1909
-				$new_sort += array_slice($fields ,($idx + 1) ,count($fields) ,true);
1909
+				$new_sort += array_slice($fields, ($idx + 1), count($fields), true);
1910 1910
 		}
1911 1911
 		else
1912 1912
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
Please login to merge, or discard this patch.
Sources/Profile-View.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 			AND a.is_read = 0' : '') . (!empty($alertIDs) ? '
262 262
 			AND a.id_alert IN ({array_int:alertIDs})' : '') . '
263 263
 		ORDER BY id_alert DESC' . (!empty($limit) ? '
264
-		LIMIT {int:limit}' : '') . (!empty($offset) ?'
264
+		LIMIT {int:limit}' : '') . (!empty($offset) ? '
265 265
 		OFFSET {int:offset}' : ''),
266 266
 		array(
267 267
 			'id_member' => $memID,
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 	call_integration_hook('integrate_fetch_alerts', array(&$alerts, &$formats));
360 360
 
361 361
 	// Substitute $scripturl into the link formats. (Done here to make life easier for hooked mods.)
362
-	$formats = array_map(function ($format) use ($scripturl) {
362
+	$formats = array_map(function($format) use ($scripturl) {
363 363
 		$format['link'] = str_replace('{scripturl}', $scripturl, $format['link']);
364 364
 		$format['text'] = str_replace('{scripturl}', $scripturl, $format['text']);
365 365
 
@@ -1166,20 +1166,20 @@  discard block
 block discarded – undo
1166 1166
 		$context['posts'][$key]['quickbuttons'] = array(
1167 1167
 			'reply' => array(
1168 1168
 				'label' => $txt['reply'],
1169
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'],
1169
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
1170 1170
 				'icon' => 'reply_button',
1171 1171
 				'show' => $post['can_reply']
1172 1172
 			),
1173 1173
 			'quote' => array(
1174 1174
 				'label' => $txt['quote_action'],
1175
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'],
1175
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
1176 1176
 				'icon' => 'quote',
1177 1177
 				'show' => $post['can_quote']
1178 1178
 			),
1179 1179
 			'remove' => array(
1180 1180
 				'label' => $txt['remove'],
1181
-				'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';profile;u='.$context['member']['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
1182
-				'javascript' => 'data-confirm="'.$txt['remove_message'].'"',
1181
+				'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . $context['member']['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1182
+				'javascript' => 'data-confirm="' . $txt['remove_message'] . '"',
1183 1183
 				'class' => 'you_sure',
1184 1184
 				'icon' => 'remove_button',
1185 1185
 				'show' => $post['can_delete']
Please login to merge, or discard this patch.
Sources/Subs-Timezones.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1704,7 +1704,7 @@
 block discarded – undo
1704 1704
 		// Missing, but we have a fallback.
1705 1705
 		else
1706 1706
 		{
1707
-			usort($fallbacks[$tzid], function ($a, $b) {
1707
+			usort($fallbacks[$tzid], function($a, $b) {
1708 1708
 				return $a['ts'] > $b['ts'];
1709 1709
 			});
1710 1710
 
Please login to merge, or discard this patch.
Themes/default/ModerationCenter.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -393,18 +393,18 @@  discard block
 block discarded – undo
393 393
 		$quickbuttons = array(
394 394
 			'approve' => array(
395 395
 				'label' => $txt['approve'],
396
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';approve='.$item['id'],
396
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';approve=' . $item['id'],
397 397
 				'icon' => 'approve',
398 398
 			),
399 399
 			'delete' => array(
400 400
 				'label' => $txt['remove'],
401
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';delete='.$item['id'],
401
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';delete=' . $item['id'],
402 402
 				'icon' => 'remove_button',
403 403
 				'show' => $item['can_delete']
404 404
 			),
405 405
 			'quickmod' => array(
406 406
 				'class' => 'inline_mod_check',
407
-				'content' => '<input type="checkbox" name="item[]" value="'.$item['id'].'" checked>',
407
+				'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>',
408 408
 				'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1
409 409
 			),
410 410
 		);
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	$quickbuttons = array(
470 470
 		'delete' => array(
471 471
 			'label' => $txt['remove_message'],
472
-			'href' => $scripturl.'?action=moderate;area=userwatch;sa=post;delete='.$post['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
472
+			'href' => $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
473 473
 			'javascript' => 'data-confirm="' . $txt['mc_watched_users_delete_post'] . '"',
474 474
 			'class' => 'you_sure',
475 475
 			'icon' => 'remove_button',
Please login to merge, or discard this patch.
Sources/ReportedContent.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -93,14 +93,14 @@  discard block
 block discarded – undo
93 93
 				),
94 94
 				'ignore' => array(
95 95
 					'label' => $report['ignore'] ? $txt['mc_reportedp_unignore'] : $txt['mc_reportedp_ignore'],
96
-					'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'],
96
+					'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'],
97 97
 					'javascript' => !$report['ignore'] ? ' data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '',
98 98
 					'class' => 'you_sure',
99 99
 					'icon' => 'ignore'
100 100
 				),
101 101
 				'close' => array(
102 102
 					'label' => $context['view_closed'] ? $txt['mc_reportedp_open'] : $txt['mc_reportedp_close'],
103
-					'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'],
103
+					'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'],
104 104
 					'icon' => $context['view_closed'] ? 'folder' : 'close',
105 105
 				),
106 106
 			);
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
 			if ($context['report_type'] == 'posts')
110 110
 				$context['reports'][$key]['quickbuttons']['delete'] = array(
111 111
 					'label' => $txt['mc_reportedp_delete'],
112
-					'href' => $scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.$context['session_var'].'='.$context['session_id'],
113
-					'javascript' => 'data-confirm="'.$txt['mc_reportedp_delete_confirm'].'"',
112
+					'href' => $scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . $context['session_var'] . '=' . $context['session_id'],
113
+					'javascript' => 'data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '"',
114 114
 					'class' => 'you_sure',
115 115
 					'icon' => 'delete',
116 116
 					'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 @@  discard block
 block discarded – undo
118 118
 
119 119
 			// Ban reported member/post author link
120 120
 			if ($context['report_type'] == 'members')
121
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.$context['session_var'].'='.$context['session_id'];
121
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'];
122 122
 			else
123
-				$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'];
123
+				$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'];
124 124
 
125 125
 			$context['reports'][$key]['quickbuttons'] += array(
126 126
 				'ban' => array(
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 				),
132 132
 				'quickmod' => array(
133 133
 					'class' => 'inline_mod_check',
134
-					'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">',
134
+					'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">',
135 135
 					'show' => !$context['view_closed']
136 136
 				)
137 137
 			);
Please login to merge, or discard this patch.
Sources/Load.php 1 patch
Spacing   +6 added lines, -9 removed lines patch added patch discarded remove patch
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
 			'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'],
815 815
 			'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1,
816 816
 			'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0,
817
-			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0,
817
+			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0,
818 818
 			'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0,
819 819
 		),
820 820
 		'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '',
@@ -1755,7 +1755,7 @@  discard block
 block discarded – undo
1755 1755
 		if (!empty($image))
1756 1756
 			$memberContext[$user]['avatar'] = array(
1757 1757
 				'name' => $profile['avatar'],
1758
-				'image' => '<img class="avatar" src="' . $image . '" alt="" loading="lazy" width="' . $profile['attachment_width'] . '" height = "'. $profile['attachment_height'] . '">',
1758
+				'image' => '<img class="avatar" src="' . $image . '" alt="" loading="lazy" width="' . $profile['attachment_width'] . '" height = "' . $profile['attachment_height'] . '">',
1759 1759
 				'href' => $image,
1760 1760
 				'url' => $image,
1761 1761
 			);
@@ -2720,8 +2720,7 @@  discard block
 block discarded – undo
2720 2720
 		$context['css_files_order'] = array();
2721 2721
 
2722 2722
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
2723
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
2724
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2723
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2725 2724
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
2726 2725
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
2727 2726
 	$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true;
@@ -2835,8 +2834,7 @@  discard block
 block discarded – undo
2835 2834
 	global $settings, $context, $modSettings;
2836 2835
 
2837 2836
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
2838
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
2839
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2837
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2840 2838
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
2841 2839
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
2842 2840
 	$params['async'] = isset($params['async']) ? $params['async'] : false;
@@ -3579,8 +3577,7 @@  discard block
 block discarded – undo
3579 3577
 
3580 3578
 	// What accelerator we are going to try.
3581 3579
 	$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT;
3582
-	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache :
3583
-		CacheApi::APIS_NAMESPACE . $cache_class_name;
3580
+	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name;
3584 3581
 
3585 3582
 	// Do some basic tests.
3586 3583
 	if (class_exists($fully_qualified_class_name))
@@ -3884,7 +3881,7 @@  discard block
 block discarded – undo
3884 3881
 			$auth_secret = hash_file('sha256', $boarddir . '/Settings.php');
3885 3882
 
3886 3883
 			// Set the last error to now, but only every 15 minutes.  Don't need to flood the logs.
3887
-			if (empty($db_last_error) || ($db_last_error + 60*15) <= time())
3884
+			if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time())
3888 3885
 			{
3889 3886
 				updateDbLastError(time());
3890 3887
 				loadLanguage('Errors');
Please login to merge, or discard this patch.
Sources/Display.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1535,14 +1535,14 @@  discard block
 block discarded – undo
1535 1535
 	$output['quickbuttons'] = array(
1536 1536
 		'quote' => array(
1537 1537
 			'label' => $txt['quote_action'],
1538
-			'href' => $scripturl.'?action=post;quote='.$output['id'].';topic='.$context['current_topic'], '.'.$context['start'].';last_msg='.$context['topic_last_message'],
1539
-			'javascript' => 'onclick="return oQuickReply.quote('.$output['id'].');"',
1538
+			'href' => $scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . $context['current_topic'], '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'],
1539
+			'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"',
1540 1540
 			'icon' => 'quote',
1541 1541
 			'show' => $context['can_quote']
1542 1542
 		),
1543 1543
 		'quote_selected' => array(
1544 1544
 			'label' => $txt['quote_selected_action'],
1545
-			'id' => 'quoteSelected_'. $output['id'],
1545
+			'id' => 'quoteSelected_' . $output['id'],
1546 1546
 			'href' => 'javascript:void(0)',
1547 1547
 			'custom' => 'style="display:none"',
1548 1548
 			'icon' => 'quote_selected',
@@ -1551,74 +1551,74 @@  discard block
 block discarded – undo
1551 1551
 		'quick_edit' => array(
1552 1552
 			'label' => $txt['quick_edit'],
1553 1553
 			'class' => 'quick_edit',
1554
-			'id' => 'modify_button_'. $output['id'],
1555
-			'custom' => 'onclick="oQuickModify.modifyMsg(\''.$output['id'].'\', \''.!empty($modSettings['toggle_subject']).'\')"',
1554
+			'id' => 'modify_button_' . $output['id'],
1555
+			'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty($modSettings['toggle_subject']) . '\')"',
1556 1556
 			'icon' => 'quick_edit_button',
1557 1557
 			'show' => $output['can_modify']
1558 1558
 		),
1559 1559
 		'more' => array(
1560 1560
 			'modify' => array(
1561 1561
 				'label' => $txt['modify'],
1562
-				'href' => $scripturl.'?action=post;msg='.$output['id'].';topic='.$context['current_topic'].'.'.$context['start'],
1562
+				'href' => $scripturl . '?action=post;msg=' . $output['id'] . ';topic=' . $context['current_topic'] . '.' . $context['start'],
1563 1563
 				'icon' => 'modify_button',
1564 1564
 				'show' => $output['can_modify']
1565 1565
 			),
1566 1566
 			'remove_topic' => array(
1567 1567
 				'label' => $txt['remove_topic'],
1568
-				'href' => $scripturl.'?action=removetopic2;topic='.$context['current_topic'].'.'.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
1569
-				'javascript' => 'data-confirm="'.$txt['are_sure_remove_topic'].'"',
1568
+				'href' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1569
+				'javascript' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"',
1570 1570
 				'class' => 'you_sure',
1571 1571
 				'icon' => 'remove_button',
1572 1572
 				'show' => $context['can_delete'] && ($context['topic_first_message'] == $output['id'])
1573 1573
 			),
1574 1574
 			'remove' => array(
1575 1575
 				'label' => $txt['remove'],
1576
-				'href' => $scripturl.'?action=deletemsg;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1577
-				'javascript' => 'data-confirm="'.$txt['remove_message_question'].'"',
1576
+				'href' => $scripturl . '?action=deletemsg;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1577
+				'javascript' => 'data-confirm="' . $txt['remove_message_question'] . '"',
1578 1578
 				'class' => 'you_sure',
1579 1579
 				'icon' => 'remove_button',
1580 1580
 				'show' => $output['can_remove'] && ($context['topic_first_message'] != $output['id'])
1581 1581
 			),
1582 1582
 			'split' => array(
1583 1583
 				'label' => $txt['split'],
1584
-				'href' => $scripturl.'?action=splittopics;topic='.$context['current_topic'].'.0;at='.$output['id'],
1584
+				'href' => $scripturl . '?action=splittopics;topic=' . $context['current_topic'] . '.0;at=' . $output['id'],
1585 1585
 				'icon' => 'split_button',
1586 1586
 				'show' => $context['can_split'] && !empty($context['real_num_replies'])
1587 1587
 			),
1588 1588
 			'report' => array(
1589 1589
 				'label' => $txt['report_to_mod'],
1590
-				'href' => $scripturl.'?action=reporttm;topic='.$context['current_topic'].'.'.$output['counter'].';msg='.$output['id'],
1590
+				'href' => $scripturl . '?action=reporttm;topic=' . $context['current_topic'] . '.' . $output['counter'] . ';msg=' . $output['id'],
1591 1591
 				'icon' => 'error',
1592 1592
 				'show' => $context['can_report_moderator']
1593 1593
 			),
1594 1594
 			'warn' => array(
1595 1595
 				'label' => $txt['issue_warning'],
1596
-				'href' => $scripturl.'?action=profile;area=issuewarning;u='.$output['member']['id'].';msg='.$output['id'],
1596
+				'href' => $scripturl . '?action=profile;area=issuewarning;u=' . $output['member']['id'] . ';msg=' . $output['id'],
1597 1597
 				'icon' => 'warn_button',
1598 1598
 				'show' => $context['can_issue_warning'] && !$output['is_message_author'] && !$output['member']['is_guest']
1599 1599
 			),
1600 1600
 			'restore' => array(
1601 1601
 				'label' => $txt['restore_message'],
1602
-				'href' => $scripturl.'?action=restoretopic;msgs='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1602
+				'href' => $scripturl . '?action=restoretopic;msgs=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1603 1603
 				'icon' => 'restore_button',
1604 1604
 				'show' => $context['can_restore_msg']
1605 1605
 			),
1606 1606
 			'approve' => array(
1607 1607
 				'label' => $txt['approve'],
1608
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1608
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1609 1609
 				'icon' => 'approve_button',
1610 1610
 				'show' => $output['can_approve']
1611 1611
 			),
1612 1612
 			'unapprove' => array(
1613 1613
 				'label' => $txt['unapprove'],
1614
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1614
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1615 1615
 				'icon' => 'unapprove_button',
1616 1616
 				'show' => $output['can_unapprove']
1617 1617
 			),
1618 1618
 		),
1619 1619
 		'quickmod' => array(
1620 1620
 			'class' => 'inline_mod_check',
1621
-			'id' => 'in_topic_mod_check_'. $output['id'],
1621
+			'id' => 'in_topic_mod_check_' . $output['id'],
1622 1622
 			'custom' => 'style="display: none;"',
1623 1623
 			'content' => '',
1624 1624
 			'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $output['can_remove']
Please login to merge, or discard this patch.
Sources/Cache/APIs/MemcacheImplementation.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -149,16 +149,16 @@  discard block
 block discarded – undo
149 149
 	{
150 150
 		global $context, $txt;
151 151
 
152
-		if (!in_array($txt[self::CLASS_KEY .'_settings'], $config_vars))
152
+		if (!in_array($txt[self::CLASS_KEY . '_settings'], $config_vars))
153 153
 		{
154
-			$config_vars[] = $txt[self::CLASS_KEY .'_settings'];
154
+			$config_vars[] = $txt[self::CLASS_KEY . '_settings'];
155 155
 			$config_vars[] = array(
156 156
 				self::CLASS_KEY,
157
-				$txt[self::CLASS_KEY .'_servers'],
157
+				$txt[self::CLASS_KEY . '_servers'],
158 158
 				'file',
159 159
 				'text',
160 160
 				0,
161
-				'subtext' => $txt[self::CLASS_KEY .'_servers_subtext']);
161
+				'subtext' => $txt[self::CLASS_KEY . '_servers_subtext']);
162 162
 		}
163 163
 
164 164
 		if (!isset($context['settings_post_javascript']))
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 		$context['settings_post_javascript'] .= '
168 168
 			$("#cache_accelerator").change(function (e) {
169 169
 				var cache_type = e.currentTarget.value;
170
-				$("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
170
+				$("#'. self::CLASS_KEY . '").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
171 171
 			});';
172 172
 	}
173 173
 
Please login to merge, or discard this patch.
Sources/Subs.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 			{
378 378
 				$val = 'CASE ';
379 379
 				foreach ($members as $k => $v)
380
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
380
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
381 381
 
382 382
 				$val = $val . ' END';
383 383
 				$type = 'raw';
@@ -1039,11 +1039,11 @@  discard block
 block discarded – undo
1039 1039
 			// Anything that isn't a specification, punctuation mark, or whitespace.
1040 1040
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
1041 1041
 			// A series of punctuation marks (except %), possibly separated by whitespace.
1042
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
1042
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
1043 1043
 			// Unwanted trailing punctuation and whitespace.
1044
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1044
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1045 1045
 			// Unwanted opening punctuation and whitespace.
1046
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1046
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1047 1047
 		),
1048 1048
 		array(
1049 1049
 			'',
@@ -1441,7 +1441,7 @@  discard block
 block discarded – undo
1441 1441
 								$returnContext .= '<img src="' . $currentAttachment['href'] . '"' . $alt . $title . ' class="bbc_img"></a>';
1442 1442
 							else
1443 1443
 							{
1444
-								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"': '';
1444
+								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
1445 1445
 								$height = !empty($params['{height}']) ? 'height="' . $params['{height}'] . '"' : '';
1446 1446
 								$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img resized"/>';
1447 1447
 							}
@@ -1452,7 +1452,7 @@  discard block
 block discarded – undo
1452 1452
 							$width = !empty($width) ? ' width="' . $width . '"' : '';
1453 1453
 							$height = !empty($height) ? ' height="' . $height . '"' : '';
1454 1454
 
1455
-							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="'. $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
1455
+							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="' . $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
1456 1456
 						}
1457 1457
 						// Audio.
1458 1458
 						elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0)
@@ -1460,7 +1460,7 @@  discard block
 block discarded – undo
1460 1460
 							$width = 'max-width:100%; width: ' . (!empty($width) ? $width : '400') . 'px;';
1461 1461
 							$height = !empty($height) ? 'height: ' . $height . 'px;' : '';
1462 1462
 
1463
-							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="'. $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
1463
+							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="' . $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
1464 1464
 						}
1465 1465
 						// Anything else.
1466 1466
 						else
@@ -1629,7 +1629,7 @@  discard block
 block discarded – undo
1629 1629
 				'type' => 'unparsed_commas_content',
1630 1630
 				'test' => '\d+,\d+\]',
1631 1631
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
1632
-				'validate' => function (&$tag, &$data, $disabled)
1632
+				'validate' => function(&$tag, &$data, $disabled)
1633 1633
 				{
1634 1634
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
1635 1635
 					if (empty($scheme))
@@ -2171,12 +2171,12 @@  discard block
 block discarded – undo
2171 2171
 		$codes[] = array(
2172 2172
 			'tag' => 'cowsay',
2173 2173
 			'parameters' => array(
2174
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2174
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
2175 2175
 					{
2176 2176
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2177 2177
 					},
2178 2178
 				),
2179
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2179
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
2180 2180
 					{
2181 2181
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2182 2182
 					},
@@ -3557,7 +3557,7 @@  discard block
 block discarded – undo
3557 3557
 		if ($fp != false)
3558 3558
 		{
3559 3559
 			// Send the HEAD request (since we don't have to worry about chunked, HTTP/1.1 is fine here.)
3560
-			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: '. SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
3560
+			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: ' . SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
3561 3561
 
3562 3562
 			// Read in the HTTP/1.1 or whatever.
3563 3563
 			$test = substr(fgets($fp, 11), -1);
@@ -4162,7 +4162,7 @@  discard block
 block discarded – undo
4162 4162
 	$toMinify = array();
4163 4163
 	$normal = array();
4164 4164
 
4165
-	uasort($context['css_files'], function ($a, $b)
4165
+	uasort($context['css_files'], function($a, $b)
4166 4166
 	{
4167 4167
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
4168 4168
 	});
@@ -5459,7 +5459,7 @@  discard block
 block discarded – undo
5459 5459
 			{
5460 5460
 				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
5461 5461
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5462
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5462
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5463 5463
 				if ($keep_alive)
5464 5464
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
5465 5465
 				else
@@ -5469,7 +5469,7 @@  discard block
 block discarded – undo
5469 5469
 			{
5470 5470
 				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
5471 5471
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5472
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5472
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5473 5473
 				if ($keep_alive)
5474 5474
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
5475 5475
 				else
@@ -5717,13 +5717,13 @@  discard block
 block discarded – undo
5717 5717
 
5718 5718
 	// UTF-8 occurences of MS special characters
5719 5719
 	$findchars_utf8 = array(
5720
-		"\xe2\x80\x9a",	// single low-9 quotation mark
5721
-		"\xe2\x80\x9e",	// double low-9 quotation mark
5722
-		"\xe2\x80\xa6",	// horizontal ellipsis
5723
-		"\xe2\x80\x98",	// left single curly quote
5724
-		"\xe2\x80\x99",	// right single curly quote
5725
-		"\xe2\x80\x9c",	// left double curly quote
5726
-		"\xe2\x80\x9d",	// right double curly quote
5720
+		"\xe2\x80\x9a", // single low-9 quotation mark
5721
+		"\xe2\x80\x9e", // double low-9 quotation mark
5722
+		"\xe2\x80\xa6", // horizontal ellipsis
5723
+		"\xe2\x80\x98", // left single curly quote
5724
+		"\xe2\x80\x99", // right single curly quote
5725
+		"\xe2\x80\x9c", // left double curly quote
5726
+		"\xe2\x80\x9d", // right double curly quote
5727 5727
 	);
5728 5728
 
5729 5729
 	// windows 1252 / iso equivalents
@@ -5739,13 +5739,13 @@  discard block
 block discarded – undo
5739 5739
 
5740 5740
 	// safe replacements
5741 5741
 	$replacechars = array(
5742
-		',',	// &sbquo;
5743
-		',,',	// &bdquo;
5744
-		'...',	// &hellip;
5745
-		"'",	// &lsquo;
5746
-		"'",	// &rsquo;
5747
-		'"',	// &ldquo;
5748
-		'"',	// &rdquo;
5742
+		',', // &sbquo;
5743
+		',,', // &bdquo;
5744
+		'...', // &hellip;
5745
+		"'", // &lsquo;
5746
+		"'", // &rsquo;
5747
+		'"', // &ldquo;
5748
+		'"', // &rdquo;
5749 5749
 	);
5750 5750
 
5751 5751
 	if ($context['utf8'])
@@ -6090,7 +6090,7 @@  discard block
 block discarded – undo
6090 6090
 			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
6091 6091
 
6092 6092
 		// We don't want abbreviations like '+03' or '-11'.
6093
-		$abbrs = array_filter($tzvalue['abbrs'], function ($abbr) {
6093
+		$abbrs = array_filter($tzvalue['abbrs'], function($abbr) {
6094 6094
 			return !strspn($abbr, '+-');
6095 6095
 		});
6096 6096
 		$abbrs = count($abbrs) == count($tzvalue['abbrs']) ? array_unique($abbrs) : array();
@@ -7054,7 +7054,7 @@  discard block
 block discarded – undo
7054 7054
 			EXISTS (
7055 7055
 				SELECT bpv.id_board
7056 7056
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7057
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
7057
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
7058 7058
 					AND bpv.deny = 0
7059 7059
 					AND bpv.id_board = b.id_board
7060 7060
 			)';
@@ -7064,7 +7064,7 @@  discard block
 block discarded – undo
7064 7064
 			AND NOT EXISTS (
7065 7065
 				SELECT bpv.id_board
7066 7066
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7067
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
7067
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
7068 7068
 					AND bpv.deny = 1
7069 7069
 					AND bpv.id_board = b.id_board
7070 7070
 			)';
@@ -7335,8 +7335,8 @@  discard block
 block discarded – undo
7335 7335
 	$i = 0;
7336 7336
 	while (empty($done))
7337 7337
 	{
7338
-		if (strpos($format, '{'. --$i . '}') !== false)
7339
-			$replacements['{'. $i . '}'] = array_pop($list);
7338
+		if (strpos($format, '{' . --$i . '}') !== false)
7339
+			$replacements['{' . $i . '}'] = array_pop($list);
7340 7340
 		else
7341 7341
 			$done = true;
7342 7342
 	}
@@ -7346,8 +7346,8 @@  discard block
 block discarded – undo
7346 7346
 	$i = 0;
7347 7347
 	while (empty($done))
7348 7348
 	{
7349
-		if (strpos($format, '{'. ++$i . '}') !== false)
7350
-			$replacements['{'. $i . '}'] = array_shift($list);
7349
+		if (strpos($format, '{' . ++$i . '}') !== false)
7350
+			$replacements['{' . $i . '}'] = array_shift($list);
7351 7351
 		else
7352 7352
 			$done = true;
7353 7353
 	}
Please login to merge, or discard this patch.