Inspection of "MySQL fix db_native_replace function (#4714)" - SimpleMachines/SMF2.1 - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — release-2.1 ( e3ceef...dd179b )

by Colin

created 2018-04-15 17:56 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.

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 	// Stick our "create a redirection topic" template in here...
 	template_redirect_options('move');
 
-    echo '
+	echo '
 					<input type="submit" value="', $txt['move_topic'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
 				</div><!-- .move_topic -->
 			</div><!-- .windowbg -->';
@@ -86,9 +86,9 @@  discard block
 block discarded – undo
  */
 function template_redirect_options($type)
 {
-    global $txt, $context, $modSettings;
+	global $txt, $context, $modSettings;
 
-    echo '
+	echo '
 					<label for="postRedirect">
 						<input type="checkbox" name="postRedirect" id="postRedirect"', $context['is_approved'] ? ' checked' : '', ' onclick="', $context['is_approved'] ? '' : 'if (this.checked && !confirm(\'' . $txt[$type . '_topic_unapproved_js'] . '\')) return false; ', 'document.getElementById(\'reasonArea\').style.display = this.checked ? \'block\' : \'none\';"> ', $txt['post_redirection'], '.
 					</label>

Please login to merge, or discard this patch.

Themes/default/GenericList.template.php 1 patch

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

@@ -220,7 +220,7 @@
 block discarded – undo
 				),
 			),
 		);
-	*/
+	 */
 
 	// Are we using right-to-left orientation?
 	$first = $context['right_to_left'] ? 'last' : 'first';

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/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/Class-Package.php 1 patch

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

@@ -793,7 +793,7 @@  discard block
 block discarded – undo
 		if (!$this->connection)
 		{
 			$this->error = 'bad_server';
-            		$this->last_message = 'Invalid Server';
+					$this->last_message = 'Invalid Server';
 			return;
 		}
 
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
 		if (!$this->check_response(220))
 		{
 			$this->error = 'bad_response';
-		        $this->last_message = 'Bad Response';
+				$this->last_message = 'Bad Response';
 			return;
 		}
 

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/Xml.php 1 patch

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

