Inspection of "Merge pull request #4301 from albertlast/1028" - SimpleMachines/SMF2.1 - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — release-2.1 ( 12381f...8d796c )

by Michael

created 2017-09-16 16:31 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -39,7 +39,7 @@
 block discarded – undo
 
 		foreach ($category['boards'] as $board)
 			echo '
-									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level']-1) . '=&gt; ' : '', $board['name'], '</option>';
+									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt; ' : '', $board['name'], '</option>';
 		echo '
 								</optgroup>';
 	}

Please login to merge, or discard this patch.

Themes/default/Help.template.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -24,8 +24,8 @@  discard block
 block discarded – undo
 		<meta charset="', $context['character_set'], '">
 		<meta name="robots" content="noindex">
 		<title>', $context['page_title'], '</title>
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 	</head>
 	<body id="help_popup">
 		<div class="windowbg description">
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
 		<title>', $txt['find_members'], '</title>
 		<meta charset="', $context['character_set'], '">
 		<meta name="robots" content="noindex">
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 		<script>
 			var membersAdded = [];
 			function addMember(name)

Please login to merge, or discard this patch.

Sources/PackageGet.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -181,14 +181,14 @@  discard block
 block discarded – undo
 		{
 			collapsedDiv.show(\'slow\');
 			icon.removeClass(\'toggle_down\').addClass(\'toggle_up\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . ');
 		}
 
 		else
 		{
 			collapsedDiv.hide(\'slow\');
 			icon.removeClass(\'toggle_up\').addClass(\'toggle_down\');
-			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .');
+			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . ');
 		}
 
 	});', true);
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
 
 	// Setup the correct template, even though I'll admit we ain't downloading ;)
 	$context['sub_template'] = 'downloaded';
-	$allowext = array('.zip','.tgz','.gz');
+	$allowext = array('.zip', '.tgz', '.gz');
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
@@ -653,13 +653,13 @@  discard block
 block discarded – undo
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 	$extension = substr(strrchr(strtolower($_FILES['package']['name']), '.'), 0);
-	if(!in_array($extension, $allowext))
+	if (!in_array($extension, $allowext))
 	{
 		fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
 	}
 	
 	// We only need the filename...
-	$extension = ($extension == '.gz') ? '.tar.gz' : $extension ;
+	$extension = ($extension == '.gz') ? '.tar.gz' : $extension;
 	$packageName = time() . $extension;
 
 	// Setup the destination and throw an error if the file is already there!

Please login to merge, or discard this patch.

Sources/Search.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -659,7 +659,7 @@  discard block
 block discarded – undo
 
 	// Remove the phrase parts and extract the words.
 	$wordArray = preg_replace('~(?:^|\s)(?:[-]?)"(?:[^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), ' ', $search_params['search']);
-	$wordArray = explode(' ',  $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES));
+	$wordArray = explode(' ', $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES));
 
 	// A minus sign in front of a word excludes the word.... so...
 	$excludedWords = array();
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
 						SELECT
 							{int:id_search},
 							t.id_topic,
-							' . $relevance. ',
+							' . $relevance . ',
 							' . (empty($userQuery) ? 't.id_first_msg' : 'm.id_msg') . ',
 							1
 						FROM ' . $subject_query['from'] . (empty($subject_query['inner_join']) ? '' : '
@@ -1339,7 +1339,7 @@  discard block
 block discarded – undo
 						if (empty($subject_query['where']))
 							continue;
 
