Passed
Pull Request — release-2.1 (#7424)
by Jeremy
05:28
created
other/update_unicode_data.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 	}
753 753
 }
754 754
 // This sort works decently well to ensure widely used scripts are ranked before rare scripts.
755
-uasort($funcs['utf8_regex_joining_type']['data'], function ($a, $b)
755
+uasort($funcs['utf8_regex_joining_type']['data'], function($a, $b)
756 756
 {
757 757
 	if ($a['stats']['age'] == $b['stats']['age'])
758 758
 	{
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
 	}
829 829
 }
830 830
 // Again, sort commonly used scripts before rare scripts.
831
-uasort($funcs['utf8_regex_indic']['data'], function ($a, $b)
831
+uasort($funcs['utf8_regex_indic']['data'], function($a, $b)
832 832
 {
833 833
 	if ($a['stats']['age'] == $b['stats']['age'])
834 834
 	{
Please login to merge, or discard this patch.
other/install.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				return false;
93 93
 		},
94 94
 		'utf8_version' => '8.0',
95
-		'utf8_version_check' => function (){
95
+		'utf8_version_check' => function() {
96 96
 			global $db_connection;
97 97
 			$request = pg_query($db_connection, 'SELECT version()');
98 98
 			list ($version) = pg_fetch_row($request);
@@ -987,7 +987,7 @@  discard block
 block discarded – undo
987 987
 	$incontext['continue'] = 1;
988 988
 
989 989
 	// Check Postgres setting
990
-	if ( $db_type === 'postgresql')
990
+	if ($db_type === 'postgresql')
991 991
 	{
992 992
 		load_database();
993 993
 		$result = $smcFunc['db_query']('', '
Please login to merge, or discard this patch.
Sources/tasks/CreatePost-Notify.php 1 patch
Spacing   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 			}
188 188
 		}
189 189
 
190
-		$unnotified = array_filter($this->members['watching'], function ($member) {
190
+		$unnotified = array_filter($this->members['watching'], function($member) {
191 191
 			return empty($member['sent']);
192 192
 		});
193 193
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		if ($type == 'edit' || !empty($this->_details['respawns']))
197 197
 		{
198 198
 			// Notifications about modified posts only go to members who were mentioned or quoted
199
-			$this->members['watching'] = $type == 'edit' ? array(): $unnotified;
199
+			$this->members['watching'] = $type == 'edit' ? array() : $unnotified;
200 200
 
201 201
 			// If this post has no quotes or mentions, just delete any obsolete alerts and bail out.
202 202
 			if (empty($this->members['quoted']) && empty($this->members['mentioned']))
@@ -512,8 +512,7 @@  discard block
 block discarded – undo
512 512
 			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($this->prefs[$member_id]))
513 513
 			{
514 514
 				$pref = !empty($this->prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ?
515
-					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] :
516
-					(!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
515
+					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
517 516
 
518 517
 				$message_type = 'notification_' . $type;
519 518
 
@@ -532,8 +531,7 @@  discard block
 block discarded – undo
532 531
 			elseif ($type == 'topic')
533 532
 			{
534 533
 				$pref = !empty($this->prefs[$member_id]['board_notify_' . $topicOptions['board']]) ?
535
-					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] :
536
-					(!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
534
+					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
537 535
 
538 536
 				$content_type = 'board';
539 537
 
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'] && !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1
136 136
 				)
137 137
 			);
Please login to merge, or discard this patch.
Themes/default/Admin.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
 	// Filter out any redundant separators before we start the loop
759 759
 	$context['config_vars'] = array_filter(
760 760
 		$context['config_vars'],
761
-		function ($v) use ($context)
761
+		function($v) use ($context)
762 762
 		{
763 763
 			static $config_vars, $prev;
764 764
 
@@ -1659,7 +1659,7 @@  discard block
 block discarded – undo
1659 1659
 		echo '
1660 1660
 								<form action="' . $scripturl . '?action=admin;area=search" method="post" accept-charset="' . $context['character_set'] . '" class="admin_search">
1661 1661
 									<span class="main_icons filter centericon"></span>
1662
-									<input type="search" name="search_term" placeholder="', $txt['admin_search'], '"', isset($context['search_term']) ? ' value="' . $context['search_term'] . '"' : '','>
1662
+									<input type="search" name="search_term" placeholder="', $txt['admin_search'], '"', isset($context['search_term']) ? ' value="' . $context['search_term'] . '"' : '', '>
1663 1663
 									<select name="search_type">
1664 1664
 										<option value="internal"', (empty($context['admin_preferences']['sb']) || $context['admin_preferences']['sb'] == 'internal' ? ' selected' : ''), '>', $txt['admin_search_type_internal'], '</option>
1665 1665
 										<option value="member"', (!empty($context['admin_preferences']['sb']) && $context['admin_preferences']['sb'] == 'member' ? ' selected' : ''), '>', $txt['admin_search_type_member'], '</option>
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
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
853 853
 			'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'],
854 854
 			'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1,
855 855
 			'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0,
856
-			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0,
856
+			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0,
857 857
 			'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0,
858 858
 		),
859 859
 		'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '',
@@ -2539,7 +2539,7 @@  discard block
 block discarded – undo
2539 2539
 	);
2540 2540
 
2541 2541
 	// Add the JQuery library to the list of files to load.
2542
-	$jQueryUrls = array ('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/'. JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-'. JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-'. JQUERY_VERSION . '.min.js');
2542
+	$jQueryUrls = array('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-' . JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-' . JQUERY_VERSION . '.min.js');
2543 2543
 
2544 2544
 	if (isset($modSettings['jquery_source']) && array_key_exists($modSettings['jquery_source'], $jQueryUrls))
2545 2545
 		loadJavaScriptFile($jQueryUrls[$modSettings['jquery_source']], array('external' => true, 'seed' => false), 'smf_jquery');
@@ -2780,8 +2780,7 @@  discard block
 block discarded – undo
2780 2780
 		$context['css_files_order'] = array();
2781 2781
 
2782 2782
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
2783
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
2784
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2783
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2785 2784
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
2786 2785
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
2787 2786
 	$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true;
@@ -2896,8 +2895,7 @@  discard block
 block discarded – undo
2896 2895
 	global $settings, $context, $modSettings;
2897 2896
 
2898 2897
 	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
2899
-		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') :
2900
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2898
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
2901 2899
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
2902 2900
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
2903 2901
 	$params['async'] = isset($params['async']) ? $params['async'] : false;
@@ -3687,8 +3685,7 @@  discard block
 block discarded – undo
3687 3685
 
3688 3686
 	// What accelerator we are going to try.
3689 3687
 	$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT;
3690
-	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache :
3691
-		CacheApi::APIS_NAMESPACE . $cache_class_name;
3688
+	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name;
3692 3689
 
3693 3690
 	// Do some basic tests.
3694 3691
 	if (class_exists($fully_qualified_class_name))
@@ -3992,7 +3989,7 @@  discard block
 block discarded – undo
3992 3989
 			$auth_secret = hash_file('sha256', $boarddir . '/Settings.php');
3993 3990
 
3994 3991
 			// Set the last error to now, but only every 15 minutes.  Don't need to flood the logs.
3995
-			if (empty($db_last_error) || ($db_last_error + 60*15) <= time())
3992
+			if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time())
3996 3993
 			{
3997 3994
 				updateDbLastError(time());
3998 3995
 				loadLanguage('Errors');
Please login to merge, or discard this patch.
Sources/ManageServer.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
 		// Cookies...
478 478
 		array('cookiename', $txt['cookie_name'], 'file', 'text', 20),
479 479
 		array('cookieTime', $txt['cookieTime'], 'db', 'select', array_filter(array_map(
480
-			function ($str) use ($txt)
480
+			function($str) use ($txt)
481 481
 			{
482 482
 				return isset($txt[$str]) ? $txt[$str] : '';
483 483
 			},
@@ -1439,7 +1439,7 @@  discard block
 block discarded – undo
1439 1439
 				// Obviously, we don't need null here.
1440 1440
 				$def['type'] = array_filter(
1441 1441
 					$def['type'],
1442
-					function ($type)
1442
+					function($type)
1443 1443
 					{
1444 1444
 						return $type !== 'NULL';
1445 1445
 					}
@@ -1765,7 +1765,7 @@  discard block
 block discarded – undo
1765 1765
 	$cacheAPIdir = $sourcedir . '/Cache';
1766 1766
 
1767 1767
 	$loadedApis = array();
1768
-	$apis_dir = $cacheAPIdir .'/'. CacheApi::APIS_FOLDER;
1768
+	$apis_dir = $cacheAPIdir . '/' . CacheApi::APIS_FOLDER;
1769 1769
 
1770 1770
 	$api_classes = new GlobIterator($apis_dir . '/*.php', FilesystemIterator::NEW_CURRENT_AND_KEY);
1771 1771
 
Please login to merge, or discard this patch.
Themes/default/index.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 					', sprintf($txt['welcome_to_forum'], $context['forum_name_html_safe']), '
274 274
 				</li>
275 275
 				<li class="button_login">
276
-					<a href="', $scripturl, '?action=login" class="', $context['current_action'] == 'login' ? 'active' : 'open','" onclick="return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ', \'login\');">
276
+					<a href="', $scripturl, '?action=login" class="', $context['current_action'] == 'login' ? 'active' : 'open', '" onclick="return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ', \'login\');">
277 277
 						<span class="main_icons login"></span>
278 278
 						<span class="textmenu">', $txt['login'], '</span>
279 279
 					</a>
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 			if ($context['can_register'])
283 283
 				echo '
284 284
 				<li class="button_signup">
285
-					<a href="', $scripturl, '?action=signup" class="', $context['current_action'] == 'signup' ? 'active' : 'open','">
285
+					<a href="', $scripturl, '?action=signup" class="', $context['current_action'] == 'signup' ? 'active' : 'open', '">
286 286
 						<span class="main_icons regcenter"></span>
287 287
 						<span class="textmenu">', $txt['register'], '</span>
288 288
 					</a>
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 				$value['id'] = $key;
637 637
 
638 638
 			$button = '
639
-				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>'.(!empty($value['icon']) ? '<span class="main_icons '.$value['icon'].'"></span>' : '').'' . $txt[$value['text']] . '</a>';
639
+				<a class="button button_strip_' . $key . (!empty($value['active']) ? ' active' : '') . (isset($value['class']) ? ' ' . $value['class'] : '') . '" ' . (!empty($value['url']) ? 'href="' . $value['url'] . '"' : '') . ' ' . (isset($value['custom']) ? ' ' . $value['custom'] : '') . '>' . (!empty($value['icon']) ? '<span class="main_icons ' . $value['icon'] . '"></span>' : '') . '' . $txt[$value['text']] . '</a>';
640 640
 
641 641
 			if (!empty($value['sub_buttons']))
642 642
 			{
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
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	require_once($sourcedir . '/Subs-Compat.php');
83 83
 
84 84
 // If $maintenance is set specifically to 2, then we're upgrading or something.
85
-if (!empty($maintenance) &&  2 === $maintenance)
85
+if (!empty($maintenance) && 2 === $maintenance)
86 86
 {
87 87
 	display_maintenance_message();
88 88
 }
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
  *
99 99
  * @param string $class The fully-qualified class name.
100 100
  */
101
-spl_autoload_register(function ($class) use ($sourcedir)
101
+spl_autoload_register(function($class) use ($sourcedir)
102 102
 {
103 103
 	$classMap = array(
104 104
 		'ReCaptcha\\' => 'ReCaptcha/',
Please login to merge, or discard this patch.