SimpleMachines / SMF2.1

Sources/ManagePosts.php

Spacing +9 added lines, -9 removed lines

@@ -138,7 +138,7 @@ 
 
 	if (isset($_POST['censortest']))
 	{
-		require_once($sourcedir . '/Subs-Post.php');
+		require_once($sourcedir.'/Subs-Post.php');
 		$censorText = $smcFunc['htmlspecialchars']($_POST['censortest'], ENT_QUOTES);
 		preparsecode($censorText);
 		$context['censor_test'] = strtr(censorText($censorText), array('"' => '"'));
@@ -223,7 +223,7 @@ 
 		return $config_vars;
 
 	// We'll want this for our easy save.
-	require_once($sourcedir . '/ManageServer.php');
+	require_once($sourcedir.'/ManageServer.php');
 
 	// Setup the template.
 	$context['page_title'] = $txt['manageposts_settings'];
@@ -245,7 +245,7 @@ 
 					$body_type = $column['type'];
 
 			if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text')
-				fatal_lang_error('convert_to_mediumtext', false, array($scripturl . '?action=admin;area=maintain;sa=database'));
+				fatal_lang_error('convert_to_mediumtext', false, array($scripturl.'?action=admin;area=maintain;sa=database'));
 		}
 
 		// If we're changing the post preview length let's check its valid
@@ -260,7 +260,7 @@ 
 	}
 
 	// Final settings...
-	$context['post_url'] = $scripturl . '?action=admin;area=postsettings;save;sa=posts';
+	$context['post_url'] = $scripturl.'?action=admin;area=postsettings;save;sa=posts';
 	$context['settings_title'] = $txt['manageposts_settings'];
 
 	// Prepare the settings...
@@ -315,7 +315,7 @@ 
 		return $config_vars;
 
 	// Get the settings template ready.
-	require_once($sourcedir . '/ManageServer.php');
+	require_once($sourcedir.'/ManageServer.php');
 
 	// Setup the template.
 	$context['page_title'] = $txt['manageposts_topic_settings'];
@@ -333,7 +333,7 @@ 
 	}
 
 	// Final settings...
-	$context['post_url'] = $scripturl . '?action=admin;area=postsettings;save;sa=topics';
+	$context['post_url'] = $scripturl.'?action=admin;area=postsettings;save;sa=topics';
 	$context['settings_title'] = $txt['manageposts_topic_settings'];
 
 	// Prepare the settings...
@@ -369,7 +369,7 @@ 
 		return $config_vars;
 
 	// Get the settings template ready.
-	require_once($sourcedir . '/ManageServer.php');
+	require_once($sourcedir.'/ManageServer.php');
 
 	// Setup the template.
 	$context['page_title'] = $txt['managedrafts_settings'];
@@ -393,7 +393,7 @@ 
 				'task' => 'remove_old_drafts',
 			)
 		);
-		require_once($sourcedir . '/ScheduledTasks.php');
+		require_once($sourcedir.'/ScheduledTasks.php');
 		CalculateNextTrigger();
 
 		// Save everything else and leave.
@@ -414,7 +414,7 @@ 
 	';
 
 	// Final settings...
-	$context['post_url'] = $scripturl . '?action=admin;area=postsettings;sa=drafts;save';
+	$context['post_url'] = $scripturl.'?action=admin;area=postsettings;sa=drafts;save';
 	$context['settings_title'] = $txt['managedrafts_settings'];
 
 	// Prepare the settings...

Sources/Subs.php

Braces +20 added lines, -12 removed lines

@@ -302,7 +302,6 @@ 
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
 	}
-
 	elseif ($members === null)
 		$condition = '1=1';
 
@@ -1739,7 +1738,7 @@ 
 				'before' => '<span style="text-shadow: $1 $2">',
 				'after' => '</span>',
 				'validate' => function(&$tag, &$data, $disabled)
-					{
+				{
 
 						if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50))
 							$data[1] = '0 -2px 1px';
@@ -1901,7 +1900,8 @@ 
 		{
 			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;
@@ -2185,7 +2185,8 @@ 
 						)?
 						';
 
-						$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);
 
 							// If this isn't a clean URL, bail out
@@ -2274,7 +2275,9 @@ 
 			$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();
@@ -3759,7 +3762,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 				echo '
 	<script src="', $js_file['fileUrl'], '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '', '></script>';
@@ -3909,7 +3911,9 @@ 
 		return $data;
 
 	// Different pages include different files, so we use a hash to label the different combinations
