albertlast / SMF2.1

Sources/Subs-Password.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 				return null;
 			}
 			if (PasswordCompat\binary\_strlen($password) > 72) {
-				$password = PasswordCompat\binary\_substr($password, 0,72);
+				$password = PasswordCompat\binary\_substr($password, 0, 72);
 			}
 			$resultLength = 0;
 			switch ($algo) {
@@ -236,7 +236,7 @@ 
 				return false;
 			}
 			if (PasswordCompat\binary\_strlen($password) > 72) {
-				$password = PasswordCompat\binary\_substr($password, 0,72);
+				$password = PasswordCompat\binary\_substr($password, 0, 72);
 			}
 			$ret = crypt($password, $hash);
 			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13) {

Sources/ManageMembergroups.php

Spacing +3 added lines, -3 removed lines

@@ -101,7 +101,7 @@ 
 					'value' => $txt['membergroups_name'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
 						if ($rowData['id_group'] == 3)
@@ -144,7 +144,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						// No explicit members for the moderator group.
 						return $rowData['id_group'] == 3 ? $txt['membergroups_guests_na'] : comma_format($rowData['num_members']);
@@ -210,7 +210,7 @@ 
 					'value' => $txt['membergroups_name'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						$colorStyle = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 						return sprintf('<a href="%1$s?action=moderate;area=viewgroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $colorStyle, $rowData['group_name']);

Sources/Profile-Actions.php

Spacing +2 added lines, -2 removed lines

@@ -302,7 +302,7 @@ 
 					'style' => 'width: 20%;',
 				),
 				'data' => array(
-					'function' => function ($warning)
+					'function' => function($warning)
 					{
 						return $warning['issuer']['link'];
 					},
@@ -330,7 +330,7 @@ 
 					'value' => $txt['profile_warning_previous_reason'],
 				),
 				'data' => array(
-					'function' => function ($warning) use ($scripturl, $txt)
+					'function' => function($warning) use ($scripturl, $txt)
 					{
 						$ret = '
 						<div class="floatleft">

Sources/tasks/GroupAct-Notify.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
 			// Same as for approving, kind of.
 			foreach ($affected_users as $user)
 			{
-				$pref = !empty($prefs[$user['member_id']]['groupr_' . $pref_name]) ? $prefs[$user['member_id']]['groupr_'. $pref_name] : 0;
+				$pref = !empty($prefs[$user['member_id']]['groupr_' . $pref_name]) ? $prefs[$user['member_id']]['groupr_' . $pref_name] : 0;
 				$custom_reason = isset($this->_details['reason']) && isset($this->_details['reason'][$user['rid']]) ? $this->_details['reason'][$user['rid']] : '';
 
 				if ($pref & 0x01)

Sources/PersonalMessage.php

Spacing +8 added lines, -8 removed lines

@@ -619,7 +619,7 @@ 
 					FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 						INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
 					WHERE pmr.id_member = {int:current_member}
-						AND pmr.deleted = {int:not_deleted}' . $labelQuery .  $labelQuery2 . '
+						AND pmr.deleted = {int:not_deleted}' . $labelQuery . $labelQuery2 . '
 						AND pmr.id_pm ' . ($descending ? '>' : '<') . ' {int:id_pm}',
 					array(
 						'current_member' => $user_info['id'],
@@ -682,12 +682,12 @@ 
 				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm
 					AND pmr.id_member = {int:current_member}
 					AND pmr.deleted = {int:deleted_by}
-					' . $labelQuery . ')') . $labelJoin . ($context['sort_by'] == 'name' ? ( '
+					' . $labelQuery . ')') . $labelJoin . ($context['sort_by'] == 'name' ? ('
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:pm_member})') : '') . '
 				WHERE ' . ($context['folder'] == 'sent' ? 'pm.id_member_from = {int:current_member}
 					AND pm.deleted_by_sender = {int:deleted_by}' : '1=1') . (empty($pmsg) ? '' : '
 					AND pm.id_pm = {int:pmsg}') . $labelQuery2 . '
-				GROUP BY pm.id_pm_head'.($_GET['sort'] != 'pm.id_pm' ? ','.$_GET['sort'] : '').'
+				GROUP BY pm.id_pm_head'.($_GET['sort'] != 'pm.id_pm' ? ',' . $_GET['sort'] : '') . '
 				ORDER BY ' . ($_GET['sort'] == 'pm.id_pm' && $context['folder'] != 'sent' ? 'id_pm' : '{raw:sort}') . ($descending ? ' DESC' : ' ASC') . (empty($_GET['pmsg']) ? '
 				LIMIT ' . $_GET['start'] . ', ' . $maxPerPage : ''),
 				array(
@@ -711,7 +711,7 @@ 
 				INNER JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm
 					AND pmr.id_member = {int:current_member}
 					AND pmr.deleted = {int:is_deleted}
-					' . $labelQuery . ')') . $labelJoin . ($context['sort_by'] == 'name' ? ( '
+					' . $labelQuery . ')') . $labelJoin . ($context['sort_by'] == 'name' ? ('
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:pm_member})') : '') . '
 			WHERE ' . ($context['folder'] == 'sent' ? 'pm.id_member_from = {raw:current_member}
 				AND pm.deleted_by_sender = {int:is_deleted}' : '1=1') . (empty($pmsg) ? '' : '
