SimpleMachines / SMF2.1

Sources/Subs-Db-mysql.php

Spacing +10 added lines, -10 removed lines

@@ -255,8 +255,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__);
@@ -460,7 +460,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);
@@ -842,7 +842,7 @@ 
 	{
 		$count = count($insertRows);
 		$ai = 0;
-		for($i = 0; $i < $count; $i++)
+		for ($i = 0; $i < $count; $i++)
 		{
 			$old_id = $smcFunc['db_insert_id']();
 
@@ -868,13 +868,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()
 				);
@@ -903,7 +903,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;
@@ -1036,7 +1036,7 @@ 
 	mysqli_stmt_bind_param($mysql_error_data_prep, 'iissssssi',
 		$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]);
-	mysqli_stmt_execute ($mysql_error_data_prep);
+	mysqli_stmt_execute($mysql_error_data_prep);
 }
 
 /**
@@ -1050,7 +1050,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/DbPackages-mysql.php

Spacing +8 added lines, -8 removed lines

@@ -126,9 +126,9 @@ 
 		{
 			$smcFunc['db_transaction']('begin');
 			$db_trans = true;
-			$smcFunc['db_drop_table']($table_name.'_old');
-			$smcFunc['db_query']('','
-				RENAME TABLE '. $table_name .' TO ' . $table_name . '_old',
+			$smcFunc['db_drop_table']($table_name . '_old');
+			$smcFunc['db_query']('', '
+				RENAME TABLE '. $table_name . ' TO ' . $table_name . '_old',
 				array(
 					'security_override' => true,
 				)
@@ -202,15 +202,15 @@ 
 	{
 		$same_col = array();
 
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT count(*), column_name
 			FROM information_schema.columns
 			WHERE table_name in ({string:table1},{string:table2}) AND table_schema = {string:schema}
 			GROUP BY column_name
 			HAVING count(*) > 1',
-			array (
+			array(
 				'table1' => $table_name,
-				'table2' => $table_name.'_old',
+				'table2' => $table_name . '_old',
 				'schema' => $db_name,
 			)
 		);
@@ -220,8 +220,8 @@ 
 			$same_col[] = $row['column_name'];
 		}
 
-		$smcFunc['db_query']('','
-			INSERT INTO ' . $table_name .'('
+		$smcFunc['db_query']('', '
+			INSERT INTO ' . $table_name . '('
 			. implode($same_col, ',') .
 			')
 			SELECT '. implode($same_col, ',') . '

Sources/Load.php

Spacing +2 added lines, -2 removed lines

@@ -1746,7 +1746,7 @@ 
 		$id_theme = $modSettings['theme_guests'];
 
 	// We already load the basic stuff?
-	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme )
+	if (empty($settings['theme_id']) || $settings['theme_id'] != $id_theme)
 	{
 		// Verify the id_theme... no foul play.
 		// Always allow the board specific theme, if they are overriding.
@@ -2018,7 +2018,7 @@ 
 	if (!isset($context['javascript_vars']))
 		$context['javascript_vars'] = array();
 
-	$context['login_url'] =  $scripturl . '?action=login2';
+	$context['login_url'] = $scripturl . '?action=login2';
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
 	$context['session_var'] = $_SESSION['session_var'];
 	$context['session_id'] = $_SESSION['session_value'];

SSI.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class) use ($sourcedir)
+spl_autoload_register(function($class) use ($sourcedir)
 {
 	$classMap = array(
 		'ReCaptcha\\' => 'ReCaptcha/',

Sources/Subs-Auth.php

Spacing +2 added lines, -2 removed lines

@@ -430,8 +430,8 @@
 	$real_name = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
 
 	// Searches.
-	$member_name_search = $member_name . ' ' . $comparison . ' ' . implode( ' OR ' . $member_name . ' ' . $comparison . ' ', $names_list);
-	$real_name_search = $real_name . ' ' . $comparison . ' ' . implode( ' OR ' . $real_name . ' ' . $comparison . ' ', $names_list);
+	$member_name_search = $member_name . ' ' . $comparison . ' ' . implode(' OR ' . $member_name . ' ' . $comparison . ' ', $names_list);
+	$real_name_search = $real_name . ' ' . $comparison . ' ' . implode(' OR ' . $real_name . ' ' . $comparison . ' ', $names_list);
 
 	// Search by username, display name, and email address.
 	$request = $smcFunc['db_query']('', '

Sources/Subs.php

Spacing +121 added lines, -121 removed lines

@@ -386,7 +386,7 @@ 
 			{
 				$val = 'CASE ';
 				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' ';
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . count(fetch_alerts($v, false, 0, array(), false)) . ' ';
 				$val = $val . ' END';
 				$type = 'raw';
 			}
@@ -817,7 +817,7 @@ 
 			$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
 		if (empty($unsupportedFormats))
 		{
-			foreach($strftimeFormatSubstitutions as $format => $substitution)
+			foreach ($strftimeFormatSubstitutions as $format => $substitution)
 			{
 				$value = @strftime('%' . $format);
 
@@ -1182,7 +1182,7 @@ 
 					'height' => array('optional' => true, 'match' => '(\d+)'),
 				),
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
+				'validate' => function(&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
 				{
 					$returnContext = '';
 
@@ -1217,7 +1217,7 @@ 
 						}
 
 						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}']))
-							$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '" class="atc_img"></a>';
+							$returnContext .= '<a href="' . $currentAttachment['href'] . ';image" id="link_' . $currentAttachment['id'] . '" onclick="' . $currentAttachment['thumbnail']['javascript'] . '"><img src="' . $currentAttachment['thumbnail']['href'] . '"' . $alt . $title . ' id="thumb_' . $currentAttachment['id'] . '" class="atc_img"></a>';
 						else
 							$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img"/>';
 					}
@@ -1246,7 +1246,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1283,7 +1283,7 @@ 
 				'type' => 'unparsed_equals_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> ($2) <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1327,7 +1327,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<a href="mailto:$1" class="bbc_email">$1</a>',
 				// @todo Should this respect guest_hideContacts?
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 				},
@@ -1346,7 +1346,7 @@ 
 				'type' => 'unparsed_commas_content',
 				'test' => '\d+,\d+\]',
 				'content' => '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (isset($disabled['url']))
 						$tag['content'] = '$1';
@@ -1362,7 +1362,7 @@ 
 				'test' => '(left|right)(\s+max=\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)?\]',
 				'before' => '<div $1>',
 				'after' => '</div>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"';
 
@@ -1411,7 +1411,7 @@ 
 					'height' => array('optional' => true, 'value' => ' height="$1"', 'match' => '(\d+)'),
 				),
 				'content' => '<img src="$1" alt="{alt}" title="{title}"{width}{height} class="bbc_img resized">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $image_proxy_secret, $boardurl, $user_info;
 
@@ -1437,7 +1437,7 @@ 
 				'tag' => 'img',
 				'type' => 'unparsed_content',
 				'content' => '<img src="$1" alt="" class="bbc_img">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $image_proxy_secret, $boardurl, $user_info;
 
@@ -1463,7 +1463,7 @@ 
 				'tag' => 'iurl',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1477,7 +1477,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (substr($data, 0, 1) == '#')
 						$data = '#post_' . substr($data, 1);
@@ -1557,7 +1557,7 @@ 
 				'tag' => 'php',
 				'type' => 'unparsed_content',
 				'content' => '<span class="phpcode">$1</span>',
-				'validate' => isset($disabled['php']) ? null : function (&$tag, &$data, $disabled)
+				'validate' => isset($disabled['php']) ? null : function(&$tag, &$data, $disabled)
 				{
 					if (!isset($disabled['php']))
 					{
@@ -1655,7 +1655,7 @@ 
 				'test' => '[1-7]\]',
 				'before' => '<span style="font-size: $1;" class="bbc_size">',
 				'after' => '</span>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
 					$data = $sizes[$data] . 'em';
@@ -1693,7 +1693,7 @@ 
 				'tag' => 'time',
 				'type' => 'unparsed_content',
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (is_numeric($data))
 						$data = timeformat($data);
@@ -1721,7 +1721,7 @@ 
 				'tag' => 'url',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1735,7 +1735,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if (empty($scheme))
@@ -1761,7 +1761,7 @@ 
 		{
 			if (isset($temp_bbc))
 				$bbc_codes = $temp_bbc;
-			usort($codes, function ($a, $b) {
+			usort($codes, function($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
 			});
 			return $codes;
@@ -1998,7 +1998,7 @@ 
 										# a run of Unicode domain name characters and a dot
 										[\p{L}\p{M}\p{N}\-.:@]+\.
 										# and then a TLD valid in the DNS or the reserved "local" TLD
-										(?:'. $modSettings['tld_regex'] .'|local)
+										(?:'. $modSettings['tld_regex'] . '|local)
 									)
 									# followed by a non-domain character or end of line
 									(?=[^\p{L}\p{N}\-.]|$)
@@ -2066,7 +2066,7 @@ 
 						)?
 						';
 
-						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches) {
+						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function($matches) {
 							$url = array_shift($matches);
 
 							$scheme = parse_url($url, PHP_URL_SCHEME);
@@ -2147,7 +2147,7 @@ 
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
 
 			// A closing tag that doesn't match any open tags? Skip it.
-			if (!in_array($look_for, array_map(function($code){return $code['tag'];}, $open_tags)))
+			if (!in_array($look_for, array_map(function($code) {return $code['tag']; }, $open_tags)))
 				continue;
 
 			$to_close = array();
@@ -2810,7 +2810,7 @@ 
 		for ($i = 0, $n = count($smileysfrom); $i < $n; $i++)
 		{
 			$specialChars = $smcFunc['htmlspecialchars']($smileysfrom[$i], ENT_QUOTES);
-			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')). '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
+			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
 
 			$smileyPregReplacements[$smileysfrom[$i]] = $smileyCode;
 
@@ -2827,7 +2827,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch,
-		function ($matches) use ($smileyPregReplacements)
+		function($matches) use ($smileyPregReplacements)
 		{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
@@ -2893,13 +2893,13 @@ 
 	{
 		if (defined('SID') && SID != '')
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
-					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : "");
+					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
 		else
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
@@ -3222,7 +3222,7 @@ 
 
 	// Add a generic "Are you sure?" confirmation message.
 	addInlineJavaScript('
-	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';');
+	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) . ';');
 
 	// Now add the capping code for avatars.
 	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize')
@@ -3583,7 +3583,7 @@ 
 
 		else
 			echo '
-	<script src="', $settings['theme_url'] ,'/scripts/minified', ($do_deferred ? '_deferred' : '') ,'.js', $minSeed ,'"></script>';
+	<script src="', $settings['theme_url'], '/scripts/minified', ($do_deferred ? '_deferred' : ''), '.js', $minSeed, '"></script>';
 	}
 
 	// Inline JavaScript - Actually useful some times!
@@ -3661,14 +3661,14 @@ 
 
 		else
 			echo '
-	<link rel="stylesheet" href="', $settings['theme_url'] ,'/css/minified.css', $minSeed ,'">';
+	<link rel="stylesheet" href="', $settings['theme_url'], '/css/minified.css', $minSeed, '">';
 	}
 
 	// Print the rest after the minified files.
 	if (!empty($normal))
 		foreach ($normal as $nf)
 			echo '
-	<link rel="stylesheet" href="', $nf ,'">';
+	<link rel="stylesheet" href="', $nf, '">';
 
 	if ($db_show_debug === true)
 	{
@@ -3684,7 +3684,7 @@ 
 	<style>';
 
 		foreach ($context['css_header'] as $css)
-			echo $css .'
+			echo $css . '
 	';
 
 		echo'
@@ -3713,27 +3713,27 @@ 
 		return false;
 
 	// Did we already did this?
-	$toCache = cache_get_data('minimized_'. $settings['theme_id'] .'_'. $type, 86400);
+	$toCache = cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type, 86400);
 
 	// Already done?
 	if (!empty($toCache))
 		return true;
 
 	// No namespaces, sorry!
-	$classType = 'MatthiasMullie\\Minify\\'. strtoupper($type);
+	$classType = 'MatthiasMullie\\Minify\\' . strtoupper($type);
 
 	// Temp path.
-	$cTempPath = $settings['theme_dir'] .'/'. ($type == 'css' ? 'css' : 'scripts') .'/';
+	$cTempPath = $settings['theme_dir'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/';
 
 	// What kind of file are we going to create?
-	$toCreate = $cTempPath .'minified'. ($do_deferred ? '_deferred' : '') .'.'. $type;
+	$toCreate = $cTempPath . 'minified' . ($do_deferred ? '_deferred' : '') . '.' . $type;
 
 	// File has to exists, if it isn't try to create it.
 	if ((!file_exists($toCreate) && @fopen($toCreate, 'w') === false) || !smf_chmod($toCreate))
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
@@ -3768,14 +3768,14 @@ 
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
 	}
 
 	// And create a long lived cache entry.
-	cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, $toCreate, 86400);
+	cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, $toCreate, 86400);
 
 	return true;
 }
@@ -3835,7 +3835,7 @@ 
 	else
 		$path = $modSettings['attachmentUploadDir'];
 
-	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
+	return $path . '/' . $attachment_id . '_' . $file_hash . '.dat';
 }
 
 /**
@@ -3879,10 +3879,10 @@ 
 		$valid_low = isValidIP($ip_parts[0]);
 		$valid_high = isValidIP($ip_parts[1]);
 		$count = 0;
-		$mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.');
+		$mode = (preg_match('/:/', $ip_parts[0]) > 0 ? ':' : '.');
 		$max = ($mode == ':' ? 'ffff' : '255');
 		$min = 0;
-		if(!$valid_low)
+		if (!$valid_low)
 		{
 			$ip_parts[0] = preg_replace('/\*/', '0', $ip_parts[0]);
 			$valid_low = isValidIP($ip_parts[0]);