-						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ( '
+						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ('
 							INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics
 								(' . ($createTemporary ? '' : 'id_search, ') . 'id_topic)') : '') . '
 							SELECT ' . ($createTemporary ? '' : $_SESSION['search_cache']['id_search'] . ', ') . 't.id_topic
@@ -1568,7 +1568,7 @@  discard block
 block discarded – undo
 					}
 					$main_query['select']['relevance'] = substr($relevance, 0, -3) . ') / ' . $new_weight_total . ' AS relevance';
 
-					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? ( '
+					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? ('
 						INSERT IGNORE INTO ' . '{db_prefix}log_search_results
 							(' . implode(', ', array_keys($main_query['select'])) . ')') : '') . '
 						SELECT
@@ -1636,7 +1636,7 @@  discard block
 block discarded – undo
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
 
 					$usedIDs = array_flip(empty($inserts) ? array() : array_keys($inserts));
-					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? ( '
+					$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? ('
 						INSERT IGNORE INTO {db_prefix}log_search_results
 							(id_search, id_topic, relevance, id_msg, num_matches)') : '') . '
 						SELECT
@@ -2102,7 +2102,7 @@  discard block
 block discarded – undo
 		$query = trim($query, "\*+");
 		$query = strtr($smcFunc['htmlspecialchars']($query), array('\\\'' => '\''));
 
-		$body_highlighted = preg_replace_callback('/((<[^>]*)|' . preg_quote(strtr($query, array('\'' => '&#039;')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function ($m)
+		$body_highlighted = preg_replace_callback('/((<[^>]*)|' . preg_quote(strtr($query, array('\'' => '&#039;')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function($m)
 		{
 			return isset($m[2]) && "$m[2]" == "$m[1]" ? stripslashes("$m[1]") : "<strong class=\"highlight\">$m[1]</strong>";
 		}, $body_highlighted);

Please login to merge, or discard this patch.

Sources/DbExtra-postgresql.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -91,7 +91,7 @@  discard block
 block discarded – undo
 
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
-	$pg_tables = array('pg_catalog','information_schema');
+	$pg_tables = array('pg_catalog', 'information_schema');
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
 {
 	static $ver;
 
-	if(!empty($ver))
+	if (!empty($ver))
 		return $ver;
 
 	global $smcFunc;

Please login to merge, or discard this patch.

Sources/Subs-Members.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -586,7 +586,7 @@  discard block
 block discarded – undo
 		'member_name' => $regOptions['username'],
 		'email_address' => $regOptions['email'],
 		'passwd' => hash_password($regOptions['username'], $regOptions['password']),
-		'password_salt' => substr(md5(mt_rand()), 0, 4) ,
+		'password_salt' => substr(md5(mt_rand()), 0, 4),
 		'posts' => 0,
 		'date_registered' => time(),
 		'member_ip' => $regOptions['interface'] == 'admin' ? '127.0.0.1' : $user_info['ip'],
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
 		'time_offset',
 	);
 	$knownInets = array(
-		'member_ip','member_ip2',
+		'member_ip', 'member_ip2',
 	);
 
 	// Call an optional function to validate the users' input.
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
 
 	//when we got no wildcard we can use equal -> fast
-	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=' );
+	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=');
 
 	// Make sure they don't want someone else's name.
 	$request = $smcFunc['db_query']('', '
@@ -1273,7 +1273,7 @@  discard block
 block discarded – undo
 		$user_info['buddies'][] = $userReceiver;
 
 		// And add a nice alert. Don't abuse though!
-		if ((cache_get_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, 86400)) == null)
+		if ((cache_get_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, 86400)) == null)
 		{
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}background_tasks',
@@ -1288,7 +1288,7 @@  discard block
 block discarded – undo
 			);
 
 			// Store this in a cache entry to avoid creating multiple alerts. Give it a long life cycle.
-			cache_put_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, '1', 86400);
+			cache_put_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, '1', 86400);
 		}
 	}
 

Please login to merge, or discard this patch.

Sources/Recent.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -237,7 +237,7 @@  discard block
 block discarded – undo
 	else
 	{
 		$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
-					AND b.id_board != {int:recycle_board}' : ''). '
+					AND b.id_board != {int:recycle_board}' : '') . '
 					AND m.id_msg >= {int:max_id_msg}';
 		$query_parameters['max_id_msg'] = max(0, $modSettings['maxMsgID'] - 100 - $_REQUEST['start'] * 6);
 		$query_parameters['recycle_board'] = $modSettings['recycle_board'];
@@ -1124,7 +1124,7 @@  discard block
 block discarded – undo
 			);
 		else
 			$request = $smcFunc['db_query']('', '
-				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
+				SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'] . '
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
 					INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)') . (strpos($_REQUEST['sort'], 'mems.') === false ? '' : '
@@ -1391,7 +1391,7 @@  discard block
 block discarded – undo
 	if ($is_topics)
 	{
 		$context['recent_buttons'] = array(
-			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'.  $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
+			'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
 		if ($context['showCheckboxes'])
@@ -1407,7 +1407,7 @@  discard block
 block discarded – undo
 	elseif (!$is_topics && isset($context['topics_to_mark']))
 	{
 		$context['recent_buttons'] = array(
-			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read']  .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
+			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
 		);
 
 		if ($context['showCheckboxes'])

Please login to merge, or discard this patch.

Sources/Class-Graphics.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -38,8 +38,8 @@  discard block
 block discarded – undo
 		$this->MAX_LZW_BITS = 12;
 		unset($this->Next, $this->Vals, $this->Stack, $this->Buf);
 
-		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
-		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS)       - 1);
+		$this->Next  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
+		$this->Vals  = range(0, (1 << $this->MAX_LZW_BITS) - 1);
 		$this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1);
 		$this->Buf   = range(0, 279);
 	}
@@ -278,9 +278,9 @@  discard block
 block discarded – undo
 		for ($i = 0; $i < $this->m_nColors; $i++)
 		{
 			$ret .=
-				chr(($this->m_arColors[$i] & 0x000000FF))       . // R
-				chr(($this->m_arColors[$i] & 0x0000FF00) >>  8) . // G
-				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16);  // B
+				chr(($this->m_arColors[$i] & 0x000000FF)) . // R
+				chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
+				chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
 		}
 
 		return $ret;
@@ -290,14 +290,14 @@  discard block
 block discarded – undo
 	{
 		$rgb  = intval($rgb) & 0xFFFFFF;
 		$r1   = ($rgb & 0x0000FF);
-		$g1   = ($rgb & 0x00FF00) >>  8;
+		$g1   = ($rgb & 0x00FF00) >> 8;
 		$b1   = ($rgb & 0xFF0000) >> 16;
 		$idx  = -1;
 
 		for ($i = 0; $i < $this->m_nColors; $i++)
 		{
 			$r2 = ($this->m_arColors[$i] & 0x000000FF);
-			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >>  8;
+			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8;
 			$b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
 			$d  = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
 

Please login to merge, or discard this patch.

Sources/Subs-ReportedContent.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}log_reported
 		SET  {raw:action} = {string:value}
-		'. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') .'
+		'. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') . '
 			' . $board_query,
 		array(
 			'action' => $action,
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 			)
 		);
 
