SimpleMachines / SMF2.1

Sources/Subs-Editor.php

Spacing +49 added lines, -49 removed lines

@@ -40,7 +40,7 @@ 
 	// @todo Tie in with bbc permissions ?
 	foreach (array('code', 'php', 'nobbc') as $code)
 	{
-		if (strpos($text, '['. $code) !== false)
+		if (strpos($text, '[' . $code) !== false)
 		{
 			$parts = preg_split('~(\[/' . $code . '\]|\[' . $code . '(?:=[^\]]+)?\])~i', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
 
@@ -77,7 +77,7 @@ 
 	// Parse unique ID's and disable javascript into the smileys - using the double space.
 	$i = 1;
 	$text = preg_replace_callback('~(?:\s|&nbsp;)?<(img\ssrc="' . preg_quote($modSettings['smileys_url'], '~') . '/[^<>]+?/([^<>]+?)"\s*)[^<>]*?class="smiley">~',
-		function ($m) use (&$i)
+		function($m) use (&$i)
 		{
 			return '<' . stripslashes($m[1]) . 'alt="" title="" onresizestart="return false;" id="smiley_' . $i++ . '_' . $m[2] . '" style="padding: 0 3px 0 3px;">';
 		}, $text);
@@ -605,10 +605,10 @@ 
 								// Inject closure for this list item first.
 								// The content of $parts[$i] is left as is!
 								array_splice($parts, $i + 1, 0, array(
-									'',				// $i + 1
-									'[/li]' . "\n",	// $i + 2
-									'',				// $i + 3
-									'',				// $i + 4
+									'', // $i + 1
+									'[/li]' . "\n", // $i + 2
+									'', // $i + 3
+									'', // $i + 4
 								));
 								$numParts = count($parts) - 1;
 
@@ -726,167 +726,167 @@ 
 
 	// The final bits are the easy ones - tags which map to tags which map to tags - etc etc.
 	$tags = array(
-		'~<b(\s(.)*?)*?' . '>~i' => function ()
+		'~<b(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[b]';
 		},
-		'~</b>~i' => function ()
+		'~</b>~i' => function()
 		{
 			return '[/b]';
 		},
-		'~<i(\s(.)*?)*?' . '>~i' => function ()
+		'~<i(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[i]';
 		},
-		'~</i>~i' => function ()
+		'~</i>~i' => function()
 		{
 			return '[/i]';
 		},
-		'~<u(\s(.)*?)*?' . '>~i' => function ()
+		'~<u(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[u]';
 		},
-		'~</u>~i' => function ()
+		'~</u>~i' => function()
 		{
 			return '[/u]';
 		},
-		'~<strong(\s(.)*?)*?' . '>~i' => function ()
+		'~<strong(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[b]';
 		},
-		'~</strong>~i' => function ()
+		'~</strong>~i' => function()
 		{
 			return '[/b]';
 		},
-		'~<em(\s(.)*?)*?' . '>~i' => function ()
+		'~<em(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[i]';
 		},
-		'~</em>~i' => function ()
+		'~</em>~i' => function()
 		{
 			return '[i]';
 		},
-		'~<s(\s(.)*?)*?' . '>~i' => function ()
+		'~<s(\s(.)*?)*?' . '>~i' => function()
 		{
 			return "[s]";
 		},
-		'~</s>~i' => function ()
+		'~</s>~i' => function()
 		{
 			return "[/s]";
 		},
-		'~<strike(\s(.)*?)*?' . '>~i' => function ()
+		'~<strike(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[s]';
 		},
-		'~</strike>~i' => function ()
+		'~</strike>~i' => function()
 		{
 			return '[/s]';
 		},
-		'~<del(\s(.)*?)*?' . '>~i' => function ()
+		'~<del(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[s]';
 		},
-		'~</del>~i' => function ()
+		'~</del>~i' => function()
 		{
 			return '[/s]';
 		},
-		'~<center(\s(.)*?)*?' . '>~i' => function ()
+		'~<center(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[center]';
 		},
-		'~</center>~i' => function ()
+		'~</center>~i' => function()
 		{
 			return '[/center]';
 		},
-		'~<pre(\s(.)*?)*?' . '>~i' => function ()
+		'~<pre(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[pre]';
 		},
-		'~</pre>~i' => function ()
+		'~</pre>~i' => function()
 		{
 			return '[/pre]';
 		},