-	$hash = md5(implode(' ', array_map(function($file) { return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
+	$hash = md5(implode(' ', array_map(function($file)
+	{
+return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
 
 	// Did we already do this?
 	list($toCache, $async, $defer) = array_pad((array) cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, 86400), 3, null);
@@ -5914,7 +5918,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}
@@ -6084,7 +6087,8 @@ 
 	if (!empty($tlds))
 	{
 		// Clean $tlds and convert it to an array
-		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line) {
+		$tlds = array_filter(explode("\n", strtolower($tlds)), function($line)
+		{
 			$line = trim($line);
 			if (empty($line) || strpos($line, '#') !== false || strpos($line, ' ') !== false)
 				return false;
@@ -6095,7 +6099,9 @@ 
 		// Convert Punycode to Unicode
 		require_once($sourcedir . '/Class-Punycode.php');
 		$Punycode = new Punycode();
-		$tlds = array_map(function ($input) use ($Punycode) { return $Punycode->decode($input); }, $tlds);
+		$tlds = array_map(function ($input) use ($Punycode)
+		{
+return $Punycode->decode($input); }, $tlds);
 	}
 	// Otherwise, use the 2012 list of gTLDs and ccTLDs for now and schedule a background update
 	else
@@ -6262,7 +6268,8 @@ 
 		}
 
 		// Sort by key length and then alphabetically
-		uksort($regex, function($k1, $k2) use (&$strlen) {
+		uksort($regex, function($k1, $k2) use (&$strlen)
+		{
 			$l1 = $strlen($k1);
 			$l2 = $strlen($k2);
 
@@ -6516,7 +6523,8 @@ 
 function sanitize_iri($iri)
 {
 	// Encode any non-ASCII characters (but not space or control characters of any sort)
-	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches) {
+	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches)
+	{
 		return rawurlencode($matches[0]);
 	}, $iri);
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -2932,7 +2932,7 @@
 		}
 
 		// Set proper extensions; do this post caching so cache doesn't become extension-specific
-		foreach($smileysto AS $ix=>$file)
+		foreach($smileysto as $ix=>$file)
 			// Need to use the default if user selection is disabled
 			if (empty($modSettings['smiley_sets_enable']))
 				$smileysto[$ix] = $file . $context['user']['smiley_set_default_ext'];

Spacing +385 added lines, -385 removed lines

@@ -250,7 +250,7 @@ 
 			foreach ($postgroups as $id => $min_posts)
 			{
 				$conditions .= '
-					WHEN posts >= ' . $min_posts . (!empty($lastMin) ? ' AND posts <= ' . $lastMin : '') . ' THEN ' . $id;
+					WHEN posts >= ' . $min_posts.(!empty($lastMin) ? ' AND posts <= '.$lastMin : '').' THEN '.$id;
 
 				$lastMin = $min_posts;
 			}
@@ -258,7 +258,7 @@ 
 			// A big fat CASE WHEN... END is faster than a zillion UPDATE's ;).
 			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}members
-			SET id_post_group = CASE ' . $conditions . '
+			SET id_post_group = CASE ' . $conditions.'
 					ELSE 0
 				END' . ($parameter1 != null ? '
 			WHERE ' . (is_array($parameter1) ? 'id_member IN ({array_int:members})' : 'id_member = {int:members}') : ''),
@@ -269,7 +269,7 @@ 
 			break;
 
 		default:
-			trigger_error('updateStats(): Invalid statistic type \'' . $type . '\'', E_USER_NOTICE);
+			trigger_error('updateStats(): Invalid statistic type \''.$type.'\'', E_USER_NOTICE);
 	}
 }
 
@@ -386,13 +386,13 @@ 
 		// Doing an increment?
 		if ($var == 'alerts' && ($val === '+' || $val === '-'))
 		{
-			include_once($sourcedir . '/Profile-View.php');
+			include_once($sourcedir.'/Profile-View.php');
 			if (is_array($members))
 			{
 				$val = 'CASE ';
 				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. count(fetch_alerts($v, false, 0, array(), false)) . ' ';
-				$val = $val . ' END';
+					$val .= 'WHEN id_member = '.$v.' THEN '.count(fetch_alerts($v, false, 0, array(), false)).' ';
+				$val = $val.' END';
 				$type = 'raw';
 			}
 			else
@@ -403,28 +403,28 @@ 
 		}
 		else if ($type == 'int' && ($val === '+' || $val === '-'))
 		{
-			$val = $var . ' ' . $val . ' 1';
+			$val = $var.' '.$val.' 1';
 			$type = 'raw';
 		}
 
 		// Ensure posts, instant_messages, and unread_messages don't overflow or underflow.
 		if (in_array($var, array('posts', 'instant_messages', 'unread_messages')))
 		{
-			if (preg_match('~^' . $var . ' (\+ |- |\+ -)([\d]+)~', $val, $match))
+			if (preg_match('~^'.$var.' (\+ |- |\+ -)([\d]+)~', $val, $match))
 			{
 				if ($match[1] != '+ ')
-					$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
+					$val = 'CASE WHEN '.$var.' <= '.abs($match[2]).' THEN 0 ELSE '.$val.' END';
 				$type = 'raw';
 			}
 		}
 
-		$setString .= ' ' . $var . ' = {' . $type . ':p_' . $var . '},';
-		$parameters['p_' . $var] = $val;
+		$setString .= ' '.$var.' = {'.$type.':p_'.$var.'},';
+		$parameters['p_'.$var] = $val;
 	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}members
-		SET' . substr($setString, 0, -1) . '
+		SET' . substr($setString, 0, -1).'
 		WHERE ' . $condition,
 		$parameters
 	);
@@ -441,11 +441,11 @@ 
 		{
 			if ($modSettings['cache_enable'] >= 3)
 			{
-				cache_put_data('member_data-profile-' . $member, null, 120);
-				cache_put_data('member_data-normal-' . $member, null, 120);
-				cache_put_data('member_data-minimal-' . $member, null, 120);
+				cache_put_data('member_data-profile-'.$member, null, 120);
+				cache_put_data('member_data-normal-'.$member, null, 120);
+				cache_put_data('member_data-minimal-'.$member, null, 120);
 			}
-			cache_put_data('user_settings-' . $member, null, 60);
+			cache_put_data('user_settings-'.$member, null, 60);
 		}
 	}
 }
@@ -499,7 +499,7 @@ 
 		{
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}settings
-				SET value = {' . ($value === false || $value === true ? 'raw' : 'string') . ':value}
+				SET value = {' . ($value === false || $value === true ? 'raw' : 'string').':value}
 				WHERE variable = {string:variable}',
 				array(
 					'value' => $value === true ? 'value + 1' : ($value === false ? 'value - 1' : $value),
@@ -593,7 +593,7 @@ 
 	{
 		// This defines the formatting for the page indexes used throughout the forum.
 		$settings['page_index'] = array(
-			'extra_before' => '<span class="pages">' . $txt['pages'] . '</span>',
+			'extra_before' => '<span class="pages">'.$txt['pages'].'</span>',
 			'previous_page' => '<span class="generic_icons previous_page"></span>',
 			'current_page' => '<span class="current_page">%1$d</span> ',
 			'page' => '<a class="navPages" href="{URL}">%2$s</a> ',
@@ -603,7 +603,7 @@ 
 		);
 	}
 
-	$base_link = strtr($settings['page_index']['page'], array('{URL}' => $flexible_start ? $base_url : strtr($base_url, array('%' => '%%')) . ';start=%1$d'));
+	$base_link = strtr($settings['page_index']['page'], array('{URL}' => $flexible_start ? $base_url : strtr($base_url, array('%' => '%%')).';start=%1$d'));
 	$pageindex = $settings['page_index']['extra_before'];
 
 	// Compact pages is off or on?
@@ -744,7 +744,7 @@ 
 	static $non_twelve_hour, $locale_cache;
 	static $unsupportedFormats, $finalizedFormats;
 
-	$unsupportedFormatsWindows = array('z','Z');
+	$unsupportedFormatsWindows = array('z', 'Z');
 
 	// Ensure required values are set
 	$user_info['time_offset'] = !empty($user_info['time_offset']) ? $user_info['time_offset'] : 0;
@@ -778,18 +778,18 @@ 
 		if (strpos($user_info['time_format'], '%H') === false && strpos($user_info['time_format'], '%T') === false)
 		{
 			$h = strpos($user_info['time_format'], '%l') === false ? '%I' : '%l';
-			$today_fmt = $h . ':%M' . $s . ' %p';
+			$today_fmt = $h.':%M'.$s.' %p';
 		}
 		else
-			$today_fmt = '%H:%M' . $s;
+			$today_fmt = '%H:%M'.$s;
 
 		// Same day of the year, same year.... Today!
 		if ($then['yday'] == $now['yday'] && $then['year'] == $now['year'])
-			return $txt['today'] . timeformat($log_time, $today_fmt, $offset_type);
+			return $txt['today'].timeformat($log_time, $today_fmt, $offset_type);
 
 		// Day-of-year is one less and same year, or it's the first of the year and that's the last of the year...
 		if ($modSettings['todayMod'] == '2' && (($then['yday'] == $now['yday'] - 1 && $then['year'] == $now['year']) || ($now['yday'] == 0 && $then['year'] == $now['year'] - 1) && $then['mon'] == 12 && $then['mday'] == 31))
-			return $txt['yesterday'] . timeformat($log_time, $today_fmt, $offset_type);
+			return $txt['yesterday'].timeformat($log_time, $today_fmt, $offset_type);
 	}
 
 	$str = !is_bool($show_today) ? $show_today : $user_info['time_format'];
@@ -829,7 +829,7 @@ 
 			$unsupportedFormats = (array) cache_get_data('unsupportedtimeformats', 86400);
 		if (empty($unsupportedFormats))
 		{
-			foreach($strftimeFormatSubstitutions as $format => $substitution)
+			foreach ($strftimeFormatSubstitutions as $format => $substitution)
 			{
 				// Avoid a crashing bug with PHP 7 on certain versions of Windows
 				if ($context['server']['is_windows'] && in_array($format, $unsupportedFormatsWindows))
@@ -838,7 +838,7 @@ 
 					continue;
 				}
 
-				$value = @strftime('%' . $format);
+				$value = @strftime('%'.$format);
 
 				// Windows will return false for unsupported formats
 				// Other operating systems return the format string as a literal
@@ -850,11 +850,11 @@ 
 
 		// Windows needs extra help if $timeformat contains something completely invalid, e.g. '%Q'
 		if (DIRECTORY_SEPARATOR === '\\')
-			$timeformat = preg_replace('~%(?!' . implode('|', array_keys($strftimeFormatSubstitutions)) . ')~', '&#37;', $timeformat);
+			$timeformat = preg_replace('~%(?!'.implode('|', array_keys($strftimeFormatSubstitutions)).')~', '&#37;', $timeformat);
 
 		// Substitute unsupported formats with supported ones
 		if (!empty($unsupportedFormats))
-			while (preg_match('~%(' . implode('|', $unsupportedFormats) . ')~', $timeformat, $matches))
+			while (preg_match('~%('.implode('|', $unsupportedFormats).')~', $timeformat, $matches))
 				$timeformat = str_replace($matches[0], $strftimeFormatSubstitutions[$matches[1]], $timeformat);
 
 		// Remember this so we don't need to do it again
@@ -865,13 +865,13 @@ 
 	$str = $finalizedFormats[$str];
 
 	if (!isset($locale_cache))
-		$locale_cache = setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+		$locale_cache = setlocale(LC_TIME, $txt['lang_locale'].!empty($modSettings['global_character_set']) ? '.'.$modSettings['global_character_set'] : '');
 
 	if ($locale_cache !== false)
 	{
 		// Check if another process changed the locale
 		if ($process_safe === true && setlocale(LC_TIME, '0') != $locale_cache)
-			setlocale(LC_TIME, $txt['lang_locale'] . !empty($modSettings['global_character_set']) ? '.' . $modSettings['global_character_set'] : '');
+			setlocale(LC_TIME, $txt['lang_locale'].!empty($modSettings['global_character_set']) ? '.'.$modSettings['global_character_set'] : '');
 
 		if (!isset($non_twelve_hour))
 			$non_twelve_hour = trim(strftime('%p')) === '';
@@ -947,7 +947,7 @@ 
 		return $subject;
 
 	// Shorten it by the length it was too long, and strip off junk from the end.
-	return $smcFunc['substr']($subject, 0, $len) . '...';
+	return $smcFunc['substr']($subject, 0, $len).'...';
 }
 
 /**
@@ -1085,7 +1085,7 @@ 
 
 		// The YouTube bbc needs this for its origin parameter
 		$scripturl_parts = parse_url($scripturl);
-		$hosturl = $scripturl_parts['scheme'] . '://' . $scripturl_parts['host'];
+		$hosturl = $scripturl_parts['scheme'].'://'.$scripturl_parts['host'];
 
 		/* The following bbc are formatted as an array, with keys as follows:
 
@@ -1209,7 +1209,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 = '';
 
@@ -1221,7 +1221,7 @@ 
 					$attachID = $data;
 
 					// Kinda need this.
-					require_once($sourcedir . '/Subs-Attachments.php');
+					require_once($sourcedir.'/Subs-Attachments.php');
 
 					$currentAttachment = parseAttachBBC($attachID);
 
@@ -1231,22 +1231,22 @@ 
 
 					if (!empty($currentAttachment['is_image']))
 					{
-						$alt = ' alt="' . (!empty($params['{alt}']) ? $params['{alt}'] : $currentAttachment['name']) . '"';
-						$title = !empty($params['{title}']) ? ' title="' . $params['{title}'] . '"' : '';
+						$alt = ' alt="'.(!empty($params['{alt}']) ? $params['{alt}'] : $currentAttachment['name']).'"';
+						$title = !empty($params['{title}']) ? ' title="'.$params['{title}'].'"' : '';
 
-						$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
-						$height = !empty($params['{height}']) ? ' height="' . $params['{height}'] . '"' : '';
+						$width = !empty($params['{width}']) ? ' width="'.$params['{width}'].'"' : '';
+						$height = !empty($params['{height}']) ? ' height="'.$params['{height}'].'"' : '';
 
 						if (empty($width) && empty($height))
 						{
-							$width = ' width="' . $currentAttachment['width'] . '"';
-							$height = ' height="' . $currentAttachment['height'] . '"';
+							$width = ' width="'.$currentAttachment['width'].'"';
+							$height = ' height="'.$currentAttachment['height'].'"';
 						}
 
 						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"/>';
+							$returnContext .= '<img src="'.$currentAttachment['href'].';image"'.$alt.$title.$width.$height.' class="bbc_img"/>';
 					}
 
 					// No image. Show a link.
@@ -1294,9 +1294,9 @@ 
 			array(
 				'tag' => 'code',
 				'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>',
+				'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']))
 					{
@@ -1314,7 +1314,7 @@ 
 								$php_string .= $php_parts[$php_i];
 								$php_parts[$php_i++] = '';
 							}
-							$php_parts[$php_i] = highlight_php_code($php_string . $php_parts[$php_i]);
+							$php_parts[$php_i] = highlight_php_code($php_string.$php_parts[$php_i]);
 						}
 
 						// Fix the PHP code stuff...
@@ -1331,9 +1331,9 @@ 
 			array(
 				'tag' => 'code',
 				'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>',
+				'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']))
 					{
@@ -1351,7 +1351,7 @@ 
 								$php_string .= $php_parts[$php_i];
 								$php_parts[$php_i++] = '';
 							}
-							$php_parts[$php_i] = highlight_php_code($php_string . $php_parts[$php_i]);
+							$php_parts[$php_i] = highlight_php_code($php_string.$php_parts[$php_i]);
 						}
 
 						// Fix the PHP code stuff...
@@ -1377,7 +1377,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>' => ''));
 				},
@@ -1397,16 +1397,16 @@ 
 				'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') . '"';
+					$class = 'class="bbc_float float'.(strpos($data, 'left') === 0 ? 'left' : 'right').'"';
 
 					if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches))
-						$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
+						$css = ' style="max-width:'.$matches[1].(is_numeric($matches[1]) ? 'px' : '').'"';
 					else
 						$css = '';
 
-					$data = $class . $css;
+					$data = $class.$css;
 				},
 				'trim' => 'outside',
 				'block_level' => true,
@@ -1420,7 +1420,7 @@ 
 					$data = strtr($data, array('<br />' => ''));
 
 					if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0)
-						$data = 'ftp://' . $data;
+						$data = 'ftp://'.$data;
 				},
 			),
 			array(
@@ -1431,7 +1431,7 @@ 
 				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (strpos($data, 'ftp://') !== 0 && strpos($data, 'ftps://') !== 0)
-						$data = 'ftp://' . $data;
+						$data = 'ftp://'.$data;
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
 				'disabled_after' => ' ($1)',
@@ -1483,7 +1483,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, $user_info;
 
@@ -1495,13 +1495,13 @@ 
 							return;
 
 						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+							$data = 'http://'.ltrim($data, ':/');
 
 						if ($scheme != 'https')
 							$data = get_proxied_url($data);
 					}
 					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+						$data = '//'.ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1509,7 +1509,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, $user_info;
 
@@ -1521,13 +1521,13 @@ 
 							return;
 
 						if (empty($scheme))
-							$data = 'http://' . ltrim($data, ':/');
+							$data = 'http://'.ltrim($data, ':/');
 
 						if ($scheme != 'https')
 							$data = get_proxied_url($data);
 					}
 					elseif (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+						$data = '//'.ltrim($data, ':/');
 				},
 				'disabled_content' => '($1)',
 			),
@@ -1535,12 +1535,12 @@ 
 				'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);
 					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+						$data = '//'.ltrim($data, ':/');
 				},
 			),
 			array(
@@ -1549,15 +1549,15 @@ 
 				'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);
+						$data = '#post_'.substr($data, 1);
 					else
 					{
 						$scheme = parse_url($data, PHP_URL_SCHEME);
 						if (empty($scheme))
-							$data = '//' . ltrim($data, ':/');
+							$data = '//'.ltrim($data, ':/');
 					}
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
@@ -1623,7 +1623,7 @@ 
 			array(
 				'tag' => 'member',
 				'type' => 'unparsed_equals',
-				'before' => '<a href="' . $scripturl . '?action=profile;u=$1" class="mention" data-mention="$1">@',
+				'before' => '<a href="'.$scripturl.'?action=profile;u=$1" class="mention" data-mention="$1">@',
 				'after' => '</a>',
 			),
 			array(
@@ -1642,12 +1642,12 @@ 
 				'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']))
 					{
 						$add_begin = substr(trim($data), 0, 5) != '&lt;?';
-						$data = highlight_php_code($add_begin ? '&lt;?php ' . $data . '?&gt;' : $data);
+						$data = highlight_php_code($add_begin ? '&lt;?php '.$data.'?&gt;' : $data);
 						if ($add_begin)
 							$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
 					}
@@ -1662,7 +1662,7 @@ 
 			),
 			array(
 				'tag' => 'quote',
-				'before' => '<blockquote><cite>' . $txt['quote'] . '</cite>',
+				'before' => '<blockquote><cite>'.$txt['quote'].'</cite>',
 				'after' => '</blockquote>',
 				'trim' => 'both',
 				'block_level' => true,
@@ -1672,7 +1672,7 @@ 
 				'parameters' => array(
 					'author' => array('match' => '(.{1,192}?)', 'quoted' => true),
 				),
-				'before' => '<blockquote><cite>' . $txt['quote_from'] . ': {author}</cite>',
+				'before' => '<blockquote><cite>'.$txt['quote_from'].': {author}</cite>',
 				'after' => '</blockquote>',
 				'trim' => 'both',
 				'block_level' => true,
@@ -1680,7 +1680,7 @@ 
 			array(
 				'tag' => 'quote',
 				'type' => 'parsed_equals',
-				'before' => '<blockquote><cite>' . $txt['quote_from'] . ': $1</cite>',
+				'before' => '<blockquote><cite>'.$txt['quote_from'].': $1</cite>',
 				'after' => '</blockquote>',
 				'trim' => 'both',
 				'quoted' => 'optional',
@@ -1695,7 +1695,7 @@ 
 					'link' => array('match' => '(?:board=\d+;)?((?:topic|threadid)=[\dmsg#\./]{1,40}(?:;start=[\dmsg#\./]{1,40})?|msg=\d+?|action=profile;u=\d+)'),
 					'date' => array('match' => '(\d+)', 'validate' => 'timeformat'),
 				),
-				'before' => '<blockquote><cite><a href="' . $scripturl . '?{link}">' . $txt['quote_from'] . ': {author} ' . $txt['search_on'] . ' {date}</a></cite>',
+				'before' => '<blockquote><cite><a href="'.$scripturl.'?{link}">'.$txt['quote_from'].': {author} '.$txt['search_on'].' {date}</a></cite>',
 				'after' => '</blockquote>',
 				'trim' => 'both',
 				'block_level' => true,
@@ -1705,7 +1705,7 @@ 
 				'parameters' => array(
 					'author' => array('match' => '(.{1,192}?)'),
 				),
-				'before' => '<blockquote><cite>' . $txt['quote_from'] . ': {author}</cite>',
+				'before' => '<blockquote><cite>'.$txt['quote_from'].': {author}</cite>',
 				'after' => '</blockquote>',
 				'trim' => 'both',
 				'block_level' => true,
@@ -1770,10 +1770,10 @@ 
 				'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';
+					$data = $sizes[$data].'em';
 				},
 			),
 			array(
@@ -1808,7 +1808,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);
@@ -1841,12 +1841,12 @@ 
 				'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);
 					if (empty($scheme))
-						$data = '//' . ltrim($data, ':/');
+						$data = '//'.ltrim($data, ':/');
 				},
 			),
 			array(
@@ -1855,11 +1855,11 @@ 
 				'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))
-						$data = '//' . ltrim($data, ':/');
+						$data = '//'.ltrim($data, ':/');
 				},
 				'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
 				'disabled_after' => ' ($1)',
@@ -1872,7 +1872,7 @@ 
 			array(
 				'tag' => 'youtube',
 				'type' => 'unparsed_content',
-				'content' => '<div class="videocontainer"><div><iframe frameborder="0" src="https://www.youtube.com/embed/$1?origin=' . $hosturl . '&wmode=opaque" data-youtube-id="$1" allowfullscreen></iframe></div></div>',
+				'content' => '<div class="videocontainer"><div><iframe frameborder="0" src="https://www.youtube.com/embed/$1?origin='.$hosturl.'&wmode=opaque" data-youtube-id="$1" allowfullscreen></iframe></div></div>',
 				'disabled_content' => '<a href="https://www.youtube.com/watch?v=$1" target="_blank" rel="noopener">https://www.youtube.com/watch?v=$1</a>',
 				'block_level' => true,
 			),
@@ -1901,7 +1901,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;
@@ -1956,7 +1956,7 @@ 
 	if ($cache_id != '' && !empty($modSettings['cache_enable']) && (($modSettings['cache_enable'] >= 2 && isset($message[1000])) || isset($message[2400])) && empty($parse_tags))
 	{
 		// It's likely this will change if the message is modified.
-		$cache_key = 'parse:' . $cache_id . '-' . md5(md5($message) . '-' . $smileys . (empty($disabled) ? '' : implode(',', array_keys($disabled))) . $smcFunc['json_encode']($context['browser']) . $txt['lang_locale'] . $user_info['time_offset'] . $user_info['time_format']);
+		$cache_key = 'parse:'.$cache_id.'-'.md5(md5($message).'-'.$smileys.(empty($disabled) ? '' : implode(',', array_keys($disabled))).$smcFunc['json_encode']($context['browser']).$txt['lang_locale'].$user_info['time_offset'].$user_info['time_format']);
 
 		if (($temp = cache_get_data($cache_key, 240)) != null)
 			return $temp;
@@ -2006,13 +2006,13 @@ 
 		foreach ($section as $code)
 			$alltags[] = $code['tag'];
 	}
-	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
+	$alltags_regex = '\b'.implode("\b|\b", array_unique($alltags)).'\b';
 
 	$pos = -1;
 	while ($pos !== false)
 	{
 		$last_pos = isset($last_pos) ? max($pos, $last_pos) : $pos;
-		preg_match('~\[/?(?=' . $alltags_regex . ')~i', $message, $matches, PREG_OFFSET_CAPTURE, $pos + 1);
+		preg_match('~\[/?(?='.$alltags_regex.')~i', $message, $matches, PREG_OFFSET_CAPTURE, $pos + 1);
 		$pos = isset($matches[0][1]) ? $matches[0][1] : false;
 
 		// Failsafe.
@@ -2036,17 +2036,17 @@ 
 				// <br> should be empty.
 				$empty_tags = array('br', 'hr');
 				foreach ($empty_tags as $tag)
-					$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '<' . $tag . '>', $data);
+					$data = str_replace(array('&lt;'.$tag.'&gt;', '&lt;'.$tag.'/&gt;', '&lt;'.$tag.' /&gt;'), '<'.$tag.'>', $data);
 
 				// b, u, i, s, pre... basic tags.
 				$closable_tags = array('b', 'u', 'i', 's', 'em', 'ins', 'del', 'pre', 'blockquote', 'strong');
 				foreach ($closable_tags as $tag)
 				{
-					$diff = substr_count($data, '&lt;' . $tag . '&gt;') - substr_count($data, '&lt;/' . $tag . '&gt;');
-					$data = strtr($data, array('&lt;' . $tag . '&gt;' => '<' . $tag . '>', '&lt;/' . $tag . '&gt;' => '</' . $tag . '>'));
+					$diff = substr_count($data, '&lt;'.$tag.'&gt;') - substr_count($data, '&lt;/'.$tag.'&gt;');
+					$data = strtr($data, array('&lt;'.$tag.'&gt;' => '<'.$tag.'>', '&lt;/'.$tag.'&gt;' => '</'.$tag.'>'));
 
 					if ($diff > 0)
-						$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+						$data = substr($data, 0, -1).str_repeat('</'.$tag.'>', $diff).substr($data, -1);
 				}
 
 				// Do <img ...> - with security... action= -> action-.
@@ -2056,13 +2056,13 @@ 
 					$replaces = array();
 					foreach ($matches[2] as $match => $imgtag)
 					{
-						$alt = empty($matches[3][$match]) ? '' : ' alt=' . preg_replace('~^&quot;|&quot;$~', '', $matches[3][$match]);
+						$alt = empty($matches[3][$match]) ? '' : ' alt='.preg_replace('~^&quot;|&quot;$~', '', $matches[3][$match]);
 
 						// Remove action= from the URL - no funny business, now.
 						if (preg_match('~action(=|%3d)(?!dlattach)~i', $imgtag) != 0)
 							$imgtag = preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $imgtag);
 
-						$replaces[$matches[0][$match]] = '[img' . $alt . ']' . $imgtag . '[/img]';
+						$replaces[$matches[0][$match]] = '[img'.$alt.']'.$imgtag.'[/img]';
 					}
 
 					$data = strtr($data, $replaces);
@@ -2117,7 +2117,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}\-.]|$)
@@ -2141,7 +2141,7 @@ 
 								# A run of Unicode domain name characters (excluding [:@])
 								[\p{L}\p{N}][\p{L}\p{M}\p{N}\-.]+[\p{L}\p{M}\p{N}]
 								# and then a dot and a valid TLD
-								\.' . $modSettings['tld_regex'] . '
+								\.' . $modSettings['tld_regex'].'
 
 								# Followed by either:
 								(?=
@@ -2185,7 +2185,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);
 
 							// If this isn't a clean URL, bail out
@@ -2198,22 +2198,22 @@ 
 							{
 								$email_address = str_replace('mailto:', '', $url);
 								if (!isset($disabled['email']) && filter_var($email_address, FILTER_VALIDATE_EMAIL) !== false)
-									return '[email=' . $email_address . ']' . $url . '[/email]';
+									return '[email='.$email_address.']'.$url.'[/email]';
 								else
 									return $url;
 							}
 
 							// Are we linking a schemeless URL or naked domain name (e.g. "example.com")?
 							if (empty($scheme))
-								$fullUrl = '//' . ltrim($url, ':/');
+								$fullUrl = '//'.ltrim($url, ':/');
 							else
 								$fullUrl = $url;
 
 							// Make sure that $fullUrl really is valid
-							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '' ) . $fullUrl) === false)
+							if (validate_iri((strpos($fullUrl, '//') === 0 ? 'http:' : '').$fullUrl) === false)
 								return $url;
 
-							return '[url=&quot;' . str_replace(array('[', ']'), array('&#91;', '&#93;'), $fullUrl) . '&quot;]' . $url . '[/url]';
+							return '[url=&quot;'.str_replace(array('[', ']'), array('&#91;', '&#93;'), $fullUrl).'&quot;]'.$url.'[/url]';
 						}, $data);
 					}
 
@@ -2229,7 +2229,7 @@ 
 						@
 						[\p{L}\p{M}\p{N}\-.]+
 						\.
-						'. $modSettings['tld_regex'] . '
+						'. $modSettings['tld_regex'].'
 
 						# Followed by either:
 						(?=
@@ -2240,7 +2240,7 @@ 
 							\.(?=$|[^\p{L}\p{M}\p{N}\-])
 						)';
 
-						$data = preg_replace('~' . $email_regex . '~xi' . ($context['utf8'] ? 'u' : ''), '[email]$0[/email]', $data);
+						$data = preg_replace('~'.$email_regex.'~xi'.($context['utf8'] ? 'u' : ''), '[email]$0[/email]', $data);
 					}
 				}
 			}
@@ -2250,7 +2250,7 @@ 
 			// If it wasn't changed, no copying or other boring stuff has to happen!
 			if ($data != substr($message, $last_pos, $pos - $last_pos))
 			{
-				$message = substr($message, 0, $last_pos) . $data . substr($message, $pos);
+				$message = substr($message, 0, $last_pos).$data.substr($message, $pos);
 
 				// Since we changed it, look again in case we added or removed a tag.  But we don't want to skip any.
 				$old_pos = strlen($data) + $last_pos;
@@ -2274,7 +2274,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();
@@ -2347,7 +2347,7 @@ 
 
 			foreach ($to_close as $tag)
 			{
-				$message = substr($message, 0, $pos) . "\n" . $tag['after'] . "\n" . substr($message, $pos2 + 1);
+				$message = substr($message, 0, $pos)."\n".$tag['after']."\n".substr($message, $pos2 + 1);
 				$pos += strlen($tag['after']) + 2;
 				$pos2 = $pos - 1;
 
@@ -2359,8 +2359,8 @@ 
 				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
 					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
 
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($whitespace_regex) && preg_match('~'.$whitespace_regex.'~', substr($message, $pos), $matches) != 0)
+					$message = substr($message, 0, $pos).substr($message, $pos + strlen($matches[0]));
 			}
 
 			if (!empty($to_close))
@@ -2393,7 +2393,7 @@ 
 				break;
 
 			// A test validation?
-			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0)
+			if (isset($possible['test']) && preg_match('~^'.$possible['test'].'~', substr($message, $pos + 1 + $pt_strlen + 1)) === 0)
 				continue;
 			// Do we want parameters?
 			elseif (!empty($possible['parameters']))
@@ -2440,7 +2440,7 @@ 
 						$quote_alt = !$quote_alt;
 				}
 				// Add a class to the quote to style alternating blockquotes
-				$possible['before'] = strtr($possible['before'], array('<blockquote>' => '<blockquote class="bbc_' . ($quote_alt ? 'alternate' : 'standard') . '_quote">'));
+				$possible['before'] = strtr($possible['before'], array('<blockquote>' => '<blockquote class="bbc_'.($quote_alt ? 'alternate' : 'standard').'_quote">'));
 			}
 
 			// This is long, but it makes things much easier and cleaner.
@@ -2449,13 +2449,13 @@ 
 				// Build a regular expression for each parameter for the current tag.
 				$preg = array();
 				foreach ($possible['parameters'] as $p => $info)
-					$preg[] = '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+					$preg[] = '(\s+'.$p.'='.(empty($info['quoted']) ? '' : '&quot;').(isset($info['match']) ? $info['match'] : '(.+?)').(empty($info['quoted']) ? '' : '&quot;').'\s*)'.(empty($info['optional']) ? '' : '?');
 
 				// Extract the string that potentially holds our parameters.
-				$blob = preg_split('~\[/?(?:' . $alltags_regex . ')~i', substr($message, $pos));
+				$blob = preg_split('~\[/?(?:'.$alltags_regex.')~i', substr($message, $pos));
 				$blobs = preg_split('~\]~i', $blob[1]);
 
-				$splitters = implode('=|', array_keys($possible['parameters'])) . '=';
+				$splitters = implode('=|', array_keys($possible['parameters'])).'=';
 
 				// Progressively append more blobs until we find our parameters or run out of blobs
 				$blob_counter = 1;
@@ -2463,10 +2463,10 @@ 
 				{
 					$given_param_string = implode(']', array_slice($blobs, 0, $blob_counter++));
 
-					$given_params = preg_split('~\s(?=(' . $splitters . '))~i', $given_param_string);
+					$given_params = preg_split('~\s(?=('.$splitters.'))~i', $given_param_string);
 					sort($given_params, SORT_STRING);
 
-					$match = preg_match('~^' . implode('', $preg) . '$~i', implode(' ', $given_params), $matches) !== 0;
+					$match = preg_match('~^'.implode('', $preg).'$~i', implode(' ', $given_params), $matches) !== 0;
 
 					if ($match)
 						$blob_counter = count($blobs) + 1;
@@ -2481,20 +2481,20 @@ 
 				{
 					$key = strtok(ltrim($matches[$i]), '=');
 					if (isset($possible['parameters'][$key]['value']))
-						$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
+						$params['{'.$key.'}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
 					elseif (isset($possible['parameters'][$key]['validate']))
-						$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
+						$params['{'.$key.'}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
 					else
-						$params['{' . $key . '}'] = $matches[$i + 1];
+						$params['{'.$key.'}'] = $matches[$i + 1];
 
 					// Just to make sure: replace any $ or { so they can't interpolate wrongly.
-					$params['{' . $key . '}'] = strtr($params['{' . $key . '}'], array('$' => '&#036;', '{' => '&#123;'));
+					$params['{'.$key.'}'] = strtr($params['{'.$key.'}'], array('$' => '&#036;', '{' => '&#123;'));
 				}
 
 				foreach ($possible['parameters'] as $p => $info)
 				{
-					if (!isset($params['{' . $p . '}']))
-						$params['{' . $p . '}'] = '';
+					if (!isset($params['{'.$p.'}']))
+						$params['{'.$p.'}'] = '';
 				}
 
 				$tag = $possible;
@@ -2556,8 +2556,8 @@ 
 			);
 
 			// First, open the tag...
-			$code .= '<li' . ($tag == '' ? '' : ' type="' . $tag . '"') . '>';
-			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos + 3);
+			$code .= '<li'.($tag == '' ? '' : ' type="'.$tag.'"').'>';
+			$message = substr($message, 0, $pos)."\n".$code."\n".substr($message, $pos + 3);
 			$pos += strlen($code) - 1 + 2;
 
 			// Next, find the next break (if any.)  If there's more itemcode after it, keep it going - otherwise close!
@@ -2566,7 +2566,7 @@ 
 			if ($pos2 !== false && ($pos2 <= $pos3 || $pos3 === false))
 			{
 				preg_match('~^(<br>|&nbsp;|\s|\[)+~', substr($message, $pos2 + 4), $matches);
-				$message = substr($message, 0, $pos2) . (!empty($matches[0]) && substr($matches[0], -1) == '[' ? '[/li]' : '[/li][/list]') . substr($message, $pos2);
+				$message = substr($message, 0, $pos2).(!empty($matches[0]) && substr($matches[0], -1) == '[' ? '[/li]' : '[/li][/list]').substr($message, $pos2);
 
 				$open_tags[count($open_tags) - 2]['after'] = '</ul>';
 			}
@@ -2586,7 +2586,7 @@ 
 		{
 			array_pop($open_tags);
 
-			$message = substr($message, 0, $pos) . "\n" . $inside['after'] . "\n" . substr($message, $pos);
+			$message = substr($message, 0, $pos)."\n".$inside['after']."\n".substr($message, $pos);
 			$pos += strlen($inside['after']) - 1 + 2;
 		}
 
@@ -2629,7 +2629,7 @@ 
 			// Close all the non block level tags so this tag isn't surrounded by them.
 			for ($i = count($open_tags) - 1; $i > $n; $i--)
 			{
-				$message = substr($message, 0, $pos) . "\n" . $open_tags[$i]['after'] . "\n" . substr($message, $pos);
+				$message = substr($message, 0, $pos)."\n".$open_tags[$i]['after']."\n".substr($message, $pos);
 				$ot_strlen = strlen($open_tags[$i]['after']);
 				$pos += $ot_strlen + 2;
 				$pos1 += $ot_strlen + 2;
@@ -2640,8 +2640,8 @@ 
 					$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
 				if (!empty($tag['trim']) && $tag['trim'] != 'inside')
 					$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
-				if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($message, $pos), $matches) != 0)
-					$message = substr($message, 0, $pos) . substr($message, $pos + strlen($matches[0]));
+				if (!empty($whitespace_regex) && preg_match('~'.$whitespace_regex.'~', substr($message, $pos), $matches) != 0)
+					$message = substr($message, 0, $pos).substr($message, $pos + strlen($matches[0]));
 
 				array_pop($open_tags);
 			}
@@ -2655,13 +2655,13 @@ 
 		{
 			// @todo Check for end tag first, so people can say "I like that [i] tag"?
 			$open_tags[] = $tag;
-			$message = substr($message, 0, $pos) . "\n" . $tag['before'] . "\n" . substr($message, $pos1);
+			$message = substr($message, 0, $pos)."\n".$tag['before']."\n".substr($message, $pos1);
 			$pos += strlen($tag['before']) - 1 + 2;
 		}
 		// Don't parse the content, just skip it.
 		elseif ($tag['type'] == 'unparsed_content')
 		{
-			$pos2 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos1);
+			$pos2 = stripos($message, '[/'.substr($message, $pos + 1, $tag_strlen).']', $pos1);
 			if ($pos2 === false)
 				continue;
 
@@ -2674,7 +2674,7 @@ 
 				$tag['validate']($tag, $data, $disabled, $params);
 
 			$code = strtr($tag['content'], array('$1' => $data));
-			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 3 + $tag_strlen);
+			$message = substr($message, 0, $pos)."\n".$code."\n".substr($message, $pos2 + 3 + $tag_strlen);
 
 			$pos += strlen($code) - 1 + 2;
 			$last_pos = $pos + 1;
@@ -2699,7 +2699,7 @@ 
 			if ($pos2 === false)
 				continue;
 
-			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
+			$pos3 = stripos($message, '[/'.substr($message, $pos + 1, $tag_strlen).']', $pos2);
 			if ($pos3 === false)
 				continue;
 
@@ -2716,14 +2716,14 @@ 
 				$tag['validate']($tag, $data, $disabled, $params);
 
 			$code = strtr($tag['content'], array('$1' => $data[0], '$2' => $data[1]));
-			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
+			$message = substr($message, 0, $pos)."\n".$code."\n".substr($message, $pos3 + 3 + $tag_strlen);
 			$pos += strlen($code) - 1 + 2;
 		}
 		// A closed tag, with no content or value.
 		elseif ($tag['type'] == 'closed')
 		{
 			$pos2 = strpos($message, ']', $pos);
-			$message = substr($message, 0, $pos) . "\n" . $tag['content'] . "\n" . substr($message, $pos2 + 1);
+			$message = substr($message, 0, $pos)."\n".$tag['content']."\n".substr($message, $pos2 + 1);
 			$pos += strlen($tag['content']) - 1 + 2;
 		}
 		// This one is sorta ugly... :/.  Unfortunately, it's needed for flash.
@@ -2733,12 +2733,12 @@ 
 			if ($pos2 === false)
 				continue;
 
-			$pos3 = stripos($message, '[/' . substr($message, $pos + 1, $tag_strlen) . ']', $pos2);
+			$pos3 = stripos($message, '[/'.substr($message, $pos + 1, $tag_strlen).']', $pos2);
 			if ($pos3 === false)
 				continue;
 
 			// We want $1 to be the content, and the rest to be csv.
-			$data = explode(',', ',' . substr($message, $pos1, $pos2 - $pos1));
+			$data = explode(',', ','.substr($message, $pos1, $pos2 - $pos1));
 			$data[0] = substr($message, $pos2 + 1, $pos3 - $pos2 - 1);
 
 			if (isset($tag['validate']))
@@ -2746,8 +2746,8 @@ 
 
 			$code = $tag['content'];
 			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
-			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos3 + 3 + $tag_strlen);
+				$code = strtr($code, array('$'.($k + 1) => trim($d)));
+			$message = substr($message, 0, $pos)."\n".$code."\n".substr($message, $pos3 + 3 + $tag_strlen);
 			$pos += strlen($code) - 1 + 2;
 		}
 		// This has parsed content, and a csv value which is unparsed.
@@ -2764,15 +2764,15 @@ 
 
 			// Fix after, for disabled code mainly.
 			foreach ($data as $k => $d)
-				$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+				$tag['after'] = strtr($tag['after'], array('$'.($k + 1) => trim($d)));
 
 			$open_tags[] = $tag;
 
 			// Replace them out, $1, $2, $3, $4, etc.
 			$code = $tag['before'];
 			foreach ($data as $k => $d)
-				$code = strtr($code, array('$' . ($k + 1) => trim($d)));
-			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + 1);
+				$code = strtr($code, array('$'.($k + 1) => trim($d)));
+			$message = substr($message, 0, $pos)."\n".$code."\n".substr($message, $pos2 + 1);
 			$pos += strlen($code) - 1 + 2;
 		}
 		// A tag set to a value, parsed or not.
@@ -2810,22 +2810,22 @@ 
 			$open_tags[] = $tag;
 
 			$code = strtr($tag['before'], array('$1' => $data));
-			$message = substr($message, 0, $pos) . "\n" . $code . "\n" . substr($message, $pos2 + ($quoted == false ? 1 : 7));
+			$message = substr($message, 0, $pos)."\n".$code."\n".substr($message, $pos2 + ($quoted == false ? 1 : 7));
 			$pos += strlen($code) - 1 + 2;
 		}
 
 		// If this is block level, eat any breaks after it.
 		if (!empty($tag['block_level']) && substr($message, $pos + 1, 4) == '<br>')
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 5);
+			$message = substr($message, 0, $pos + 1).substr($message, $pos + 5);
 
 		// Are we trimming outside this tag?
 		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($message, $pos + 1), $matches) != 0)
-			$message = substr($message, 0, $pos + 1) . substr($message, $pos + 1 + strlen($matches[0]));
+			$message = substr($message, 0, $pos + 1).substr($message, $pos + 1 + strlen($matches[0]));
 	}
 
 	// Close any remaining tags.
 	while ($tag = array_pop($open_tags))
-		$message .= "\n" . $tag['after'] . "\n";
+		$message .= "\n".$tag['after']."\n";
 
 	// Parse the smileys within the parts where it can be done safely.
 	if ($smileys === true)
@@ -2842,7 +2842,7 @@ 
 		$message = strtr($message, array("\n" => ''));
 
 	if ($message !== '' && $message[0] === ' ')
-		$message = '&nbsp;' . substr($message, 1);
+		$message = '&nbsp;'.substr($message, 1);
 
 	// Cleanup whitespace.
 	$message = strtr($message, array('  ' => ' &nbsp;', "\r" => '', "\n" => '<br>', '<br> ' => '<br>&nbsp;', '&#13;' => "\n"));
@@ -2932,12 +2932,12 @@ 
 		}
 
 		// Set proper extensions; do this post caching so cache doesn't become extension-specific
-		foreach($smileysto AS $ix=>$file)
+		foreach ($smileysto AS $ix=>$file)
 			// Need to use the default if user selection is disabled
 			if (empty($modSettings['smiley_sets_enable']))
-				$smileysto[$ix] = $file . $context['user']['smiley_set_default_ext'];
+				$smileysto[$ix] = $file.$context['user']['smiley_set_default_ext'];
 			else
-				$smileysto[$ix] = $file . $user_info['smiley_set_ext'];
+				$smileysto[$ix] = $file.$user_info['smiley_set_ext'];
 
 		// The non-breaking-space is a complex thing...
 		$non_breaking_space = $context['utf8'] ? '\x{A0}' : '\xA0';
@@ -2945,12 +2945,12 @@ 
 		// This smiley regex makes sure it doesn't parse smileys within code tags (so [url=mailto:David@bla.com] doesn't parse the :D smiley)
 		$smileyPregReplacements = array();
 		$searchParts = array();
-		$smileys_path = $smcFunc['htmlspecialchars']($modSettings['smileys_url'] . '/' . $user_info['smiley_set'] . '/');
+		$smileys_path = $smcFunc['htmlspecialchars']($modSettings['smileys_url'].'/'.$user_info['smiley_set'].'/');
 
 		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;
 
@@ -2970,12 +2970,12 @@ 
 			}
 		}
 
-		$smileyPregSearch = '~(?<=[>:\?\.\s' . $non_breaking_space . '[\]()*\\\;]|(?<![a-zA-Z0-9])\(|^)(' . build_regex($searchParts, '~') . ')(?=[^[:alpha:]0-9]|$)~' . ($context['utf8'] ? 'u' : '');
+		$smileyPregSearch = '~(?<=[>:\?\.\s'.$non_breaking_space.'[\]()*\\\;]|(?<![a-zA-Z0-9])\(|^)('.build_regex($searchParts, '~').')(?=[^[:alpha:]0-9]|$)~'.($context['utf8'] ? 'u' : '');
 	}
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch,
-		function ($matches) use ($smileyPregReplacements)
+		function($matches) use ($smileyPregReplacements)
 		{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
@@ -3003,7 +3003,7 @@ 
 	error_reporting($oldlevel);
 
 	// Yes, I know this is kludging it, but this is the best way to preserve tabs from PHP :P.
-	$buffer = preg_replace('~SMF_TAB(?:</(?:font|span)><(?:font color|span style)="[^"]*?">)?\\(\\);~', '<pre style="display: inline;">' . "\t" . '</pre>', $buffer);
+	$buffer = preg_replace('~SMF_TAB(?:</(?:font|span)><(?:font color|span style)="[^"]*?">)?\\(\\);~', '<pre style="display: inline;">'."\t".'</pre>', $buffer);
 
 	return strtr($buffer, array('\'' => '&#039;', '<code>' => '', '</code>' => ''));
 }
@@ -3030,7 +3030,7 @@ 
 		return strtr($url, array('http://' => 'https://'));
 
 	// By default, use SMF's own image proxy script
-	$proxied_url = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($url) . '&hash=' . md5($url . $image_proxy_secret);
+	$proxied_url = strtr($boardurl, array('http://' => 'https://')).'/proxy.php?request='.urlencode($url).'&hash='.md5($url.$image_proxy_secret);
 
 	// Allow mods to easily implement an alternative proxy
 	// MOD AUTHORS: To add settings UI for your proxy, use the integrate_general_settings hook.
@@ -3059,28 +3059,28 @@ 
 	$add = preg_match('~^(ftp|http)[s]?://~', $setLocation) == 0 && substr($setLocation, 0, 6) != 'about:';
 
 	if ($add)
-		$setLocation = $scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+		$setLocation = $scripturl.($setLocation != '' ? '?'.$setLocation : '');
 
 	// Put the session ID in.
 	if (defined('SID') && SID != '')
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', $scripturl . '?' . SID . ';', $setLocation);
+		$setLocation = preg_replace('/^'.preg_quote($scripturl, '/').'(?!\?'.preg_quote(SID, '/').')\\??/', $scripturl.'?'.SID.';', $setLocation);
 	// Keep that debug in their for template debugging!
 	elseif (isset($_GET['debug']))
-		$setLocation = preg_replace('/^' . preg_quote($scripturl, '/') . '\\??/', $scripturl . '?debug;', $setLocation);
+		$setLocation = preg_replace('/^'.preg_quote($scripturl, '/').'\\??/', $scripturl.'?debug;', $setLocation);
 
 	if (!empty($modSettings['queryless_urls']) && (empty($context['server']['is_cgi']) || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && (!empty($context['server']['is_apache']) || !empty($context['server']['is_lighttpd']) || !empty($context['server']['is_litespeed'])))
 	{
 		if (defined('SID') && SID != '')
-			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+			$setLocation = preg_replace_callback('~^'.preg_quote($scripturl, '~').'\?(?:'.SID.'(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
+				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)
+			$setLocation = preg_replace_callback('~^'.preg_quote($scripturl, '~').'\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
+				function($m) use ($scripturl)
 				{
-					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
+					return $scripturl.'/'.strtr("$m[1]", '&;=', '//,').'.html'.(isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
 	}
 
@@ -3088,7 +3088,7 @@ 
 	call_integration_hook('integrate_redirect', array(&$setLocation, &$refresh, &$permanent));
 
 	// Set the header.
-	header('location: ' . str_replace(' ', '%20', $setLocation), true, $permanent ? 301 : 302);
+	header('location: '.str_replace(' ', '%20', $setLocation), true, $permanent ? 301 : 302);
 
 	// Debugging.
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3133,7 +3133,7 @@ 
 	{
 		// Was the page title set last minute? Also update the HTML safe one.
 		if (!empty($context['page_title']) && empty($context['page_title_html_safe']))
-			$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+			$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])).(!empty($context['current_page']) ? ' - '.$txt['page'].' '.($context['current_page'] + 1) : '');
 
 		// Start up the session URL fixer.
 		ob_start('ob_sessrewrite');
@@ -3214,7 +3214,7 @@ 
 	$url = str_replace(' ', '%20', $url);
 
 	// Can we pull this from the cache... please please?
-	if (($temp = cache_get_data('url_image_size-' . md5($url), 240)) !== null)
+	if (($temp = cache_get_data('url_image_size-'.md5($url), 240)) !== null)
 		return $temp;
 	$t = microtime(true);
 
@@ -3240,7 +3240,7 @@ 
 		if ($fp != false)
 		{
 			// Send the HEAD request (since we don't have to worry about chunked, HTTP/1.1 is fine here.)
-			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'User-Agent: PHP/SMF' . "\r\n" . 'Connection: close' . "\r\n\r\n");
+			fwrite($fp, 'HEAD /'.$match[2].' HTTP/1.1'."\r\n".'Host: '.$match[1]."\r\n".'User-Agent: PHP/SMF'."\r\n".'Connection: close'."\r\n\r\n");
 
 			// Read in the HTTP/1.1 or whatever.
 			$test = substr(fgets($fp, 11), -1);
@@ -3272,7 +3272,7 @@ 
 
 	// If this took a long time, we may never have to do it again, but then again we might...
 	if (microtime(true) - $t > 0.8)
-		cache_put_data('url_image_size-' . md5($url), $size, 240);
+		cache_put_data('url_image_size-'.md5($url), $size, 240);
 
 	// Didn't work.
 	return $size;
@@ -3307,7 +3307,7 @@ 
 			continue;
 
 		// Clean it up for presentation ;).
-		$context['news_lines'][$i] = parse_bbc(stripslashes(trim($context['news_lines'][$i])), true, 'news' . $i);
+		$context['news_lines'][$i] = parse_bbc(stripslashes(trim($context['news_lines'][$i])), true, 'news'.$i);
 	}
 	if (!empty($context['news_lines']))
 		$context['random_news_line'] = $context['news_lines'][mt_rand(0, count($context['news_lines']) - 1)];
@@ -3340,19 +3340,19 @@ 
 		}
 		// Uploaded?
 		elseif ($user_info['avatar']['url'] == '' && !empty($user_info['avatar']['id_attach']))
-			$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'] . '/' . $user_info['avatar']['filename'] : $scripturl . '?action=dlattach;attach=' . $user_info['avatar']['id_attach'] . ';type=avatar';
+			$context['user']['avatar']['href'] = $user_info['avatar']['custom_dir'] ? $modSettings['custom_avatar_url'].'/'.$user_info['avatar']['filename'] : $scripturl.'?action=dlattach;attach='.$user_info['avatar']['id_attach'].';type=avatar';
 		// Full URL?
 		elseif (strpos($user_info['avatar']['url'], 'http://') === 0 || strpos($user_info['avatar']['url'], 'https://') === 0)
 			$context['user']['avatar']['href'] = $user_info['avatar']['url'];
 		// Otherwise we assume it's server stored.
 		elseif ($user_info['avatar']['url'] != '')
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/' . $smcFunc['htmlspecialchars']($user_info['avatar']['url']);
+			$context['user']['avatar']['href'] = $modSettings['avatar_url'].'/'.$smcFunc['htmlspecialchars']($user_info['avatar']['url']);
 		// No avatar at all? Fine, we have a big fat default avatar ;)
 		else
-			$context['user']['avatar']['href'] = $modSettings['avatar_url'] . '/default.png';
+			$context['user']['avatar']['href'] = $modSettings['avatar_url'].'/default.png';
 
 		if (!empty($context['user']['avatar']))
-			$context['user']['avatar']['image'] = '<img src="' . $context['user']['avatar']['href'] . '" alt="" class="avatar">';
+			$context['user']['avatar']['image'] = '<img src="'.$context['user']['avatar']['href'].'" alt="" class="avatar">';
 
 		// Figure out how long they've been logged in.
 		$context['user']['total_time_logged_in'] = array(
@@ -3391,36 +3391,36 @@ 
 		addInlineJavaScript('
 		jQuery(document).ready(function($) {
 			new smc_Popup({
-				heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']) . ',
-				content: ' . JavaScriptEscape(sprintf($txt['show_personal_messages'], $context['user']['unread_messages'], $scripturl . '?action=pm')) . ',
+				heading: ' . JavaScriptEscape($txt['show_personal_messages_heading']).',
+				content: ' . JavaScriptEscape(sprintf($txt['show_personal_messages'], $context['user']['unread_messages'], $scripturl.'?action=pm')).',
 				icon_class: \'generic_icons mail_new\'
 			});
 		});');
 
 	// 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')
 		addInlineCss('
-	img.avatar { max-width: ' . $modSettings['avatar_max_width_external'] . 'px; max-height: ' . $modSettings['avatar_max_height_external'] . 'px; }');
+	img.avatar { max-width: ' . $modSettings['avatar_max_width_external'].'px; max-height: '.$modSettings['avatar_max_height_external'].'px; }');
 
 	// Add max image limits
 	if (!empty($modSettings['max_image_width']))
 		addInlineCss('
-	.postarea .bbc_img { max-width: ' . $modSettings['max_image_width'] . 'px; }');
+	.postarea .bbc_img { max-width: ' . $modSettings['max_image_width'].'px; }');
 
 	if (!empty($modSettings['max_image_height']))
 		addInlineCss('
-	.postarea .bbc_img { max-height: ' . $modSettings['max_image_height'] . 'px; }');
+	.postarea .bbc_img { max-height: ' . $modSettings['max_image_height'].'px; }');
 
 	// This looks weird, but it's because BoardIndex.php references the variable.
 	$context['common_stats']['latest_member'] = array(
 		'id' => $modSettings['latestMember'],
 		'name' => $modSettings['latestRealName'],
-		'href' => $scripturl . '?action=profile;u=' . $modSettings['latestMember'],
-		'link' => '<a href="' . $scripturl . '?action=profile;u=' . $modSettings['latestMember'] . '">' . $modSettings['latestRealName'] . '</a>',
+		'href' => $scripturl.'?action=profile;u='.$modSettings['latestMember'],
+		'link' => '<a href="'.$scripturl.'?action=profile;u='.$modSettings['latestMember'].'">'.$modSettings['latestRealName'].'</a>',
 	);
 	$context['common_stats'] = array(
 		'total_posts' => comma_format($modSettings['totalMessages']),
@@ -3437,7 +3437,7 @@ 
 		$context['page_title'] = '';
 
 	// Set some specific vars.
-	$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])) . (!empty($context['current_page']) ? ' - ' . $txt['page'] . ' ' . ($context['current_page'] + 1) : '');
+	$context['page_title_html_safe'] = $smcFunc['htmlspecialchars'](un_htmlspecialchars($context['page_title'])).(!empty($context['current_page']) ? ' - '.$txt['page'].' '.($context['current_page'] + 1) : '');
 	$context['meta_keywords'] = !empty($modSettings['meta_keywords']) ? $smcFunc['htmlspecialchars']($modSettings['meta_keywords']) : '';
 
 	// Content related meta tags, including Open Graph
@@ -3489,7 +3489,7 @@ 
 	// if more is needed, request it
 	if ($memory_current < $memory_needed)
 	{
-		@ini_set('memory_limit', ceil($memory_needed / 1048576) . 'M');
+		@ini_set('memory_limit', ceil($memory_needed / 1048576).'M');
 		$memory_current = memoryReturnBytes(ini_get('memory_limit'));
 	}
 
@@ -3541,16 +3541,16 @@ 
 	if (empty($context['no_last_modified']))
 	{
 		header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
-		header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+		header('last-modified: '.gmdate('D, d M Y H:i:s').' GMT');
 
 		// Are we debugging the template/html content?
 		if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !isBrowser('ie'))
 			header('content-type: application/xhtml+xml');
 		elseif (!isset($_REQUEST['xml']))
-			header('content-type: text/html; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+			header('content-type: text/html; charset='.(empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
 	}
 
-	header('content-type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	header('content-type: text/'.(isset($_REQUEST['xml']) ? 'xml' : 'html').'; charset='.(empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
 
 	// We need to splice this in after the body layer, or after the main layer for older stuff.
 	if ($context['in_maintenance'] && $context['user']['is_admin'])
@@ -3571,7 +3571,7 @@ 
 	$showed_banned = false;
 	foreach ($context['template_layers'] as $layer)
 	{
-		loadSubTemplate($layer . '_above', true);
+		loadSubTemplate($layer.'_above', true);
 
 		// May seem contrived, but this is done in case the body and main layer aren't there...
 		if (in_array($layer, array('body', 'main')) && allowedTo('admin_forum') && !$user_info['is_guest'] && !$checked_securityFiles)
@@ -3585,7 +3585,7 @@ 
 
 			foreach ($securityFiles as $i => $securityFile)
 			{
-				if (!file_exists($boarddir . '/' . $securityFile))
+				if (!file_exists($boarddir.'/'.$securityFile))
 					unset($securityFiles[$i]);
 			}
 
@@ -3601,7 +3601,7 @@ 
 
 			// If agreement is enabled, at least the english version shall exists
 			if ($modSettings['requireAgreement'])
-				$agreement = !file_exists($boarddir . '/agreement.txt');
+				$agreement = !file_exists($boarddir.'/agreement.txt');
 
 			if (!empty($securityFiles) || (!empty($modSettings['cache_enable']) && !is_writable($cachedir)) || !empty($agreement))
 			{
@@ -3687,7 +3687,7 @@ 
 	$context['load_queries'] = $db_count;
 
 	foreach (array_reverse($context['template_layers']) as $layer)
-		loadSubTemplate($layer . '_below', true);
+		loadSubTemplate($layer.'_below', true);
 }
 
 /**
@@ -3865,12 +3865,12 @@ 
 	if (!empty($normal))
 		foreach ($normal as $nf)
 			echo '
-	<link rel="stylesheet" href="', $nf ,'">';
+	<link rel="stylesheet" href="', $nf, '">';
 
 	if ($db_show_debug === true)
 	{
 		// Try to keep only what's useful.
-		$repl = array($boardurl . '/Themes/' => '', $boardurl . '/' => '');
+		$repl = array($boardurl.'/Themes/' => '', $boardurl.'/' => '');
 		foreach ($context['css_files'] as $file)
 			$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
 	}
@@ -3881,7 +3881,7 @@ 
 	<style>';
 
 		foreach ($context['css_header'] as $css)
-			echo $css .'
+			echo $css.'
 	';
 
 		echo'
@@ -3909,15 +3909,15 @@ 
 		return $data;
 
 	// Different pages include different files, so we use a hash to label the different combinations
-	$hash = md5(implode(' ', array_map(function($file) { return $file['filePath'] . (int) @filesize($file['filePath']) . (int) @filemtime($file['filePath']); }, $data)));
+	$hash = md5(implode(' ', array_map(function($file) { return $file['filePath'].(int) @filesize($file['filePath']).(int) @filemtime($file['filePath']); }, $data)));
 
 	// Did we already do this?
-	list($toCache, $async, $defer) = array_pad((array) cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, 86400), 3, null);
+	list($toCache, $async, $defer) = array_pad((array) cache_get_data('minimized_'.$settings['theme_id'].'_'.$type.'_'.$hash, 86400), 3, null);
 
 	// Already done?
 	if (!empty($toCache))
 		return array('smf_minified' => array(
-			'fileUrl' => $settings['theme_url'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/' . basename($toCache),
+			'fileUrl' => $settings['theme_url'].'/'.($type == 'css' ? 'css' : 'scripts').'/'.basename($toCache),
 			'filePath' => $toCache,
 			'fileName' => basename($toCache),
 			'options' => array('async' => !empty($async), 'defer' => !empty($defer)),
@@ -3925,20 +3925,20 @@ 
 
 
 	// 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_' . $hash . '.' . $type;
+	$toCreate = $cTempPath.'minified_'.$hash.'.'.$type;
 
 	// File has to exist. If it doesn'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 . '_' . $hash, null);
+		cache_put_data('minimized_'.$settings['theme_id'].'_'.$type.'_'.$hash, null);
 
 		// The process failed, so roll back to print each individual file.
 		return $data;
@@ -3990,17 +3990,17 @@ 
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, null);
+		cache_put_data('minimized_'.$settings['theme_id'].'_'.$type.'_'.$hash, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
 	}
 
 	// And create a one day cache entry.
-	cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type . '_' . $hash, array($toCache, $async, $defer), 86400);
+	cache_put_data('minimized_'.$settings['theme_id'].'_'.$type.'_'.$hash, array($toCache, $async, $defer), 86400);
 
 	return array('smf_minified' => array(
-		'fileUrl' => $settings['theme_url'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/' . basename($toCreate),
+		'fileUrl' => $settings['theme_url'].'/'.($type == 'css' ? 'css' : 'scripts').'/'.basename($toCreate),
 		'filePath' => $toCreate,
 		'fileName' => basename($toCreate),
 		'options' => array('async' => $async, 'defer' => $defer),
@@ -4029,11 +4029,11 @@ 
 	{
 		foreach (array('css', 'js') as $type)
 		{
-			foreach (glob(rtrim($theme['dir'], '/') . '/' . ($type == 'css' ? 'css' : 'scripts') . '/minified*.' . $type) as $filename)
+			foreach (glob(rtrim($theme['dir'], '/').'/'.($type == 'css' ? 'css' : 'scripts').'/minified*.'.$type) as $filename)
 			{
 				// Remove the cache entry
-				if (preg_match('~([a-zA-Z0-9]+)\.' . $type . '$~', $filename, $matches))
-					cache_put_data('minimized_' . $theme['id'] . '_' . $type . '_' . $matches[1], null);
+				if (preg_match('~([a-zA-Z0-9]+)\.'.$type.'$~', $filename, $matches))
+					cache_put_data('minimized_'.$theme['id'].'_'.$type.'_'.$matches[1], null);
 
 				// Try to delete the file. Add it to our error list if it fails.
 				if (!@unlink($filename))
@@ -4070,7 +4070,7 @@ 
 
 	// Just make up a nice hash...
 	if ($new)
-		return sha1(md5($filename . time()) . mt_rand());
+		return sha1(md5($filename.time()).mt_rand());
 
 	// Just make sure that attachment id is only a int
 	$attachment_id = (int) $attachment_id;
@@ -4096,7 +4096,7 @@ 
 
 	// Still no hash? mmm...
 	if (empty($file_hash))
-		$file_hash = sha1(md5($filename . time()) . mt_rand());
+		$file_hash = sha1(md5($filename.time()).mt_rand());
 
 	// Are we using multiple directories?
 	if (is_array($modSettings['attachmentUploadDir']))
@@ -4105,7 +4105,7 @@ 
 	else
 		$path = $modSettings['attachmentUploadDir'];
 
-	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
+	return $path.'/'.$attachment_id.'_'.$file_hash.'.dat';
 }
 
 /**
@@ -4149,16 +4149,16 @@ 
 		$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]);
 			while (!$valid_low)
 			{
-				$ip_parts[0] .= $mode . $min;
+				$ip_parts[0] .= $mode.$min;
 				$valid_low = isValidIP($ip_parts[0]);
 				$count++;
 				if ($count > 9) break;
@@ -4166,20 +4166,20 @@ 
 		}
 
 		$count = 0;
-		if(!$valid_high)
+		if (!$valid_high)
 		{
 			$ip_parts[1] = preg_replace('/\*/', $max, $ip_parts[1]);
 			$valid_high = isValidIP($ip_parts[1]);
 			while (!$valid_high)
 			{
-				$ip_parts[1] .= $mode . $max;
+				$ip_parts[1] .= $mode.$max;
 				$valid_high = isValidIP($ip_parts[1]);
 				$count++;
 				if ($count > 9) break;
 			}
 		}
 
-		if($valid_high && $valid_low)
+		if ($valid_high && $valid_low)
 		{
 			$ip_array['low'] = $ip_parts[0];
 			$ip_array['high'] = $ip_parts[1];
@@ -4199,7 +4199,7 @@ 
 {
 	global $modSettings;
 
-	if (($host = cache_get_data('hostlookup-' . $ip, 600)) !== null)
+	if (($host = cache_get_data('hostlookup-'.$ip, 600)) !== null)
 		return $host;
 	$t = microtime(true);
 
@@ -4207,9 +4207,9 @@ 
 	if (!isset($host) && (strpos(strtolower(PHP_OS), 'win') === false || strpos(strtolower(PHP_OS), 'darwin') !== false) && mt_rand(0, 1) == 1)
 	{
 		if (!isset($modSettings['host_to_dis']))
-			$test = @shell_exec('host -W 1 ' . @escapeshellarg($ip));
+			$test = @shell_exec('host -W 1 '.@escapeshellarg($ip));
 		else
-			$test = @shell_exec('host ' . @escapeshellarg($ip));
+			$test = @shell_exec('host '.@escapeshellarg($ip));
 
 		// Did host say it didn't find anything?
 		if (strpos($test, 'not found') !== false)
@@ -4225,7 +4225,7 @@ 
 	// This is nslookup; usually only Windows, but possibly some Unix?
 	if (!isset($host) && stripos(PHP_OS, 'win') !== false && strpos(strtolower(PHP_OS), 'darwin') === false && mt_rand(0, 1) == 1)
 	{
-		$test = @shell_exec('nslookup -timeout=1 ' . @escapeshellarg($ip));
+		$test = @shell_exec('nslookup -timeout=1 '.@escapeshellarg($ip));
 		if (strpos($test, 'Non-existent domain') !== false)
 			$host = '';
 		elseif (preg_match('~Name:\s+([^\s]+)~', $test, $match) == 1)
@@ -4238,7 +4238,7 @@ 
 
 	// It took a long time, so let's cache it!
 	if (microtime(true) - $t > 0.5)
-		cache_put_data('hostlookup-' . $ip, $host, 600);
+		cache_put_data('hostlookup-'.$ip, $host, 600);
 
 	return $host;
 }
@@ -4256,7 +4256,7 @@ 
 	global $smcFunc, $context;
 
 	// Step 1: Remove entities/things we don't consider words:
-	$words = preg_replace('~(?:[\x0B\0' . ($context['utf8'] ? '\x{A0}' : '\xA0') . '\t\r\s\n(){}\\[\\]<>!@$%^*.,:+=`\~\?/\\\\]+|&(?:amp|lt|gt|quot);)+~' . ($context['utf8'] ? 'u' : ''), ' ', strtr($text, array('<br>' => ' ')));
+	$words = preg_replace('~(?:[\x0B\0'.($context['utf8'] ? '\x{A0}' : '\xA0').'\t\r\s\n(){}\\[\\]<>!@$%^*.,:+=`\~\?/\\\\]+|&(?:amp|lt|gt|quot);)+~'.($context['utf8'] ? 'u' : ''), ' ', strtr($text, array('<br>' => ' ')));
 
 	// Step 2: Entities we left to letters, where applicable, lowercase.
 	$words = un_htmlspecialchars($smcFunc['strtolower']($words));
@@ -4315,9 +4315,9 @@ 
 	if (!$settings['use_image_buttons'])
 		return $txt[$alt];
 	elseif (!empty($settings['use_buttons']))
-		return '<span class="generic_icons ' . $name . '" alt="' . $txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . $txt[$label] . '</strong>' : '');
+		return '<span class="generic_icons '.$name.'" alt="'.$txt[$alt].'"></span>'.($label != '' ? '&nbsp;<strong>'.$txt[$label].'</strong>' : '');
 	else
-		return '<img src="' . $settings['lang_images_url'] . '/' . $name . '" alt="' . $txt[$alt] . '" ' . $custom . '>';
+		return '<img src="'.$settings['lang_images_url'].'/'.$name.'" alt="'.$txt[$alt].'" '.$custom.'>';
 }
 
 /**
@@ -4359,28 +4359,28 @@ 
 	{
 		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("profile", "' . $scripturl.'?action=profile;area=popup");
+	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);
+	user_menus.add("pm", "' . $scripturl.'?action=pm;sa=popup");', true);
 
 		if (!empty($modSettings['enable_ajax_alerts']))
 		{
-			require_once($sourcedir . '/Subs-Notify.php');
+			require_once($sourcedir.'/Subs-Notify.php');
 
 			$timeout = getNotifyPrefs($context['user']['id'], 'alert_timeout', true);
 			$timeout = empty($timeout) ? 10000 : $timeout[$context['user']['id']]['alert_timeout'] * 1000;
 
 			addInlineJavaScript('
-	var new_alert_title = "' . $context['forum_name'] . '";
-	var alert_timeout = ' . $timeout . ';');
+	var new_alert_title = "' . $context['forum_name'].'";
+	var alert_timeout = ' . $timeout.';');
 			loadJavaScriptFile('alerts.js', array('minimize' => true), 'smf_alerts');
 		}
 	}
 
 	// All the buttons we can possible want and then some, try pulling the final list of buttons from cache first.
-	if (($menu_buttons = cache_get_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $cacheTime)) === null || time() - $cacheTime <= $modSettings['settings_updated'])
+	if (($menu_buttons = cache_get_data('menu_buttons-'.implode('_', $user_info['groups']).'-'.$user_info['language'], $cacheTime)) === null || time() - $cacheTime <= $modSettings['settings_updated'])
 	{
 		$buttons = array(
 			'home' => array(
@@ -4393,39 +4393,39 @@ 
 			),
 			'search' => array(
 				'title' => $txt['search'],
-				'href' => $scripturl . '?action=search',
+				'href' => $scripturl.'?action=search',
 				'show' => $context['allow_search'],
 				'sub_buttons' => array(
 				),
 			),
 			'admin' => array(
 				'title' => $txt['admin'],
-				'href' => $scripturl . '?action=admin',
+				'href' => $scripturl.'?action=admin',
 				'show' => $context['allow_admin'],
 				'sub_buttons' => array(
 					'featuresettings' => array(
 						'title' => $txt['modSettings_title'],
-						'href' => $scripturl . '?action=admin;area=featuresettings',
+						'href' => $scripturl.'?action=admin;area=featuresettings',
 						'show' => allowedTo('admin_forum'),
 					),
 					'packages' => array(
 						'title' => $txt['package'],
-						'href' => $scripturl . '?action=admin;area=packages',
+						'href' => $scripturl.'?action=admin;area=packages',
 						'show' => allowedTo('admin_forum'),
 					),
 					'errorlog' => array(
 						'title' => $txt['errlog'],
-						'href' => $scripturl . '?action=admin;area=logs;sa=errorlog;desc',
+						'href' => $scripturl.'?action=admin;area=logs;sa=errorlog;desc',
 						'show' => allowedTo('admin_forum') && !empty($modSettings['enableErrorLogging']),
 					),
 					'permissions' => array(
 						'title' => $txt['edit_permissions'],
-						'href' => $scripturl . '?action=admin;area=permissions',
+						'href' => $scripturl.'?action=admin;area=permissions',
 						'show' => allowedTo('manage_permissions'),
 					),
 					'memberapprove' => array(
 						'title' => $txt['approve_members_waiting'],
-						'href' => $scripturl . '?action=admin;area=viewmembers;sa=browse;type=approve',
+						'href' => $scripturl.'?action=admin;area=viewmembers;sa=browse;type=approve',
 						'show' => !empty($context['unapproved_members']),
 						'is_last' => true,
 					),
@@ -4433,32 +4433,32 @@ 
 			),
 			'moderate' => array(
 				'title' => $txt['moderate'],
-				'href' => $scripturl . '?action=moderate',
+				'href' => $scripturl.'?action=moderate',
 				'show' => $context['allow_moderation_center'],
 				'sub_buttons' => array(
 					'modlog' => array(
 						'title' => $txt['modlog_view'],
-						'href' => $scripturl . '?action=moderate;area=modlog',
+						'href' => $scripturl.'?action=moderate;area=modlog',
 						'show' => !empty($modSettings['modlog_enabled']) && !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
 					),
 					'poststopics' => array(
 						'title' => $txt['mc_unapproved_poststopics'],
-						'href' => $scripturl . '?action=moderate;area=postmod;sa=posts',
+						'href' => $scripturl.'?action=moderate;area=postmod;sa=posts',
 						'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
 					),
 					'attachments' => array(
 						'title' => $txt['mc_unapproved_attachments'],
-						'href' => $scripturl . '?action=moderate;area=attachmod;sa=attachments',
+						'href' => $scripturl.'?action=moderate;area=attachmod;sa=attachments',
 						'show' => $modSettings['postmod_active'] && !empty($user_info['mod_cache']['ap']),
 					),
 					'reports' => array(
 						'title' => $txt['mc_reported_posts'],
-						'href' => $scripturl . '?action=moderate;area=reportedposts',
+						'href' => $scripturl.'?action=moderate;area=reportedposts',
 						'show' => !empty($user_info['mod_cache']) && $user_info['mod_cache']['bq'] != '0=1',
 					),
 					'reported_members' => array(
 						'title' => $txt['mc_reported_members'],
-						'href' => $scripturl . '?action=moderate;area=reportedmembers',
+						'href' => $scripturl.'?action=moderate;area=reportedmembers',
 						'show' => allowedTo('moderate_forum'),
 						'is_last' => true,
 					)
@@ -4466,17 +4466,17 @@ 
 			),
 			'calendar' => array(
 				'title' => $txt['calendar'],
-				'href' => $scripturl . '?action=calendar',
+				'href' => $scripturl.'?action=calendar',
 				'show' => $context['allow_calendar'],
 				'sub_buttons' => array(
 					'view' => array(
 						'title' => $txt['calendar_menu'],
-						'href' => $scripturl . '?action=calendar',
+						'href' => $scripturl.'?action=calendar',
 						'show' => $context['allow_calendar_event'],
 					),
 					'post' => array(
 						'title' => $txt['calendar_post_event'],
-						'href' => $scripturl . '?action=calendar;sa=post',
+						'href' => $scripturl.'?action=calendar;sa=post',
 						'show' => $context['allow_calendar_event'],
 						'is_last' => true,
 					),
@@ -4484,17 +4484,17 @@ 
 			),
 			'mlist' => array(
 				'title' => $txt['members_title'],
-				'href' => $scripturl . '?action=mlist',
+				'href' => $scripturl.'?action=mlist',
 				'show' => $context['allow_memberlist'],
 				'sub_buttons' => array(
 					'mlist_view' => array(
 						'title' => $txt['mlist_menu_view'],
-						'href' => $scripturl . '?action=mlist',
+						'href' => $scripturl.'?action=mlist',
 						'show' => true,
 					),
 					'mlist_search' => array(
 						'title' => $txt['mlist_search'],
-						'href' => $scripturl . '?action=mlist;sa=search',
+						'href' => $scripturl.'?action=mlist;sa=search',
 						'show' => true,
 						'is_last' => true,
 					),
@@ -4502,7 +4502,7 @@ 
 			),
 			'signup' => array(
 				'title' => $txt['register'],
-				'href' => $scripturl . '?action=signup',
+				'href' => $scripturl.'?action=signup',
 				'show' => $user_info['is_guest'] && $context['can_register'],
 				'sub_buttons' => array(
 				),
@@ -4510,7 +4510,7 @@ 
 			),
 			'logout' => array(
 				'title' => $txt['logout'],
-				'href' => $scripturl . '?action=logout;%1$s=%2$s',
+				'href' => $scripturl.'?action=logout;%1$s=%2$s',
 				'show' => !$user_info['is_guest'],
 				'sub_buttons' => array(
 				),
@@ -4559,20 +4559,20 @@ 
 					}
 
 				// Does this button have its own icon?
-				if (isset($button['icon']) && file_exists($settings['theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['images_url'] . '/' . $button['icon'] . '" alt="">';
-				elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'] . '/images/' . $button['icon']))
-					$button['icon'] = '<img src="' . $settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
+				if (isset($button['icon']) && file_exists($settings['theme_dir'].'/images/'.$button['icon']))
+					$button['icon'] = '<img src="'.$settings['images_url'].'/'.$button['icon'].'" alt="">';
+				elseif (isset($button['icon']) && file_exists($settings['default_theme_dir'].'/images/'.$button['icon']))
+					$button['icon'] = '<img src="'.$settings['default_images_url'].'/'.$button['icon'].'" alt="">';
 				elseif (isset($button['icon']))
-					$button['icon'] = '<span class="generic_icons ' . $button['icon'] . '"></span>';
+					$button['icon'] = '<span class="generic_icons '.$button['icon'].'"></span>';
 				else
-					$button['icon'] = '<span class="generic_icons ' . $act . '"></span>';
+					$button['icon'] = '<span class="generic_icons '.$act.'"></span>';
 
 				$menu_buttons[$act] = $button;
 			}
 
 		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('menu_buttons-' . implode('_', $user_info['groups']) . '-' . $user_info['language'], $menu_buttons, $cacheTime);
+			cache_put_data('menu_buttons-'.implode('_', $user_info['groups']).'-'.$user_info['language'], $menu_buttons, $cacheTime);
 	}
 
 	$context['menu_buttons'] = $menu_buttons;
@@ -4655,7 +4655,7 @@ 
 		$context['total_admin_reports'] += $context['unapproved_members'];
 	}
 
-	if($context['total_admin_reports'] > 0 && !empty($context['menu_buttons']['admin']))
+	if ($context['total_admin_reports'] > 0 && !empty($context['menu_buttons']['admin']))
 	{
 		$context['menu_buttons']['admin']['amt'] = $context['total_admin_reports'];
 	}
@@ -4759,11 +4759,11 @@ 
 
 	// Any objects?
 	if ($object)
-		$function = $function . '#';
+		$function = $function.'#';
 
 	// Any files  to load?
 	if (!empty($file) && is_string($file))
-		$function = $file . (!empty($function) ? '|' . $function : '');
+		$function = $file.(!empty($function) ? '|'.$function : '');
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -4825,11 +4825,11 @@ 
 
 	// Any objects?
 	if ($object)
-		$function = $function . '#';
+		$function = $function.'#';
 
 	// Any files  to load?
 	if (!empty($file) && is_string($file))
-		$function = $file . '|' . $function;
+		$function = $file.'|'.$function;
 
 	// Get the correct string.
 	$integration_call = $function;
@@ -5002,7 +5002,7 @@ 
 		// No? try a fallback to $sourcedir
 		else
 		{
-			$absPath = $sourcedir .'/'. $file;
+			$absPath = $sourcedir.'/'.$file;
 
 			if (file_exists($absPath))
 				require_once($absPath);
@@ -5051,15 +5051,15 @@ 
 	elseif ($match[1] == 'ftp')
 	{
 		// Include the file containing the ftp_connection class.
-		require_once($sourcedir . '/Class-Package.php');
+		require_once($sourcedir.'/Class-Package.php');
 
 		// Establish a connection and attempt to enable passive mode.
-		$ftp = new ftp_connection(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
+		$ftp = new ftp_connection(($match[2] ? 'ssl://' : '').$match[3], empty($match[5]) ? 21 : $match[5], 'anonymous', $webmaster_email);
 		if ($ftp->error !== false || !$ftp->passive())
 			return false;
 
 		// I want that one *points*!
-		fwrite($ftp->connection, 'RETR ' . $match[6] . "\r\n");
+		fwrite($ftp->connection, 'RETR '.$match[6]."\r\n");
 
 		// Since passive mode worked (or we would have returned already!) open the connection.
 		$fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $err, $err, 5);
@@ -5088,7 +5088,7 @@ 
 		if (empty($fp))
 		{
 			// Open the socket on the port we want...
-			$fp = @fsockopen(($match[2] ? 'ssl://' : '') . $match[3], empty($match[5]) ? ($match[2] ? 443 : 80) : $match[5], $err, $err, 5);
+			$fp = @fsockopen(($match[2] ? 'ssl://' : '').$match[3], empty($match[5]) ? ($match[2] ? 443 : 80) : $match[5], $err, $err, 5);
 		}
 		if (!empty($fp))
 		{
@@ -5101,25 +5101,25 @@ 
 			// I want this, from there, and I'm not going to be bothering you for more (probably.)
 			if (empty($post_data))
 			{
-				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
-				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
-				fwrite($fp, 'user-agent: PHP/SMF' . "\r\n");
+				fwrite($fp, 'GET '.($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '').' HTTP/1.0'."\r\n");
+				fwrite($fp, 'Host: '.$match[3].(empty($match[5]) ? ($match[2] ? ':443' : '') : ':'.$match[5])."\r\n");
+				fwrite($fp, 'user-agent: PHP/SMF'."\r\n");
 				if ($keep_alive)
-					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
+					fwrite($fp, 'connection: Keep-Alive'."\r\n\r\n");
 				else
-					fwrite($fp, 'connection: close' . "\r\n\r\n");
+					fwrite($fp, 'connection: close'."\r\n\r\n");
 			}
 			else
 			{
-				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
-				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
-				fwrite($fp, 'user-agent: PHP/SMF' . "\r\n");
+				fwrite($fp, 'POST '.($match[6] !== '/' ? $match[6] : '').' HTTP/1.0'."\r\n");
+				fwrite($fp, 'Host: '.$match[3].(empty($match[5]) ? ($match[2] ? ':443' : '') : ':'.$match[5])."\r\n");
+				fwrite($fp, 'user-agent: PHP/SMF'."\r\n");
 				if ($keep_alive)
-					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
+					fwrite($fp, 'connection: Keep-Alive'."\r\n");
 				else
-					fwrite($fp, 'connection: close' . "\r\n");
-				fwrite($fp, 'content-type: application/x-www-form-urlencoded' . "\r\n");
-				fwrite($fp, 'content-length: ' . strlen($post_data) . "\r\n\r\n");
+					fwrite($fp, 'connection: close'."\r\n");
+				fwrite($fp, 'content-type: application/x-www-form-urlencoded'."\r\n");
+				fwrite($fp, 'content-length: '.strlen($post_data)."\r\n\r\n");
 				fwrite($fp, $post_data);
 			}
 
@@ -5182,7 +5182,7 @@ 
 		elseif (function_exists('curl_init'))
 		{
 			// Include the file containing the curl_fetch_web_data class.
-			require_once($sourcedir . '/Class-CurlFetchWeb.php');
+			require_once($sourcedir.'/Class-CurlFetchWeb.php');
 
 			$fetch_data = new curl_fetch_web_data();
 			$fetch_data->get_url_data($url, $post_data);
@@ -5224,7 +5224,7 @@ 
 
 	// We already know the number of likes per message, we just want to know whether the current user liked it or not.
 	$user = $user_info['id'];
-	$cache_key = 'likes_topic_' . $topic . '_' . $user;
+	$cache_key = 'likes_topic_'.$topic.'_'.$user;
 	$ttl = 180;
 
 	if (($temp = cache_get_data($cache_key, $ttl)) === null)
@@ -5269,15 +5269,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
@@ -5295,15 +5295,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'])
@@ -5339,7 +5339,7 @@ 
 
 	// Quote, Ampersand, Apostrophe, Less/Greater Than get html replaced
 	if (in_array($num, array(0x22, 0x26, 0x27, 0x3C, 0x3E)))
-		return '&#' . $num . ';';
+		return '&#'.$num.';';
 
 	if (empty($context['utf8']))
 	{
@@ -5351,7 +5351,7 @@ 
 			return chr($num);
 		// all others get html-ised
 		else
-			return '&#' . $matches[2] . ';';
+			return '&#'.$matches[2].';';
 	}
 	else
 	{
@@ -5364,13 +5364,13 @@ 
 			return chr($num);
 		// <0x800 (2048)
 		elseif ($num < 0x800)
-			return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+			return chr(($num >> 6) + 192).chr(($num & 63) + 128);
 		// < 0x10000 (65536)
 		elseif ($num < 0x10000)
-			return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+			return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 		// <= 0x10FFFF (1114111)
 		else
-			return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+			return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
 }
 
@@ -5400,13 +5400,13 @@ 
 		return chr($num);
 	// <0x800 (2048)
 	elseif ($num < 0x800)
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		return chr(($num >> 6) + 192).chr(($num & 63) + 128);
 	// < 0x10000 (65536)
 	elseif ($num < 0x10000)
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	// <= 0x10FFFF (1114111)
 	else
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 }
 
 /**
@@ -5429,7 +5429,7 @@ 
 	if ($num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num == 0x202D || $num == 0x202E)
 		return '';
 	else
-		return '&#' . $num . ';';
+		return '&#'.$num.';';
 }
 
 /**
@@ -5455,9 +5455,9 @@ 
 		$defaults = array('mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank');
 		$url_params = array();
 		if (!empty($modSettings['gravatarMaxRating']) && in_array($modSettings['gravatarMaxRating'], $ratings))
-			$url_params[] = 'rating=' . $modSettings['gravatarMaxRating'];
+			$url_params[] = 'rating='.$modSettings['gravatarMaxRating'];
 		if (!empty($modSettings['gravatarDefault']) && in_array($modSettings['gravatarDefault'], $defaults))
-			$url_params[] = 'default=' . $modSettings['gravatarDefault'];
+			$url_params[] = 'default='.$modSettings['gravatarDefault'];
 		if (!empty($modSettings['avatar_max_width_external']))
 			$size_string = (int) $modSettings['avatar_max_width_external'];
 		if (!empty($modSettings['avatar_max_height_external']) && !empty($size_string))
@@ -5465,11 +5465,11 @@ 
 				$size_string = $modSettings['avatar_max_height_external'];
 
 		if (!empty($size_string))
-			$url_params[] = 's=' . $size_string;
+			$url_params[] = 's='.$size_string;
 	}
 	$http_method = !empty($modSettings['force_ssl']) ? 'https://secure' : 'http://www';
 
-	return $http_method . '.gravatar.com/avatar/' . md5($smcFunc['strtolower']($email_address)) . '?' . implode('&', $url_params);
+	return $http_method.'.gravatar.com/avatar/'.md5($smcFunc['strtolower']($email_address)).'?'.implode('&', $url_params);
 }
 
 /**
@@ -5502,7 +5502,7 @@ 
 		$when = time();
 
 	// We'll need these too
-	$date_when = date_create('@' . $when);
+	$date_when = date_create('@'.$when);
 	$later = (int) date_format(date_add($date_when, date_interval_create_from_date_string('1 year')), 'U');
 
 	// Load up any custom time zone descriptions we might have
@@ -5581,10 +5581,10 @@ 
 			$desc = $tztxt[$tzvalue['tzid']];
 		// Otherwise, use the list of locations (max 5, so things don't get silly)
 		else
-			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
+			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)).(count($tzvalue['locations']) > 5 ? ', '.$txt['etc'] : '');
 
 		// Show the UTC offset and the abbreviation, if it's something like 'MST' and not '-06'
-		$desc = '[UTC' . date_format($date_when, 'P') . '] - ' . (!strspn($tzvalue['abbr'], '+-') ? $tzvalue['abbr'] . ' - ' : '') . $desc;
+		$desc = '[UTC'.date_format($date_when, 'P').'] - '.(!strspn($tzvalue['abbr'], '+-') ? $tzvalue['abbr'].' - ' : '').$desc;
 
 		if (isset($priority_zones[$tzkey]))
 			$priority_timezones[$tzvalue['tzid']] = $desc;
@@ -5597,7 +5597,7 @@ 
 
 	$timezones = array_merge(
 		$priority_timezones,
-		array('' => '(Forum Default)', 'UTC' => 'UTC - ' . $tztxt['UTC'], '-----'),
+		array('' => '(Forum Default)', 'UTC' => 'UTC - '.$tztxt['UTC'], '-----'),
 		$timezones
 	);
 
@@ -5623,7 +5623,7 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
+	if (empty($bin))
 		return '';
 
 	global $db_type;
@@ -5654,28 +5654,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)
-			$out .= _safe_serialize($k) . _safe_serialize($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.
@@ -5717,7 +5717,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();
@@ -5731,40 +5731,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];
 		}
 
@@ -5772,10 +5772,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();
@@ -5784,7 +5784,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$list[$key] = $value;
 					$state = 2;
@@ -5795,29 +5795,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;
@@ -5830,7 +5830,7 @@ 
 
 			// Expecting array or value.
 			case 0:
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$data = array();
 					$list = &$data;
@@ -5839,7 +5839,7 @@ 
 					break;
 				}
 
-				if($type != '}')
+				if ($type != '}')
 				{
 					$data = $value;
 					$state = 1;
@@ -5852,7 +5852,7 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
+	if (!empty($str))
 		return false;
 
 	return $data;
@@ -5906,7 +5906,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))
@@ -5941,13 +5941,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';
@@ -5975,10 +5975,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();
@@ -6074,7 +6074,7 @@ 
 			$postapocalypticNightmare = true;
 	}
 	// If we aren't updating and the regex is valid, we're done
-	elseif (!empty($modSettings['tld_regex']) && @preg_match('~' . $modSettings['tld_regex'] . '~', null) !== false)
+	elseif (!empty($modSettings['tld_regex']) && @preg_match('~'.$modSettings['tld_regex'].'~', null) !== false)
 	{
 		$done = true;
 		return;
@@ -6093,9 +6093,9 @@ 
 		});
 
 		// Convert Punycode to Unicode
-		require_once($sourcedir . '/Class-Punycode.php');
+		require_once($sourcedir.'/Class-Punycode.php');
 		$Punycode = new Punycode();
-		$tlds = array_map(function ($input) use ($Punycode) { return $Punycode->decode($input); }, $tlds);
+		$tlds = array_map(function($input) use ($Punycode) { return $Punycode->decode($input); }, $tlds);
 	}
 	// Otherwise, use the 2012 list of gTLDs and ccTLDs for now and schedule a background update
 	else
@@ -6189,7 +6189,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++;
@@ -6216,7 +6216,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++;
@@ -6244,16 +6244,16 @@ 
 					$new_key .= $new_key_array[0];
 				}
 				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
+					$sub_regex = '(?'.'>'.$sub_regex.')';
 			}
 
 			if ($depth > 1)
-				$regex[$new_key] = $key_regex . $sub_regex;
+				$regex[$new_key] = $key_regex.$sub_regex;
 			else
 			{
 				if (($length += strlen($key_regex) + 1) < $max_length || empty($regex))
 				{
-					$regex[$new_key] = $key_regex . $sub_regex;
+					$regex[$new_key] = $key_regex.$sub_regex;
 					unset($index[$key]);
 				}
 				else
@@ -6287,10 +6287,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))
@@ -6309,7 +6309,7 @@ 
  {
 	// First, strip the subfolder from the passed url, if any
 	$parsedurl = parse_url($url);
-	$url = 'ssl://' . $parsedurl['host'] . ':443';
+	$url = 'ssl://'.$parsedurl['host'].':443';
 
 	// Next, check the ssl stream context for certificate info
 	$result = false;
@@ -6335,7 +6335,7 @@ 
 {
 	// Ask for the headers for the passed url, but via http...
 	// Need to add the trailing slash, or it puts it there & thinks there's a redirect when there isn't...
-	$url = str_ireplace('https://', 'http://', $url) . '/';
+	$url = str_ireplace('https://', 'http://', $url).'/';
 	$headers = @get_headers($url);
 	if ($headers === false)
 		return false;
@@ -6443,7 +6443,7 @@ 
 		// Just in case we've got duplicates here...
 		$boards_mod = array_unique($boards_mod);
 
-		$mod_cache['mq'] = empty($boards_mod) ? '0=1' : 'b.id_board IN (' . implode(',', $boards_mod) . ')';
+		$mod_cache['mq'] = empty($boards_mod) ? '0=1' : 'b.id_board IN ('.implode(',', $boards_mod).')';
 	}
 
 	// Just build this here, it makes it easier to change/use - administrators can see all boards.
@@ -6451,8 +6451,8 @@ 
 		$query_part['query_see_board'] = '1=1';
 	// Otherwise just the groups in $user_info['groups'].
 	else
-		$query_part['query_see_board'] = 'EXISTS (SELECT DISTINCT bpv.id_board FROM ' . $db_prefix . 'board_permissions_view bpv WHERE (bpv.id_group IN ( '. implode(',', $groups) .') AND bpv.deny = 0) '
-				.  ( !empty($deny_boards_access) ? ' AND (bpv.id_group NOT IN ( '. implode(',', $groups) .') and bpv.deny = 1)' : '')
+		$query_part['query_see_board'] = 'EXISTS (SELECT DISTINCT bpv.id_board FROM '.$db_prefix.'board_permissions_view bpv WHERE (bpv.id_group IN ( '.implode(',', $groups).') AND bpv.deny = 0) '
+				.  (!empty($deny_boards_access) ? ' AND (bpv.id_group NOT IN ( '.implode(',', $groups).') and bpv.deny = 1)' : '')
 				. ' AND bpv.id_board = b.id_board)';
 		
 	// Build the list of boards they WANT to see.
@@ -6463,7 +6463,7 @@ 
 		$query_part['query_wanna_see_board'] = $query_part['query_see_board'];
 	// Ok I guess they don't want to see all the boards
 	else
-		$query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
+		$query_part['query_wanna_see_board'] = '('.$query_part['query_see_board'].' AND b.id_board NOT IN ('.implode(',', $ignoreboards).'))';
 
 	return $query_part;
 }
@@ -6516,7 +6516,7 @@ 
 function sanitize_iri($iri)
 {
 	// Encode any non-ASCII characters (but not space or control characters of any sort)
-	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function ($matches) {
+	$iri = preg_replace_callback('~[^\x00-\x7F\pZ\pC]~u', function($matches) {
 		return rawurlencode($matches[0]);
 	}, $iri);
 
@@ -6542,13 +6542,13 @@ 
 {
 	global $sourcedir;
 
-	$host = parse_url((strpos($iri, '://') === false ? 'http://' : '') . ltrim($iri, ':/'), PHP_URL_HOST);
+	$host = parse_url((strpos($iri, '://') === false ? 'http://' : '').ltrim($iri, ':/'), PHP_URL_HOST);
 
 	if (empty($host))
 		return $iri;
 
 	// Convert the domain using the Punycode algorithm
-	require_once($sourcedir . '/Class-Punycode.php');
+	require_once($sourcedir.'/Class-Punycode.php');
 	$Punycode = new Punycode();
 	$encoded_host = $Punycode->encode($host);
 	$pos = strpos($iri, $host);
@@ -6558,7 +6558,7 @@ 
 	$unescaped = array(
 		'%21'=>'!', '%23'=>'#', '%24'=>'$', '%26'=>'&',
 		'%27'=>"'", '%28'=>'(', '%29'=>')', '%2A'=>'*',
-		'%2B'=>'+', '%2C'=>',',	'%2F'=>'/', '%3A'=>':',
+		'%2B'=>'+', '%2C'=>',', '%2F'=>'/', '%3A'=>':',
 		'%3B'=>';', '%3D'=>'=', '%3F'=>'?', '%40'=>'@',
 	);
 	$iri = strtr(rawurlencode($iri), $unescaped);
@@ -6579,13 +6579,13 @@ 
 {
 	global $sourcedir;
 
-	$host = parse_url((strpos($url, '://') === false ? 'http://' : '') . ltrim($url, ':/'), PHP_URL_HOST);
+	$host = parse_url((strpos($url, '://') === false ? 'http://' : '').ltrim($url, ':/'), PHP_URL_HOST);
 
 	if (empty($host))
 		return $url;
 
 	// Decode the domain from Punycode
-	require_once($sourcedir . '/Class-Punycode.php');
+	require_once($sourcedir.'/Class-Punycode.php');
 	$Punycode = new Punycode();
 	$decoded_host = $Punycode->decode($host);
 	$pos = strpos($url, $host);
@@ -6656,9 +6656,9 @@ 
 	$protocol = preg_match('~^\s*(HTTP/[12]\.\d)\s*$~i', $_SERVER['SERVER_PROTOCOL'], $matches) ? $matches[1] : 'HTTP/1.0';
 
 	if (!isset($statuses[$code]) && empty($status))
-		header($protocol . ' 500 Internal Server Error');
+		header($protocol.' 500 Internal Server Error');
 	else
-		header($protocol . ' ' . $code . ' ' . (!empty($status) ? $status : $statuses[$code]));
+		header($protocol.' '.$code.' '.(!empty($status) ? $status : $statuses[$code]));
 }
 
 ?>
\ No newline at end of file

Sources/Load.php

Spacing +181 added lines, -181 removed lines

@@ -76,7 +76,7 @@ 
 	$utf8 = (empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set']) === 'UTF-8';
 
 	// Set a list of common functions.
-	$ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);';
+	$ent_list = '&(?:#'.(empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021').'|quot|amp|lt|gt|nbsp);';
 	$ent_check = empty($modSettings['disableEntityCheck']) ? function($string)
 		{
 			$string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string);
@@ -103,12 +103,12 @@ 
 			}
 			elseif ($ord < 224)
 			{
-				$new_string .= $string[$i] . $string[$i + 1];
+				$new_string .= $string[$i].$string[$i + 1];
 				$i += 2;
 			}
 			elseif ($ord < 240)
 			{
-				$new_string .= $string[$i] . $string[$i + 1] . $string[$i + 2];
+				$new_string .= $string[$i].$string[$i + 1].$string[$i + 2];
 				$i += 3;
 			}
 			elseif ($ord < 248)
@@ -118,7 +118,7 @@ 
 				$val += (ord($string[$i + 1]) & 0x3F) << 12;
 				$val += (ord($string[$i + 2]) & 0x3F) << 6;
 				$val += (ord($string[$i + 3]) & 0x3F);
-				$new_string .= '&#' . $val . ';';
+				$new_string .= '&#'.$val.';';
 				$i += 4;
 			}
 		}
@@ -130,7 +130,7 @@ 
 		'entity_fix' => function($string)
 		{
 			$num = $string[0] === 'x' ? hexdec(substr($string, 1)) : (int) $string;
-			return $num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202E || $num === 0x202D ? '' : '&#' . $num . ';';
+			return $num < 0x20 || $num > 0x10FFFF || ($num >= 0xD800 && $num <= 0xDFFF) || $num === 0x202E || $num === 0x202D ? '' : '&#'.$num.';';
 		},
 		'htmlspecialchars' => function($string, $quote_style = ENT_COMPAT, $charset = 'ISO-8859-1') use ($ent_check, $utf8, $fix_utf8mb4)
 		{
@@ -141,15 +141,15 @@ 
 			// Preg_replace space characters depend on the character set in use
 			$space_chars = $utf8 ? '\p{Z}\p{C}' : '\x00-\x20\x80-\xA0';
 
-			return preg_replace('~^(?:[' . $space_chars . ']|&nbsp;)+|(?:[' . $space_chars . ']|&nbsp;)+$~' . ($utf8 ? 'u' : ''), '', $ent_check($string));
+			return preg_replace('~^(?:['.$space_chars.']|&nbsp;)+|(?:['.$space_chars.']|&nbsp;)+$~'.($utf8 ? 'u' : ''), '', $ent_check($string));
 		},
 		'strlen' => function($string) use ($ent_list, $utf8, $ent_check)
 		{
-			return strlen(preg_replace('~' . $ent_list . ($utf8 ? '|.~u' : '~'), '_', $ent_check($string)));
+			return strlen(preg_replace('~'.$ent_list.($utf8 ? '|.~u' : '~'), '_', $ent_check($string)));
 		},
 		'strpos' => function($haystack, $needle, $offset = 0) use ($utf8, $ent_check, $ent_list, $modSettings)
 		{
-			$haystack_arr = preg_split('~(' . $ent_list . '|.)~' . ($utf8 ? 'u' : ''), $ent_check($haystack), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+			$haystack_arr = preg_split('~('.$ent_list.'|.)~'.($utf8 ? 'u' : ''), $ent_check($haystack), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 			if (strlen($needle) === 1)
 			{
@@ -158,7 +158,7 @@ 
 			}
 			else
 			{
-				$needle_arr = preg_split('~(' . $ent_list . '|.)~' . ($utf8 ? 'u' : '') . '', $ent_check($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+				$needle_arr = preg_split('~('.$ent_list.'|.)~'.($utf8 ? 'u' : '').'', $ent_check($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 				$needle_size = count($needle_arr);
 
 				$result = array_search($needle_arr[0], array_slice($haystack_arr, $offset));
@@ -174,14 +174,14 @@ 
 		},
 		'substr' => function($string, $start, $length = null) use ($utf8, $ent_check, $ent_list, $modSettings)
 		{
-			$ent_arr = preg_split('~(' . $ent_list . '|.)~' . ($utf8 ? 'u' : '') . '', $ent_check($string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+			$ent_arr = preg_split('~('.$ent_list.'|.)~'.($utf8 ? 'u' : '').'', $ent_check($string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 			return $length === null ? implode('', array_slice($ent_arr, $start)) : implode('', array_slice($ent_arr, $start, $length));
 		},
 		'strtolower' => $utf8 ? function($string) use ($sourcedir)
 		{
 			if (!function_exists('mb_strtolower'))
 			{
-				require_once($sourcedir . '/Subs-Charset.php');
+				require_once($sourcedir.'/Subs-Charset.php');
 				return utf8_strtolower($string);
 			}
 
@@ -193,7 +193,7 @@ 
 
 			if (!function_exists('mb_strtolower'))
 			{
-				require_once($sourcedir . '/Subs-Charset.php');
+				require_once($sourcedir.'/Subs-Charset.php');
 				return utf8_strtoupper($string);
 			}
 
@@ -202,15 +202,15 @@ 
 		'truncate' => function($string, $length) use ($utf8, $ent_check, $ent_list, &$smcFunc)
 		{
 			$string = $ent_check($string);
-			preg_match('~^(' . $ent_list . '|.){' . $smcFunc['strlen'](substr($string, 0, $length)) . '}~' . ($utf8 ? 'u' : ''), $string, $matches);
+			preg_match('~^('.$ent_list.'|.){'.$smcFunc['strlen'](substr($string, 0, $length)).'}~'.($utf8 ? 'u' : ''), $string, $matches);
 			$string = $matches[0];
 			while (strlen($string) > $length)
-				$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+				$string = preg_replace('~(?:'.$ent_list.'|.)$~'.($utf8 ? 'u' : ''), '', $string);
 			return $string;
 		},
 		'ucfirst' => $utf8 ? function($string) use (&$smcFunc)
 		{
-			return $smcFunc['strtoupper']($smcFunc['substr']($string, 0, 1)) . $smcFunc['substr']($string, 1);
+			return $smcFunc['strtoupper']($smcFunc['substr']($string, 0, 1)).$smcFunc['substr']($string, 1);
 		} : 'ucfirst',
 		'ucwords' => $utf8 ? function($string) use (&$smcFunc)
 		{
@@ -428,17 +428,17 @@ 
 		$id_member = !empty($id_member) && strlen($password) > 0 ? (int) $id_member : 0;
 
 		// Make sure the cookie is set to the correct domain and path
-		require_once($sourcedir . '/Subs-Auth.php');
+		require_once($sourcedir.'/Subs-Auth.php');
 		if (array($cookie_domain, $cookie_path) !== url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies'])))
 			setLoginCookie((int) $login_span - time(), $id_member);
 	}
-	elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
+	elseif (empty($id_member) && isset($_SESSION['login_'.$cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
 	{
 		// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
-		$cookie_data = $smcFunc['json_decode']($_SESSION['login_' . $cookiename], true);
+		$cookie_data = $smcFunc['json_decode']($_SESSION['login_'.$cookiename], true);
 
 		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+			$cookie_data = safe_unserialize($_SESSION['login_'.$cookiename]);
 
 		list($id_member, $password, $login_span) = array_pad((array) $cookie_data, 3, '');
 		$id_member = !empty($id_member) && strlen($password) == 128 && (int) $login_span > time() ? (int) $id_member : 0;
@@ -448,7 +448,7 @@ 
 	if ($id_member != 0)
 	{
 		// Is the member data cached?
-		if (empty($modSettings['cache_enable']) || $modSettings['cache_enable'] < 2 || ($user_settings = cache_get_data('user_settings-' . $id_member, 60)) == null)
+		if (empty($modSettings['cache_enable']) || $modSettings['cache_enable'] < 2 || ($user_settings = cache_get_data('user_settings-'.$id_member, 60)) == null)
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT mem.*, COALESCE(a.id_attach, 0) AS id_attach, a.filename, a.attachment_type
@@ -467,7 +467,7 @@ 
 				$user_settings['avatar'] = get_proxied_url($user_settings['avatar']);
 
 			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				cache_put_data('user_settings-'.$id_member, $user_settings, 60);
 		}
 
 		// Did we find 'im?  If not, junk it.
@@ -491,7 +491,7 @@ 
 		// If we no longer have the member maybe they're being all hackey, stop brute force!
 		if (!$id_member)
 		{
-			require_once($sourcedir . '/LogInOut.php');
+			require_once($sourcedir.'/LogInOut.php');
 			validatePasswordFlood(
 				!empty($user_settings['id_member']) ? $user_settings['id_member'] : $id_member,
 				!empty($user_settings['member_name']) ? $user_settings['member_name'] : '',
@@ -502,7 +502,7 @@ 
 		// Validate for Two Factor Authentication
 		elseif (!empty($modSettings['tfa_mode']) && $id_member && !empty($user_settings['tfa_secret']) && (empty($_REQUEST['action']) || !in_array($_REQUEST['action'], array('login2', 'logintfa'))))
 		{
-			$tfacookie = $cookiename . '_tfa';
+			$tfacookie = $cookiename.'_tfa';
 			$tfasecret = null;
 
 			$verified = call_integration_hook('integrate_verify_tfa', array($id_member, $user_settings));
@@ -582,7 +582,7 @@ 
 		// 3. If it was set within this session, no need to set it again.
 		// 4. New session, yet updated < five hours ago? Maybe cache can help.
 		// 5. We're still logging in or authenticating
-		if (SMF != 'SSI' && !isset($_REQUEST['xml']) && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('.xml', 'login2', 'logintfa'))) && empty($_SESSION['id_msg_last_visit']) && (empty($modSettings['cache_enable']) || ($_SESSION['id_msg_last_visit'] = cache_get_data('user_last_visit-' . $id_member, 5 * 3600)) === null))
+		if (SMF != 'SSI' && !isset($_REQUEST['xml']) && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], array('.xml', 'login2', 'logintfa'))) && empty($_SESSION['id_msg_last_visit']) && (empty($modSettings['cache_enable']) || ($_SESSION['id_msg_last_visit'] = cache_get_data('user_last_visit-'.$id_member, 5 * 3600)) === null))
 		{
 			// @todo can this be cached?
 			// Do a quick query to make sure this isn't a mistake.
@@ -607,10 +607,10 @@ 
 				$user_settings['last_login'] = time();
 
 				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-					cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+					cache_put_data('user_settings-'.$id_member, $user_settings, 60);
 
 				if (!empty($modSettings['cache_enable']))
-					cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+					cache_put_data('user_last_visit-'.$id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
 			}
 		}
 		elseif (empty($_SESSION['id_msg_last_visit']))
@@ -664,15 +664,15 @@ 
 			$_COOKIE[$cookiename] = '';
 
 		// Expire the 2FA cookie
-		if (isset($_COOKIE[$cookiename . '_tfa']) && empty($context['tfa_member']))
+		if (isset($_COOKIE[$cookiename.'_tfa']) && empty($context['tfa_member']))
 		{
-			$tfa_data = $smcFunc['json_decode']($_COOKIE[$cookiename . '_tfa'], true);
+			$tfa_data = $smcFunc['json_decode']($_COOKIE[$cookiename.'_tfa'], true);
 
 			list (,, $exp) = array_pad((array) $tfa_data, 3, 0);
 
 			if (time() > $exp)
 			{
-				$_COOKIE[$cookiename . '_tfa'] = '';
+				$_COOKIE[$cookiename.'_tfa'] = '';
 				setTFACookie(-3600, 0, '');
 			}
 		}
@@ -686,7 +686,7 @@ 
 		// Do we perhaps think this is a search robot? Check every five minutes just in case...
 		if ((!empty($modSettings['spider_mode']) || !empty($modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300))
 		{
-			require_once($sourcedir . '/ManageSearchEngines.php');
+			require_once($sourcedir.'/ManageSearchEngines.php');
 			$user_info['possibly_robot'] = SpiderCheck();
 		}
 		elseif (!empty($modSettings['spider_mode']))
@@ -807,7 +807,7 @@ 
 		$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 		// Looking through the message table can be slow, so try using the cache first.
-		if (($topic = cache_get_data('msg_topic-' . $_REQUEST['msg'], 120)) === null)
+		if (($topic = cache_get_data('msg_topic-'.$_REQUEST['msg'], 120)) === null)
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT id_topic
@@ -825,13 +825,13 @@ 
 				list ($topic) = $smcFunc['db_fetch_row']($request);
 				$smcFunc['db_free_result']($request);
 				// Save save save.
-				cache_put_data('msg_topic-' . $_REQUEST['msg'], $topic, 120);
+				cache_put_data('msg_topic-'.$_REQUEST['msg'], $topic, 120);
 			}
 		}
 
 		// Remember redirection is the key to avoiding fallout from your bosses.
 		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
+			redirectexit('topic='.$topic.'.msg'.$_REQUEST['msg'].'#msg'.$_REQUEST['msg']);
 		else
 		{
 			loadPermissions();
@@ -851,9 +851,9 @@ 
 	{
 		// @todo SLOW?
 		if (!empty($topic))
-			$temp = cache_get_data('topic_board-' . $topic, 120);
+			$temp = cache_get_data('topic_board-'.$topic, 120);
 		else
-			$temp = cache_get_data('board-' . $board, 120);
+			$temp = cache_get_data('board-'.$board, 120);
 
 		if (!empty($temp))
 		{
@@ -869,11 +869,11 @@ 
 				c.id_cat, b.name AS bname, b.description, b.num_topics, b.member_groups, b.deny_member_groups,
 				b.id_parent, c.name AS cname, COALESCE(mg.id_group, 0) AS id_moderator_group, mg.group_name,
 				COALESCE(mem.id_member, 0) AS id_moderator,
-				mem.real_name' . (!empty($topic) ? ', b.id_board' : '') . ', b.child_level,
+				mem.real_name' . (!empty($topic) ? ', b.id_board' : '').', b.child_level,
 				b.id_theme, b.override_theme, b.count_posts, b.id_profile, b.redirect,
-				b.unapproved_topics, b.unapproved_posts' . (!empty($topic) ? ', t.approved, t.id_member_started' : '') . '
+				b.unapproved_topics, b.unapproved_posts' . (!empty($topic) ? ', t.approved, t.id_member_started' : '').'
 			FROM {db_prefix}boards AS b' . (!empty($topic) ? '
-				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = {int:current_topic})' : '') . '
+				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = {int:current_topic})' : '').'
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 				LEFT JOIN {db_prefix}moderator_groups AS modgs ON (modgs.id_board = {raw:board_link})
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = modgs.id_group)
@@ -932,16 +932,16 @@ 
 					$board_info['moderators'][$row['id_moderator']] = array(
 						'id' => $row['id_moderator'],
 						'name' => $row['real_name'],
-						'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
-						'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
+						'href' => $scripturl.'?action=profile;u='.$row['id_moderator'],
+						'link' => '<a href="'.$scripturl.'?action=profile;u='.$row['id_moderator'].'">'.$row['real_name'].'</a>'
 					);
 
 				if (!empty($row['id_moderator_group']))
 					$board_info['moderator_groups'][$row['id_moderator_group']] = array(
 						'id' => $row['id_moderator_group'],
 						'name' => $row['group_name'],
-						'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
-						'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
+						'href' => $scripturl.'?action=groups;sa=members;group='.$row['id_moderator_group'],
+						'link' => '<a href="'.$scripturl.'?action=groups;sa=members;group='.$row['id_moderator_group'].'">'.$row['group_name'].'</a>'
 					);
 			}
 			while ($row = $smcFunc['db_fetch_assoc']($request));
@@ -975,8 +975,8 @@ 
 			{
 				// @todo SLOW?
 				if (!empty($topic))
-					cache_put_data('topic_board-' . $topic, $board_info, 120);
-				cache_put_data('board-' . $board, $board_info, 120);
+					cache_put_data('topic_board-'.$topic, $board_info, 120);
+				cache_put_data('board-'.$board, $board_info, 120);
 			}
 		}
 		else
@@ -1013,12 +1013,12 @@ 
 		$context['linktree'] = array_merge(
 			$context['linktree'],
 			array(array(
-				'url' => $scripturl . '#c' . $board_info['cat']['id'],
+				'url' => $scripturl.'#c'.$board_info['cat']['id'],
 				'name' => $board_info['cat']['name']
 			)),
 			array_reverse($board_info['parent_boards']),
 			array(array(
-				'url' => $scripturl . '?board=' . $board . '.0',
+				'url' => $scripturl.'?board='.$board.'.0',
 				'name' => $board_info['name']
 			))
 		);
@@ -1098,14 +1098,14 @@ 
 		if ($user_info['possibly_robot'])
 			$cache_groups .= '-spider';
 
-		if ($modSettings['cache_enable'] >= 2 && !empty($board) && ($temp = cache_get_data('permissions:' . $cache_groups . ':' . $board, 240)) != null && time() - 240 > $modSettings['settings_updated'])
+		if ($modSettings['cache_enable'] >= 2 && !empty($board) && ($temp = cache_get_data('permissions:'.$cache_groups.':'.$board, 240)) != null && time() - 240 > $modSettings['settings_updated'])
 		{
 			list ($user_info['permissions']) = $temp;
 			banPermissions();
 
 			return;
 		}
-		elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated'])
+		elseif (($temp = cache_get_data('permissions:'.$cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated'])
 			list ($user_info['permissions'], $removals) = $temp;
 	}
 
@@ -1136,7 +1136,7 @@ 
 		$smcFunc['db_free_result']($request);
 
 		if (isset($cache_groups))
-			cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+			cache_put_data('permissions:'.$cache_groups, array($user_info['permissions'], $removals), 240);
 	}
 
 	// Get the board permissions.
@@ -1150,7 +1150,7 @@ 
 			SELECT permission, add_deny
 			FROM {db_prefix}board_permissions
 			WHERE (id_group IN ({array_int:member_groups})
-				' . $spider_restrict . ')
+				' . $spider_restrict.')
 				AND id_profile = {int:id_profile}',
 			array(
 				'member_groups' => $user_info['groups'],
@@ -1173,7 +1173,7 @@ 
 		$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
 
 	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+		cache_put_data('permissions:'.$cache_groups.':'.$board, array($user_info['permissions'], null), 240);
 
 	// Banned?  Watch, don't touch..
 	banPermissions();
@@ -1183,7 +1183,7 @@ 
 	{
 		if (!isset($_SESSION['mc']) || $_SESSION['mc']['time'] <= $modSettings['settings_updated'])
 		{
-			require_once($sourcedir . '/Subs-Auth.php');
+			require_once($sourcedir.'/Subs-Auth.php');
 			rebuildModCache();
 		}
 		else
@@ -1228,7 +1228,7 @@ 
 		$users = array_values($users);
 		for ($i = 0, $n = count($users); $i < $n; $i++)
 		{
-			$data = cache_get_data('member_data-' . $set . '-' . $users[$i], 240);
+			$data = cache_get_data('member_data-'.$set.'-'.$users[$i], 240);
 			if ($data == null)
 				continue;
 
@@ -1246,7 +1246,7 @@ 
 			mem.birthdate, mem.member_ip, mem.member_ip2, mem.posts, mem.last_login, mem.id_post_group, mem.lngfile, mem.id_group, mem.time_offset, mem.show_online,
 			mg.online_color AS member_group_color, COALESCE(mg.group_name, {string:blank_string}) AS member_group,
 			pg.online_color AS post_group_color, COALESCE(pg.group_name, {string:blank_string}) AS post_group,
-			mem.is_activated, mem.warning, ' . (!empty($modSettings['titlesEnable']) ? 'mem.usertitle, ' : '') . '
+			mem.is_activated, mem.warning, ' . (!empty($modSettings['titlesEnable']) ? 'mem.usertitle, ' : '').'
 			CASE WHEN mem.id_group = 0 OR mg.icons = {string:blank_string} THEN pg.icons ELSE mg.icons END AS icons';
 	$select_tables = '
 			LEFT JOIN {db_prefix}log_online AS lo ON (lo.id_member = mem.id_member)
@@ -1272,7 +1272,7 @@ 
 			$select_tables = '';
 			break;
 		default:
-			trigger_error('loadMemberData(): Invalid member data set \'' . $set . '\'', E_USER_WARNING);
+			trigger_error('loadMemberData(): Invalid member data set \''.$set.'\'', E_USER_WARNING);
 	}
 
 	// Allow mods to easily add to the selected member data
@@ -1282,9 +1282,9 @@ 
 	{
 		// Load the member's data.
 		$request = $smcFunc['db_query']('', '
-			SELECT' . $select_columns . '
-			FROM {db_prefix}members AS mem' . $select_tables . '
-			WHERE mem.' . ($is_name ? 'member_name' : 'id_member') . ' IN ({' . ($is_name ? 'array_string' : 'array_int') . ':users})',
+			SELECT' . $select_columns.'
+			FROM {db_prefix}members AS mem' . $select_tables.'
+			WHERE mem.' . ($is_name ? 'member_name' : 'id_member').' IN ({'.($is_name ? 'array_string' : 'array_int').':users})',
 			array(
 				'blank_string' => '',
 				'users' => $users,
@@ -1355,7 +1355,7 @@ 
 	if (!empty($new_loaded_ids) && !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
 	{
 		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++)
-			cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+			cache_put_data('member_data-'.$set.'-'.$new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
 	}
 
 	// Are we loading any moderators?  If so, fix their group data...
@@ -1418,7 +1418,7 @@ 
 		return false;
 	if (!isset($user_profile[$user]))
 	{
-		trigger_error('loadMemberContext(): member id ' . $user . ' not previously loaded by loadMemberData()', E_USER_WARNING);
+		trigger_error('loadMemberContext(): member id '.$user.' not previously loaded by loadMemberData()', E_USER_WARNING);
 		return false;
 	}
 
@@ -1432,7 +1432,7 @@ 
 
 	// Set things up to be used before hand.
 	$profile['signature'] = str_replace(array("\n", "\r"), array('<br>', ''), $profile['signature']);
-	$profile['signature'] = parse_bbc($profile['signature'], true, 'sig' . $profile['id_member']);
+	$profile['signature'] = parse_bbc($profile['signature'], true, 'sig'.$profile['id_member']);
 
 	$profile['is_online'] = (!empty($profile['show_online']) || allowedTo('moderate_forum')) && $profile['is_online'] > 0;
 	$profile['icons'] = empty($profile['icons']) ? array('', '') : explode('#', $profile['icons']);
@@ -1441,10 +1441,10 @@ 
 	$buddy_list = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
 
 	//We need a little fallback for the membergroup icons. If it doesn't exist in the current theme, fallback to default theme
-	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) //icon is set and exists
-		$group_icon_url = $settings['images_url'] . '/membericons/' . $profile['icons'][1];
+	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'].'/images/membericons/'.$profile['icons'][1])) //icon is set and exists
+		$group_icon_url = $settings['images_url'].'/membericons/'.$profile['icons'][1];
 	elseif (isset($profile['icons'][1])) //icon is set and doesn't exist, fallback to default
-		$group_icon_url = $settings['default_images_url'] . '/membericons/' . $profile['icons'][1];
+		$group_icon_url = $settings['default_images_url'].'/membericons/'.$profile['icons'][1];
 	else //not set, bye bye
 		$group_icon_url = '';
 
@@ -1453,8 +1453,8 @@ 
 		'username' => $profile['member_name'],
 		'name' => $profile['real_name'],
 		'id' => $profile['id_member'],
-		'href' => $scripturl . '?action=profile;u=' . $profile['id_member'],
-		'link' => '<a href="' . $scripturl . '?action=profile;u=' . $profile['id_member'] . '" title="' . $txt['profile_of'] . ' ' . $profile['real_name'] . '" ' . (!empty($modSettings['onlineEnable']) ? 'class="pm_icon"' : '') . '>' . $profile['real_name'] . '</a>',
+		'href' => $scripturl.'?action=profile;u='.$profile['id_member'],
+		'link' => '<a href="'.$scripturl.'?action=profile;u='.$profile['id_member'].'" title="'.$txt['profile_of'].' '.$profile['real_name'].'" '.(!empty($modSettings['onlineEnable']) ? 'class="pm_icon"' : '').'>'.$profile['real_name'].'</a>',
 		'email' => $profile['email_address'],
 		'show_email' => !$user_info['is_guest'] && ($user_info['id'] == $profile['id_member'] || allowedTo('moderate_forum')),
 		'registered' => empty($profile['date_registered']) ? $txt['not_applicable'] : timeformat($profile['date_registered']),
@@ -1469,9 +1469,9 @@ 
 			$loadedLanguages = getLanguages();
 
 		$memberContext[$user] += array(
-			'username_color' => '<span ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['member_name'] . '</span>',
-			'name_color' => '<span ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['real_name'] . '</span>',
-			'link_color' => '<a href="' . $scripturl . '?action=profile;u=' . $profile['id_member'] . '" title="' . $txt['profile_of'] . ' ' . $profile['real_name'] . '" ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['real_name'] . '</a>',
+			'username_color' => '<span '.(!empty($profile['member_group_color']) ? 'style="color:'.$profile['member_group_color'].';"' : '').'>'.$profile['member_name'].'</span>',
+			'name_color' => '<span '.(!empty($profile['member_group_color']) ? 'style="color:'.$profile['member_group_color'].';"' : '').'>'.$profile['real_name'].'</span>',
+			'link_color' => '<a href="'.$scripturl.'?action=profile;u='.$profile['id_member'].'" title="'.$txt['profile_of'].' '.$profile['real_name'].'" '.(!empty($profile['member_group_color']) ? 'style="color:'.$profile['member_group_color'].';"' : '').'>'.$profile['real_name'].'</a>',
 			'is_buddy' => $profile['buddy'],
 			'is_reverse_buddy' => in_array($user_info['id'], $buddy_list),
 			'buddies' => $buddy_list,
@@ -1481,7 +1481,7 @@ 
 				'title' => $profile['website_title'],
 				'url' => $profile['website_url'],
 			),
-			'birth_date' => empty($profile['birthdate']) ? '1004-01-01' : (substr($profile['birthdate'], 0, 4) === '0004' ? '1004' . substr($profile['birthdate'], 4) : $profile['birthdate']),
+			'birth_date' => empty($profile['birthdate']) ? '1004-01-01' : (substr($profile['birthdate'], 0, 4) === '0004' ? '1004'.substr($profile['birthdate'], 4) : $profile['birthdate']),
 			'signature' => $profile['signature'],
 			'real_posts' => $profile['posts'],
 			'posts' => $profile['posts'] > 500000 ? $txt['geek'] : comma_format($profile['posts']),
@@ -1493,8 +1493,8 @@ 
 				'is_online' => $profile['is_online'],
 				'text' => $smcFunc['htmlspecialchars']($txt[$profile['is_online'] ? 'online' : 'offline']),
 				'member_online_text' => sprintf($txt[$profile['is_online'] ? 'member_is_online' : 'member_is_offline'], $smcFunc['htmlspecialchars']($profile['real_name'])),
-				'href' => $scripturl . '?action=pm;sa=send;u=' . $profile['id_member'],
-				'link' => '<a href="' . $scripturl . '?action=pm;sa=send;u=' . $profile['id_member'] . '">' . $txt[$profile['is_online'] ? 'online' : 'offline'] . '</a>',
+				'href' => $scripturl.'?action=pm;sa=send;u='.$profile['id_member'],
+				'link' => '<a href="'.$scripturl.'?action=pm;sa=send;u='.$profile['id_member'].'">'.$txt[$profile['is_online'] ? 'online' : 'offline'].'</a>',
 				'label' => $txt[$profile['is_online'] ? 'online' : 'offline']
 			),
 			'language' => !empty($loadedLanguages[$profile['lngfile']]) && !empty($loadedLanguages[$profile['lngfile']]['name']) ? $loadedLanguages[$profile['lngfile']]['name'] : $smcFunc['ucwords'](strtr($profile['lngfile'], array('_' => ' ', '-utf8' => ''))),
@@ -1508,7 +1508,7 @@ 
 			'group_id' => $profile['id_group'],
 			'post_group' => $profile['post_group'],
 			'post_group_color' => $profile['post_group_color'],
-			'group_icons' => str_repeat('<img src="' . str_replace('$language', $context['user']['language'], isset($profile['icons'][1]) ? $group_icon_url : '') . '" alt="*">', empty($profile['icons'][0]) || empty($profile['icons'][1]) ? 0 : $profile['icons'][0]),
+			'group_icons' => str_repeat('<img src="'.str_replace('$language', $context['user']['language'], isset($profile['icons'][1]) ? $group_icon_url : '').'" alt="*">', empty($profile['icons'][0]) || empty($profile['icons'][1]) ? 0 : $profile['icons'][0]),
 			'warning' => $profile['warning'],
 			'warning_status' => !empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $profile['warning'] ? 'mute' : (!empty($modSettings['warning_moderate']) && $modSettings['warning_moderate'] <= $profile['warning'] ? 'moderate' : (!empty($modSettings['warning_watch']) && $modSettings['warning_watch'] <= $profile['warning'] ? 'watch' : (''))),
 			'local_time' => timeformat(time() + ($profile['time_offset'] - $user_info['time_offset']) * 3600, false),
@@ -1531,18 +1531,18 @@ 
 			// So it's stored in the member table?
 			if (!empty($profile['avatar']))
 			{
-				$image = (stristr($profile['avatar'], 'http://') || stristr($profile['avatar'], 'https://')) ? $profile['avatar'] : $modSettings['avatar_url'] . '/' . $profile['avatar'];
+				$image = (stristr($profile['avatar'], 'http://') || stristr($profile['avatar'], 'https://')) ? $profile['avatar'] : $modSettings['avatar_url'].'/'.$profile['avatar'];
 			}
 			elseif (!empty($profile['filename']))
-				$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
+				$image = $modSettings['custom_avatar_url'].'/'.$profile['filename'];
 			// Right... no avatar...use the default one
 			else
-				$image = $modSettings['avatar_url'] . '/default.png';
+				$image = $modSettings['avatar_url'].'/default.png';
 		}
 		if (!empty($image))
 			$memberContext[$user]['avatar'] = array(
 				'name' => $profile['avatar'],
-				'image' => '<img class="avatar" src="' . $image . '" alt="avatar_' . $profile['member_name'] . '">',
+				'image' => '<img class="avatar" src="'.$image.'" alt="avatar_'.$profile['member_name'].'">',
 				'href' => $image,
 				'url' => $image,
 			);
@@ -1717,7 +1717,7 @@ 
 	if (empty($context['browser']))
 		detectBrowser();
 
-	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_' . $browser]) ? true : false;
+	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_'.$browser]) ? true : false;
 }
 
 /**
@@ -1774,7 +1774,7 @@ 
 	call_integration_hook('integrate_pre_load_theme', array(&$id_theme));
 
 	// 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)
 	{
 		$member = empty($user_info['id']) ? -1 : $user_info['id'];
 
@@ -1782,12 +1782,12 @@ 
 		if (empty($modSettings['force_ssl']))
 			$image_proxy_enabled = false;
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && ($temp = cache_get_data('theme_settings-' . $id_theme . ':' . $member, 60)) != null && time() - 60 > $modSettings['settings_updated'])
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && ($temp = cache_get_data('theme_settings-'.$id_theme.':'.$member, 60)) != null && time() - 60 > $modSettings['settings_updated'])
 		{
 			$themeData = $temp;
 			$flag = true;
 		}
-		elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated'])
+		elseif (($temp = cache_get_data('theme_settings-'.$id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated'])
 			$themeData = $temp + array($member => array());
 		else
 			$themeData = array(-1 => array(), 0 => array(), $member => array());
@@ -1798,8 +1798,8 @@ 
 			$result = $smcFunc['db_query']('', '
 				SELECT variable, value, id_member, id_theme
 				FROM {db_prefix}themes
-				WHERE id_member' . (empty($themeData[0]) ? ' IN (-1, 0, {int:id_member})' : ' = {int:id_member}') . '
-					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)') .'
+				WHERE id_member' . (empty($themeData[0]) ? ' IN (-1, 0, {int:id_member})' : ' = {int:id_member}').'
+					AND id_theme' . ($id_theme == 1 ? ' = {int:id_theme}' : ' IN ({int:id_theme}, 1)').'
 				ORDER BY id_theme asc',
 				array(
 					'id_theme' => $id_theme,
@@ -1815,7 +1815,7 @@ 
 
 				// If this is the theme_dir of the default theme, store it.
 				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member']))
-					$themeData[0]['default_' . $row['variable']] = $row['value'];
+					$themeData[0]['default_'.$row['variable']] = $row['value'];
 
 				// If this isn't set yet, is a theme option, or is not the default theme..
 				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1')
@@ -1831,10 +1831,10 @@ 
 				}
 
 			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+				cache_put_data('theme_settings-'.$id_theme.':'.$member, $themeData, 60);
 			// Only if we didn't already load that part of the cache...
 			elseif (!isset($temp))
-				cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+				cache_put_data('theme_settings-'.$id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
 		}
 
 		$settings = $themeData[0];
@@ -1873,15 +1873,15 @@ 
 			fatal_lang_error($txt['login_ssl_required']);
 		}
 
-		redirectexit(strtr($_SERVER['REQUEST_URL'], array('http://' => 'https://')) . (strpos($_SERVER['REQUEST_URL'], '?') > 0 ? ';' : '?') . 'sslRedirect');
+		redirectexit(strtr($_SERVER['REQUEST_URL'], array('http://' => 'https://')).(strpos($_SERVER['REQUEST_URL'], '?') > 0 ? ';' : '?').'sslRedirect');
 	}
 
 	// Check to see if they're accessing it from the wrong place.
 	if (isset($_SERVER['HTTP_HOST']) || isset($_SERVER['SERVER_NAME']))
 	{
 		$detected_url = httpsOn() ? 'https://' : 'http://';
-		$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
-		$temp = preg_replace('~/' . basename($scripturl) . '(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
+		$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'].(empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':'.$_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
+		$temp = preg_replace('~/'.basename($scripturl).'(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
 		if ($temp != '/')
 			$detected_url .= $temp;
 	}
@@ -1912,7 +1912,7 @@ 
 				$v = current($_GET);
 
 				if ($k != 'wwwRedirect')
-					redirectexit('wwwRedirect;' . $k . '=' . $v);
+					redirectexit('wwwRedirect;'.$k.'='.$v);
 			}
 		}
 
@@ -1950,7 +1950,7 @@ 
 				foreach ($board_info['moderators'] as $k => $dummy)
 				{
 					$board_info['moderators'][$k]['href'] = strtr($dummy['href'], array($oldurl => $boardurl));
-					$board_info['moderators'][$k]['link'] = strtr($dummy['link'], array('"' . $oldurl => '"' . $boardurl));
+					$board_info['moderators'][$k]['link'] = strtr($dummy['link'], array('"'.$oldurl => '"'.$boardurl));
 				}
 			}
 			foreach ($context['linktree'] as $k => $dummy)
@@ -2038,7 +2038,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'];
@@ -2176,7 +2176,7 @@ 
 		loadLanguage('ThemeStrings', '', false);
 
 	// Make a special URL for the language.
-	$settings['lang_images_url'] = $settings['images_url'] . '/' . (!empty($txt['image_lang']) ? $txt['image_lang'] : $user_info['language']);
+	$settings['lang_images_url'] = $settings['images_url'].'/'.(!empty($txt['image_lang']) ? $txt['image_lang'] : $user_info['language']);
 
 	// And of course, let's load the default CSS file.
 	loadCSSFile('index.css', array('minimize' => true, 'order_pos' => 1), 'smf_index');
@@ -2203,14 +2203,14 @@ 
 			$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
 
 		// Do this to keep things easier in the templates.
-		$context['theme_variant'] = '_' . $context['theme_variant'];
-		$context['theme_variant_url'] = $context['theme_variant'] . '/';
+		$context['theme_variant'] = '_'.$context['theme_variant'];
+		$context['theme_variant_url'] = $context['theme_variant'].'/';
 
 		if (!empty($context['theme_variant']))
 		{
-			loadCSSFile('index' . $context['theme_variant'] . '.css', array('order_pos' => 300), 'smf_index' . $context['theme_variant']);
+			loadCSSFile('index'.$context['theme_variant'].'.css', array('order_pos' => 300), 'smf_index'.$context['theme_variant']);
 			if ($context['right_to_left'])
-				loadCSSFile('rtl' . $context['theme_variant'] . '.css', array('order_pos' => 400), 'smf_rtl' . $context['theme_variant']);
+				loadCSSFile('rtl'.$context['theme_variant'].'.css', array('order_pos' => 400), 'smf_rtl'.$context['theme_variant']);
 		}
 	}
 
@@ -2226,18 +2226,18 @@ 
 
 	// Default JS variables for use in every theme
 	$context['javascript_vars'] = array(
-		'smf_theme_url' => '"' . $settings['theme_url'] . '"',
-		'smf_default_theme_url' => '"' . $settings['default_theme_url'] . '"',
-		'smf_images_url' => '"' . $settings['images_url'] . '"',
-		'smf_smileys_url' => '"' . $modSettings['smileys_url'] . '"',
-		'smf_smiley_sets_default' => '"' . $modSettings['smiley_sets_default'] . '"',
-		'smf_smiley_sets_exts' => '"' . $modSettings['smiley_sets_exts'] . '"',
-		'smf_smiley_sets_default_ext' => '"' . $context['user']['smiley_set_default_ext'] . '"',
-		'smf_scripturl' => '"' . $scripturl . '"',
+		'smf_theme_url' => '"'.$settings['theme_url'].'"',
+		'smf_default_theme_url' => '"'.$settings['default_theme_url'].'"',
+		'smf_images_url' => '"'.$settings['images_url'].'"',
+		'smf_smileys_url' => '"'.$modSettings['smileys_url'].'"',
+		'smf_smiley_sets_default' => '"'.$modSettings['smiley_sets_default'].'"',
+		'smf_smiley_sets_exts' => '"'.$modSettings['smiley_sets_exts'].'"',
+		'smf_smiley_sets_default_ext' => '"'.$context['user']['smiley_set_default_ext'].'"',
+		'smf_scripturl' => '"'.$scripturl.'"',
 		'smf_iso_case_folding' => $context['server']['iso_case_folding'] ? 'true' : 'false',
-		'smf_charset' => '"' . $context['character_set'] . '"',
-		'smf_session_id' => '"' . $context['session_id'] . '"',
-		'smf_session_var' => '"' . $context['session_var'] . '"',
+		'smf_charset' => '"'.$context['character_set'].'"',
+		'smf_session_id' => '"'.$context['session_id'].'"',
+		'smf_session_var' => '"'.$context['session_var'].'"',
 		'smf_member_id' => $context['user']['id'],
 		'ajax_notification_text' => JavaScriptEscape($txt['ajax_in_progress']),
 		'help_popup_heading_text' => JavaScriptEscape($txt['help_popup']),
@@ -2276,7 +2276,7 @@ 
 		if (isBrowser('possibly_robot'))
 		{
 			// @todo Maybe move this somewhere better?!
-			require_once($sourcedir . '/ScheduledTasks.php');
+			require_once($sourcedir.'/ScheduledTasks.php');
 
 			// What to do, what to do?!
 			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time())
@@ -2292,7 +2292,7 @@ 
 			addInlineJavaScript('
 		function smfAutoTask()
 		{
-			$.get(smf_scripturl + "?scheduled=' . $type . ';ts=' . $ts . '");
+			$.get(smf_scripturl + "?scheduled=' . $type.';ts='.$ts.'");
 		}
 		window.setTimeout("smfAutoTask();", 1);');
 		}
@@ -2306,7 +2306,7 @@ 
 		addInlineJavaScript('
 	function triggerCron()
 	{
-		$.get(' . JavaScriptEscape($boardurl) . ' + "/cron.php?ts=' . $ts . '");
+		$.get(' . JavaScriptEscape($boardurl).' + "/cron.php?ts='.$ts.'");
 	}
 	window.setTimeout(triggerCron, 1);', true);
 	}
@@ -2370,7 +2370,7 @@ 
 			$style_sheets = array($style_sheets);
 
 		foreach ($style_sheets as $sheet)
-			loadCSSFile($sheet . '.css', array(), $sheet);
+			loadCSSFile($sheet.'.css', array(), $sheet);
 	}
 
 	// No template to load?
@@ -2380,10 +2380,10 @@ 
 	$loaded = false;
 	foreach ($settings['template_dirs'] as $template_dir)
 	{
-		if (file_exists($template_dir . '/' . $template_name . '.template.php'))
+		if (file_exists($template_dir.'/'.$template_name.'.template.php'))
 		{
 			$loaded = true;
-			template_include($template_dir . '/' . $template_name . '.template.php', true);
+			template_include($template_dir.'/'.$template_name.'.template.php', true);
 			break;
 		}
 	}
@@ -2391,16 +2391,16 @@ 
 	if ($loaded)
 	{
 		if ($db_show_debug === true)
-			$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+			$context['debug']['templates'][] = $template_name.' ('.basename($template_dir).')';
 
 		// If they have specified an initialization function for this template, go ahead and call it now.
-		if (function_exists('template_' . $template_name . '_init'))
-			call_user_func('template_' . $template_name . '_init');
+		if (function_exists('template_'.$template_name.'_init'))
+			call_user_func('template_'.$template_name.'_init');
 	}
 	// Hmmm... doesn't exist?!  I don't suppose the directory is wrong, is it?
-	elseif (!file_exists($settings['default_theme_dir']) && file_exists($boarddir . '/Themes/default'))
+	elseif (!file_exists($settings['default_theme_dir']) && file_exists($boarddir.'/Themes/default'))
 	{
-		$settings['default_theme_dir'] = $boarddir . '/Themes/default';
+		$settings['default_theme_dir'] = $boarddir.'/Themes/default';
 		$settings['template_dirs'][] = $settings['default_theme_dir'];
 
 		if (!empty($context['user']['is_admin']) && !isset($_GET['th']))
@@ -2408,7 +2408,7 @@ 
 			loadLanguage('Errors');
 			echo '
 <div class="alert errorbox">
-	<a href="', $scripturl . '?action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'], '" class="alert">', $txt['theme_dir_wrong'], '</a>
+	<a href="', $scripturl.'?action=admin;area=theme;sa=list;'.$context['session_var'].'='.$context['session_id'], '" class="alert">', $txt['theme_dir_wrong'], '</a>
 </div>';
 		}
 
@@ -2443,7 +2443,7 @@ 
 		$context['debug']['sub_templates'][] = $sub_template_name;
 
 	// Figure out what the template function is named.
-	$theme_function = 'template_' . $sub_template_name;
+	$theme_function = 'template_'.$sub_template_name;
 	if (function_exists($theme_function))
 		$theme_function();
 	elseif ($fatal === false)
@@ -2482,7 +2482,7 @@ 
 	if (empty($context['css_files_order']))
 		$context['css_files_order'] = array();
 
-	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? (array_key_exists('browser_cache', $modSettings) ? $modSettings['browser_cache'] : '') : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
+	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? (array_key_exists('browser_cache', $modSettings) ? $modSettings['browser_cache'] : '') : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?'.$params['seed']) : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true;
@@ -2502,13 +2502,13 @@ 
 	if (empty($params['external']))
 	{
 		// Are we validating the the file exists?
-		if (!empty($params['validate']) && !file_exists($settings[$themeRef . '_dir'] . '/css/' . $fileName))
+		if (!empty($params['validate']) && !file_exists($settings[$themeRef.'_dir'].'/css/'.$fileName))
 		{
 			// Maybe the default theme has it?
-			if ($themeRef === 'theme' && !$params['force_current'] && file_exists($settings['default_theme_dir'] . '/css/' . $fileName))
+			if ($themeRef === 'theme' && !$params['force_current'] && file_exists($settings['default_theme_dir'].'/css/'.$fileName))
 			{
-				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
-				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
+				$fileUrl = $settings['default_theme_url'].'/css/'.$fileName.($has_seed ? '' : $params['seed']);
+				$filePath = $settings['default_theme_dir'].'/css/'.$fileName.($has_seed ? '' : $params['seed']);
 			}
 
 			else
@@ -2520,8 +2520,8 @@ 
 
 		else
 		{
-			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
-			$filePath = $settings[$themeRef . '_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
+			$fileUrl = $settings[$themeRef.'_url'].'/css/'.$fileName.($has_seed ? '' : $params['seed']);
+			$filePath = $settings[$themeRef.'_dir'].'/css/'.$fileName.($has_seed ? '' : $params['seed']);
 		}
 	}
 
@@ -2590,7 +2590,7 @@ 
 {
 	global $settings, $context, $modSettings;
 
-	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? (array_key_exists('browser_cache', $modSettings) ? $modSettings['browser_cache'] : '') : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?' . $params['seed']) : '');
+	$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ? (array_key_exists('browser_cache', $modSettings) ? $modSettings['browser_cache'] : '') : (is_string($params['seed']) ? ($params['seed'] = $params['seed'][0] === '?' ? $params['seed'] : '?'.$params['seed']) : '');
 	$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
 	$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
 	$params['async'] = isset($params['async']) ? $params['async'] : false;
@@ -2610,13 +2610,13 @@ 
 	if (empty($params['external']))
 	{
 		// Are we validating it exists on disk?
-		if (!empty($params['validate']) && !file_exists($settings[$themeRef . '_dir'] . '/scripts/' . $fileName))
+		if (!empty($params['validate']) && !file_exists($settings[$themeRef.'_dir'].'/scripts/'.$fileName))
 		{
 			// Can't find it in this theme, how about the default?
-			if ($themeRef === 'theme' && !$params['force_current'] && file_exists($settings['default_theme_dir'] . '/scripts/' . $fileName))
+			if ($themeRef === 'theme' && !$params['force_current'] && file_exists($settings['default_theme_dir'].'/scripts/'.$fileName))
 			{
-				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
-				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
+				$fileUrl = $settings['default_theme_url'].'/scripts/'.$fileName.($has_seed ? '' : $params['seed']);
+				$filePath = $settings['default_theme_dir'].'/scripts/'.$fileName.($has_seed ? '' : $params['seed']);
 			}
 
 			else
@@ -2628,8 +2628,8 @@ 
 
 		else
 		{
-			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
-			$filePath = $settings[$themeRef . '_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
+			$fileUrl = $settings[$themeRef.'_url'].'/scripts/'.$fileName.($has_seed ? '' : $params['seed']);
+			$filePath = $settings[$themeRef.'_dir'].'/scripts/'.$fileName.($has_seed ? '' : $params['seed']);
 		}
 	}
 
@@ -2711,7 +2711,7 @@ 
 	// Make sure we have $settings - if not we're in trouble and need to find it!
 	if (empty($settings['default_theme_dir']))
 	{
-		require_once($sourcedir . '/ScheduledTasks.php');
+		require_once($sourcedir.'/ScheduledTasks.php');
 		loadEssentialThemeData();
 	}
 
@@ -2751,17 +2751,17 @@ 
 		$found = false;
 		foreach ($attempts as $k => $file)
 		{
-			if (file_exists($file[0] . '/languages/' . $file[1] . '.' . $file[2] . '.php'))
+			if (file_exists($file[0].'/languages/'.$file[1].'.'.$file[2].'.php'))
 			{
 				// Include it!
-				template_include($file[0] . '/languages/' . $file[1] . '.' . $file[2] . '.php');
+				template_include($file[0].'/languages/'.$file[1].'.'.$file[2].'.php');
 
 				// Note that we found it.
 				$found = true;
 
 				// setlocale is required for basename() & pathinfo() to work properly on the selected language
 				if (!empty($txt['lang_locale']) && !empty($modSettings['global_character_set']))
-					setlocale(LC_CTYPE, $txt['lang_locale'] . '.' . $modSettings['global_character_set']);
+					setlocale(LC_CTYPE, $txt['lang_locale'].'.'.$modSettings['global_character_set']);
 
 				break;
 			}
@@ -2770,7 +2770,7 @@ 
 		// That couldn't be found!  Log the error, but *try* to continue normally.
 		if (!$found && $fatal)
 		{
-			log_error(sprintf($txt['theme_language_error'], $template_name . '.' . $lang, 'template'));
+			log_error(sprintf($txt['theme_language_error'], $template_name.'.'.$lang, 'template'));
 			break;
 		}
 
@@ -2779,8 +2779,8 @@ 
 		{
 			foreach ($txt['emails'] as $key => $value)
 			{
-				$txt[$key . '_subject'] = $value['subject'];
-				$txt[$key . '_body'] = $value['body'];
+				$txt[$key.'_subject'] = $value['subject'];
+				$txt[$key.'_body'] = $value['body'];
 			}
 			$txt['emails'] = array();
 		}
@@ -2792,9 +2792,9 @@ 
 		{
 			foreach ($birthdayEmails as $key => $value)
 			{
-				$txtBirthdayEmails[$key . '_subject'] = $value['subject'];
-				$txtBirthdayEmails[$key . '_body'] = $value['body'];
-				$txtBirthdayEmails[$key . '_author'] = $value['author'];
+				$txtBirthdayEmails[$key.'_subject'] = $value['subject'];
+				$txtBirthdayEmails[$key.'_body'] = $value['body'];
+				$txtBirthdayEmails[$key.'_author'] = $value['author'];
 			}
 			$birthdayEmails = array();
 		}
@@ -2802,7 +2802,7 @@ 
 
 	// Keep track of what we're up to soldier.
 	if ($db_show_debug === true)
-		$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+		$context['debug']['language_files'][] = $template_name.'.'.$lang.' ('.$theme_name.')';
 
 	// Remember what we have loaded, and in which language.
 	$already_loaded[$template_name] = $lang;
@@ -2824,7 +2824,7 @@ 
 	global $scripturl, $smcFunc;
 
 	// First check if we have this cached already.
-	if (($boards = cache_get_data('board_parents-' . $id_parent, 480)) === null)
+	if (($boards = cache_get_data('board_parents-'.$id_parent, 480)) === null)
 	{
 		$boards = array();
 		$original_parent = $id_parent;
@@ -2856,7 +2856,7 @@ 
 				{
 					$id_parent = $row['id_parent'];
 					$boards[$row['id_board']] = array(
-						'url' => $scripturl . '?board=' . $row['id_board'] . '.0',
+						'url' => $scripturl.'?board='.$row['id_board'].'.0',
 						'name' => $row['name'],
 						'level' => $row['child_level'],
 						'groups' => explode(',', $row['member_groups']),
@@ -2872,8 +2872,8 @@ 
 						$boards[$id]['moderators'][$row['id_moderator']] = array(
 							'id' => $row['id_moderator'],
 							'name' => $row['real_name'],
-							'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
-							'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
+							'href' => $scripturl.'?action=profile;u='.$row['id_moderator'],
+							'link' => '<a href="'.$scripturl.'?action=profile;u='.$row['id_moderator'].'">'.$row['real_name'].'</a>'
 						);
 					}
 
@@ -2884,15 +2884,15 @@ 
 						$boards[$id]['moderator_groups'][$row['id_moderator_group']] = array(
 							'id' => $row['id_moderator_group'],
 							'name' => $row['group_name'],
-							'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
-							'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
+							'href' => $scripturl.'?action=groups;sa=members;group='.$row['id_moderator_group'],
+							'link' => '<a href="'.$scripturl.'?action=groups;sa=members;group='.$row['id_moderator_group'].'">'.$row['group_name'].'</a>'
 						);
 					}
 			}
 			$smcFunc['db_free_result']($result);
 		}
 
-		cache_put_data('board_parents-' . $original_parent, $boards, 480);
+		cache_put_data('board_parents-'.$original_parent, $boards, 480);
 	}
 
 	return $boards;
@@ -2922,14 +2922,14 @@ 
 
 		// Default language directories to try.
 		$language_directories = array(
-			$settings['default_theme_dir'] . '/languages',
+			$settings['default_theme_dir'].'/languages',
 		);
 		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir'])
-			$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+			$language_directories[] = $settings['actual_theme_dir'].'/languages';
 
 		// We possibly have a base theme directory.
 		if (!empty($settings['base_theme_dir']))
-			$language_directories[] = $settings['base_theme_dir'] . '/languages';
+			$language_directories[] = $settings['base_theme_dir'].'/languages';
 
 		// Remove any duplicates.
 		$language_directories = array_unique($language_directories);
@@ -2961,7 +2961,7 @@ 
 					$langName = $smcFunc['ucwords'](strtr($matches[1], array('_' => ' ')));
 
 					// Get the line we need.
-					$fp = @fopen($language_dir . '/' . $entry);
+					$fp = @fopen($language_dir.'/'.$entry);
 
 					// Yay!
 					if ($fp)
@@ -2990,7 +2990,7 @@ 
 					'name' => $langName,
 					'selected' => false,
 					'filename' => $matches[1],
-					'location' => $language_dir . '/index.' . $matches[1] . '.php',
+					'location' => $language_dir.'/index.'.$matches[1].'.php',
 				);
 			}
 			$dir->close();
@@ -3047,7 +3047,7 @@ 
 				$boundary_before = preg_match('/^\w/', $censor_vulgar[$i]) ? '\b' : ($charset === 'UTF-8' ? '(?<![\p{L}\p{M}\p{N}_])' : '(?<!\w)');
 				$boundary_after = preg_match('/\w$/', $censor_vulgar[$i]) ? '\b' : ($charset === 'UTF-8' ? '(?![\p{L}\p{M}\p{N}_])' : '(?!\w)');
 
-				$censor_vulgar[$i] = '/' . $boundary_before . $censor_vulgar[$i] . $boundary_after . '/' . (empty($modSettings['censorIgnoreCase']) ? '' : 'i') . ($charset === 'UTF-8' ? 'u' : '');
+				$censor_vulgar[$i] = '/'.$boundary_before.$censor_vulgar[$i].$boundary_after.'/'.(empty($modSettings['censorIgnoreCase']) ? '' : 'i').($charset === 'UTF-8' ? 'u' : '');
 			}
 		}
 	}
@@ -3108,18 +3108,18 @@ 
 			ob_start();
 
 		if (isset($_GET['debug']))
-			header('content-type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+			header('content-type: application/xhtml+xml; charset='.(empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
 
 		// Don't cache error pages!!
 		header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
-		header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+		header('last-modified: '.gmdate('D, d M Y H:i:s').' GMT');
 		header('cache-control: no-cache');
 
 		if (!isset($txt['template_parse_error']))
 		{
 			$txt['template_parse_error'] = 'Template Parse Error!';
 			$txt['template_parse_error_message'] = 'It seems something has gone sour on the forum with the template system.  This problem should only be temporary, so please come back later and try again.  If you continue to see this message, please contact the administrator.<br><br>You can also try <a href="javascript:location.reload();">refreshing this page</a>.';
-			$txt['template_parse_error_details'] = 'There was a problem loading the <pre><strong>%1$s</strong></pre> template or language file.  Please check the syntax and try again - remember, single quotes (<pre>\'</pre>) often have to be escaped with a slash (<pre>\\</pre>).  To see more specific error information from PHP, try <a href="' . $boardurl . '%1$s" class="extern">accessing the file directly</a>.<br><br>You may want to try to <a href="javascript:location.reload();">refresh this page</a> or <a href="' . $scripturl . '?theme=1">use the default theme</a>.';
+			$txt['template_parse_error_details'] = 'There was a problem loading the <pre><strong>%1$s</strong></pre> template or language file.  Please check the syntax and try again - remember, single quotes (<pre>\'</pre>) often have to be escaped with a slash (<pre>\\</pre>).  To see more specific error information from PHP, try <a href="'.$boardurl.'%1$s" class="extern">accessing the file directly</a>.<br><br>You may want to try to <a href="javascript:location.reload();">refresh this page</a> or <a href="'.$scripturl.'?theme=1">use the default theme</a>.';
 			$txt['template_parse_errmsg'] = 'Unfortunately more information is not available at this time as to exactly what is wrong.';
 		}
 
@@ -3151,7 +3151,7 @@ 
 </html>';
 		else
 		{
-			$error = fetch_web_data($boardurl . strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
+			$error = fetch_web_data($boardurl.strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 			$error_array = error_get_last();
 			if (empty($error) && ini_get('track_errors') && !empty($error_array))
 				$error = $error_array['message'];
@@ -3171,10 +3171,10 @@ 
 				echo '
 		<hr>
 
-		<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>' . $boarddir => '<strong>...', '<strong>' . strtr($boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
+		<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>'.$boarddir => '<strong>...', '<strong>'.strtr($boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
 
 			// I know, I know... this is VERY COMPLICATED.  Still, it's good.
-			if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0)
+			if (preg_match('~ <strong>(\d+)</strong><br( /)?'.'>$~i', $error, $match) != 0)
 			{
 				$data = file($filename);
 				$data2 = highlight_php_code(implode('', $data));
@@ -3182,9 +3182,9 @@ 
 
 				// Fix the PHP code stuff...
 				if (!isBrowser('gecko'))
-					$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
+					$data2 = str_replace("\t", '<span style="white-space: pre;">'."\t".'</span>', $data2);
 				else
-					$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+					$data2 = str_replace('<pre style="display: inline;">'."\t".'</pre>', "\t", $data2);
 
 				// Now we get to work around a bug in PHP where it doesn't escape <br>s!
 				$j = -1;
@@ -3198,7 +3198,7 @@ 
 					$n = substr_count($line, '<br>');
 					for ($i = 0; $i < $n; $i++)
 					{
-						$data2[$j] .= '&lt;br /&gt;' . $data2[$j + $i + 1];
+						$data2[$j] .= '&lt;br /&gt;'.$data2[$j + $i + 1];
 						unset($data2[$j + $i + 1]);
 					}
 					$j += $n;
@@ -3226,9 +3226,9 @@ 
 					if ($line == $match[1])
 						echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
 
-					echo '<span style="color: black;">', sprintf('%' . strlen($n) . 's', $line), ':</span> ';
+					echo '<span style="color: black;">', sprintf('%'.strlen($n).'s', $line), ':</span> ';
 					if (isset($data2[$line]) && $data2[$line] != '')
-						echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+						echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line.$data2[$line];
 
 					if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0)
 					{
@@ -3267,11 +3267,11 @@ 
 	global $db_type, $db_name, $ssi_db_user, $ssi_db_passwd, $sourcedir, $db_prefix, $db_port, $db_mb4;
 
 	// Figure out what type of database we are using.
-	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
+	if (empty($db_type) || !file_exists($sourcedir.'/Subs-Db-'.$db_type.'.php'))
 		$db_type = 'mysql';
 
 	// Load the file for the database.
-	require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
+	require_once($sourcedir.'/Subs-Db-'.$db_type.'.php');
 
 	$db_options = array();
 
@@ -3329,18 +3329,18 @@ 
 		$cacheAPI = false;
 
 	// Make sure our class is in session.
-	require_once($sourcedir . '/Class-CacheAPI.php');
+	require_once($sourcedir.'/Class-CacheAPI.php');
 
 	// What accelerator we are going to try.
 	$tryAccelerator = !empty($overrideCache) ? $overrideCache : !empty($cache_accelerator) ? $cache_accelerator : 'smf';
 	$tryAccelerator = strtolower($tryAccelerator);
 
 	// Do some basic tests.
-	if (file_exists($sourcedir . '/CacheAPI-' . $tryAccelerator . '.php'))
+	if (file_exists($sourcedir.'/CacheAPI-'.$tryAccelerator.'.php'))
 	{
-		require_once($sourcedir . '/CacheAPI-' . $tryAccelerator . '.php');
+		require_once($sourcedir.'/CacheAPI-'.$tryAccelerator.'.php');
 
-		$cache_class_name = $tryAccelerator . '_cache';
+		$cache_class_name = $tryAccelerator.'_cache';
 		$testAPI = new $cache_class_name();
 
 		// No Support?  NEXT!
@@ -3394,7 +3394,7 @@ 
 	*/
 	if (empty($modSettings['cache_enable']) || $modSettings['cache_enable'] < $level || !is_array($cache_block = cache_get_data($key, 3600)) || (!empty($cache_block['refresh_eval']) && eval($cache_block['refresh_eval'])) || (!empty($cache_block['expires']) && $cache_block['expires'] < time()))
 	{
-		require_once($sourcedir . '/' . $file);
+		require_once($sourcedir.'/'.$file);
 		$cache_block = call_user_func_array($function, $params);
 
 		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level)
@@ -3587,17 +3587,17 @@ 
 
 				// Just a plain external url.
 				else
-					$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+					$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'].'/'.$data['avatar'];
 			}
 		}
 
 		// Perhaps this user has an attachment as avatar...
 		else if (!empty($data['filename']))
-			$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+			$image = $modSettings['custom_avatar_url'].'/'.$data['filename'];
 
 		// Right... no avatar... use our default image.
 		else
-			$image = $modSettings['avatar_url'] . '/default.png';
+			$image = $modSettings['avatar_url'].'/default.png';
 	}
 
 	call_integration_hook('integrate_set_avatar_data', array(&$image, &$data));
@@ -3606,7 +3606,7 @@ 
 	if (!empty($image))
 		return array(
 			'name' => !empty($data['avatar']) ? $data['avatar'] : '',
-			'image' => '<img class="avatar" src="' . $image . '" />',
+			'image' => '<img class="avatar" src="'.$image.'" />',
 			'href' => $image,
 			'url' => $image,
 		);

Braces +1 added lines, -6 removed lines

@@ -78,7 +78,7 @@ 
 	// Set a list of common functions.
 	$ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);';
 	$ent_check = empty($modSettings['disableEntityCheck']) ? function($string)
-		{
+	{
 			$string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string);
 			return $string;
 		} : function($string)
@@ -2131,7 +2131,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?
@@ -2510,14 +2509,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2618,14 +2615,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);

Sources/ManageServer.php

Spacing +56 added lines, -56 removed lines

@@ -108,13 +108,13 @@ 
 	$context['sub_action'] = $_REQUEST['sa'];
 
 	// Warn the user if there's any relevant information regarding Settings.php.
-	$settings_not_writable = !is_writable($boarddir . '/Settings.php');
-	$settings_backup_fail = !@is_writable($boarddir . '/Settings_bak.php') || !@copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php');
+	$settings_not_writable = !is_writable($boarddir.'/Settings.php');
+	$settings_backup_fail = !@is_writable($boarddir.'/Settings_bak.php') || !@copy($boarddir.'/Settings.php', $boarddir.'/Settings_bak.php');
 
 	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+		$context['settings_message'] = '<div class="centertext"><strong>'.$txt['settings_not_writable'].'</strong></div><br>';
 	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+		$context['settings_message'] = '<div class="centertext"><strong>'.$txt['admin_backup_fail'].'</strong></div><br>';
 
 	$context['settings_not_writable'] = $settings_not_writable;
 
@@ -141,7 +141,7 @@ 
 	global $scripturl, $context, $txt, $modSettings, $boardurl, $sourcedir;
 
 	// If no cert, force_ssl must remain 0
-	require_once($sourcedir . '/Subs.php');
+	require_once($sourcedir.'/Subs.php');
 	if (!ssl_cert_found($boardurl) && empty($modSettings['force_ssl']))
 		$disable_force_ssl = true;
 	else
@@ -178,7 +178,7 @@ 
 		return $config_vars;
 
 	// Setup the template stuff.
-	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=general;save';
+	$context['post_url'] = $scripturl.'?action=admin;area=serversettings;sa=general;save';
 	$context['settings_title'] = $txt['general_settings'];
 
 	// Saving settings?
@@ -205,7 +205,7 @@ 
 
 		saveSettings($config_vars);
 		$_SESSION['adm-save'] = true;
-		redirectexit('action=admin;area=serversettings;sa=general;' . $context['session_var'] . '=' . $context['session_id']);
+		redirectexit('action=admin;area=serversettings;sa=general;'.$context['session_var'].'='.$context['session_id']);
 	}
 
 	// Fill the config array.
@@ -251,14 +251,14 @@ 
 function AlignURLsWithSSLSetting($new_force_ssl = 0)
 {
 	global $boardurl, $modSettings, $sourcedir, $smcFunc;
-	require_once($sourcedir . '/Subs-Admin.php');
+	require_once($sourcedir.'/Subs-Admin.php');
 
 	// Check $boardurl
 	if (!empty($new_force_ssl))
 		$newval = strtr($boardurl, array('http://' => 'https://'));
 	else
 		$newval = strtr($boardurl, array('https://' => 'http://'));
-	updateSettingsFile(array('boardurl' => '\'' . addslashes($newval) . '\''));
+	updateSettingsFile(array('boardurl' => '\''.addslashes($newval).'\''));
 
 	$new_settings = array();
 
@@ -405,7 +405,7 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 			$fts_language[$row['cfgname']] = $row['cfgname'];
 
-		$config_vars = array_merge ($config_vars, array(
+		$config_vars = array_merge($config_vars, array(
 				'',
 				array('search_language', $txt['search_language'], 'db', 'select', $fts_language, 'pgFulltextSearch')
 			)
@@ -419,7 +419,7 @@ 
 		return $config_vars;
 
 	// Setup the template stuff.
-	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=database;save';
+	$context['post_url'] = $scripturl.'?action=admin;area=serversettings;sa=database;save';
 	$context['settings_title'] = $txt['database_settings'];
 	$context['save_disabled'] = $context['settings_not_writable'];
 
@@ -437,7 +437,7 @@ 
 
 		saveSettings($config_vars);
 		$_SESSION['adm-save'] = true;
-		redirectexit('action=admin;area=serversettings;sa=database;' . $context['session_var'] . '=' . $context['session_id']);
+		redirectexit('action=admin;area=serversettings;sa=database;'.$context['session_var'].'='.$context['session_id']);
 	}
 
 	// Fill the config array.
@@ -478,7 +478,7 @@ 
 			2 => $txt['tfa_mode_forced'],
 		)) + (empty($user_settings['tfa_secret']) ? array() : array(
 			3 => $txt['tfa_mode_forcedall'],
-		)), 'subtext' => $txt['tfa_mode_subtext'] . (empty($user_settings['tfa_secret']) ? '<br><strong>' . $txt['tfa_mode_forced_help'] . '</strong>' : ''), 'tfa_mode'),
+		)), 'subtext' => $txt['tfa_mode_subtext'].(empty($user_settings['tfa_secret']) ? '<br><strong>'.$txt['tfa_mode_forced_help'].'</strong>' : ''), 'tfa_mode'),
 	);
 
 	addInlineJavaScript('
@@ -506,7 +506,7 @@ 
 	if ($return_config)
 		return $config_vars;
 
-	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=cookie;save';
+	$context['post_url'] = $scripturl.'?action=admin;area=serversettings;sa=cookie;save';
 	$context['settings_title'] = $txt['cookies_sessions_settings'];
 
 	// Saving settings?
@@ -530,7 +530,7 @@ 
 		if ($cookiename != $_POST['cookiename'] || !empty($scope_changed))
 		{
 			$original_session_id = $context['session_id'];
-			include_once($sourcedir . '/Subs-Auth.php');
+			include_once($sourcedir.'/Subs-Auth.php');
 
 			// Remove the old cookie.
 			setLoginCookie(-3600, 0);
@@ -539,7 +539,7 @@ 
 			$cookiename = !empty($_POST['cookiename']) ? $_POST['cookiename'] : $cookiename;
 			setLoginCookie(60 * $modSettings['cookieTime'], $user_settings['id_member'], hash_salt($user_settings['passwd'], $user_settings['password_salt']));
 
-			redirectexit('action=admin;area=serversettings;sa=cookie;' . $context['session_var'] . '=' . $original_session_id, $context['server']['needs_login_fix']);
+			redirectexit('action=admin;area=serversettings;sa=cookie;'.$context['session_var'].'='.$original_session_id, $context['server']['needs_login_fix']);
 		}
 
 		//If we disabled 2FA, reset all members and membergroups settings.
@@ -562,7 +562,7 @@ 
 		}
 
 		$_SESSION['adm-save'] = true;
-		redirectexit('action=admin;area=serversettings;sa=cookie;' . $context['session_var'] . '=' . $context['session_id']);
+		redirectexit('action=admin;area=serversettings;sa=cookie;'.$context['session_var'].'='.$context['session_id']);
 	}
 
 	// Fill the config array.
@@ -617,10 +617,10 @@ 
 		call_integration_hook('integrate_save_general_security_settings');
 
 		writeLog();
-		redirectexit('action=admin;area=serversettings;sa=security;' . $context['session_var'] . '=' . $context['session_id']);
+		redirectexit('action=admin;area=serversettings;sa=security;'.$context['session_var'].'='.$context['session_id']);
 	}
 
-	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;save;sa=security';
+	$context['post_url'] = $scripturl.'?action=admin;area=serversettings;save;sa=security';
 	$context['settings_title'] = $txt['security_settings'];
 
 	prepareDBSettingContext($config_vars);
@@ -673,7 +673,7 @@ 
 	{
 		foreach ($detected as $tryCache => $dummy)
 		{
-			$cache_class_name = $tryCache . '_cache';
+			$cache_class_name = $tryCache.'_cache';
 
 			// loadCacheAPIs has already included the file, just see if we can't add the settings in.
 			if (is_callable(array($cache_class_name, 'cacheSettings')))
@@ -698,14 +698,14 @@ 
 		updatesettings(array('cache_enable' => (int) $_POST['cache_enable']));
 
 		// exit so we reload our new settings on the page
-		redirectexit('action=admin;area=serversettings;sa=cache;' . $context['session_var'] . '=' . $context['session_id']);
+		redirectexit('action=admin;area=serversettings;sa=cache;'.$context['session_var'].'='.$context['session_id']);
 	}
 
 	loadLanguage('ManageMaintenance');
 	createToken('admin-maint');
 	$context['template_layers'][] = 'clean_cache_button';
 
-	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=cache;save';
+	$context['post_url'] = $scripturl.'?action=admin;area=serversettings;sa=cache;save';
 	$context['settings_title'] = $txt['caching_settings'];
 
 	// Changing cache settings won't have any effect if Settings.php is not writeable.
@@ -792,7 +792,7 @@ 
 	if ($return_config)
 		return $config_vars;
 
-	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=loads;save';
+	$context['post_url'] = $scripturl.'?action=admin;area=serversettings;sa=loads;save';
 	$context['settings_title'] = $txt['load_balancing_settings'];
 
 	// Saving?
@@ -819,7 +819,7 @@ 
 		saveDBSettings($config_vars);
 		if (!isset($_SESSION['adm-save']))
 			$_SESSION['adm-save'] = true;
-		redirectexit('action=admin;area=serversettings;sa=loads;' . $context['session_var'] . '=' . $context['session_id']);
+		redirectexit('action=admin;area=serversettings;sa=loads;'.$context['session_var'].'='.$context['session_id']);
 	}
 
 	prepareDBSettingContext($config_vars);
@@ -1081,16 +1081,16 @@ 
 				if (!is_numeric($k))
 				{
 					if (substr($k, 0, 2) == 'on')
-						$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
+						$context['config_vars'][$config_var[1]]['javascript'] .= ' '.$k.'="'.$v.'"';
 					else
 						$context['config_vars'][$config_var[1]][$k] = $v;
 				}
 
 				// See if there are any other labels that might fit?
-				if (isset($txt['setting_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
-				elseif (isset($txt['groups_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				if (isset($txt['setting_'.$config_var[1]]))
+					$context['config_vars'][$config_var[1]]['label'] = $txt['setting_'.$config_var[1]];
+				elseif (isset($txt['groups_'.$config_var[1]]))
+					$context['config_vars'][$config_var[1]]['label'] = $txt['groups_'.$config_var[1]];
 			}
 
 			// Set the subtext in case it's part of the label.
@@ -1107,13 +1107,13 @@ 
 	// If we have inline permissions we need to prep them.
 	if (!empty($inlinePermissions) && allowedTo('manage_permissions'))
 	{
-		require_once($sourcedir . '/ManagePermissions.php');
+		require_once($sourcedir.'/ManagePermissions.php');
 		init_inline_permissions($inlinePermissions, isset($context['permissions_excluded']) ? $context['permissions_excluded'] : array());
 	}
 
 	if ($board_list)
 	{
-		require_once($sourcedir . '/Subs-MessageIndex.php');
+		require_once($sourcedir.'/Subs-MessageIndex.php');
 		$context['board_list'] = getBoardList();
 	}
 
@@ -1156,9 +1156,9 @@ 
 		foreach ($bbcChoice as $bbc)
 		{
 			$context['bbc_sections'][$bbc] = array(
-				'title' => isset($txt['bbc_title_' . $bbc]) ? $txt['bbc_title_' . $bbc] : $txt['bbcTagsToUse_select'],
-				'disabled' => empty($modSettings['bbc_disabled_' . $bbc]) ? array() : $modSettings['bbc_disabled_' . $bbc],
-				'all_selected' => empty($modSettings['bbc_disabled_' . $bbc]),
+				'title' => isset($txt['bbc_title_'.$bbc]) ? $txt['bbc_title_'.$bbc] : $txt['bbcTagsToUse_select'],
+				'disabled' => empty($modSettings['bbc_disabled_'.$bbc]) ? array() : $modSettings['bbc_disabled_'.$bbc],
+				'all_selected' => empty($modSettings['bbc_disabled_'.$bbc]),
 			);
 		}
 	}
@@ -1184,7 +1184,7 @@ 
 
 	// Fix the darn stupid cookiename! (more may not be allowed, but these for sure!)
 	if (isset($_POST['cookiename']))
-		$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+		$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~'.($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
 
 	// Fix the forum's URL if necessary.
 	if (isset($_POST['boardurl']))
@@ -1194,7 +1194,7 @@ 
 		elseif (substr($_POST['boardurl'], -1) == '/')
 			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
 		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://')
-			$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+			$_POST['boardurl'] = 'http://'.$_POST['boardurl'];
 	}
 
 	// Any passwords?
@@ -1237,11 +1237,11 @@ 
 		if (in_array($config_var, $config_passwords))
 		{
 			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1])
-				$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
+				$new_settings[$config_var] = '\''.addcslashes($_POST[$config_var][0], '\'\\').'\'';
 		}
 		elseif (in_array($config_var, $config_strs))
 		{
-			$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var], '\'\\') . '\'';
+			$new_settings[$config_var] = '\''.addcslashes($_POST[$config_var], '\'\\').'\'';
 		}
 		elseif (in_array($config_var, $config_ints))
 		{
@@ -1265,12 +1265,12 @@ 
 		else
 		{
 			// This shouldn't happen, but it might...
-			fatal_error('Unknown config_var \'' . $config_var . '\'');
+			fatal_error('Unknown config_var \''.$config_var.'\'');
 		}
 	}
 
 	// Save the relevant settings in the Settings.php file.
