albertlast / SMF2.1

Sources/MessageIndex.php

Spacing +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 				' . (empty($sort_methods_table[$context['sort_by']]) ? '' : $sort_methods_table[$context['sort_by']]) . '
 				WHERE t.id_board = {int:current_board} '
 				. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
-					AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') .'
+					AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . '
 				ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
 				LIMIT {int:maxindex}
 					OFFSET {int:start} ';
@@ -333,7 +333,7 @@ 
 		SELECT
 			t.id_topic, t.num_replies, t.locked, t.num_views, t.is_sticky, t.id_poll, t.id_previous_board,
 			' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, COALESCE(lmr.id_msg, -1)) + 1') . ' AS new_from,
-			' . ( $enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
+			' . ($enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
 			'	: '') . '
 			t.id_last_msg, t.approved, t.unapproved_posts, ml.poster_time AS last_poster_time, t.id_redirect_topic,
 			ml.id_msg_modified, ml.subject AS last_subject, ml.icon AS last_icon,
@@ -357,7 +357,7 @@ 
 			LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = {int:current_board} AND lmr.id_member = {int:current_member})') . '
 			' . (!empty($message_index_tables) ? implode("\n\t\t\t\t", $message_index_tables) : '') . '
 			' . (!empty($message_index_wheres) ? ' WHERE ' . implode("\n\t\t\t\tAND ", $message_index_wheres) : '') . '
-		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') ,
+		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC'),
 		$message_index_parameters
 	);
 

Sources/ManageMembers.php

Spacing +4 added lines, -4 removed lines

@@ -352,7 +352,7 @@ 
 			// INET.
 			elseif ($param_info['type'] == 'inet')
 			{
-				if(count($search_params[$param_name]) === 1)
+				if (count($search_params[$param_name]) === 1)
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' = {inet:' . $param_name . '})';
 					$where_params[$param_name] = $search_params[$param_name][0];
@@ -360,8 +360,8 @@ 
 				elseif (count($search_params[$param_name]) === 2)
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' <= {inet:' . $param_name . '_high} and ' . $param_info['db_fields'][0] . ' >= {inet:' . $param_name . '_low})';
-					$where_params[$param_name.'_low'] = $search_params[$param_name]['low'];
-					$where_params[$param_name.'_high'] = $search_params[$param_name]['high'];
+					$where_params[$param_name . '_low'] = $search_params[$param_name]['low'];
+					$where_params[$param_name . '_high'] = $search_params[$param_name]['high'];
 				}
 				
 			}
@@ -1005,7 +1005,7 @@ 
 	if (!empty($context['show_filter']) && !empty($context['available_filters']))
 		$listOptions['additional_rows'][] = array(
 			'position' => 'above_column_headers',
-			'value' => '<strong>' . $txt['admin_browse_filter_show'] . ':</strong> ' . ((isset($context['current_filter']) && isset($txt['admin_browse_filter_type_'.$context['current_filter']])) ? $txt['admin_browse_filter_type_'.$context['current_filter']] : $context['available_filters'][0]['desc']),
+			'value' => '<strong>' . $txt['admin_browse_filter_show'] . ':</strong> ' . ((isset($context['current_filter']) && isset($txt['admin_browse_filter_type_' . $context['current_filter']])) ? $txt['admin_browse_filter_type_' . $context['current_filter']] : $context['available_filters'][0]['desc']),
 			'class' => 'filter_row generic_list_wrapper smalltext',
 		);
 

Sources/ManageLanguages.php

Spacing +10 added lines, -10 removed lines

@@ -592,7 +592,7 @@ 
 			'editlang' => array(
 				'header' => array(
 					'value' => '',
-				),'data' => array(
+				), 'data' => array(
 					'function' => function($rowData) use ($scripturl, $txt)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=languages;sa=editlang;lid=%2$s" class="button">%3$s</a>', $scripturl, $rowData['id'], $txt['edit']);
@@ -1269,7 +1269,7 @@ 
 					// Now create the string!
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n" . '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');' . $entryValue['cruft'],
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');' . $entryValue['cruft'],
 					);
 				}
 			}
@@ -1291,7 +1291,7 @@ 
 					// And save it
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'][' . $subKey . '] = ' . $save_strings[$entryValue['key']][$entryValue['subkey']] . ';' . $entryValue['cruft'],
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'][' . $subKey . '] = ' . $save_strings[$entryValue['key']][$entryValue['subkey']] . ';' . $entryValue['cruft'],
 					);
 				}
 
@@ -1301,7 +1301,7 @@ 
 					$entryValue['entry'] = '\'\'';
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n",
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n",
 					);
 				}
 
@@ -1329,7 +1329,7 @@ 
 					// And we know what to save now!
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'] = ' . $save_strings[$entryValue['key']] . ';' . $entryValue['cruft'],
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'] = ' . $save_strings[$entryValue['key']] . ';' . $entryValue['cruft'],
 					);
 				}
 				// Remove this entry only if it is allowed