-		'~<sub(\s(.)*?)*?' . '>~i' => function ()
+		'~<sub(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[sub]';
 		},
-		'~</sub>~i' => function ()
+		'~</sub>~i' => function()
 		{
 			return '[/sub]';
 		},
-		'~<sup(\s(.)*?)*?' . '>~i' => function ()
+		'~<sup(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[sup]';
 		},
-		'~</sup>~i' => function ()
+		'~</sup>~i' => function()
 		{
 			return '[/sup]';
 		},
-		'~<tt(\s(.)*?)*?' . '>~i' => function ()
+		'~<tt(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[tt]';
 		},
-		'~</tt>~i' => function ()
+		'~</tt>~i' => function()
 		{
 			return '[/tt]';
 		},
-		'~<table(\s(.)*?)*?' . '>~i' => function ()
+		'~<table(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[table]';
 		},
-		'~</table>~i' => function ()
+		'~</table>~i' => function()
 		{
 			return '[/table]';
 		},
-		'~<tr(\s(.)*?)*?' . '>~i' => function ()
+		'~<tr(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[tr]';
 		},
-		'~</tr>~i' => function ()
+		'~</tr>~i' => function()
 		{
 			return '[/tr]';
 		},
-		'~<(td|th)\s[^<>]*?colspan="?(\d{1,2})"?.*?' . '>~i' => function ($matches)
+		'~<(td|th)\s[^<>]*?colspan="?(\d{1,2})"?.*?' . '>~i' => function($matches)
 		{
 			return str_repeat('[td][/td]', $matches[2] - 1) . '[td]';
 		},
-		'~<(td|th)(\s(.)*?)*?' . '>~i' => function ()
+		'~<(td|th)(\s(.)*?)*?' . '>~i' => function()
 		{
 			return '[td]';
 		},
-		'~</(td|th)>~i' => function ()
+		'~</(td|th)>~i' => function()
 		{
 			return '[/td]';
 		},
-		'~<br(?:\s[^<>]*?)?' . '>~i' => function ()
+		'~<br(?:\s[^<>]*?)?' . '>~i' => function()
 		{
 			return "\n";
 		},
-		'~<hr[^<>]*>(\n)?~i' => function ($matches)
+		'~<hr[^<>]*>(\n)?~i' => function($matches)
 		{
-			return "[hr]\n". $matches[0];
+			return "[hr]\n" . $matches[0];
 		},
-		'~(\n)?\\[hr\\]~i' => function ()
+		'~(\n)?\\[hr\\]~i' => function()
 		{
 			return "\n[hr]";
 		},
-		'~^\n\\[hr\\]~i' => function ()
+		'~^\n\\[hr\\]~i' => function()
 		{
 			return "[hr]";
 		},
-		'~<blockquote(\s(.)*?)*?' . '>~i' =>  function ()
+		'~<blockquote(\s(.)*?)*?' . '>~i' =>  function()
 		{
 			return "&lt;blockquote&gt;";
 		},
-		'~</blockquote>~i' => function ()
+		'~</blockquote>~i' => function()
 		{
 			return "&lt;/blockquote&gt;";
 		},
-		'~<ins(\s(.)*?)*?' . '>~i' => function ()
+		'~<ins(\s(.)*?)*?' . '>~i' => function()
 		{
 			return "&lt;ins&gt;";
 		},
-		'~</ins>~i' => function ()
+		'~</ins>~i' => function()
 		{
 			return "&lt;/ins&gt;";
 		},
@@ -2391,7 +2391,7 @@ 
 		array(
 			'group_name' => $smcFunc['db_case_sensitive'] ? 'LOWER(group_name}' : 'group_name',
 			'min_posts' => -1,
-			'invalid_groups' => array(1,3),
+			'invalid_groups' => array(1, 3),
 			'hidden' => 2,
 			'search' => $_REQUEST['search'],
 		)

Sources/PostModeration.php

Spacing +5 added lines, -5 removed lines

@@ -176,11 +176,11 @@ 
 		{
 			if ($curAction == 'approve')
 			{
-				approveMessages ($toAction, $details, $context['current_view']);
+				approveMessages($toAction, $details, $context['current_view']);
 			}
 			else
 			{
-				removeMessages ($toAction, $details, $context['current_view']);
+				removeMessages($toAction, $details, $context['current_view']);
 			}
 		}
 	}
