Passed
Pull Request — release-2.1 (#7287)
by Mathias
04:46
created
Sources/MessageIndex.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -340,7 +340,7 @@
 block discarded – undo
340 340
 		WHERE t.id_board = {int:current_board} '
341 341
 			. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
342 342
 			AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . (!empty($message_index_topic_wheres) ? '
343
-			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : ''). '
343
+			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : '') . '
344 344
 		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
345 345
 		LIMIT {int:maxindex}
346 346
 			OFFSET {int:start} ';
Please login to merge, or discard this patch.
Sources/News.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	);
92 92
 	foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var)
93 93
 		if (isset($_GET[$var]))
94
-			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var];
94
+			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';') . $var . '=' . $_GET[$var];
95 95
 
96 96
 	// Handle the cases where a board, boards, or category is asked for.
97 97
 	$query_this_board = 1;
@@ -303,17 +303,17 @@  discard block
 block discarded – undo
303 303
 	 * namespaces, which could cause it to mangle the XML horrifically
304 304
 	 * during processing.
305 305
 	 */
306
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/' . $subaction;
306
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/' . $subaction;
307 307
 
308 308
 	// Allow mods to add extra namespaces and tags to the feed/channel
309 309
 	$namespaces = array(
310 310
 		'rss' => array(),
311
-		'rss2' => array('atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
312
-		'atom' => array('' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
311
+		'rss2' => array('atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
312
+		'atom' => array('' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
313 313
 		'rdf' => array(
314
-			'' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/',
315
-			'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#',
316
-			'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/',
314
+			'' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/',
315
+			'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#',
316
+			'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/',
317 317
 		),
318 318
 		'smf' => array(
319 319
 			'smf' => $smf_ns,
@@ -2127,7 +2127,7 @@  discard block
 block discarded – undo
2127 2127
 			m.id_msg, m.id_topic, m.id_board, m.id_member, m.poster_email, m.poster_ip,
2128 2128
 			m.poster_time, m.subject, m.modified_time, m.modified_name, m.modified_reason, m.body,
2129 2129
 			m.likes, m.approved, m.smileys_enabled
2130
-		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ?'
2130
+		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ? '
2131 2131
 			INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
2132 2132
 		WHERE m.id_member = {int:uid}
2133 2133
 			AND m.id_msg > {int:start_after}
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
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 			AND a.is_read = 0' : '') . (!empty($alertIDs) ? '
263 263
 			AND a.id_alert IN ({array_int:alertIDs})' : '') . '
264 264
 		ORDER BY id_alert DESC' . (!empty($limit) ? '
265
-		LIMIT {int:limit}' : '') . (!empty($offset) ?'
265
+		LIMIT {int:limit}' : '') . (!empty($offset) ? '
266 266
 		OFFSET {int:offset}' : ''),
267 267
 		array(
268 268
 			'id_member' => $memID,
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 
362 362
 	// Substitute $scripturl into the link formats. (Done here to make life easier for hooked mods.)
363 363
 	$formats = array_map(
364
-		function ($format) use ($scripturl)
364
+		function($format) use ($scripturl)
365 365
 		{
366 366
 			$format['link'] = str_replace('{scripturl}', $scripturl, $format['link']);
367 367
 			$format['text'] = str_replace('{scripturl}', $scripturl, $format['text']);
@@ -1172,20 +1172,20 @@  discard block
 block discarded – undo
1172 1172
 		$context['posts'][$key]['quickbuttons'] = array(
1173 1173
 			'reply' => array(
1174 1174
 				'label' => $txt['reply'],
1175
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'],
1175
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
1176 1176
 				'icon' => 'reply_button',
1177 1177
 				'show' => $post['can_reply']
1178 1178
 			),
1179 1179
 			'quote' => array(
1180 1180
 				'label' => $txt['quote_action'],
1181
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'],
1181
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
1182 1182
 				'icon' => 'quote',
1183 1183
 				'show' => $post['can_quote']
1184 1184
 			),
1185 1185
 			'remove' => array(
1186 1186
 				'label' => $txt['remove'],
1187
-				'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';profile;u='.$context['member']['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
1188
-				'javascript' => 'data-confirm="'.$txt['remove_message'].'"',
1187
+				'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . $context['member']['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1188
+				'javascript' => 'data-confirm="' . $txt['remove_message'] . '"',
1189 1189
 				'class' => 'you_sure',
1190 1190
 				'icon' => 'remove_button',
1191 1191
 				'show' => $post['can_delete']
Please login to merge, or discard this patch.
Sources/tasks/ExportProfileData.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 		$feed_meta = array(
205 205
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
206 206
 			'desc' => sentence_list(array_map(
207
-				function ($datatype) use ($txt)
207
+				function($datatype) use ($txt)
208 208
 				{
209 209
 					return $txt[$datatype];
210 210
 				},
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
 					'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
727 727
 				),
728 728
 				$returnContext
729
-			) . $hidden_orig_link . '</span>' ;
729
+			) . $hidden_orig_link . '</span>';
730 730
 		}
731 731
 		elseif (strpos($currentAttachment['mime_type'], 'video/') === 0)
732 732
 		{
Please login to merge, or discard this patch.
Sources/Subs-Db-postgresql.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		display_db_error();
76 76
 
77 77
 	// We need to escape ' and \
78
-	$db_passwd = str_replace(array('\\','\''), array('\\\\','\\\''), $db_passwd);
78
+	$db_passwd = str_replace(array('\\', '\''), array('\\\\', '\\\''), $db_passwd);
79 79
 
80 80
 	// Since pg_connect doesn't feed error info to pg_last_error, we have to catch issues with a try/catch.
81 81
 	set_error_handler(
@@ -910,7 +910,7 @@  discard block
 block discarded – undo
910 910
 	if (filter_var($error_array[2], FILTER_VALIDATE_IP) === false)
911 911
 		$error_array[2] = null;
912 912
 
913
-	if(empty($db_persist))
913
+	if (empty($db_persist))
914 914
 	{ // without pooling
915 915
 		if (empty($pg_error_data_prep))
916 916
 			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
Please login to merge, or discard this patch.
Sources/Post.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1277,7 +1277,7 @@
 block discarded – undo
1277 1277
 	if ($context['can_post_attachment'])
1278 1278
 	{
1279 1279
 		$acceptedFiles = empty($context['allowed_extensions']) ? '' : implode(',', array_map(
1280
-			function ($val) use ($smcFunc)
1280
+			function($val) use ($smcFunc)
1281 1281
 			{
1282 1282
 				return !empty($val) ? ('.' . $smcFunc['htmltrim']($val)) : '';
1283 1283
 			},
Please login to merge, or discard this patch.
Sources/Profile-Export.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	// Figure out the filename we'll tell the browser.
470 470
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
471 471
 	$included_desc = array_map(
472
-		function ($datatype) use ($txt)
472
+		function($datatype) use ($txt)
473 473
 		{
474 474
 			return $txt[$datatype];
475 475
 		},
@@ -789,9 +789,9 @@  discard block
 block discarded – undo
789 789
 	$xslt_variables = array();
790 790
 
791 791
 	// Do not change any of these to HTTPS URLs. For explanation, see comments in the buildXmlFeed() function.
792
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/profile';
793
-	$xslt_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform';
794
-	$html_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/xhtml';
792
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/profile';
793
+	$xslt_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform';
794
+	$html_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/xhtml';
795 795
 
796 796
 	require_once($sourcedir . DIRECTORY_SEPARATOR . 'News.php');
797 797
 
@@ -1696,14 +1696,14 @@  discard block
 block discarded – undo
1696 1696
 
1697 1697
 		if (!empty($context['export_css_header']))
1698 1698
 		{
1699
-			$stylesheet['css_js'] .=  '
1699
+			$stylesheet['css_js'] .= '
1700 1700
 			<style><![CDATA[' . "\n" . implode("\n", $context['export_css_header']) . "\n" . ']]>
1701 1701
 			</style>';
1702 1702
 		}
1703 1703
 
1704 1704
 		if (!empty($context['export_javascript_vars']))
1705 1705
 		{
1706
-			$stylesheet['css_js'] .=  '
1706
+			$stylesheet['css_js'] .= '
1707 1707
 			<script><![CDATA[';
1708 1708
 
1709 1709
 			foreach ($context['export_javascript_vars'] as $var => $val)
@@ -1739,7 +1739,7 @@  discard block
 block discarded – undo
1739 1739
 
1740 1740
 		if (!empty($context['export_javascript_inline']['standard']))
1741 1741
 		{
1742
-			$stylesheet['css_js'] .=  '
1742
+			$stylesheet['css_js'] .= '
1743 1743
 			<script><![CDATA[' . "\n" . implode("\n", $context['export_javascript_inline']['standard']) . "\n" . ']]>
1744 1744
 			</script>';
1745 1745
 		}
@@ -1751,7 +1751,7 @@  discard block
 block discarded – undo
1751 1751
 
1752 1752
 			$stylesheet['css_js'] .= "\n\t" . str_replace("\n", "\n\t", implode("\n", $context['export_javascript_inline']['defer']));
1753 1753
 
1754
-			$stylesheet['css_js'] .= "\n" . '});'. "\n" . ']]>
1754
+			$stylesheet['css_js'] .= "\n" . '});' . "\n" . ']]>
1755 1755
 			</script>';
1756 1756
 		}
1757 1757
 
@@ -1834,7 +1834,7 @@  discard block
 block discarded – undo
1834 1834
 
1835 1835
 	usort(
1836 1836
 		$context['css_files'],
1837
-		function ($a, $b)
1837
+		function($a, $b)
1838 1838
 		{
1839 1839
 			return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
1840 1840
 		}
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
@@ -1716,7 +1716,7 @@
 block discarded – undo
1716 1716
 		{
1717 1717
 			usort(
1718 1718
 				$fallbacks[$tzid],
1719
-				function ($a, $b)
1719
+				function($a, $b)
1720 1720
 				{
1721 1721
 					return $a['ts'] > $b['ts'];
1722 1722
 				}
Please login to merge, or discard this patch.
Sources/ManagePermissions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1840,7 +1840,7 @@
 block discarded – undo
1840 1840
 		// Make sure this is an array of integers
1841 1841
 		$excluded_groups = array_filter(
1842 1842
 			(array) $excluded_groups,
1843
-			function ($v)
1843
+			function($v)
1844 1844
 			{
1845 1845
 				return is_int($v) || is_string($v) && (string) intval($v) === $v;
1846 1846
 			}
Please login to merge, or discard this patch.