SimpleMachines / SMF2.1

Sources/ManageSearch.php

Braces +4 added lines, -2 removed lines

@@ -223,7 +223,8 @@ 
 		checkSession('get');
 		validateToken('admin-msm', 'get');
 
-		if ($db_type == 'postgresql') {
+		if ($db_type == 'postgresql')
+		{
 			$smcFunc['db_query']('', '
 				DROP INDEX IF EXISTS {db_prefix}messages_ftx',
 				array(
@@ -787,7 +788,8 @@ 
 	// We need this for db_get_version
 	db_extend();
 
-	if ($smcFunc['db_title'] == 'PostgreSQL') {
+	if ($smcFunc['db_title'] == 'PostgreSQL')
+	{
 		$request = $smcFunc['db_query']('', '
 			SELECT
 				indexname

Sources/News.php

Braces +8 added lines, -4 removed lines

@@ -389,7 +389,9 @@ 
 
 		foreach ($xml_data as $item)
 		{
-			$link = array_filter($item['content'], function ($e) { return ($e['tag'] == 'link'); });
+			$link = array_filter($item['content'], function ($e)
+			{
+return ($e['tag'] == 'link'); });
 			$link = array_pop($link);
 
 			echo '
@@ -446,7 +448,7 @@ 
 		return $val;
 
 	$val = preg_replace_callback('~\b' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~', function($m) use ($scripturl)
-		{
+	{
 			return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "");
 		}, $val);
 	return $val;
@@ -867,7 +869,8 @@ 
 			// Sort the attachments by size to make things easier below
 			if (!empty($loaded_attachments))
 			{
-				uasort($loaded_attachments, function($a, $b) {
+				uasort($loaded_attachments, function($a, $b)
+				{
 					if ($a['filesize'] == $b['filesize'])
 					        return 0;
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
@@ -1283,7 +1286,8 @@ 
 			// Sort the attachments by size to make things easier below
 			if (!empty($loaded_attachments))
 			{
-				uasort($loaded_attachments, function($a, $b) {
+				uasort($loaded_attachments, function($a, $b)
+				{
 					if ($a['filesize'] == $b['filesize'])
 					        return 0;
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;

Sources/Post.php

Braces +3 added lines, -1 removed lines

@@ -1281,7 +1281,9 @@
 	// File Upload.
 	if ($context['can_post_attachment'])
 	{
-		$acceptedFiles = implode(',', array_map(function($val) use($smcFunc) { return '.' . $smcFunc['htmltrim']($val); } , explode(',', $context['allowed_extensions'])));
+		$acceptedFiles = implode(',', array_map(function($val) use($smcFunc)
+		{
+return '.' . $smcFunc['htmltrim']($val); } , explode(',', $context['allowed_extensions'])));
 
 		loadJavaScriptFile('dropzone.min.js', array('defer' => true), 'smf_dropzone');
 		loadJavaScriptFile('smf_fileUpload.js', array('defer' => true, 'minimize' => true), 'smf_fileUpload');

Sources/Class-TOTP.php

Braces +24 added lines, -12 removed lines

@@ -64,7 +64,8 @@ 
 	{
 		$this->buildLookup();
 
-		if ($initKey !== null) {
+		if ($initKey !== null)
+		{
 			$this->setInitKey($initKey);
 		}
 	}
@@ -98,7 +99,8 @@ 
 	 */
 	public function setRange($range)
 	{
-		if (!is_numeric($range)) {
+		if (!is_numeric($range))
+		{
 			throw new \InvalidArgumentException('Invalid window range');
 		}
 		$this->range = $range;
@@ -114,7 +116,8 @@ 
 	 */
 	public function setInitKey($key)
 	{
-		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false) {
+		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false)
+		{
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 		$this->initKey = $key;
@@ -140,7 +143,8 @@ 
 	 */
 	public function setLookup($lookup)
 	{
-		if (!is_array($lookup)) {
+		if (!is_array($lookup))
+		{
 			throw new \InvalidArgumentException('Lookup value must be an array');
 		}
 		$this->lookup = $lookup;
@@ -176,7 +180,8 @@ 
 	 */
 	public function setRefresh($seconds)
 	{
-		if (!is_numeric($seconds)) {
+		if (!is_numeric($seconds))
+		{
 			throw new \InvalidArgumentException('Seconds must be numeric');
 		}
 		$this->refreshSeconds = $seconds;
@@ -217,7 +222,8 @@ 
 	 */
 	public function validateCode($code, $initKey = null, $timestamp = null, $range = null)
 	{
-		if (strlen($code) !== $this->getCodeLength()) {
+		if (strlen($code) !== $this->getCodeLength())
+		{
 			throw new \InvalidArgumentException('Incorrect code length');
 		}
 
@@ -227,8 +233,10 @@ 
 
 		$binary = $this->base32_decode($initKey);
 
-		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++) {
-			if ($this->generateOneTime($binary, $time) == $code) {
+		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++)
+		{
+			if ($this->generateOneTime($binary, $time) == $code)
+			{
 				return true;
 			}
 		}
@@ -269,7 +277,8 @@ 
 		$lookup = implode('', array_keys($this->getLookup()));
 		$code = '';
 
-		for ($i = 0; $i < $length; $i++) {
+		for ($i = 0; $i < $length; $i++)
+		{
 			$code .= $lookup[mt_rand(0, strlen($lookup) - 1)];
 		}
 
@@ -315,7 +324,8 @@ 
 	{
 		$lookup = $this->getLookup();
 
-		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false) {
+		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false)
+		{
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 
@@ -324,12 +334,14 @@ 
 		$length = 0;
 		$binary = '';
 
-		for ($i = 0; $i < strlen($hash); $i++) {
+		for ($i = 0; $i < strlen($hash); $i++)
+		{
 			$buffer = $buffer << 5;
 			$buffer += $lookup[$hash[$i]];
 			$length += 5;
 
-			if ($length >= 8) {
+			if ($length >= 8)
+			{
 				$length -= 8;
 				$binary .= chr(($buffer & (0xFF << $length)) >> $length);
 			}

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);
 

Sources/Likes.php

Braces -1 removed lines

@@ -222,7 +222,6 @@
 
 			$this->_validLikes['can_like'] = ($this->_user['id'] == $topicOwner ? 'cannot_like_content' : (allowedTo('likes_like') ? true : 'cannot_like_content'));
 		}
-
 		else
 		{
 			// Modders: This will give you whatever the user offers up in terms of liking, e.g. $this->_type=msg, $this->_content=1

Sources/Subs-Editor.php

Braces +3 added lines, -5 removed lines

@@ -332,7 +332,6 @@ 
 					$replacement .= $precedingStyle . $extra_attr . $afterStyle;
 			}
 		}
-
 		elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1)
 		{
 			// Is this the element that we've been waiting for to be closed?
@@ -592,7 +591,6 @@ 
 							$parts[$i + 2] = str_repeat("\t", $listDepth) . '[/list]';
 							$parts[$i + 3] = '';
 						}
-
 						else
 						{
 							// We're in a list item.
@@ -631,7 +629,6 @@ 
 							$parts[$i + 2] = '';
 							$parts[$i + 3] = '';
 						}
-
 						else
 						{
 							// Remove the trailing breaks from the list item.
@@ -1112,7 +1109,8 @@ 
 		$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
 
 	// Need to sort the tags by name length.
-	uksort($valid_tags, function ($a, $b) {
+	uksort($valid_tags, function ($a, $b)
+	{
 		return strlen($a) < strlen($b) ? 1 : -1;
 	});
 
@@ -1980,7 +1978,7 @@ 
 
 		// Set proper extensions; do this post caching so cache doesn't become extension-specific
 		array_walk_recursive($context['smileys'], function (&$filename, $key)
-			{
+		{
 				global $context, $user_info, $modSettings;
 				if ($key == 'filename')
 					// Need to use the default if user selection is disabled

Sources/Attachments.php

Braces -1 removed lines

@@ -199,7 +199,6 @@
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 		}
-
 		else
 			$context['attachments'] = array(
 				'quantity' => 0,

Sources/DbSearch-postgresql.php

Braces +2 added lines, -1 removed lines

@@ -99,7 +99,8 @@
 	if (preg_match('~^\s*INSERT\sIGNORE~i', $db_string) != 0)
 	{
 		$db_string = preg_replace('~^\s*INSERT\sIGNORE~i', 'INSERT', $db_string);
-		if ($smcFunc['db_support_ignore']){
+		if ($smcFunc['db_support_ignore'])
+		{
 			//pg style "INSERT INTO.... ON CONFLICT DO NOTHING"
 			$db_string = $db_string.' ON CONFLICT DO NOTHING';
 		}