albertlast / SMF2.1

Sources/Class-SearchAPI.php

Spacing +4 added lines, -4 removed lines

@@ -223,7 +223,7 @@ 
 
 		global $smcFunc;
 
-		$result = $smcFunc['db_query']('','
+		$result = $smcFunc['db_query']('', '
 			SELECT DISTINCT id_search
 			FROM {db_prefix}log_search_results
 			WHERE id_msg = {int:id_msg}',
@@ -239,7 +239,7 @@ 
 		if (count($id_searchs) < 1)
 			return;
 
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_search_results
 			WHERE id_search in ({array_int:id_searchs})',
 			array(
@@ -247,7 +247,7 @@ 
 			)
 		);
 
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_search_topics
 			WHERE id_search in ({array_int:id_searchs})',
 			array(
@@ -255,7 +255,7 @@ 
 			)
 		);
 
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_search_messages
 			WHERE id_search in ({array_int:id_searchs})',
 			array(

Sources/SearchAPI-Fulltext.php

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
 	/**
 	 * @var array Which databases support this method?
 	 */
-	protected $supported_databases = array('mysql','postgresql');
+	protected $supported_databases = array('mysql', 'postgresql');
 
 	/**
 	 * The constructor function
@@ -176,7 +176,7 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if( $smcFunc['db_title'] == "PostgreSQL")
+		if ($smcFunc['db_title'] == "PostgreSQL")
 			$modSettings['search_simple_fulltext'] = true;
 
 		if ($query_params['id_search'])
@@ -256,7 +256,7 @@ 
 			// if we have bool terms to search, add them in
 			if ($query_params['boolean_match'])
 			{
-				if($smcFunc['db_title'] == "PostgreSQL")
+				if ($smcFunc['db_title'] == "PostgreSQL")
 				{
 					$language_ftx = $smcFunc['db_search_language']();
 
@@ -268,7 +268,7 @@ 
 			}
 		}
 
-		$ignoreRequest = $smcFunc['db_search_query']('insert_into_log_messages_fulltext', ($smcFunc['db_support_ignore'] ? ( '
+		$ignoreRequest = $smcFunc['db_search_query']('insert_into_log_messages_fulltext', ($smcFunc['db_support_ignore'] ? ('
 			INSERT IGNORE INTO {db_prefix}' . $search_data['insert_into'] . '
 				(' . implode(', ', array_keys($query_select)) . ')') : '') . '
 			SELECT ' . implode(', ', $query_select) . '

Sources/Subs-Db-mysql.php

Spacing +10 added lines, -10 removed lines

@@ -254,8 +254,8 @@ 
 
 		case 'datetime':
 			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'str_to_date('.
-					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
+				return 'str_to_date(' .
+					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
 					',\'%Y-%m-%d %h:%i:%s\')';
 			else
 				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
@@ -406,7 +406,7 @@ 
 		$old_pos = 0;
 		$pos = -1;
 		// Remove the string escape for better runtime
-		$db_string_1 = str_replace('\\\'','',$db_string);
+		$db_string_1 = str_replace('\\\'', '', $db_string);
 		while (true)
 		{
 			$pos = strpos($db_string_1, '\'', $pos + 1);
@@ -787,7 +787,7 @@ 
 	{
 		$count = count($insertRows);
 		$ai = 0;
-		for($i = 0; $i < $count; $i++)
+		for ($i = 0; $i < $count; $i++)
 		{
 			$old_id = $smcFunc['db_insert_id']();
 
@@ -813,13 +813,13 @@ 
 				$count2 = count($indexed_columns);
 				for ($x = 0; $x < $count2; $x++)
 				{
-					$where_string += key($indexed_columns[$x]) . ' = '. $insertRows[$i][$x];
+					$where_string += key($indexed_columns[$x]) . ' = ' . $insertRows[$i][$x];
 					if (($x + 1) < $count2)
 						$where_string += ' AND ';
 				}
 
-				$request = $smcFunc['db_query']('','
-					SELECT `'. $keys[0] . '` FROM ' . $table .'
+				$request = $smcFunc['db_query']('', '
+					SELECT `'. $keys[0] . '` FROM ' . $table . '
 					WHERE ' . $where_string . ' LIMIT 1',
 					array()
 				);
@@ -848,7 +848,7 @@ 
 			$return_var = array();
 			$count = count($insertRows);
 			$start = smf_db_insert_id($table, $keys[0]);
-			for ($i = 0; $i < $count; $i++ )
+			for ($i = 0; $i < $count; $i++)
 				$return_var[] = $start + $i;
 		}
 		return $return_var;
@@ -985,7 +985,7 @@ 
 	mysqli_stmt_bind_param($mysql_error_data_prep, 'iissssssis',
 		$error_array[0], $error_array[1], $error_array[2], $error_array[3], $error_array[4], $error_array[5], $error_array[6],
 		$error_array[7], $error_array[8], $error_array[9]);
-	mysqli_stmt_execute ($mysql_error_data_prep);
+	mysqli_stmt_execute($mysql_error_data_prep);
 }
 
 /**
@@ -999,7 +999,7 @@ 
  */
 function smf_db_custom_order($field, $array_values, $desc = false)
 {
-	$return = 'CASE '. $field . ' ';
+	$return = 'CASE ' . $field . ' ';
 	$count = count($array_values);
 	$then = ($desc ? ' THEN -' : ' THEN ');
 

Sources/Search.php

Spacing +7 added lines, -7 removed lines

@@ -659,7 +659,7 @@ 
 
 	// 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();
@@ -997,7 +997,7 @@ 
 		// Are the result fresh?
 		if (!$update_cache && !empty($_SESSION['search_cache']['id_search']))
 		{
-			$request = $smcFunc['db_query']('','
+			$request = $smcFunc['db_query']('', '
 				SELECT id_search 
 				FROM {db_prefix}log_search_results
 				WHERE id_search = {int:search_id}
@@ -1119,7 +1119,7 @@ 
 						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']) ? '' : '
@@ -1352,7 +1352,7 @@ 
 						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
@@ -1579,7 +1579,7 @@ 
 					}
 					$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
@@ -1647,7 +1647,7 @@ 
 					$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
@@ -2116,7 +2116,7 @@ 
 		if (strlen($query) == 0)
 			continue;
 
-		$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);

Sources/Errors.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 		$backtrace = debug_backtrace();
 
 	// are we in a loop?
-	if($error_call > 2)
+	if ($error_call > 2)
 	{
 		var_dump($backtrace);
 		die('Error loop.');
@@ -549,7 +549,7 @@ 
 		$url['error'] = $error;
 		// Url field got a max length of 1024 in db
 		if (strlen($url['error']) > 500)
-			$url['error'] = substr($url['error'],0,500);
+			$url['error'] = substr($url['error'], 0, 500);
 
 		if (!empty($sprintf))
 			$url['error_params'] = $sprintf;

Themes/default/Memberlist.template.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 			if (!empty($context['custom_profile_fields']['columns']))
 				foreach ($context['custom_profile_fields']['columns'] as $key => $column)
 					echo '
-						<td class="' , $key , ' centertext">', $member['options'][$key], '</td>';
+						<td class="' , $key, ' centertext">', $member['options'][$key], '</td>';
 
 			echo '
 					</tr>';

Sources/Profile-View.php

Spacing +2 added lines, -2 removed lines

@@ -1904,7 +1904,7 @@ 
 	if (count($context['ip']) !== 2)
 		fatal_lang_error('invalid_tracking_ip', false);
 
-	$ip_string = array('{inet:ip_address_low}','{inet:ip_address_high}');
+	$ip_string = array('{inet:ip_address_low}', '{inet:ip_address_high}');
 	$fields = array(
 			'ip_address_low' => $context['ip']['low'],
 			'ip_address_high' => $context['ip']['high'],
@@ -1912,7 +1912,7 @@ 
 
 	$ip_var = $context['ip'];
 
-	if ($context['ip']['low'] !==  $context['ip']['high'])
+	if ($context['ip']['low'] !== $context['ip']['high'])
 		$context['ip'] = $context['ip']['low'] . ' - ' . $context['ip']['high'];
 	else
 		$context['ip'] = $context['ip']['low'];

Themes/default/Errors.template.php

Spacing +1 added lines, -1 removed lines

@@ -328,7 +328,7 @@
 		foreach ($context['error_info']['backtrace'] as $key => $value)
 		{
 			//Check for existing
-			if (!property_exists($value,'file') || empty($value->file))
+			if (!property_exists($value, 'file') || empty($value->file))
 				$value->file = $txt['unknown'];
 			if (!property_exists($value, 'line') || empty($value->line))
 				$value->line = -1;

Themes/default/Profile.template.php

Indentation +16 added lines, -16 removed lines

@@ -2192,10 +2192,10 @@ 
  */
 function template_ignoreboards()
 {
-    global $context, $txt, $scripturl;
+	global $context, $txt, $scripturl;
 
-    // The main containing header.
-    echo '
+	// The main containing header.
+	echo '
 	<form action="', $scripturl, '?action=profile;area=ignoreboards;save" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator">
 		<div class="cat_bar">
 			<h3 class="catbg profile_hd">
@@ -2207,34 +2207,34 @@ 
 			<div class="flow_hidden boardslist">
 				<ul>';
 
-    foreach ($context['categories'] as $category)
-    {
-        echo '
+	foreach ($context['categories'] as $category)
+	{
+		echo '
 					<li>
 						<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \'creator\'); return false;">', $category['name'], '</a>
             			<ul>';
 
-        foreach ($category['boards'] as $board)
-        {
-            echo '
+		foreach ($category['boards'] as $board)
+		{
+			echo '
 							<li style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
 								<label for="ignore_brd', $board['id'], '"><input type="checkbox" id="brd', $board['id'], '" name="ignore_brd[', $board['id'], ']" value="', $board['id'], '"', $board['selected'] ? ' checked' : '', '> ', $board['name'], '</label>
 							</li>';
-        }
+		}
 
-        echo '
+		echo '
 						</ul>
 					</li>';
-    }
+	}
 
-    echo '
+	echo '
 				</ul>
     		</div><!-- .flow_hidden boardslist -->';
 
-    // Show the standard "Save Settings" profile button.
-    template_profile_save();
+	// Show the standard "Save Settings" profile button.
+	template_profile_save();
 
-    echo '
+	echo '
 		</div><!-- .windowbg -->
 	</form>
 	<br>';

Spacing +2 added lines, -2 removed lines

@@ -459,7 +459,7 @@ 
 		$fields = '';
 		foreach ($context['print_custom_fields']['below_signature'] as $field)
 			if (!empty($field['output_html']))
-				$fields .=  '
+				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
 
 		if (!empty($fields))
@@ -3167,7 +3167,7 @@ 
 					<div class="floatright tfa_qrcode">
 						<div id="qrcode"></div>
 						<script type="text/javascript">
-							new QRCode(document.getElementById("qrcode"), "' , $context['tfa_qr_url'],'");
+							new QRCode(document.getElementById("qrcode"), "' , $context['tfa_qr_url'], '");
 						</script>
 					</div>';