@@ -3896,7 +3896,7 @@ 
 		}
 
 		$count = 0;
-		if(!$valid_high)
+		if (!$valid_high)
 		{
 			$ip_parts[1] = preg_replace('/\*/', $max, $ip_parts[1]);
 			$valid_high = isValidIP($ip_parts[1]);
@@ -3909,7 +3909,7 @@ 
 			}
 		}
 
-		if($valid_high && $valid_low)
+		if ($valid_high && $valid_low)
 		{
 			$ip_array['low'] = $ip_parts[0];
 			$ip_array['high'] = $ip_parts[1];
@@ -4091,7 +4091,7 @@ 
 		addInlineJavaScript('
 	var user_menus = new smc_PopupMenu();
 	user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup");
-	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true);
+	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u=' . $context['user']['id'] . '");', true);
 		if ($context['allow_pm'])
 			addInlineJavaScript('
 	user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true);
@@ -4727,7 +4727,7 @@ 
 		// No? try a fallback to $sourcedir
 		else
 		{
-			$absPath = $sourcedir .'/'. $file;
+			$absPath = $sourcedir . '/' . $file;
 
 			if (file_exists($absPath))
 				require_once($absPath);
@@ -4808,15 +4808,15 @@ 
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
-		"\xe2\x80\x9a",	// single low-9 quotation mark
-		"\xe2\x80\x9e",	// double low-9 quotation mark
-		"\xe2\x80\xa6",	// horizontal ellipsis
-		"\xe2\x80\x98",	// left single curly quote
-		"\xe2\x80\x99",	// right single curly quote
-		"\xe2\x80\x9c",	// left double curly quote
-		"\xe2\x80\x9d",	// right double curly quote
-		"\xe2\x80\x93",	// en dash
-		"\xe2\x80\x94",	// em dash
+		"\xe2\x80\x9a", // single low-9 quotation mark
+		"\xe2\x80\x9e", // double low-9 quotation mark
+		"\xe2\x80\xa6", // horizontal ellipsis
+		"\xe2\x80\x98", // left single curly quote
+		"\xe2\x80\x99", // right single curly quote
+		"\xe2\x80\x9c", // left double curly quote
+		"\xe2\x80\x9d", // right double curly quote
+		"\xe2\x80\x93", // en dash
+		"\xe2\x80\x94", // em dash
 	);
 
 	// windows 1252 / iso equivalents
@@ -4834,15 +4834,15 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
-		'-',	// &ndash;
-		'--',	// &mdash;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
+		'-', // &ndash;
+		'--', // &mdash;
 	);
 
 	if ($context['utf8'])