@@ -272,13 +272,13 @@
 block discarded – undo
 				$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
 			// Add in few replacements.
 			/**
-			* These are the defaults:
-			* - {MEMBER} - Member Name. => current user for review
-			* - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced
-			* - {FORUMNAME} - Forum Name.
-			* - {SCRIPTURL} - Web address of forum.
-			* - {REGARDS} - Standard email sign-off.
-			*/
+			 * These are the defaults:
+			 * - {MEMBER} - Member Name. => current user for review
+			 * - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced
+			 * - {FORUMNAME} - Forum Name.
+			 * - {SCRIPTURL} - Web address of forum.
+			 * - {REGARDS} - Standard email sign-off.
+			 */
 			$find = array(
 				'{MEMBER}',
 				'{FORUMNAME}',

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-BrowserDetect.php 1 patch

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -101,9 +101,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is Opera or not
-	* @return boolean Whether or not this is Opera
-	*/
+	 * Determine if the browser is Opera or not
+	 * @return boolean Whether or not this is Opera
+	 */
 	function isOpera()
 	{
 		if (!isset($this->_browsers['is_opera']))
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is IE or not
-	* @return boolean true Whether or not the browser is IE
-	*/
+	 * Determine if the browser is IE or not
+	 * @return boolean true Whether or not the browser is IE
+	 */
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is IE11 or not
-	* @return boolean Whether or not the browser is IE11
-	*/
+	 * Determine if the browser is IE11 or not
+	 * @return boolean Whether or not the browser is IE11
+	 */
 	function isIe11()
 	{
 		// IE11 is a bit different than earlier versions
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
  	}
 
 	/**
-	* Determine if the browser is Edge or not
-	* @return boolean Whether or not the browser is Edge
-	*/
+	 * Determine if the browser is Edge or not
+	 * @return boolean Whether or not the browser is Edge
+	 */
 	function isEdge()
 	{
 		if (!isset($this->_browsers['is_edge']))
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is a Webkit based one or not
-	* @return boolean Whether or not this is a Webkit-based browser
-	*/
+	 * Determine if the browser is a Webkit based one or not
+	 * @return boolean Whether or not this is a Webkit-based browser
+	 */
 	function isWebkit()
 	{
 		if (!isset($this->_browsers['is_webkit']))
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is Firefox or one of its variants
-	* @return boolean Whether or not this is Firefox (or one of its variants)
-	*/
+	 * Determine if the browser is Firefox or one of its variants
+	 * @return boolean Whether or not this is Firefox (or one of its variants)
+	 */
 	function isFirefox()
 	{
 		if (!isset($this->_browsers['is_firefox']))
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is WebTv or not
-	* @return boolean Whether or not this is WebTV
-	*/
+	 * Determine if the browser is WebTv or not
+	 * @return boolean Whether or not this is WebTV
+	 */
 	function isWebTv()
 	{
 		if (!isset($this->_browsers['is_web_tv']))
@@ -181,9 +181,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is konqueror or not
-	* @return boolean Whether or not this is Konqueror
-	*/
+	 * Determine if the browser is konqueror or not
+	 * @return boolean Whether or not this is Konqueror
+	 */
 	function isKonqueror()
 	{
 		if (!isset($this->_browsers['is_konqueror']))
@@ -192,9 +192,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is Gecko or not
-	* @return boolean Whether or not this is a Gecko-based browser
-	*/
+	 * Determine if the browser is Gecko or not
+	 * @return boolean Whether or not this is a Gecko-based browser
+	 */
 	function isGecko()
 	{
 		if (!isset($this->_browsers['is_gecko']))
@@ -203,9 +203,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is Opera Mini or not
-	* @return boolean Whether or not this is Opera Mini
-	*/
+	 * Determine if the browser is Opera Mini or not
+	 * @return boolean Whether or not this is Opera Mini
+	 */
 	function isOperaMini()
 	{
 		if (!isset($this->_browsers['is_opera_mini']))
@@ -216,9 +216,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Determine if the browser is Opera Mobile or not
-	* @return boolean Whether or not this is Opera Mobile
-	*/
+	 * Determine if the browser is Opera Mobile or not
+	 * @return boolean Whether or not this is Opera Mobile
+	 */
 	function isOperaMobi()
 	{
 		if (!isset($this->_browsers['is_opera_mobi']))

Please login to merge, or discard this patch.

		@@ -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	}

		@@ -220,7 +220,7 @@
		block discarded – undo
220	220	),
221	221	),
222	222	);
223		- */
	223	+ */
224	224
225	225	// Are we using right-to-left orientation?
226	226	$first = $context['right_to_left'] ? 'last' : 'first';

		@@ -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);

		@@ -793,7 +793,7 @@ discard block
		block discarded – undo
793	793	if (!$this->connection)
794	794	{
795	795	$this->error = 'bad_server';
796		- $this->last_message = 'Invalid Server';
	796	+ $this->last_message = 'Invalid Server';
797	797	return;
798	798	}
799	799
		@@ -801,7 +801,7 @@ discard block
		block discarded – undo
801	801	if (!$this->check_response(220))
802	802	{
803	803	$this->error = 'bad_response';
804		- $this->last_message = 'Bad Response';
	804	+ $this->last_message = 'Bad Response';
805	805	return;
806	806	}
807	807

		@@ -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

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	// Stick our "create a redirection topic" template in here...
64	64	template_redirect_options('move');
65	65
66		- echo '
	66	+ echo '
67	67	<input type="submit" value="', $txt['move_topic'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
68	68	</div><!-- .move_topic -->
69	69	</div><!-- .windowbg -->';
		@@ -86,9 +86,9 @@ discard block
		block discarded – undo
86	86	*/
87	87	function template_redirect_options($type)
88	88	{
89		- global $txt, $context, $modSettings;
	89	+ global $txt, $context, $modSettings;
90	90
91		- echo '
	91	+ echo '
92	92	<label for="postRedirect">
93	93	<input type="checkbox" name="postRedirect" id="postRedirect"', $context['is_approved'] ? ' checked' : '', ' onclick="', $context['is_approved'] ? '' : 'if (this.checked && !confirm(\'' . $txt[$type . '_topic_unapproved_js'] . '\')) return false; ', 'document.getElementById(\'reasonArea\').style.display = this.checked ? \'block\' : \'none\';"> ', $txt['post_redirection'], '.
94	94	</label>

		@@ -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)

		@@ -272,13 +272,13 @@
		block discarded – undo
272	272	$context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body'];
273	273	// Add in few replacements.
274	274	/**
275		- * These are the defaults:
276		- * - {MEMBER} - Member Name. => current user for review
277		- * - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced
278		- * - {FORUMNAME} - Forum Name.
279		- * - {SCRIPTURL} - Web address of forum.
280		- * - {REGARDS} - Standard email sign-off.
281		- */
	275	+ * These are the defaults:
	276	+ * - {MEMBER} - Member Name. => current user for review
	277	+ * - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced
	278	+ * - {FORUMNAME} - Forum Name.
	279	+ * - {SCRIPTURL} - Web address of forum.
	280	+ * - {REGARDS} - Standard email sign-off.
	281	+ */
282	282	$find = array(
283	283	'{MEMBER}',
284	284	'{FORUMNAME}',

		@@ -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'])

		@@ -101,9 +101,9 @@ discard block
		block discarded – undo
101	101	}
102	102
103	103	/**
104		- * Determine if the browser is Opera or not
105		- * @return boolean Whether or not this is Opera
106		- */
	104	+ * Determine if the browser is Opera or not
	105	+ * @return boolean Whether or not this is Opera
	106	+ */
107	107	function isOpera()
108	108	{
109	109	if (!isset($this->_browsers['is_opera']))
		@@ -112,9 +112,9 @@ discard block
		block discarded – undo
112	112	}
113	113
114	114	/**
115		- * Determine if the browser is IE or not
116		- * @return boolean true Whether or not the browser is IE
117		- */
	115	+ * Determine if the browser is IE or not
	116	+ * @return boolean true Whether or not the browser is IE
	117	+ */
118	118	function isIe()
119	119	{
120	120	// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
		@@ -124,9 +124,9 @@ discard block
		block discarded – undo
124	124	}
125	125
126	126	/**
127		- * Determine if the browser is IE11 or not
128		- * @return boolean Whether or not the browser is IE11
129		- */
	127	+ * Determine if the browser is IE11 or not
	128	+ * @return boolean Whether or not the browser is IE11
	129	+ */
130	130	function isIe11()
131	131	{
132	132	// IE11 is a bit different than earlier versions
		@@ -137,9 +137,9 @@ discard block
		block discarded – undo
137	137	}
138	138
139	139	/**
140		- * Determine if the browser is Edge or not
141		- * @return boolean Whether or not the browser is Edge
142		- */
	140	+ * Determine if the browser is Edge or not
	141	+ * @return boolean Whether or not the browser is Edge
	142	+ */
143	143	function isEdge()
144	144	{
145	145	if (!isset($this->_browsers['is_edge']))
		@@ -148,9 +148,9 @@ discard block
		block discarded – undo
148	148	}
149	149
150	150	/**
151		- * Determine if the browser is a Webkit based one or not
152		- * @return boolean Whether or not this is a Webkit-based browser
153		- */
	151	+ * Determine if the browser is a Webkit based one or not
	152	+ * @return boolean Whether or not this is a Webkit-based browser
	153	+ */
154	154	function isWebkit()
155	155	{
156	156	if (!isset($this->_browsers['is_webkit']))
		@@ -159,9 +159,9 @@ discard block
		block discarded – undo
159	159	}
160	160
161	161	/**
162		- * Determine if the browser is Firefox or one of its variants
163		- * @return boolean Whether or not this is Firefox (or one of its variants)
164		- */
	162	+ * Determine if the browser is Firefox or one of its variants
	163	+ * @return boolean Whether or not this is Firefox (or one of its variants)
	164	+ */
165	165	function isFirefox()
166	166	{
167	167	if (!isset($this->_browsers['is_firefox']))
		@@ -170,9 +170,9 @@ discard block
		block discarded – undo
170	170	}
171	171
172	172	/**
173		- * Determine if the browser is WebTv or not
174		- * @return boolean Whether or not this is WebTV
175		- */
	173	+ * Determine if the browser is WebTv or not
	174	+ * @return boolean Whether or not this is WebTV
	175	+ */
176	176	function isWebTv()
177	177	{
178	178	if (!isset($this->_browsers['is_web_tv']))
		@@ -181,9 +181,9 @@ discard block
		block discarded – undo
181	181	}
182	182
183	183	/**
184		- * Determine if the browser is konqueror or not
185		- * @return boolean Whether or not this is Konqueror
186		- */
	184	+ * Determine if the browser is konqueror or not
	185	+ * @return boolean Whether or not this is Konqueror
	186	+ */
187	187	function isKonqueror()
188	188	{
189	189	if (!isset($this->_browsers['is_konqueror']))
		@@ -192,9 +192,9 @@ discard block
		block discarded – undo
192	192	}
193	193
194	194	/**
195		- * Determine if the browser is Gecko or not
196		- * @return boolean Whether or not this is a Gecko-based browser
197		- */
	195	+ * Determine if the browser is Gecko or not
	196	+ * @return boolean Whether or not this is a Gecko-based browser
	197	+ */
198	198	function isGecko()
199	199	{
200	200	if (!isset($this->_browsers['is_gecko']))
		@@ -203,9 +203,9 @@ discard block
		block discarded – undo
203	203	}
204	204
205	205	/**
206		- * Determine if the browser is Opera Mini or not
207		- * @return boolean Whether or not this is Opera Mini
208		- */
	206	+ * Determine if the browser is Opera Mini or not
	207	+ * @return boolean Whether or not this is Opera Mini
	208	+ */
209	209	function isOperaMini()
210	210	{
211	211	if (!isset($this->_browsers['is_opera_mini']))
		@@ -216,9 +216,9 @@ discard block
		block discarded – undo
216	216	}
217	217
218	218	/**
219		- * Determine if the browser is Opera Mobile or not
220		- * @return boolean Whether or not this is Opera Mobile
221		- */
	219	+ * Determine if the browser is Opera Mobile or not
	220	+ * @return boolean Whether or not this is Opera Mobile
	221	+ */
222	222	function isOperaMobi()
223	223	{
224	224	if (!isset($this->_browsers['is_opera_mobi']))

SimpleMachines / SMF2.1

Push — release-2.1 ( e3ceef...dd179b )

Status

Category

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

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +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 +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +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

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

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

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch