SimpleMachines / SMF2.1

Sources/tasks/CreatePost-Notify.php

Indentation +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 {
 	/**
 	 * Constants for reply types.
-	*/
+	 */
 	const NOTIFY_TYPE_REPLY_AND_MODIFY = 1;
 	const NOTIFY_TYPE_REPLY_AND_TOPIC_START_FOLLOWING = 2;
 	const NOTIFY_TYPE_ONLY_REPLIES = 3;
@@ -27,7 +27,7 @@ 
 
 	/**
 	 * Constants for frequencies.
-	*/
+	 */
 	const FREQUENCY_NOTHING = 0;
 	const FREQUENCY_EVERYTHING = 1;
 	const FREQUENCY_FIRST_UNREAD_MSG = 2;

Braces -1 removed lines

@@ -266,7 +266,6 @@
 				$user_info = $real_user_info;
 				unset($real_user_info);
 			}
-
 			else
 				$user_info = null;
 

Spacing +3 added lines, -5 removed lines

@@ -118,7 +118,7 @@ 
 		if ($type == 'edit')
 		{
 			// Filter out members who have already been notified about this post's topic
-			$unnotified = array_filter($watched, function ($member)
+			$unnotified = array_filter($watched, function($member)
 			{
 				return empty($member['sent']);
 			});
@@ -204,8 +204,7 @@ 
 			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($prefs[$member_id]))
 			{
 				$pref = !empty($prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ?
-					$prefs[$member_id]['topic_notify_' . $topicOptions['id']] :
-					(!empty($prefs[$member_id]['topic_notify']) ? $prefs[$member_id]['topic_notify'] : 0);
+					$prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($prefs[$member_id]['topic_notify']) ? $prefs[$member_id]['topic_notify'] : 0);
 
 				$message_type = 'notification_' . $type;
 
@@ -224,8 +223,7 @@ 
 			elseif ($type == 'topic')
 			{
 				$pref = !empty($prefs[$member_id]['board_notify_' . $topicOptions['board']]) ?
-					$prefs[$member_id]['board_notify_' . $topicOptions['board']] :
-					(!empty($prefs[$member_id]['board_notify']) ? $prefs[$member_id]['board_notify'] : 0);
+					$prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($prefs[$member_id]['board_notify']) ? $prefs[$member_id]['board_notify'] : 0);
 
 				$content_type = 'board';
 

Sources/ManageErrors.php

Spacing +2 added lines, -2 removed lines

@@ -355,8 +355,8 @@
 	elseif (isset($_POST['delall']) && isset($filter))
 	{
 		// ip need a different placeholder type
-		$filter_type = $filter['variable'] == 'ip'? 'inet' : 'string';
-		$filter_op = $filter['variable'] == 'ip'? '=' : 'LIKE';
+		$filter_type = $filter['variable'] == 'ip' ? 'inet' : 'string';
+		$filter_op = $filter['variable'] == 'ip' ? '=' : 'LIKE';
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_errors
 			WHERE ' . $filter['variable'] . ' ' . $filter_op . ' {' . $filter_type . ':filter}',

Sources/Subs.php

Spacing +33 added lines, -33 removed lines

@@ -377,7 +377,7 @@ 
 			{
 				$val = 'CASE ';
 				foreach ($members as $k => $v)
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
 
 				$val = $val . ' END';
 				$type = 'raw';
@@ -1041,11 +1041,11 @@ 
 			// Anything that isn't a specification, punctuation mark, or whitespace.
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
 			// A series of punctuation marks (except %), possibly separated by whitespace.
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
 			// Unwanted trailing punctuation and whitespace.
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
 			// Unwanted opening punctuation and whitespace.
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
 		),
 		array(
 			'',
@@ -1460,7 +1460,7 @@ 
 							$width = !empty($width) ? ' width="' . $width . '"' : '';
 							$height = !empty($height) ? ' height="' . $height . '"' : '';
 
-							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="'. $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
+							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="' . $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
 						}
 						// Audio.
 						elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0)
@@ -1468,7 +1468,7 @@ 
 							$width = 'max-width:100%; width: ' . (!empty($width) ? $width : '400') . 'px;';
 							$height = !empty($height) ? 'height: ' . $height . 'px;' : '';
 
-							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="'. $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
+							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="' . $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
 						}
 						// Anything else.
 						else
@@ -1631,7 +1631,7 @@ 
 				'type' => 'unparsed_commas_content',
 				'test' => '\d+,\d+\]',
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
 					if (empty($scheme))
@@ -2169,12 +2169,12 @@ 
 		$codes[] = array(
 			'tag' => 'cowsay',
 			'parameters' => array(
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
 					{
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
 					},
 				),
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
 					{
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
 					},
@@ -3546,7 +3546,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: '. SMF_USER_AGENT . "\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: ' . SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
 
 			// Read in the HTTP/1.1 or whatever.
 			$test = substr(fgets($fp, 11), -1);
@@ -4150,7 +4150,7 @@ 
 	$toMinify = array();
 	$normal = array();
 
-	usort($context['css_files'], function ($a, $b)
+	usort($context['css_files'], function($a, $b)
 	{
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
 	});
@@ -5446,7 +5446,7 @@ 
 			{
 				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: '. SMF_USER_AGENT . "\r\n");
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
 				if ($keep_alive)
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
 				else
@@ -5456,7 +5456,7 @@ 
 			{
 				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: '. SMF_USER_AGENT . "\r\n");
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
 				if ($keep_alive)
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
 				else
@@ -5704,13 +5704,13 @@ 
 
 	// 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\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
 	);
 
 	// windows 1252 / iso equivalents
@@ -5726,13 +5726,13 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
 	);
 
 	if ($context['utf8'])
@@ -6917,7 +6917,7 @@ 
 			EXISTS (
 				SELECT bpv.id_board
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
 					AND bpv.deny = 0
 					AND bpv.id_board = b.id_board
 			)';
@@ -6927,7 +6927,7 @@ 
 			AND NOT EXISTS (
 				SELECT bpv.id_board
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
 					AND bpv.deny = 1
 					AND bpv.id_board = b.id_board
 			)';
@@ -7198,8 +7198,8 @@ 
 	$i = 0;
 	while (empty($done))
 	{
-		if (strpos($format, '{'. --$i . '}') !== false)
-			$replacements['{'. $i . '}'] = array_pop($list);
+		if (strpos($format, '{' . --$i . '}') !== false)
+			$replacements['{' . $i . '}'] = array_pop($list);
 		else
 			$done = true;
 	}
@@ -7209,8 +7209,8 @@ 
 	$i = 0;
 	while (empty($done))
 	{
-		if (strpos($format, '{'. ++$i . '}') !== false)
-			$replacements['{'. $i . '}'] = array_shift($list);
+		if (strpos($format, '{' . ++$i . '}') !== false)
+			$replacements['{' . $i . '}'] = array_shift($list);
 		else
 			$done = true;
 	}

Braces +3 added lines, -9 removed lines

@@ -279,7 +279,6 @@ 
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
 	}
-
 	elseif ($members === null)
 		$condition = '1=1';
 
@@ -382,11 +381,9 @@ 
 				$val = $val . ' END';
 				$type = 'raw';
 			}
-
 			else
 				$val = alert_count($members, true);
 		}
-
 		elseif ($type == 'int' && ($val === '+' || $val === '-'))
 		{
 			$val = $var . ' ' . $val . ' 1';
@@ -2170,12 +2167,12 @@ 
 			'tag' => 'cowsay',
 			'parameters' => array(
 				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
-					{
+				{
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
 					},
 				),
 				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
-					{
+				{
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
 					},
 				),
@@ -3273,7 +3270,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch, function($matches) use ($smileyPregReplacements)
-		{
+	{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
 }
@@ -4071,7 +4068,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 			{
 				echo '
@@ -6354,7 +6350,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}
@@ -7286,7 +7281,6 @@ 
 
             $length += array_length($value, $deep_count);
         }
-
         else
             $length += strlen($value);
     }

Indentation +37 added lines, -37 removed lines

@@ -7239,32 +7239,32 @@ 
  */
 function truncate_array($array, $max_length = 1900, $deep = 3)
 {
-    $array = (array) $array;
+	$array = (array) $array;
 
-    $curr_length = array_length($array, $deep);
+	$curr_length = array_length($array, $deep);
 
-    if ($curr_length <= $max_length)
-        return $array;
+	if ($curr_length <= $max_length)
+		return $array;
 
-    else
-    {
-        // Truncate each element's value to a reasonable length
-        $param_max = floor($max_length / count($array));
+	else
+	{
+		// Truncate each element's value to a reasonable length
+		$param_max = floor($max_length / count($array));
 
-        $current_deep = $deep - 1;
+		$current_deep = $deep - 1;
 
-        foreach ($array as $key => &$value)
-        {
-            if (is_array($value))
-                if ($current_deep > 0)
-                    $value = truncate_array($value, $current_deep);
+		foreach ($array as $key => &$value)
+		{
+			if (is_array($value))
+				if ($current_deep > 0)
+					$value = truncate_array($value, $current_deep);
 
-            else
-                $value = substr($value, 0, $param_max - strlen($key) - 5);
-        }
+			else
+				$value = substr($value, 0, $param_max - strlen($key) - 5);
+		}
 
-        return $array;
-    }
+		return $array;
+	}
 }
 
 /**
@@ -7275,29 +7275,29 @@ 
  */
 function array_length($array, $deep = 3)
 {
-    // Work with arrays
-    $array = (array) $array;
-    $length = 0;
+	// Work with arrays
+	$array = (array) $array;
+	$length = 0;
 
-    $deep_count = $deep - 1;
+	$deep_count = $deep - 1;
 
-    foreach ($array as $value)
-    {
-        // Recursive?
-        if (is_array($value))
-        {
-            // No can't do
-            if ($deep_count <= 0)
-                continue;
+	foreach ($array as $value)
+	{
+		// Recursive?
+		if (is_array($value))
+		{
+			// No can't do
+			if ($deep_count <= 0)
+				continue;
 
-            $length += array_length($value, $deep_count);
-        }
+			$length += array_length($value, $deep_count);
+		}
 
-        else
-            $length += strlen($value);
-    }
+		else
+			$length += strlen($value);
+	}
 
-    return $length;
+	return $length;
 }
 
 /**

Sources/Profile-Export.php

Braces +3 added lines, -1 removed lines

@@ -1396,7 +1396,9 @@
 
 	// 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) { return $txt[$datatype]; }, $datatypes);
+	$included_desc = array_map(function ($datatype) use ($txt)
+	{
+return $txt[$datatype]; }, $datatypes);
 
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));

Spacing +9 added lines, -9 removed lines

@@ -459,7 +459,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) { return $txt[$datatype]; }, $datatypes);
+	$included_desc = array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
 
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));
@@ -774,9 +774,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');
 
@@ -1682,14 +1682,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)
@@ -1725,7 +1725,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>';
 		}
@@ -1737,7 +1737,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>';
 		}
 
@@ -1818,7 +1818,7 @@ 
 	$css_to_minify = array();
 	$normal_css_files = array();
 
-	usort($context['css_files'], function ($a, $b)
+	usort($context['css_files'], function($a, $b)
 	{
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
 	});

Sources/Load.php

Braces +1 added lines, -8 removed lines

@@ -104,7 +104,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)
@@ -929,7 +929,6 @@ 
 			$user_info_min[$row['id_member']]['time_offset'] = ($tz_user->getOffset($time_user) -
 					$tz_system->getOffset($time_system)) / 3600;
 		}
-
 		else
 			$user_info_min[$row['id_member']]['time_offset'] = empty($row['time_offset']) ? 0 : $row['time_offset'];
 	}
@@ -1658,7 +1657,6 @@ 
 			$time_user = new DateTime('now', $tz_user);
 			$profile['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
 		}
-
 		else
 		{
 			// !!! Compatibility.
@@ -2321,7 +2319,6 @@ 
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
 	}
-
 	else
 	{
 		// Custom templates to load, or just default?
@@ -2702,14 +2699,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName;
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName;
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName;
@@ -2817,14 +2812,12 @@ 
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName;
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName;
 			}
-
 			else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
 		}
-
 		else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName;

Sources/tasks/ExportProfileData.php

Spacing +2 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
+			'desc' => sentence_list(array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
 			'author' => $mbname,
 			'source' => $scripturl . '?action=profile;u=' . $uid,
 			'self' => '', // Unused, but can't be null.
@@ -640,7 +640,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)
 		{

Braces +3 added lines, -1 removed lines

@@ -152,7 +152,9 @@
 
 		$feed_meta = array(
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
+			'desc' => sentence_list(array_map(function ($datatype) use ($txt)
+			{
+return $txt[$datatype]; }, array_keys($included))),
 			'author' => $mbname,
 			'source' => $scripturl . '?action=profile;u=' . $uid,
 			'self' => '', // Unused, but can't be null.

Themes/default/ModerationCenter.template.php

Spacing +4 added lines, -4 removed lines

@@ -393,17 +393,17 @@ 
 		$quickbuttons = array(
 			'approve' => array(
 				'label' => $txt['approve'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';approve='.$item['id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';approve=' . $item['id'],
 				'icon' => 'approve',
 			),
 			'delete' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';delete='.$item['id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';delete=' . $item['id'],
 				'icon' => 'remove_button',
 				'show' => $item['can_delete']
 			),
 			'quickmod' => array(
-				'content' => '<input type="checkbox" name="item[]" value="'.$item['id'].'" checked>',
+				'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>',
 				'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1
 			),
 		);
@@ -468,7 +468,7 @@ 
 	$quickbuttons = array(
 		'delete' => array(
 			'label' => $txt['remove_message'],
-			'href' => $scripturl.'?action=moderate;area=userwatch;sa=post;delete='.$post['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
+			'href' => $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'javascript' => 'data-confirm="' . $txt['mc_watched_users_delete_post'] . '"',
 			'class' => 'you_sure',
 			'icon' => 'remove_button',

Sources/Profile-View.php

Spacing +5 added lines, -5 removed lines

@@ -261,7 +261,7 @@ 
 			AND a.is_read = 0' : '') . (!empty($alertIDs) ? '
 			AND a.id_alert IN ({array_int:alertIDs})' : '') . '
 		ORDER BY id_alert DESC' . (!empty($limit) ? '
-		LIMIT {int:limit}' : '') . (!empty($offset) ?'
+		LIMIT {int:limit}' : '') . (!empty($offset) ? '
 		OFFSET {int:offset}' : ''),
 		array(
 			'id_member' => $memID,
@@ -1160,20 +1160,20 @@ 
 		$context['posts'][$key]['quickbuttons'] = array(
 			'reply' => array(
 				'label' => $txt['reply'],
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'],
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
 				'icon' => 'reply_button',
 				'show' => $post['can_reply']
 			),
 			'quote' => array(
 				'label' => $txt['quote_action'],
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'],
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
 				'icon' => 'quote',
 				'show' => $post['can_quote']
 			),
 			'remove' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';profile;u='.$context['member']['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
-				'javascript' => 'data-confirm="'.$txt['remove_message'].'"',
+				'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . $context['member']['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
+				'javascript' => 'data-confirm="' . $txt['remove_message'] . '"',
 				'class' => 'you_sure',
 				'icon' => 'remove_button',
 				'show' => $post['can_delete']

Sources/ReportedContent.php

Spacing +7 added lines, -7 removed lines

@@ -93,14 +93,14 @@ 
 				),
 				'ignore' => array(
 					'label' => $report['ignore'] ? $txt['mc_reportedp_unignore'] : $txt['mc_reportedp_ignore'],
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;ignore='.(int)!$report['ignore'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-ignore_token_var'].'='.$context['mod-report-ignore_token'],
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;ignore=' . (int) !$report['ignore'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-ignore_token_var'] . '=' . $context['mod-report-ignore_token'],
 					'javascript' => !$report['ignore'] ? ' data-confirm="' . $txt['mc_reportedp_ignore_confirm'] . '"' : '',
 					'class' => 'you_sure',
 					'icon' => 'ignore'
 				),
 				'close' => array(
 					'label' => $context['view_closed'] ? $txt['mc_reportedp_open'] : $txt['mc_reportedp_close'],
-					'href' => $scripturl.'?action=moderate;area=reported'.$context['report_type'].';sa=handle;closed='.(int)!$report['closed'].';rid='.$report['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';'.$context['mod-report-closed_token_var'].'='.$context['mod-report-closed_token'],
+					'href' => $scripturl . '?action=moderate;area=reported' . $context['report_type'] . ';sa=handle;closed=' . (int) !$report['closed'] . ';rid=' . $report['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';' . $context['mod-report-closed_token_var'] . '=' . $context['mod-report-closed_token'],
 					'icon' => $context['view_closed'] ? 'folder' : 'close',
 				),
 			);
@@ -109,8 +109,8 @@ 
 			if ($context['report_type'] == 'posts')
 				$context['reports'][$key]['quickbuttons']['delete'] = array(
 					'label' => $txt['mc_reportedp_delete'],
-					'href' => $scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.$context['session_var'].'='.$context['session_id'],
-					'javascript' => 'data-confirm="'.$txt['mc_reportedp_delete_confirm'].'"',
+					'href' => $scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . $context['session_var'] . '=' . $context['session_id'],
+					'javascript' => 'data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'delete',
 					'show' => !$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards']))
@@ -118,9 +118,9 @@ 
 
 			// Ban reported member/post author link
 			if ($context['report_type'] == 'members')
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.$context['session_var'].'='.$context['session_id'];
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 			else
-				$ban_link = $scripturl.'?action=admin;area=ban;sa=add'.(!empty($report['author']['id']) ? ';u='.$report['author']['id'] : ';msg='.$report['topic']['id_msg']).';'.$context['session_var'].'='.$context['session_id'];
+				$ban_link = $scripturl . '?action=admin;area=ban;sa=add' . (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']) . ';' . $context['session_var'] . '=' . $context['session_id'];
 
 			$context['reports'][$key]['quickbuttons'] += array(
 				'ban' => array(
@@ -130,7 +130,7 @@ 
 					'show' => !$report['closed'] && !empty($context['report_manage_bans']) && ($context['report_type'] == 'posts' || $context['report_type'] == 'members' && !empty($report['user']['id']))
 				),
 				'quickmod' => array(
-					'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">',
+					'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">',
 					'show' => !$context['view_closed']
 				)
 			);