@@ -437,7 +437,7 @@ 
 					'value' => $txt['mc_unapproved_attach_poster'],
 				),
 				'data' => array(
-					'function' => function ($data)
+					'function' => function($data)
 					{
 						return $data['poster']['link'];
 					},
@@ -467,7 +467,7 @@ 
 					'value' => $txt['post'],
 				),
 				'data' => array(
-					'function' => function ($data)
+					'function' => function($data)
 					{
 						return '<a href="' . $data['message']['href'] . '">' . shorten_subject($data['message']['subject'], 20) . '</a>';
 					},
@@ -693,7 +693,7 @@ 
 			logAction(($approved ? 'un' : '') . 'approve', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
 	}
 
-	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg']. '#msg' . $_REQUEST['msg']);
+	redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
 }
 
 /**

Sources/ManageSearchEngines.php

Spacing +4 added lines, -4 removed lines

@@ -239,7 +239,7 @@ 
 					'value' => $txt['spider_name'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($smcFunc, $scripturl)
+					'function' => function($rowData) use ($smcFunc, $scripturl)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=sengines;sa=editspiders;sid=%2$d">%3$s</a>', $scripturl, $rowData['id_spider'], $smcFunc['htmlspecialchars']($rowData['spider_name']));
 					},
@@ -254,7 +254,7 @@ 
 					'value' => $txt['spider_last_seen'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($context, $txt)
+					'function' => function($rowData) use ($context, $txt)
 					{
 						return isset($context['spider_last_seen'][$rowData['id_spider']]) ? timeformat($context['spider_last_seen'][$rowData['id_spider']]) : $txt['spider_last_never'];
 					},
@@ -690,7 +690,7 @@ 
 
 		if (!empty($_POST['delete_entries']) && isset($_POST['older']))
 		{
-			$deleteTime = time() - (((int)$_POST['older']) * 24 * 60 * 60);
+			$deleteTime = time() - (((int) $_POST['older']) * 24 * 60 * 60);
 
 			// Delete the entires.
 			$smcFunc['db_query']('', '
@@ -742,7 +742,7 @@ 
 					'value' => $txt['spider_time'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return timeformat($rowData['log_time']);
 					},

Sources/Memberlist.php

Spacing +3 added lines, -3 removed lines

@@ -510,7 +510,7 @@ 
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_id_group} THEN mem.id_post_group ELSE mem.id_group END)' .
 				(empty($customJoin) ? '' : implode('
 				', $customJoin)) . '
-			WHERE (' . implode( ' ' . $query . ' OR ', $fields) . ' ' . $query . ')
+			WHERE (' . implode(' ' . $query . ' OR ', $fields) . ' ' . $query . ')
 				AND mem.is_activated = {int:is_activated}',
 			$query_parameters
 		);
@@ -527,7 +527,7 @@ 
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_id_group} THEN mem.id_post_group ELSE mem.id_group END)' .
 				(empty($customJoin) ? '' : implode('
 				', $customJoin)) . '
-			WHERE (' . implode( ' ' . $query . ' OR ', $fields) . ' ' . $query . ')
+			WHERE (' . implode(' ' . $query . ' OR ', $fields) . ' ' . $query . ')
 				AND mem.is_activated = {int:is_activated}
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
@@ -700,7 +700,7 @@ 
 				'up' => 't' . $row['col_name'] . '.value ASC'
 			);
 
-		$cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' .  $row['col_name'] . ' ON (t' .  $row['col_name'] . '.variable = {literal:' .  $row['col_name'] . '} AND t' .  $row['col_name'] . '.id_theme = 1 AND t' .  $row['col_name'] . '.id_member = mem.id_member)';
+		$cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' . $row['col_name'] . ' ON (t' . $row['col_name'] . '.variable = {literal:' . $row['col_name'] . '} AND t' . $row['col_name'] . '.id_theme = 1 AND t' . $row['col_name'] . '.id_member = mem.id_member)';
 	}
 	$smcFunc['db_free_result']($request);
 

Sources/DbExtra-postgresql.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
-	$pg_tables = array('pg_catalog','information_schema');
+	$pg_tables = array('pg_catalog', 'information_schema');
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -289,7 +289,7 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
+	if (!empty($ver))
 		return $ver;
 
 	global $smcFunc;

Sources/Class-TOTP.php

Spacing +9 added lines, -9 removed lines

@@ -114,7 +114,7 @@ 
 	 */
 	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;