-	require_once($sourcedir . '/Subs-Admin.php');
+	require_once($sourcedir.'/Subs-Admin.php');
 	updateSettingsFile($new_settings);
 
 	// Now loop through the remaining (database-based) settings.
@@ -1319,7 +1319,7 @@ 
 	$inlinePermissions = array();
 	foreach ($config_vars as $var)
 	{
-		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags']))))
+		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1].'_enabledTags']))))
 			continue;
 
 		// Checkboxes!
@@ -1405,12 +1405,12 @@ 
 			foreach (parse_bbc(false) as $tag)
 				$bbcTags[] = $tag['tag'];
 
-			if (!isset($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array();
-			elseif (!is_array($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			if (!isset($_POST[$var[1].'_enabledTags']))
+				$_POST[$var[1].'_enabledTags'] = array();
+			elseif (!is_array($_POST[$var[1].'_enabledTags']))
+				$_POST[$var[1].'_enabledTags'] = array($_POST[$var[1].'_enabledTags']);
 
-			$setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1] . '_enabledTags']));
+			$setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1].'_enabledTags']));
 		}
 		// Permissions?
 		elseif ($var[0] == 'permissions')
@@ -1423,7 +1423,7 @@ 
 	// If we have inline permissions we need to save them.
 	if (!empty($inlinePermissions) && allowedTo('manage_permissions'))
 	{
-		require_once($sourcedir . '/ManagePermissions.php');
+		require_once($sourcedir.'/ManagePermissions.php');
 		save_inline_permissions($inlinePermissions);
 	}
 }