-		while($row = $smcFunc['db_fetch_assoc']($request))
+		while ($row = $smcFunc['db_fetch_assoc']($request))
 			$extra[$row['id_report']] = array(
 				'report' => $row['id_report'],
 				'member' => $row['id_member'],

Please login to merge, or discard this patch.

		@@ -181,14 +181,14 @@ discard block
		block discarded – undo
181	181	{
182	182	collapsedDiv.show(\'slow\');
183	183	icon.removeClass(\'toggle_down\').addClass(\'toggle_up\');
184		- icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .');
	184	+ icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . ');
185	185	}
186	186
187	187	else
188	188	{
189	189	collapsedDiv.hide(\'slow\');
190	190	icon.removeClass(\'toggle_up\').addClass(\'toggle_down\');
191		- icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .');
	191	+ icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . ');
192	192	}
193	193
194	194	});', true);
		@@ -641,7 +641,7 @@ discard block
		block discarded – undo
641	641
642	642	// Setup the correct template, even though I'll admit we ain't downloading ;)
643	643	$context['sub_template'] = 'downloaded';
644		- $allowext = array('.zip','.tgz','.gz');
	644	+ $allowext = array('.zip', '.tgz', '.gz');
645	645	// @todo Use FTP if the Packages directory is not writable.
646	646
647	647	// Check the file was even sent!
		@@ -653,13 +653,13 @@ discard block
		block discarded – undo
653	653	// Make sure it has a sane filename.
654	654	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
655	655	$extension = substr(strrchr(strtolower($_FILES['package']['name']), '.'), 0);
656		- if(!in_array($extension, $allowext))
	656	+ if (!in_array($extension, $allowext))
657	657	{
658	658	fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
659	659	}
660	660
661	661	// We only need the filename...
662		- $extension = ($extension == '.gz') ? '.tar.gz' : $extension ;
	662	+ $extension = ($extension == '.gz') ? '.tar.gz' : $extension;
663	663	$packageName = time() . $extension;
664	664
665	665	// Setup the destination and throw an error if the file is already there!

		@@ -659,7 +659,7 @@ discard block
		block discarded – undo
659	659
660	660	// Remove the phrase parts and extract the words.
661	661	$wordArray = preg_replace('~(?:^\|\s)(?:[-]?)"(?:[^"]+)"(?:$\|\s)~' . ($context['utf8'] ? 'u' : ''), ' ', $search_params['search']);
662		- $wordArray = explode(' ', $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES));
	662	+ $wordArray = explode(' ', $smcFunc['htmlspecialchars'](un_htmlspecialchars($wordArray), ENT_QUOTES));
663	663
664	664	// A minus sign in front of a word excludes the word.... so...
665	665	$excludedWords = array();
		@@ -1104,7 +1104,7 @@ discard block
		block discarded – undo
1104	1104	SELECT
1105	1105	{int:id_search},
1106	1106	t.id_topic,
1107		- ' . $relevance. ',
	1107	+ ' . $relevance . ',
1108	1108	' . (empty($userQuery) ? 't.id_first_msg' : 'm.id_msg') . ',
1109	1109	1
1110	1110	FROM ' . $subject_query['from'] . (empty($subject_query['inner_join']) ? '' : '
		@@ -1339,7 +1339,7 @@ discard block
		block discarded – undo
1339	1339	if (empty($subject_query['where']))
1340	1340	continue;
1341	1341
1342		- $ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ( '
	1342	+ $ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ('
1343	1343	INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics
1344	1344	(' . ($createTemporary ? '' : 'id_search, ') . 'id_topic)') : '') . '
1345	1345	SELECT ' . ($createTemporary ? '' : $_SESSION['search_cache']['id_search'] . ', ') . 't.id_topic
		@@ -1568,7 +1568,7 @@ discard block
		block discarded – undo
1568	1568	}
1569	1569	$main_query['select']['relevance'] = substr($relevance, 0, -3) . ') / ' . $new_weight_total . ' AS relevance';
1570	1570
1571		- $ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? ( '
	1571	+ $ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_no_index', ($smcFunc['db_support_ignore'] ? ('
1572	1572	INSERT IGNORE INTO ' . '{db_prefix}log_search_results
1573	1573	(' . implode(', ', array_keys($main_query['select'])) . ')') : '') . '
1574	1574	SELECT
		@@ -1636,7 +1636,7 @@ discard block
		block discarded – undo
1636	1636	$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
1637	1637
1638	1638	$usedIDs = array_flip(empty($inserts) ? array() : array_keys($inserts));
1639		- $ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? ( '
	1639	+ $ignoreRequest = $smcFunc['db_search_query']('insert_log_search_results_sub_only', ($smcFunc['db_support_ignore'] ? ('
1640	1640	INSERT IGNORE INTO {db_prefix}log_search_results
1641	1641	(id_search, id_topic, relevance, id_msg, num_matches)') : '') . '
1642	1642	SELECT
		@@ -2102,7 +2102,7 @@ discard block
		block discarded – undo
2102	2102	$query = trim($query, "\*+");
2103	2103	$query = strtr($smcFunc['htmlspecialchars']($query), array('\\\'' => '\''));
2104	2104
2105		- $body_highlighted = preg_replace_callback('/((<[^>]*)\|' . preg_quote(strtr($query, array('\'' => ''')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function ($m)
	2105	+ $body_highlighted = preg_replace_callback('/((<[^>]*)\|' . preg_quote(strtr($query, array('\'' => ''')), '/') . ')/i' . ($context['utf8'] ? 'u' : ''), function($m)
2106	2106	{
2107	2107	return isset($m[2]) && "$m[2]" == "$m[1]" ? stripslashes("$m[1]") : "<strong class=\"highlight\">$m[1]</strong>";
2108	2108	}, $body_highlighted);

		@@ -586,7 +586,7 @@ discard block
		block discarded – undo
586	586	'member_name' => $regOptions['username'],
587	587	'email_address' => $regOptions['email'],
588	588	'passwd' => hash_password($regOptions['username'], $regOptions['password']),
589		- 'password_salt' => substr(md5(mt_rand()), 0, 4) ,
	589	+ 'password_salt' => substr(md5(mt_rand()), 0, 4),
590	590	'posts' => 0,
591	591	'date_registered' => time(),
592	592	'member_ip' => $regOptions['interface'] == 'admin' ? '127.0.0.1' : $user_info['ip'],
		@@ -676,7 +676,7 @@ discard block
		block discarded – undo
676	676	'time_offset',
677	677	);
678	678	$knownInets = array(
679		- 'member_ip','member_ip2',
	679	+ 'member_ip', 'member_ip2',
680	680	);
681	681
682	682	// Call an optional function to validate the users' input.
		@@ -904,7 +904,7 @@ discard block
		block discarded – undo
904	904	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
905	905
906	906	//when we got no wildcard we can use equal -> fast
907		- $operator = (strpos($checkName, '%') \|\| strpos($checkName, '_') ? 'LIKE' : '=' );
	907	+ $operator = (strpos($checkName, '%') \|\| strpos($checkName, '_') ? 'LIKE' : '=');
908	908
909	909	// Make sure they don't want someone else's name.
910	910	$request = $smcFunc['db_query']('', '
		@@ -1273,7 +1273,7 @@ discard block
		block discarded – undo
1273	1273	$user_info['buddies'][] = $userReceiver;
1274	1274
1275	1275	// And add a nice alert. Don't abuse though!
1276		- if ((cache_get_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, 86400)) == null)
	1276	+ if ((cache_get_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, 86400)) == null)
1277	1277	{
1278	1278	$smcFunc['db_insert']('insert',
1279	1279	'{db_prefix}background_tasks',
		@@ -1288,7 +1288,7 @@ discard block
		block discarded – undo
1288	1288	);
1289	1289
1290	1290	// Store this in a cache entry to avoid creating multiple alerts. Give it a long life cycle.
1291		- cache_put_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, '1', 86400);
	1291	+ cache_put_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, '1', 86400);
1292	1292	}
1293	1293	}
1294	1294

		@@ -237,7 +237,7 @@ discard block
		block discarded – undo
237	237	else
238	238	{
239	239	$query_this_board = '{query_wanna_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
240		- AND b.id_board != {int:recycle_board}' : ''). '
	240	+ AND b.id_board != {int:recycle_board}' : '') . '
241	241	AND m.id_msg >= {int:max_id_msg}';
242	242	$query_parameters['max_id_msg'] = max(0, $modSettings['maxMsgID'] - 100 - $_REQUEST['start'] * 6);
243	243	$query_parameters['recycle_board'] = $modSettings['recycle_board'];
		@@ -1124,7 +1124,7 @@ discard block
		block discarded – undo
1124	1124	);
1125	1125	else
1126	1126	$request = $smcFunc['db_query']('', '
1127		- SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'].'
	1127	+ SELECT DISTINCT t.id_topic,'.$_REQUEST['sort'] . '
1128	1128	FROM {db_prefix}topics AS t
1129	1129	INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
1130	1130	INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)') . (strpos($_REQUEST['sort'], 'mems.') === false ? '' : '
		@@ -1391,7 +1391,7 @@ discard block
		block discarded – undo
1391	1391	if ($is_topics)
1392	1392	{
1393	1393	$context['recent_buttons'] = array(
1394		- 'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
	1394	+ 'markread' => array('text' => !empty($context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=' . (!empty($context['no_board_limits']) ? 'all' : 'board' . $context['querystring_board_limits']) . ';' . $context['session_var'] . '=' . $context['session_id']),
1395	1395	);
1396	1396
1397	1397	if ($context['showCheckboxes'])
		@@ -1407,7 +1407,7 @@ discard block
		block discarded – undo
1407	1407	elseif (!$is_topics && isset($context['topics_to_mark']))
1408	1408	{
1409	1409	$context['recent_buttons'] = array(
1410		- 'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="'. $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
	1410	+ 'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=unreadreplies;topics=' . $context['topics_to_mark'] . ';' . $context['session_var'] . '=' . $context['session_id']),
1411	1411	);
1412	1412
1413	1413	if ($context['showCheckboxes'])

		@@ -39,7 +39,7 @@
		block discarded – undo
39	39
40	40	foreach ($category['boards'] as $board)
41	41	echo '
42		- <option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level']-1) . '=> ' : '', $board['name'], '</option>';
	42	+ <option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=> ' : '', $board['name'], '</option>';
43	43	echo '
44	44	</optgroup>';
45	45	}

		@@ -24,8 +24,8 @@ discard block
		block discarded – undo
24	24	<meta charset="', $context['character_set'], '">
25	25	<meta name="robots" content="noindex">
26	26	<title>', $context['page_title'], '</title>
27		- <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
28		- <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
	27	+ <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
	28	+ <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
29	29	</head>
30	30	<body id="help_popup">
31	31	<div class="windowbg description">
		@@ -50,8 +50,8 @@ discard block
		block discarded – undo
50	50	<title>', $txt['find_members'], '</title>
51	51	<meta charset="', $context['character_set'], '">
52	52	<meta name="robots" content="noindex">
53		- <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
54		- <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
	53	+ <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
	54	+ <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
55	55	<script>
56	56	var membersAdded = [];
57	57	function addMember(name)

		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91
92	92	$table = str_replace('{db_prefix}', $db_prefix, $table);
93	93
94		- $pg_tables = array('pg_catalog','information_schema');
	94	+ $pg_tables = array('pg_catalog', 'information_schema');
95	95
96	96	$request = $smcFunc['db_query']('', '
97	97	SELECT pg_relation_size(C.oid) AS "size"
		@@ -289,7 +289,7 @@ discard block
		block discarded – undo
289	289	{
290	290	static $ver;
291	291
292		- if(!empty($ver))
	292	+ if (!empty($ver))
293	293	return $ver;
294	294
295	295	global $smcFunc;

		@@ -38,8 +38,8 @@ discard block
		block discarded – undo
38	38	$this->MAX_LZW_BITS = 12;
39	39	unset($this->Next, $this->Vals, $this->Stack, $this->Buf);
40	40
41		- $this->Next = range(0, (1 << $this->MAX_LZW_BITS) - 1);
42		- $this->Vals = range(0, (1 << $this->MAX_LZW_BITS) - 1);
	41	+ $this->Next = range(0, (1 << $this->MAX_LZW_BITS) - 1);
	42	+ $this->Vals = range(0, (1 << $this->MAX_LZW_BITS) - 1);
43	43	$this->Stack = range(0, (1 << ($this->MAX_LZW_BITS + 1)) - 1);
44	44	$this->Buf = range(0, 279);
45	45	}
		@@ -278,9 +278,9 @@ discard block
		block discarded – undo
278	278	for ($i = 0; $i < $this->m_nColors; $i++)
279	279	{
280	280	$ret .=
281		- chr(($this->m_arColors[$i] & 0x000000FF)) . // R
282		- chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
283		- chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
	281	+ chr(($this->m_arColors[$i] & 0x000000FF)) . // R
	282	+ chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
	283	+ chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B
284	284	}
285	285
286	286	return $ret;
		@@ -290,14 +290,14 @@ discard block
		block discarded – undo
290	290	{
291	291	$rgb = intval($rgb) & 0xFFFFFF;
292	292	$r1 = ($rgb & 0x0000FF);
293		- $g1 = ($rgb & 0x00FF00) >> 8;
	293	+ $g1 = ($rgb & 0x00FF00) >> 8;
294	294	$b1 = ($rgb & 0xFF0000) >> 16;
295	295	$idx = -1;
296	296
297	297	for ($i = 0; $i < $this->m_nColors; $i++)
298	298	{
299	299	$r2 = ($this->m_arColors[$i] & 0x000000FF);
300		- $g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8;
	300	+ $g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8;
301	301	$b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
302	302	$d = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
303	303

		@@ -49,7 +49,7 @@ discard block
		block discarded – undo
49	49	$smcFunc['db_query']('', '
50	50	UPDATE {db_prefix}log_reported
51	51	SET {raw:action} = {string:value}
52		- '. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') .'
	52	+ '. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') . '
53	53	' . $board_query,
54	54	array(
55	55	'action' => $action,
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	)
98	98	);
99	99
100		- while($row = $smcFunc['db_fetch_assoc']($request))
	100	+ while ($row = $smcFunc['db_fetch_assoc']($request))
101	101	$extra[$row['id_report']] = array(
102	102	'report' => $row['id_report'],
103	103	'member' => $row['id_member'],

SimpleMachines / SMF2.1

Push — release-2.1 ( 12381f...8d796c )

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch