SimpleMachines / SMF2.1

Sources/MessageIndex.php

Spacing +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 		WHERE t.id_board = {int:current_board} '
 			. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
 			AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . (!empty($message_index_topic_wheres) ? '
-			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : ''). '
+			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : '') . '
 		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
 		LIMIT {int:maxindex}
 			OFFSET {int:start} ';

Sources/News.php

Spacing +8 added lines, -8 removed lines

@@ -91,7 +91,7 @@ 
 	);
 	foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var)
 		if (isset($_GET[$var]))
-			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var];
+			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';') . $var . '=' . $_GET[$var];
 
 	// Handle the cases where a board, boards, or category is asked for.
 	$query_this_board = 1;
@@ -303,17 +303,17 @@ 
 	 * namespaces, which could cause it to mangle the XML horrifically
 	 * during processing.
 	 */
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/' . $subaction;
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/' . $subaction;
 
 	// Allow mods to add extra namespaces and tags to the feed/channel
 	$namespaces = array(
 		'rss' => array(),
-		'rss2' => array('atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
-		'atom' => array('' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
+		'rss2' => array('atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
+		'atom' => array('' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
 		'rdf' => array(
-			'' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/',
-			'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#',
-			'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/',
+			'' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/',
+			'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#',
+			'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/',
 		),
 		'smf' => array(
 			'smf' => $smf_ns,
@@ -2127,7 +2127,7 @@ 
 			m.id_msg, m.id_topic, m.id_board, m.id_member, m.poster_email, m.poster_ip,
 			m.poster_time, m.subject, m.modified_time, m.modified_name, m.modified_reason, m.body,
 			m.likes, m.approved, m.smileys_enabled
-		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ?'
+		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ? '
 			INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
 		WHERE m.id_member = {int:uid}
 			AND m.id_msg > {int:start_after}

Indentation +1 added lines, -1 removed lines

@@ -2202,7 +2202,7 @@
 					function($a, $b)
 					{
 						if ($a['filesize'] == $b['filesize'])
-					        return 0;
+							return 0;
 
 						return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 					}

Sources/tasks/ExportProfileData.php

Spacing +2 added lines, -2 removed lines

@@ -204,7 +204,7 @@ 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
 			'desc' => sentence_list(array_map(
-				function ($datatype) use ($txt)
+				function($datatype) use ($txt)
 				{
 					return $txt[$datatype];
 				},
@@ -726,7 +726,7 @@ 
 					'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
 				),
 				$returnContext
-			) . $hidden_orig_link . '</span>' ;
+			) . $hidden_orig_link . '</span>';
 		}
 		elseif (strpos($currentAttachment['mime_type'], 'video/') === 0)
 		{

Sources/Post.php

Spacing +1 added lines, -1 removed lines

@@ -1277,7 +1277,7 @@
 	if ($context['can_post_attachment'])
 	{
 		$acceptedFiles = empty($context['allowed_extensions']) ? '' : implode(',', array_map(
-			function ($val) use ($smcFunc)
+			function($val) use ($smcFunc)
 			{
 				return !empty($val) ? ('.' . $smcFunc['htmltrim']($val)) : '';
 			},

Sources/Profile-Export.php

Spacing +9 added lines, -9 removed lines

@@ -469,7 +469,7 @@ 
 	// Figure out the filename we'll tell the browser.
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
 	$included_desc = array_map(
-		function ($datatype) use ($txt)
+		function($datatype) use ($txt)
 		{
 			return $txt[$datatype];
 		},
@@ -789,9 +789,9 @@ 
 	$xslt_variables = array();
 
 	// Do not change any of these to HTTPS URLs. For explanation, see comments in the buildXmlFeed() function.
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/profile';
-	$xslt_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform';
-	$html_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/xhtml';
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/profile';
+	$xslt_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform';
+	$html_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/xhtml';
 
 	require_once($sourcedir . DIRECTORY_SEPARATOR . 'News.php');
 
@@ -1696,14 +1696,14 @@ 
 
 		if (!empty($context['export_css_header']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<style><![CDATA[' . "\n" . implode("\n", $context['export_css_header']) . "\n" . ']]>
 			</style>';
 		}
 
 		if (!empty($context['export_javascript_vars']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<script><![CDATA[';
 
 			foreach ($context['export_javascript_vars'] as $var => $val)
@@ -1739,7 +1739,7 @@ 
 
 		if (!empty($context['export_javascript_inline']['standard']))
 		{
-			$stylesheet['css_js'] .=  '
+			$stylesheet['css_js'] .= '
 			<script><![CDATA[' . "\n" . implode("\n", $context['export_javascript_inline']['standard']) . "\n" . ']]>
 			</script>';
 		}
@@ -1751,7 +1751,7 @@ 
 
 			$stylesheet['css_js'] .= "\n\t" . str_replace("\n", "\n\t", implode("\n", $context['export_javascript_inline']['defer']));
 
-			$stylesheet['css_js'] .= "\n" . '});'. "\n" . ']]>
+			$stylesheet['css_js'] .= "\n" . '});' . "\n" . ']]>
 			</script>';
 		}
 
@@ -1834,7 +1834,7 @@ 
 
 	usort(
 		$context['css_files'],
-		function ($a, $b)
+		function($a, $b)
 		{
 			return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
 		}

Sources/Subs-Timezones.php

Spacing +1 added lines, -1 removed lines

@@ -1716,7 +1716,7 @@
 		{
 			usort(
 				$fallbacks[$tzid],
-				function ($a, $b)
+				function($a, $b)
 				{
 					return $a['ts'] > $b['ts'];
 				}

Sources/ManagePermissions.php

Spacing +1 added lines, -1 removed lines

@@ -1840,7 +1840,7 @@
 		// Make sure this is an array of integers
 		$excluded_groups = array_filter(
 			(array) $excluded_groups,
-			function ($v)
+			function($v)
 			{
 				return is_int($v) || is_string($v) && (string) intval($v) === $v;
 			}

Themes/default/Admin.template.php

Spacing +1 added lines, -1 removed lines

@@ -758,7 +758,7 @@
 	// Filter out any redundant separators before we start the loop
 	$context['config_vars'] = array_filter(
 		$context['config_vars'],
-		function ($v) use ($context)
+		function($v) use ($context)
 		{
 			static $config_vars, $prev;
 

Sources/Load.php

Spacing +7 added lines, -10 removed lines

@@ -814,7 +814,7 @@ 
 			'filename' => empty($user_settings['filename']) ? '' : $user_settings['filename'],
 			'custom_dir' => !empty($user_settings['attachment_type']) && $user_settings['attachment_type'] == 1,
 			'id_attach' => isset($user_settings['id_attach']) ? $user_settings['id_attach'] : 0,
-			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width']: 0,
+			'width' => isset($user_settings['attachment_width']) > 0 ? $user_settings['attachment_width'] : 0,
 			'height' => isset($user_settings['attachment_height']) > 0 ? $user_settings['attachment_height'] : 0,
 		),
 		'smiley_set' => isset($user_settings['smiley_set']) ? $user_settings['smiley_set'] : '',
@@ -2471,7 +2471,7 @@ 
 	);
 
 	// Add the JQuery library to the list of files to load.
-	$jQueryUrls = array ('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/'. JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-'. JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-'. JQUERY_VERSION . '.min.js');
+	$jQueryUrls = array('cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', 'jquery_cdn' => 'https://code.jquery.com/jquery-' . JQUERY_VERSION . '.min.js', 'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-' . JQUERY_VERSION . '.min.js');
 	
 	if (isset($modSettings['jquery_source']) && array_key_exists($modSettings['jquery_source'], $jQueryUrls))
 		loadJavaScriptFile($jQueryUrls[$modSettings['jquery_source']], array('external' => true, 'seed' => false), 'smf_jquery');
@@ -2712,8 +2712,7 @@ 
 		$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', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($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;
@@ -2828,8 +2827,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', $context) ? $context['browser_cache'] : '') :
-		(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
+		(array_key_exists('browser_cache', $context) ? $context['browser_cache'] : '') : (is_string($params['seed']) ? '?' . ltrim($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;
@@ -2934,7 +2932,7 @@ 
 					$elements[] = JavaScriptEscape($element);
 			}
 
-			$value = '[' . implode(', ',$elements) . ']';
+			$value = '[' . implode(', ', $elements) . ']';
 		}
 	}
 
@@ -3615,8 +3613,7 @@ 
 
 	// What accelerator we are going to try.
 	$cache_class_name = !empty($cache_accelerator) ? $cache_accelerator : CacheApi::APIS_DEFAULT;
-	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache :
-		CacheApi::APIS_NAMESPACE . $cache_class_name;
+	$fully_qualified_class_name = !empty($overrideCache) ? $overrideCache : CacheApi::APIS_NAMESPACE . $cache_class_name;
 
 	// Do some basic tests.
 	if (class_exists($fully_qualified_class_name))
@@ -3920,7 +3917,7 @@ 
 			$auth_secret = hash_file('sha256', $boarddir . '/Settings.php');
 
 			// Set the last error to now, but only every 15 minutes.  Don't need to flood the logs.
-			if (empty($db_last_error) || ($db_last_error + 60*15) <= time())
+			if (empty($db_last_error) || ($db_last_error + 60 * 15) <= time())
 			{
 				updateDbLastError(time());
 				loadLanguage('Errors');

Braces +1 added lines, -2 removed lines

@@ -107,7 +107,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) $string);
 			return $string;
 		} : function($string)
@@ -2422,7 +2422,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?