@@ -1455,7 +1455,7 @@ 
 	// put all of it into an array
 	foreach ($info_lines as $line)
 	{
-		if (preg_match('~(' . $remove . ')~', $line))
+		if (preg_match('~('.$remove.')~', $line))
 			continue;
 
 		// new category?
@@ -1485,26 +1485,26 @@ 
 	global $sourcedir, $txt;
 
 	// Make sure our class is in session.
-	require_once($sourcedir . '/Class-CacheAPI.php');
+	require_once($sourcedir.'/Class-CacheAPI.php');
 
 	$apis = array();
 	if ($dh = opendir($sourcedir))
 	{
 		while (($file = readdir($dh)) !== false)
 		{
-			if (is_file($sourcedir . '/' . $file) && preg_match('~^CacheAPI-([A-Za-z\d_]+)\.php$~', $file, $matches))
+			if (is_file($sourcedir.'/'.$file) && preg_match('~^CacheAPI-([A-Za-z\d_]+)\.php$~', $file, $matches))
 			{
 				$tryCache = strtolower($matches[1]);
 
-				require_once($sourcedir . '/' . $file);
-				$cache_class_name = $tryCache . '_cache';
+				require_once($sourcedir.'/'.$file);
+				$cache_class_name = $tryCache.'_cache';
 				$testAPI = new $cache_class_name();
 
 				// No Support?  NEXT!
 				if (!$testAPI->isSupported(true))
 					continue;
 
-				$apis[$tryCache] = isset($txt[$tryCache . '_cache']) ? $txt[$tryCache . '_cache'] : $tryCache;
+				$apis[$tryCache] = isset($txt[$tryCache.'_cache']) ? $txt[$tryCache.'_cache'] : $tryCache;
 			}
 		}
 	}
@@ -1533,9 +1533,9 @@ 
 	$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);
 	if ($fp)
 	{
-		$out = 'GET /smf/stats/register_stats.php?site=' . base64_encode($boardurl) . ' HTTP/1.1' . "\r\n";
-		$out .= 'Host: www.simplemachines.org' . "\r\n";
-		$out .= 'Connection: Close' . "\r\n\r\n";
+		$out = 'GET /smf/stats/register_stats.php?site='.base64_encode($boardurl).' HTTP/1.1'."\r\n";
+		$out .= 'Host: www.simplemachines.org'."\r\n";
+		$out .= 'Connection: Close'."\r\n\r\n";
 		fwrite($fp, $out);
 
 		$return_data = '';

Themes/default/languages/Admin.english.php

Spacing +5 added lines, -5 removed lines

@@ -122,11 +122,11 @@ 
 $txt['member_id'] = 'ID';
 
 $txt['unknown'] = 'unknown';
-$txt['security_wrong'] = 'Administration login attempt!' . "\n" . 'Referrer: %1$s' . "\n" . 'User agent: %2$s' . "\n" . 'IP: %3$s';
+$txt['security_wrong'] = 'Administration login attempt!'."\n".'Referrer: %1$s'."\n".'User agent: %2$s'."\n".'IP: %3$s';
 
 $txt['email_as_html'] = 'Send in HTML format. (with this you can put normal HTML in the email.)';
 $txt['email_parsed_html'] = 'Add <br>s and  s to this message.';
-$txt['email_variables'] = 'In this message you can use a few &quot;variables&quot;. Click <a href="' . $scripturl . '?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help">here</a> for more information.';
+$txt['email_variables'] = 'In this message you can use a few &quot;variables&quot;. Click <a href="'.$scripturl.'?action=helpadmin;help=email_members" onclick="return reqOverlayDiv(this.href);" class="help">here</a> for more information.';
 $txt['email_force'] = 'Send this to members even if they have chosen not to receive announcements.';
 $txt['email_as_pms'] = 'Send this to these groups using personal messages.';
 $txt['email_continue'] = 'Continue';
@@ -358,7 +358,7 @@ 
 
 $txt['attach_dir_does_not_exist'] = 'Does not exist';
 $txt['attach_dir_not_writable'] = 'Not writable';
-$txt['attach_dir_files_missing'] = 'Files Missing (<a href="' . $scripturl . '?action=admin;area=manageattachments;sa=repair;%2$s=%1$s">Repair</a>)';
+$txt['attach_dir_files_missing'] = 'Files Missing (<a href="'.$scripturl.'?action=admin;area=manageattachments;sa=repair;%2$s=%1$s">Repair</a>)';
 $txt['attach_dir_unused'] = 'Unused';
 $txt['attach_dir_empty'] = 'Empty';
 $txt['attach_dir_ok'] = 'OK';
@@ -410,8 +410,8 @@ 
 $txt['use_subdirectories_for_attachments_note'] = 'Otherwise any new directories will be created within the forum\'s main directory.';
 $txt['basedirectory_for_attachments'] = 'Set a base directory for attachments';
 $txt['basedirectory_for_attachments_current'] = 'Current base directory';
-$txt['basedirectory_for_attachments_warning'] = '<div class="smalltext">Please note that the directory is wrong. <br>(<a href="' . $scripturl . '?action=admin;area=manageattachments;sa=attachpaths">Attempt to correct</a>)</div>';
-$txt['attach_current_dir_warning'] = '<div class="smalltext">There seems to be a problem with this directory. <br>(<a href="' . $scripturl . '?action=admin;area=manageattachments;sa=attachpaths">Attempt to correct</a>)</div>';
+$txt['basedirectory_for_attachments_warning'] = '<div class="smalltext">Please note that the directory is wrong. <br>(<a href="'.$scripturl.'?action=admin;area=manageattachments;sa=attachpaths">Attempt to correct</a>)</div>';
+$txt['attach_current_dir_warning'] = '<div class="smalltext">There seems to be a problem with this directory. <br>(<a href="'.$scripturl.'?action=admin;area=manageattachments;sa=attachpaths">Attempt to correct</a>)</div>';
 
 $txt['attachment_transfer'] = 'Transfer Attachments';
 $txt['attachment_transfer_desc'] = 'Transfer files between directories.';

Sources/Subs-Attachments.php

Spacing +53 added lines, -53 removed lines

@@ -79,19 +79,19 @@ 
 	switch ($modSettings['automanage_attachments'])
 	{
 		case 1:
-			$updir = $basedirectory . DIRECTORY_SEPARATOR . 'attachments_' . (isset($modSettings['last_attachments_directory'][$base_dir]) ? $modSettings['last_attachments_directory'][$base_dir] : 0);
+			$updir = $basedirectory.DIRECTORY_SEPARATOR.'attachments_'.(isset($modSettings['last_attachments_directory'][$base_dir]) ? $modSettings['last_attachments_directory'][$base_dir] : 0);
 			break;
 		case 2:
-			$updir = $basedirectory . DIRECTORY_SEPARATOR . $year;
+			$updir = $basedirectory.DIRECTORY_SEPARATOR.$year;
 			break;
 		case 3:
-			$updir = $basedirectory . DIRECTORY_SEPARATOR . $year . DIRECTORY_SEPARATOR . $month;
+			$updir = $basedirectory.DIRECTORY_SEPARATOR.$year.DIRECTORY_SEPARATOR.$month;
 			break;
 		case 4:
-			$updir = $basedirectory . DIRECTORY_SEPARATOR . (empty($modSettings['use_subdirectories_for_attachments']) ? 'attachments-' : 'random_') . $rand;
+			$updir = $basedirectory.DIRECTORY_SEPARATOR.(empty($modSettings['use_subdirectories_for_attachments']) ? 'attachments-' : 'random_').$rand;
 			break;
 		case 5:
-			$updir = $basedirectory . DIRECTORY_SEPARATOR . (empty($modSettings['use_subdirectories_for_attachments']) ? 'attachments-' : 'random_') . $rand . DIRECTORY_SEPARATOR . $rand1;
+			$updir = $basedirectory.DIRECTORY_SEPARATOR.(empty($modSettings['use_subdirectories_for_attachments']) ? 'attachments-' : 'random_').$rand.DIRECTORY_SEPARATOR.$rand1;
 			break;
 		default :
 			$updir = '';
@@ -135,7 +135,7 @@ 
 	if ($directory === false)
 	{
 		// Maybe it's just the folder name
-		$tree = get_directory_tree_elements($boarddir . DIRECTORY_SEPARATOR . $updir);
+		$tree = get_directory_tree_elements($boarddir.DIRECTORY_SEPARATOR.$updir);
 		$count = count($tree);
 
 		$directory = attachments_init_dir($tree, $count);
@@ -143,7 +143,7 @@ 
 			return false;
 	}
 
-	$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
+	$directory .= DIRECTORY_SEPARATOR.array_shift($tree);
 
 	while (!@is_dir($directory) || $count != -1)
 	{
@@ -156,7 +156,7 @@ 
 			}
 		}
 
-		$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
+		$directory .= DIRECTORY_SEPARATOR.array_shift($tree);
 		$count--;
 	}
 
@@ -168,7 +168,7 @@ 
 	}
 
 	// Everything seems fine...let's create the .htaccess
-	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
+	if (!file_exists($directory.DIRECTORY_SEPARATOR.'.htaccess'))
 		secureDirectory($updir, true);
 
 	$sep = (DIRECTORY_SEPARATOR === '\\') ? '\/' : DIRECTORY_SEPARATOR;
@@ -224,7 +224,7 @@ 
 	// And increment it.
 	$modSettings['last_attachments_directory'][$base_dir]++;
 
-	$updir = $basedirectory . DIRECTORY_SEPARATOR . 'attachments_' . $modSettings['last_attachments_directory'][$base_dir];
+	$updir = $basedirectory.DIRECTORY_SEPARATOR.'attachments_'.$modSettings['last_attachments_directory'][$base_dir];
 	if (automanage_attachments_create_directory($updir))
 	{
 		$modSettings['currentAttachmentUploadDir'] = array_search($updir, $modSettings['attachmentUploadDir']);
@@ -363,7 +363,7 @@ 
 		if (!$ignore_temp)
 		{
 			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-				if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
+				if (strpos($attachID, 'post_tmp_'.$user_info['id']) !== false)
 					unlink($attachment['tmp_name']);
 
 			$context['we_are_history'] = $txt['error_temp_attachments_flushed'];
@@ -412,16 +412,16 @@ 
 			if ($_FILES['attachment']['error'][$n] == 2)
 				$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
 			elseif ($_FILES['attachment']['error'][$n] == 6)
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				log_error($_FILES['attachment']['name'][$n].': '.$txt['php_upload_error_6'], 'critical');
 			else
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				log_error($_FILES['attachment']['name'][$n].': '.$txt['php_upload_error_'.$_FILES['attachment']['error'][$n]]);
 			if (empty($errors))
 				$errors[] = 'attach_php_error';
 		}
 
 		// Try to move and rename the file before doing any more checks on it.
-		$attachID = 'post_tmp_' . $user_info['id'] . '_' . md5(mt_rand());
-		$destName = $context['attach_dir'] . '/' . $attachID;
+		$attachID = 'post_tmp_'.$user_info['id'].'_'.md5(mt_rand());
+		$destName = $context['attach_dir'].'/'.$attachID;
 		if (empty($errors))
 		{
 			// The reported MIME type of the attachment might not be reliable.
@@ -515,7 +515,7 @@ 
 	$size = @getimagesize($_SESSION['temp_attachments'][$attachID]['tmp_name']);
 	if (isset($context['valid_image_types'][$size[2]]))
 	{
-		require_once($sourcedir . '/Subs-Graphics.php');
+		require_once($sourcedir.'/Subs-Graphics.php');
 		if (!checkImageContents($_SESSION['temp_attachments'][$attachID]['tmp_name'], !empty($modSettings['attachment_image_paranoid'])))
 		{
 			// It's bad. Last chance, maybe we can re-encode it?
@@ -532,7 +532,7 @@ 
 			if (!(empty($size)) && ($size[2] != $old_format))
 			{
 				if (isset($context['valid_image_types'][$size[2]]))
-					$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['valid_image_types'][$size[2]];
+					$_SESSION['temp_attachments'][$attachID]['type'] = 'image/'.$context['valid_image_types'][$size[2]];
 			}
 		}
 	}
@@ -563,7 +563,7 @@ 
 		if (empty($modSettings['attachment_full_notified']) && !empty($modSettings['attachmentDirSizeLimit']) && $modSettings['attachmentDirSizeLimit'] > 4000 && $context['dir_size'] > ($modSettings['attachmentDirSizeLimit'] - 2000) * 1024
 			|| (!empty($modSettings['attachmentDirFileLimit']) && $modSettings['attachmentDirFileLimit'] * .95 < $context['dir_files'] && $modSettings['attachmentDirFileLimit'] > 500))
 		{
-			require_once($sourcedir . '/Subs-Admin.php');
+			require_once($sourcedir.'/Subs-Admin.php');
 			emailAdmins('admin_attachments_full');
 			updateSettings(array('attachment_full_notified' => 1));
 		}
@@ -577,8 +577,8 @@ 
 				// Move it to the new folder if we can.
 				if (automanage_attachments_by_space())
 				{
-					rename($_SESSION['temp_attachments'][$attachID]['tmp_name'], $context['attach_dir'] . '/' . $attachID);
-					$_SESSION['temp_attachments'][$attachID]['tmp_name'] = $context['attach_dir'] . '/' . $attachID;
+					rename($_SESSION['temp_attachments'][$attachID]['tmp_name'], $context['attach_dir'].'/'.$attachID);
+					$_SESSION['temp_attachments'][$attachID]['tmp_name'] = $context['attach_dir'].'/'.$attachID;
 					$_SESSION['temp_attachments'][$attachID]['id_folder'] = $modSettings['currentAttachmentUploadDir'];
 					$context['dir_size'] = 0;
 					$context['dir_files'] = 0;
@@ -658,7 +658,7 @@ 
 {
 	global $modSettings, $sourcedir, $smcFunc, $context, $txt;
 
-	require_once($sourcedir . '/Subs-Graphics.php');
+	require_once($sourcedir.'/Subs-Graphics.php');
 
 	// If this is an image we need to set a few additional parameters.
 	$size = @getimagesize($attachmentOptions['tmp_name']);
@@ -673,7 +673,7 @@ 
 
 		// Otherwise a valid one?
 		elseif (isset($context['valid_image_types'][$size[2]]))
-			$attachmentOptions['mime_type'] = 'image/' . $context['valid_image_types'][$size[2]];
+			$attachmentOptions['mime_type'] = 'image/'.$context['valid_image_types'][$size[2]];
 	}
 
 	// It is possible we might have a MIME type that isn't actually an image but still have a size.
@@ -692,7 +692,7 @@ 
 	if (empty($attachmentOptions['fileext']))
 	{
 		$attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : '');
-		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name'])
+		if (strlen($attachmentOptions['fileext']) > 8 || '.'.$attachmentOptions['fileext'] == $attachmentOptions['name'])
 			$attachmentOptions['fileext'] = '';
 	}
 
@@ -755,21 +755,21 @@ 
 		if (createThumbnail($attachmentOptions['destination'], $modSettings['attachmentThumbWidth'], $modSettings['attachmentThumbHeight']))
 		{
 			// Figure out how big we actually made it.
-			$size = @getimagesize($attachmentOptions['destination'] . '_thumb');
+			$size = @getimagesize($attachmentOptions['destination'].'_thumb');
 			list ($thumb_width, $thumb_height) = $size;
 
 			if (!empty($size['mime']))
 				$thumb_mime = $size['mime'];
 			elseif (isset($context['valid_image_types'][$size[2]]))
-				$thumb_mime = 'image/' . $context['valid_image_types'][$size[2]];
+				$thumb_mime = 'image/'.$context['valid_image_types'][$size[2]];
 			// Lord only knows how this happened...
 			else
 				$thumb_mime = '';
 
-			$thumb_filename = $attachmentOptions['name'] . '_thumb';
-			$thumb_size = filesize($attachmentOptions['destination'] . '_thumb');
+			$thumb_filename = $attachmentOptions['name'].'_thumb';
+			$thumb_size = filesize($attachmentOptions['destination'].'_thumb');
 			$thumb_file_hash = getAttachmentFilename($thumb_filename, false, null, true);
-			$thumb_path = $attachmentOptions['destination'] . '_thumb';
+			$thumb_path = $attachmentOptions['destination'].'_thumb';
 
 			// We should check the file size and count here since thumbs are added to the existing totals.
 			if (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] == 1 && !empty($modSettings['attachmentDirSizeLimit']) || !empty($modSettings['attachmentDirFileLimit']))
@@ -782,8 +782,8 @@ 
 				{
 					if (automanage_attachments_by_space())
 					{
-						rename($thumb_path, $context['attach_dir'] . '/' . $thumb_filename);
-						$thumb_path = $context['attach_dir'] . '/' . $thumb_filename;
+						rename($thumb_path, $context['attach_dir'].'/'.$thumb_filename);
+						$thumb_path = $context['attach_dir'].'/'.$thumb_filename;
 						$context['dir_size'] = 0;
 						$context['dir_files'] = 0;
 					}
@@ -792,8 +792,8 @@ 
 			// If a new folder has been already created. Gotta move this thumb there then.
 			if ($modSettings['currentAttachmentUploadDir'] != $attachmentOptions['id_folder'])
 			{
-				rename($thumb_path, $context['attach_dir'] . '/' . $thumb_filename);
-				$thumb_path = $context['attach_dir'] . '/' . $thumb_filename;
+				rename($thumb_path, $context['attach_dir'].'/'.$thumb_filename);
+				$thumb_path = $context['attach_dir'].'/'.$thumb_filename;
 			}
 
 			// To the database we go!
@@ -910,13 +910,13 @@ 
 		$attachContext = $attachLoaded[$attachID];
 
 		// Fix the url to point out to showAvatar().
-		$attachContext['href'] = $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview';
+		$attachContext['href'] = $scripturl.'?action=dlattach;attach='.$attachID.';type=preview';
 
-		$attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview' . (empty($attachContext['is_image']) ? ';file' : '') . '">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>';
+		$attachContext['link'] = '<a href="'.$scripturl.'?action=dlattach;attach='.$attachID.';type=preview'.(empty($attachContext['is_image']) ? ';file' : '').'">'.$smcFunc['htmlspecialchars']($attachContext['name']).'</a>';
 
 		// Fix the thumbnail too, if the image has one.
 		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb']))
-			$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+			$attachContext['thumbnail']['href'] = $scripturl.'?action=dlattach;attach='.$attachContext['thumbnail']['id'].';image;type=preview';
 
 		return $attachContext;
 	}
@@ -992,9 +992,9 @@ 
 
 	$request = $smcFunc['db_query']('', '
 		SELECT a.id_attach, a.id_msg, a.id_member, a.size, a.mime_type, a.id_folder, a.filename' . (empty($modSettings['attachmentShowImages']) || empty($modSettings['attachmentThumbnails']) ? '' : ',
-				COALESCE(thumb.id_attach, 0) AS id_thumb, thumb.width AS thumb_width, thumb.height AS thumb_height') . '
+				COALESCE(thumb.id_attach, 0) AS id_thumb, thumb.width AS thumb_width, thumb.height AS thumb_height').'
 		FROM {db_prefix}attachments AS a' . (empty($modSettings['attachmentShowImages']) || empty($modSettings['attachmentThumbnails']) ? '' : '
-				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)') . '
+				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)').'
 		WHERE a.id_attach IN ({array_int:attach_ids})
 		LIMIT 1',
 		array(
@@ -1072,12 +1072,12 @@ 
 			SELECT
 				a.id_attach, a.id_folder, a.id_msg, a.filename, a.file_hash, COALESCE(a.size, 0) AS filesize, a.downloads, a.approved, m.id_topic AS topic, m.id_board AS board,
 				a.width, a.height' . (empty($modSettings['attachmentShowImages']) || empty($modSettings['attachmentThumbnails']) ? '' : ',
-				COALESCE(thumb.id_attach, 0) AS id_thumb, thumb.width AS thumb_width, thumb.height AS thumb_height') . '
+				COALESCE(thumb.id_attach, 0) AS id_thumb, thumb.width AS thumb_width, thumb.height AS thumb_height').'
 			FROM {db_prefix}attachments AS a' . (empty($modSettings['attachmentShowImages']) || empty($modSettings['attachmentThumbnails']) ? '' : '
-				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)') . '
+				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)').'
 				LEFT JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 			WHERE a.attachment_type = {int:attachment_type}
-				'. (!empty($msgID) ? 'AND a.id_msg = {int:message_id}' : '') . '',
+				'. (!empty($msgID) ? 'AND a.id_msg = {int:message_id}' : '').'',
 			array(
 				'message_id' => $msgID,
 				'attachment_type' => 0,
@@ -1131,10 +1131,10 @@ 
 				'id' => $attachment['id_attach'],
 				'name' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $smcFunc['htmlspecialchars']($attachment['filename'])),
 				'downloads' => $attachment['downloads'],
-				'size' => ($attachment['filesize'] < 1024000) ? round($attachment['filesize'] / 1024, 2) . ' ' . $txt['kilobyte'] : round($attachment['filesize'] / 1024 / 1024, 2) . ' ' . $txt['megabyte'],
+				'size' => ($attachment['filesize'] < 1024000) ? round($attachment['filesize'] / 1024, 2).' '.$txt['kilobyte'] : round($attachment['filesize'] / 1024 / 1024, 2).' '.$txt['megabyte'],
 				'byte_size' => $attachment['filesize'],
-				'href' => $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_attach'],
-				'link' => '<a href="' . $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_attach'] . '">' . $smcFunc['htmlspecialchars']($attachment['filename']) . '</a>',
+				'href' => $scripturl.'?action=dlattach;topic='.$attachment['topic'].'.0;attach='.$attachment['id_attach'],
+				'link' => '<a href="'.$scripturl.'?action=dlattach;topic='.$attachment['topic'].'.0;attach='.$attachment['id_attach'].'">'.$smcFunc['htmlspecialchars']($attachment['filename']).'</a>',
 				'is_image' => !empty($attachment['width']) && !empty($attachment['height']) && !empty($modSettings['attachmentShowImages']),
 				'is_approved' => $attachment['approved'],
 				'topic' => $attachment['topic'],
@@ -1161,7 +1161,7 @@ 
 				{
 					$filename = getAttachmentFilename($attachment['filename'], $attachment['id_attach'], $attachment['id_folder']);
 
-					require_once($sourcedir . '/Subs-Graphics.php');
+					require_once($sourcedir.'/Subs-Graphics.php');
 					if (createThumbnail($filename, $modSettings['attachmentThumbWidth'], $modSettings['attachmentThumbHeight']))
 					{
 						// So what folder are we putting this image in?
@@ -1177,9 +1177,9 @@ 
 						}
 
 						// Calculate the size of the created thumbnail.
-						$size = @getimagesize($filename . '_thumb');
+						$size = @getimagesize($filename.'_thumb');
 						list ($attachment['thumb_width'], $attachment['thumb_height']) = $size;
-						$thumb_size = filesize($filename . '_thumb');
+						$thumb_size = filesize($filename.'_thumb');
 
 						// What about the extension?
 						$thumb_ext = isset($context['valid_image_types'][$size[2]]) ? $context['valid_image_types'][$size[2]] : '';
@@ -1188,9 +1188,9 @@ 
 						if (!empty($size['mime']))
 							$thumb_mime = $size['mime'];
 						else
-							$thumb_mime = 'image/' . $thumb_ext;
+							$thumb_mime = 'image/'.$thumb_ext;
 
-						$thumb_filename = $attachment['filename'] . '_thumb';
+						$thumb_filename = $attachment['filename'].'_thumb';
 						$thumb_hash = getAttachmentFilename($thumb_filename, false, null, true);
 						$old_id_thumb = $attachment['id_thumb'];
 
@@ -1216,12 +1216,12 @@ 
 							);
 
 							$thumb_realname = getAttachmentFilename($thumb_filename, $attachment['id_thumb'], $id_folder_thumb, false, $thumb_hash);
-							rename($filename . '_thumb', $thumb_realname);
+							rename($filename.'_thumb', $thumb_realname);
 
 							// Do we need to remove an old thumbnail?
 							if (!empty($old_id_thumb))
 							{
-								require_once($sourcedir . '/ManageAttachments.php');
+								require_once($sourcedir.'/ManageAttachments.php');
 								removeAttachments(array('id_attach' => $old_id_thumb), '', false, false);
 							}
 						}
@@ -1239,7 +1239,7 @@ 
 			if (!empty($attachment['id_thumb']))
 				$attachmentData[$i]['thumbnail'] = array(
 					'id' => $attachment['id_thumb'],
-					'href' => $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_thumb'] . ';image',
+					'href' => $scripturl.'?action=dlattach;topic='.$attachment['topic'].'.0;attach='.$attachment['id_thumb'].';image',
 				);
 			$attachmentData[$i]['thumbnail']['has_thumb'] = !empty($attachment['id_thumb']);
 
@@ -1261,9 +1261,9 @@ 
 			{
 				// If the image is too large to show inline, make it a popup.
 				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height'])))
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
+					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\''.$attachmentData[$i]['href'].';image\', '.($attachment['width'] + 20).', '.($attachment['height'] + 20).', true);';
 				else
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb('.$attachment['id_attach'].');';
 			}
 
 			if (!$attachmentData[$i]['thumbnail']['has_thumb'])