@@ -5260,7 +5260,7 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
+	if (empty($bin))
 		return '';
 
 	global $db_type;
@@ -5291,28 +5291,28 @@ 
  */
 function _safe_serialize($value)
 {
-	if(is_null($value))
+	if (is_null($value))
 		return 'N;';
 
-	if(is_bool($value))
-		return 'b:'. (int) $value .';';
+	if (is_bool($value))
+		return 'b:' . (int) $value . ';';
 
-	if(is_int($value))
-		return 'i:'. $value .';';
+	if (is_int($value))
+		return 'i:' . $value . ';';
 
-	if(is_float($value))
-		return 'd:'. str_replace(',', '.', $value) .';';
+	if (is_float($value))
+		return 'd:' . str_replace(',', '.', $value) . ';';
 
-	if(is_string($value))
-		return 's:'. strlen($value) .':"'. $value .'";';
+	if (is_string($value))
+		return 's:' . strlen($value) . ':"' . $value . '";';
 
-	if(is_array($value))
+	if (is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
+		foreach ($value as $k => $v)
 			$out .= _safe_serialize($k) . _safe_serialize($v);
 
-		return 'a:'. count($value) .':{'. $out .'}';
+		return 'a:' . count($value) . ':{' . $out . '}';
 	}
 
 	// safe_serialize cannot serialize resources or objects.
@@ -5354,7 +5354,7 @@ 
 function _safe_unserialize($str)
 {
 	// Input  is not a string.
-	if(empty($str) || !is_string($str))
+	if (empty($str) || !is_string($str))
 		return false;
 
 	$stack = array();
@@ -5368,40 +5368,40 @@ 
 	 *   3 - in array, expecting value or another array
 	 */
 	$state = 0;
-	while($state != 1)
+	while ($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
-		if($type == '}')
+		if ($type == '}')
 			$str = substr($str, 1);
 
-		else if($type == 'N' && $str[1] == ';')
+		else if ($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
 		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		else if ($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
 		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		else if ($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
-			$value = (int)$matches[1];
+			$value = (int) $matches[1];
 			$str = $matches[2];
 		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		else if ($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
-			$value = (float)$matches[1];
+			$value = (float) $matches[1];
 			$str = $matches[3];
 		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		else if ($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int) $matches[1], 2) == '";')
 		{
-			$value = substr($matches[2], 0, (int)$matches[1]);
-			$str = substr($matches[2], (int)$matches[1] + 2);
+			$value = substr($matches[2], 0, (int) $matches[1]);
+			$str = substr($matches[2], (int) $matches[1] + 2);
 		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
+		else if ($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
 		{
-			$expectedLength = (int)$matches[1];
+			$expectedLength = (int) $matches[1];
 			$str = $matches[2];
 		}
 
@@ -5409,10 +5409,10 @@ 
 		else
 			return false;
 
-		switch($state)
+		switch ($state)
 		{
 			case 3: // In array, expecting value or another array.
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$stack[] = &$list;
 					$list[$key] = array();
@@ -5421,7 +5421,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$list[$key] = $value;
 					$state = 2;
@@ -5432,29 +5432,29 @@ 
 				return false;
 
 			case 2: // in array, expecting end of array or a key
-				if($type == '}')
+				if ($type == '}')
 				{
 					// Array size is less than expected.
-					if(count($list) < end($expected))
+					if (count($list) < end($expected))
 						return false;
 
 					unset($list);
-					$list = &$stack[count($stack)-1];
+					$list = &$stack[count($stack) - 1];
 					array_pop($stack);
 
 					// Go to terminal state if we're at the end of the root array.
 					array_pop($expected);
 
-					if(count($expected) == 0)
+					if (count($expected) == 0)
 						$state = 1;
 
 					break;
 				}
 
-				if($type == 'i' || $type == 's')
+				if ($type == 'i' || $type == 's')
 				{
 					// Array size exceeds expected length.
-					if(count($list) >= end($expected))
+					if (count($list) >= end($expected))
 						return false;
 
 					$key = $value;
@@ -5467,7 +5467,7 @@ 
 
 			// Expecting array or value.
 			case 0:
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$data = array();
 					$list = &$data;
@@ -5476,7 +5476,7 @@ 
 					break;
 				}
 
-				if($type != '}')
+				if ($type != '}')
 				{
 					$data = $value;
 					$state = 1;
@@ -5489,7 +5489,7 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
+	if (!empty($str))
 		return false;
 
 	return $data;
@@ -5543,7 +5543,7 @@ 
 	// Set different modes.
 	$chmodValues = $isDir ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
 
-	foreach($chmodValues as $val)
+	foreach ($chmodValues as $val)
 	{
 		// If it's writable, break out of the loop.
 		if (is_writable($file))
@@ -5578,13 +5578,13 @@ 
 	$returnArray = @json_decode($json, $returnAsArray);
 
 	// PHP 5.3 so no json_last_error_msg()
-	switch(json_last_error())
+	switch (json_last_error())
 	{
 		case JSON_ERROR_NONE:
 			$jsonError = false;
 			break;
 		case JSON_ERROR_DEPTH:
-			$jsonError =  'JSON_ERROR_DEPTH';
+			$jsonError = 'JSON_ERROR_DEPTH';
 			break;
 		case JSON_ERROR_STATE_MISMATCH:
 			$jsonError = 'JSON_ERROR_STATE_MISMATCH';
@@ -5612,10 +5612,10 @@ 
 		loadLanguage('Errors');
 
 		if (!empty($jsonDebug))
-			log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
+			log_error($txt['json_' . $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
 
 		else
-			log_error($txt['json_'. $jsonError], 'critical');
+			log_error($txt['json_' . $jsonError], 'critical');
 
 		// Everyone expects an array.
 		return array();
@@ -5727,7 +5727,7 @@ 
 		});
 
 		// Convert Punycode to Unicode
-		$tlds = array_map(function ($input) {
+		$tlds = array_map(function($input) {
 			$prefix = 'xn--';
 			$safe_char = 0xFFFC;
 			$base = 36;
@@ -5743,7 +5743,7 @@ 
 
 			foreach ($enco_parts as $encoded)
 			{
-				if (strpos($encoded,$prefix) !== 0 || strlen(trim(str_replace($prefix,'',$encoded))) == 0)
+				if (strpos($encoded, $prefix) !== 0 || strlen(trim(str_replace($prefix, '', $encoded))) == 0)
 				{
 					$output_parts[] = $encoded;
 					continue;
@@ -5754,7 +5754,7 @@ 
 				$idx = 0;
 				$char = 0x80;
 				$decoded = array();
-				$output='';
+				$output = '';
 				$delim_pos = strrpos($encoded, '-');
 
 				if ($delim_pos > strlen($prefix))
@@ -5770,7 +5770,7 @@ 
 
 				for ($enco_idx = $delim_pos ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len)
 				{
-					for ($old_idx = $idx, $w = 1, $k = $base; 1 ; $k += $base)
+					for ($old_idx = $idx, $w = 1, $k = $base; 1; $k += $base)
 					{
 						$cp = ord($encoded{$enco_idx++});
 						$digit = ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $base));
@@ -5811,15 +5811,15 @@ 
 
 					// 2 bytes
 					elseif ($v < (1 << 11))
-						$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+						$output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
 
 					// 3 bytes
 					elseif ($v < (1 << 16))
-						$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					// 4 bytes
 					elseif ($v < (1 << 21))
-						$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					//  'Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k
 					else
@@ -5924,7 +5924,7 @@ 
 	}
 
 	// This recursive function creates the index array from the strings
-	$add_string_to_index = function ($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
+	$add_string_to_index = function($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
 	{
 		static $depth = 0;
 		$depth++;
@@ -5951,7 +5951,7 @@ 
 	};
 
 	// This recursive function turns the index array into a regular expression
-	$index_to_regex = function (&$index, $delim) use (&$strlen, &$index_to_regex)
+	$index_to_regex = function(&$index, $delim) use (&$strlen, &$index_to_regex)
 	{
 		static $depth = 0;
 		$depth++;
@@ -5975,11 +5975,11 @@ 
 
 				if (count(array_keys($value)) == 1)
 				{
-					$new_key_array = explode('(?'.'>', $sub_regex);
+					$new_key_array = explode('(?' . '>', $sub_regex);
 					$new_key .= $new_key_array[0];
 				}
 				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
+					$sub_regex = '(?' . '>' . $sub_regex . ')';
 			}
 
 			if ($depth > 1)
@@ -6022,10 +6022,10 @@ 
 	{
 		$regex = array();
 		while (!empty($index))
-			$regex[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+			$regex[] = '(?' . '>' . $index_to_regex($index, $delim) . ')';
 	}
 	else
-		$regex = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		$regex = '(?' . '>' . $index_to_regex($index, $delim) . ')';
 
 	// Restore PHP's internal character encoding to whatever it was originally
 	if (!empty($current_encoding))

Sources/Display.php

Spacing +2 added lines, -2 removed lines

@@ -899,13 +899,13 @@
 		if ($start_char === 'C')
 			$limit_seek = $limit;
 		else
-			$limit_seek  = $limit + 1;
+			$limit_seek = $limit + 1;
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_msg, id_member, approved
 			FROM {db_prefix}messages
 			WHERE id_topic = {int:current_topic}
-			AND id_msg '. $page_operator . ' {int:page_id}'. (!$modSettings['postmod_active'] || $approve_posts ? '' : '
+			AND id_msg '. $page_operator . ' {int:page_id}' . (!$modSettings['postmod_active'] || $approve_posts ? '' : '
 			AND (approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR id_member = {int:current_member}') . ')') . '
 			ORDER BY id_msg ' . ($ascending_seek ? '' : 'DESC') . ($context['messages_per_page'] == -1 ? '' : '
 			LIMIT {int:limit}'),