@@ -848,7 +848,7 @@ 
 					)
 				);
 
-				while($row2 = $smcFunc['db_fetch_assoc']($request2))
+				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
 					if (isset($context['labels'][$l_id]))
@@ -1626,7 +1626,7 @@ 
 					)
 				);
 
-				while($row2 = $smcFunc['db_fetch_assoc']($request2))
+				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
 					if (isset($context['labels'][$l_id]))
@@ -3723,7 +3723,7 @@ 
 	// Editing a specific one?
 	if (isset($_GET['add']))
 	{
-		$context['rid'] = isset($_GET['rid']) && isset($context['rules'][$_GET['rid']])? (int) $_GET['rid'] : 0;
+		$context['rid'] = isset($_GET['rid']) && isset($context['rules'][$_GET['rid']]) ? (int) $_GET['rid'] : 0;
 		$context['sub_template'] = 'add_rule';
 
 		// Current rule information...
@@ -3764,7 +3764,7 @@ 
 	elseif (isset($_GET['save']))
 	{
 		checkSession();
-		$context['rid'] = isset($_GET['rid']) && isset($context['rules'][$_GET['rid']])? (int) $_GET['rid'] : 0;
+		$context['rid'] = isset($_GET['rid']) && isset($context['rules'][$_GET['rid']]) ? (int) $_GET['rid'] : 0;
 
 		// Name is easy!
 		$ruleName = $smcFunc['htmlspecialchars'](trim($_POST['rule_name']));

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/Subs-Db-postgresql.php

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 	if (!empty($db_options['persist']))
 		$connection = @pg_pconnect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
 	else
-		$connection = @pg_connect( 'host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+		$connection = @pg_connect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if (!$connection)
@@ -87,7 +87,7 @@ 
  *
  * @param string $type Indicates which additional file to load. ('extra', 'packages')
  */
-function db_extend ($type = 'extra')
+function db_extend($type = 'extra')
 {
 	global $sourcedir, $db_type;
 
@@ -103,7 +103,7 @@ 
  * @param string $db_prefix The database prefix
  * @param string $db_name The database name
  */
-function db_fix_prefix (&$db_prefix, $db_name)
+function db_fix_prefix(&$db_prefix, $db_name)
 {
 	return;
 }
@@ -236,7 +236,7 @@ 
 						$replacement[$key] = 'null';
 					if (!isValidIP($value))
 						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
-					$replacement[$key] =  sprintf('\'%1$s\'::inet', pg_escape_string($value));
+					$replacement[$key] = sprintf('\'%1$s\'::inet', pg_escape_string($value));
 				}
 
 				return implode(', ', $replacement);
@@ -549,7 +549,7 @@ 
 
 	// Log the error.
 	if (function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" .$db_string : ''), 'database', $file, $line);
+		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
 
 	// Nothing's defined yet... just die with it.
 	if (empty($context) || empty($txt))
@@ -685,31 +685,31 @@ 
 		static $pg_version;
 		static $replace_support;
 
-		if(empty($pg_version))
+		if (empty($pg_version))
 		{
 			db_extend();
 			//pg 9.5 got replace support
 			$pg_version = $smcFunc['db_get_version']();
 			// if we got a Beta Version
 			if (stripos($pg_version, 'beta') !== false)
-				$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')).'.0';
+				$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
 			// or RC
 			if (stripos($pg_version, 'rc') !== false)
-				$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')).'.0';
+				$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
 
-			$replace_support = (version_compare($pg_version,'9.5.0','>=') ? true : false);
+			$replace_support = (version_compare($pg_version, '9.5.0', '>=') ? true : false);
 		}
 
 		$count = 0;
 		$where = '';
 		$count_pk = 0;
 
-		If($replace_support)
+		If ($replace_support)
 		{
 			foreach ($columns as $columnName => $type)
 			{
 				//check pk fiel
-				IF(in_array($columnName, $keys))
+				IF (in_array($columnName, $keys))
 				{
 					$key_str .= ($count_pk > 0 ? ',' : '');
 					$key_str .= $columnName;
@@ -718,11 +718,11 @@ 
 				else //normal field
 				{
 					$col_str .= ($count > 0 ? ',' : '');
-					$col_str .= $columnName.' = EXCLUDED.'.$columnName;
+					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
 					$count++;
 				}
 			}
-			$replace = ' ON CONFLICT ('.$key_str.') DO UPDATE SET '.$col_str;
+			$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
 		}
 		else
 		{
@@ -782,7 +782,7 @@ 
 			$smcFunc['db_query']('', '
 				INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
 				VALUES
-					' . $entry.$replace,
+					' . $entry . $replace,
 				array(
 					'security_override' => true,
 					'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
@@ -877,7 +877,7 @@ 
  * @param bool $translate_human_wildcards If true, turns human readable wildcards into SQL wildcards.
  * @return string The escaped string
  */
-function smf_db_escape_wildcard_string($string, $translate_human_wildcards=false)
+function smf_db_escape_wildcard_string($string, $translate_human_wildcards = false)
 {
 	$replacements = array(
 		'%' => '\%',

Sources/Drafts.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 				locked = {int:locked},
 				is_sticky = {int:is_sticky}
 			WHERE id_draft = {int:id_draft}',
-			array (
+			array(
 				'id_topic' => $topic_id,
 				'id_board' => $board,
 				'poster_time' => time(),
@@ -410,7 +410,7 @@ 
 		DELETE FROM {db_prefix}user_drafts
 		WHERE id_draft IN ({array_int:id_draft})' . ($check ? '
 			AND  id_member = {int:id_member}' : ''),
-		array (
+		array(
 			'id_draft' => $id_draft,
 			'id_member' => empty($user_info['id']) ? -1 : $user_info['id'],
 		)
@@ -471,7 +471,7 @@ 
 			$context['drafts'][] = array(
 				'subject' => censorText(shorten_subject(stripslashes($row['subject']), 24)),
 				'poster_time' => timeformat($row['poster_time']),
-				'link' => '<a href="' . $scripturl . '?action=post;board=' . $row['id_board'] . ';' . (!empty($row['id_topic']) ? 'topic='. $row['id_topic'] .'.0;' : '') . 'id_draft=' . $row['id_draft'] . '">' . $row['subject'] . '</a>',
+				'link' => '<a href="' . $scripturl . '?action=post;board=' . $row['id_board'] . ';' . (!empty($row['id_topic']) ? 'topic=' . $row['id_topic'] . '.0;' : '') . 'id_draft=' . $row['id_draft'] . '">' . $row['subject'] . '</a>',
 			);
 		// PM drafts
 		elseif ($draft_type === 1)

Sources/ManageLanguages.php

Spacing +10 added lines, -10 removed lines

@@ -474,7 +474,7 @@ 
 		'id' => 'lang_main_files_list',
 		'title' => $txt['languages_download_main_files'],
 		'get_items' => array(
-			'function' => function () use ($context)
+			'function' => function() use ($context)
 			{
 				return $context['files']['lang'];
 			},
@@ -485,7 +485,7 @@ 
 					'value' => $txt['languages_download_filename'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return '<strong>' . $rowData['name'] . '</strong><br><span class="smalltext">' . $txt['languages_download_dest'] . ': ' . $rowData['destination'] . '</span>' . ($rowData['version_compare'] == 'older' ? '<br>' . $txt['languages_download_older'] : '');
 					},
@@ -496,7 +496,7 @@ 
 					'value' => $txt['languages_download_writable'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return '<span style="color: ' . ($rowData['writable'] ? 'green' : 'red') . ';">' . ($rowData['writable'] ? $txt['yes'] : $txt['no']) . '</span>';
 					},
@@ -507,7 +507,7 @@ 
 					'value' => $txt['languages_download_version'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return '<span style="color: ' . ($rowData['version_compare'] == 'older' ? 'red' : ($rowData['version_compare'] == 'same' ? 'orange' : 'green')) . ';">' . $rowData['version'] . '</span>';
 					},
@@ -518,7 +518,7 @@ 
 					'value' => $txt['languages_download_exists'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return $rowData['exists'] ? ($rowData['exists'] == 'same' ? $txt['languages_download_exists_same'] : $txt['languages_download_exists_different']) : $txt['no'];
 					},
@@ -530,7 +530,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return '<input type="checkbox" name="copy_file[]" value="' . $rowData['generaldest'] . '"' . ($rowData['default_copy'] ? ' checked' : '') . ' class="input_check">';
 					},
@@ -609,7 +609,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return '<input type="radio" name="def_language" value="' . $rowData['id'] . '"' . ($rowData['default'] ? ' checked' : '') . ' onclick="highlightSelected(\'list_language_list_' . $rowData['id'] . '\');" class="input_radio">';
 					},
@@ -622,7 +622,7 @@ 
 					'value' => $txt['languages_lang_name'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=languages;sa=editlang;lid=%2$s">%3$s</a>', $scripturl, $rowData['id'], $rowData['name']);
 					},
@@ -676,7 +676,7 @@ 
 		$("tr.highlight2").removeClass("highlight2");
 		$("#" + box).addClass("highlight2");
 	}
-	highlightSelected("list_language_list_' . ($language == '' ? 'english' : $language). '");', true);
+	highlightSelected("list_language_list_' . ($language == '' ? 'english' : $language) . '");', true);
 
 	// Display a warning if we cannot edit the default setting.
 	if (!is_writable($boarddir . '/Settings.php'))
@@ -931,7 +931,7 @@ 
 			);
 		}
 		$dir->close();
-		usort($context['possible_files'][$theme]['files'], function ($val1, $val2)
+		usort($context['possible_files'][$theme]['files'], function($val1, $val2)
 		{
 			return strcmp($val1['name'], $val2['name']);
 		});