@@ -247,7 +247,7 @@ 
 		$initKey = ($initKey == null) ? $this->getInitKey() : $initKey;
 		$timestamp = ($timestamp == null) ? $this->generateTimestamp() : $timestamp;
 
-		$hash = hash_hmac (
+		$hash = hash_hmac(
 			'sha1',
 			pack('N*', 0) . pack('N*', $timestamp),
 			$initKey,
@@ -270,7 +270,7 @@ 
 		$code = '';
 
 		for ($i = 0; $i < $length; $i++) {
-			$code .= $lookup[mt_rand(0, strlen($lookup)-1)];
+			$code .= $lookup[mt_rand(0, strlen($lookup) - 1)];
 		}
 
 		return $code;
@@ -283,7 +283,7 @@ 
 	 */
 	public function generateTimestamp()
 	{
-		return floor(microtime(true)/$this->getRefresh());
+		return floor(microtime(true) / $this->getRefresh());
 	}
 
 	/**
@@ -297,10 +297,10 @@ 
 		$offset = ord($hash[19]) & 0xf;
 
 		return (
-			((ord($hash[$offset+0]) & 0x7f) << 24 ) |
-			((ord($hash[$offset+1]) & 0xff) << 16 ) |
-			((ord($hash[$offset+2]) & 0xff) << 8 ) |
-			(ord($hash[$offset+3]) & 0xff)
+			((ord($hash[$offset + 0]) & 0x7f) << 24) |
+			((ord($hash[$offset + 1]) & 0xff) << 16) |
+			((ord($hash[$offset + 2]) & 0xff) << 8) |
+			(ord($hash[$offset + 3]) & 0xff)
 		) % pow(10, $this->getCodeLength());
 	}
 
@@ -315,7 +315,7 @@ 
 	{
 		$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!');
 		}
 

Sources/DbPackages-mysql.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 	// Righty - let's do the damn thing!
 	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
 	foreach ($columns as $column)
-		$table_query .= "\n\t" . smf_db_create_query_column($column)  . ',';
+		$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
 
 	// Loop through the indexes next...
 	foreach ($indexes as $index)
@@ -744,7 +744,7 @@ 
 		$type = $type . '(' . $size . ')';
 
 	// Now just put it together!
-	return '`' .$column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;
+	return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;
 }
 
 ?>
\ No newline at end of file

Sources/ManageScheduledTasks.php

Spacing +1 added lines, -1 removed lines

@@ -515,7 +515,7 @@
 					'value' => $txt['scheduled_log_time_run'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return timeformat($rowData['time_run'], true);
 					},

Sources/Subs-Auth.php

Spacing +3 added lines, -3 removed lines

@@ -393,7 +393,7 @@ 
 	// This ensures you can't search someones email address if you can't see it.
 	if (($use_wildcards || $maybe_email) && allowedTo('moderate_forum'))
 		$email_condition = '
-			OR (email_address ' . $comparison . ' \'' . implode( '\') OR (email_address ' . $comparison . ' \'', $names) . '\')';
+			OR (email_address ' . $comparison . ' \'' . implode('\') OR (email_address ' . $comparison . ' \'', $names) . '\')';
 	else
 		$email_condition = '';
 
@@ -412,8 +412,8 @@ 
 		LIMIT {int:limit}',
 		array(
 			'buddy_list' => $user_info['buddies'],
-			'member_name_search' => $member_name . ' ' . $comparison . ' \'' . implode( '\' OR ' . $member_name . ' ' . $comparison . ' \'', $names) . '\'',
-			'real_name_search' => $real_name . ' ' . $comparison . ' \'' . implode( '\' OR ' . $real_name . ' ' . $comparison . ' \'', $names) . '\'',
+			'member_name_search' => $member_name . ' ' . $comparison . ' \'' . implode('\' OR ' . $member_name . ' ' . $comparison . ' \'', $names) . '\'',
+			'real_name_search' => $real_name . ' ' . $comparison . ' \'' . implode('\' OR ' . $real_name . ' ' . $comparison . ' \'', $names) . '\'',
 			'email_condition' => $email_condition,
 			'limit' => $max,
 		)