@@ -1338,7 +1338,7 @@ 
 					$entryValue['entry'] = '\'\'';
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n",
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n",
 					);
 				}
 
@@ -1369,8 +1369,8 @@ 
 						continue;
 
 					$final_saves[$string_key] = array(
-						'find' => "\s*\?".'>$',
-						'replace' => "\n\$" . $type . '[\'' . $string_key . '\'] = ' . $string_val['string'] . ';' . "\n\n?".'>',
+						'find' => "\s*\?" . '>$',
+						'replace' => "\n\$" . $type . '[\'' . $string_key . '\'] = ' . $string_val['string'] . ';' . "\n\n?" . '>',
 						'is_regex' => true,
 					);
 				}
@@ -1387,8 +1387,8 @@ 
 						$subKey = ctype_digit(trim($substring_key, '\'')) ? trim($substring_key, '\'') : '\'' . $substring_key . '\'';
 
 						$final_saves[$string_key . '[' . $substring_key . ']'] = array(
-							'find' => "\s*\?".'>$',
-							'replace' => "\n\$" . $type . '[\'' . $string_key . '\'][' . $subKey . '] = ' . $substring_val['string'] . ';' . "\n\n?".'>',
+							'find' => "\s*\?" . '>$',
+							'replace' => "\n\$" . $type . '[\'' . $string_key . '\'][' . $subKey . '] = ' . $substring_val['string'] . ';' . "\n\n?" . '>',
 							'is_regex' => true,
 						);
 					}

Sources/Subscriptions-PayPal.php

Spacing +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
 			$header = 'POST /cgi-bin/webscr HTTP/1.1' . "\r\n";
 			$header .= 'content-type: application/x-www-form-urlencoded' . "\r\n";
 			$header .= 'Host: www.' . (!empty($modSettings['paidsubs_test']) ? 'sandbox.' : '') . 'paypal.com' . "\r\n";
-			$header .= 'content-length: ' . strlen ($requestString) . "\r\n";
+			$header .= 'content-length: ' . strlen($requestString) . "\r\n";
 			$header .= 'connection: close' . "\r\n\r\n";
 
 			// Open the connection.

Sources/Subs-MembersOnline.php

Braces -1 removed lines

@@ -93,7 +93,6 @@
 
 			continue;
 		}
-
 		elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden']))
 		{
 			// Just increase the stats and don't add this hidden user to any list.

Sources/PackageGet.php

Spacing +5 added lines, -5 removed lines

@@ -181,14 +181,14 @@ 
 		{
 			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 @@ 
 
 	// 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 @@ 
 	// 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!

Sources/Subs-Members.php

Spacing +5 added lines, -5 removed lines

@@ -586,7 +586,7 @@ 
 		'member_name' => $regOptions['username'],
 		'email_address' => $regOptions['email'],
 		'passwd' => hash_password($regOptions['username'], $regOptions['password']),
-		'password_salt' => substr(md5($smcFunc['random_int']()), 0, 4) ,
+		'password_salt' => substr(md5($smcFunc['random_int']()), 0, 4),
 		'posts' => 0,
 		'date_registered' => time(),
 		'member_ip' => $regOptions['interface'] == 'admin' ? '127.0.0.1' : $user_info['ip'],
@@ -676,7 +676,7 @@ 
 		'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 @@ 
 	$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 @@ 
 		$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 @@ 
 			);
 
 			// 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);
 		}
 	}
 

Sources/Profile-Modify.php

Spacing +2 added lines, -2 removed lines

@@ -1257,7 +1257,7 @@ 
 			);
 			if (empty($value))
 			{
-				$deletes = array('id_theme' => 1 , 'variable' => $row['col_name'], 'id_member' => $memID);
+				$deletes = array('id_theme' => 1, 'variable' => $row['col_name'], 'id_member' => $memID);
 				unset($user_profile[$memID]['options'][$row['col_name']]);
 			}
 			else
@@ -1285,7 +1285,7 @@ 
 				array('id_theme', 'variable', 'id_member')
 			);
 		if (!empty($deletes))
-			$smcFunc['db_query']('','
+			$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}themes
 				WHERE id_theme = {int:id_theme} AND
 						variable = {string:variable} AND

Sources/Subs-Db-mysql.php

Spacing +10 added lines, -10 removed lines

@@ -262,8 +262,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__);
@@ -414,7 +414,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);
@@ -800,7 +800,7 @@ 
 	{
 		$count = count($insertRows);
 		$ai = 0;
-		for($i = 0; $i < $count; $i++)
+		for ($i = 0; $i < $count; $i++)
 		{
 			$old_id = $smcFunc['db_insert_id']();
 
@@ -826,13 +826,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()
 				);
@@ -861,7 +861,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;
@@ -998,7 +998,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);
 }
 
 /**
@@ -1012,7 +1012,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 ');