smfmod_a2ebg

@@ -22,11 +23,11 @@ class a2ebg

 		self::loadLanguage();

-		$config_vars[] = array(

+		$config_vars[] = [

 			'select', 'aebg_auto_select',

-				array('main_ip_check' => $txt['ban_on_ip'], 'hostname_check' => $txt['ban_on_hostname'], 'email_check' => $txt['ban_on_email'], 'user_check' => $txt['ban_on_username']),

+			['main_ip_check' => $txt['ban_on_ip'], 'hostname_check' => $txt['ban_on_hostname'], 'email_check' => $txt['ban_on_email'], 'user_check' => $txt['ban_on_username']],

 			'multiple' => true,

-			);

+		];

 	}

 	// This is called when we edit a ban regardless of if its new or not.

@@ -38,65 +39,68 @@ class a2ebg

 		$ban_info['easy_ban_group'] = empty($_POST['easy_ban_group']) ? '0' : '1';

 		// We are adding or modifying a ban normally.

-		if (empty($_POST['ban_group']))

-		{

-			if (!empty($_POST['bg']))

-			{

-				$request = $smcFunc['db_query']('', '

+		if (empty($_POST['ban_group'])) {

+			if (!empty($_POST['bg'])) {

+				$request = $smcFunc['db_query'](

+					'',

+					'

 					SELECT

 						bg.id_ban_group, bg.easy_bg

 					FROM {db_prefix}ban_groups AS bg

 					WHERE bg.id_ban_group = {int:current_ban}',

-					array(

+					[

 						'current_ban' => (int) $_REQUEST['bg'],

-					)

+					],

 				);

 				$row = $smcFunc['db_fetch_assoc']($request);

 				$smcFunc['db_free_result']($request);

 				$context['ban']['id'] = $row['id_ban_group'];

 				$context['ban']['easy_bg'] = $row['easy_bg'];

-			}

-			else

+			} else {

 				$context['ban']['easy_bg'] = 0;

+			}

 			$context['easy_ban_group'] = $ban_info['easy_ban_group'];

+

 			return;

 		}

 		// This occurs when we are "adding" a ban.

-		$request = $smcFunc['db_query']('', '

+		$request = $smcFunc['db_query'](

+			'',

+			'

 			SELECT

 				bg.id_ban_group, bg.name, bg.ban_time, COALESCE(bg.expire_time, 0) AS expire_time, bg.reason, bg.notes, bg.cannot_access, bg.cannot_register, bg.cannot_login, bg.cannot_post, bg.easy_bg

 			FROM {db_prefix}ban_groups AS bg

 			WHERE bg.id_ban_group = {int:current_ban}',

-			array(

+			[

 				'current_ban' => (int) $_REQUEST['ban_group'],

-			)

+			],

 		);

 		$row = $smcFunc['db_fetch_assoc']($request);

 		$smcFunc['db_free_result']($request);

-		$context['ban'] = array(

+		$context['ban'] = [

 			'id' => $row['id_ban_group'],

 			'easy_bg' => $row['easy_bg'],

 			'name' => $row['name'],

-			'expiration' => array(

+			'expiration' => [

 				'status' => empty($row['expire_time']) ? 'never' : ($row['expire_time'] < time() ? 'expired' : 'one_day'),

-				'days' => $row['expire_time'] > time() ? ($row['expire_time'] - time() < 86400 ? 1 : ceil(($row['expire_time'] - time()) / 86400)) : 0

-			),

+				'days' => $row['expire_time'] > time() ? ($row['expire_time'] - time() < 86400 ? 1 : ceil(($row['expire_time'] - time()) / 86400)) : 0,

+			],

 			'reason' => $row['reason'],

 			'notes' => $row['notes'],

-			'cannot' => array(

+			'cannot' => [

 				'access' => !empty($row['cannot_access']),

 				'post' => !empty($row['cannot_post']),

 				'register' => !empty($row['cannot_register']),

 				'login' => !empty($row['cannot_login']),

-			),

+			],

 			'is_new' => false,

 			'hostname' => '',

 			'email' => '',

-		);

+		];

 		// Setup info for later.

 		$ban_info = $context['ban'];

@@ -129,24 +133,28 @@ class a2ebg

 		loadTemplate('Add2ExistingBanGroup');

 		// Normal way of doing a new one? Skip.

-		if (empty($context['ban']['from_user']))

-		{

+		if (empty($context['ban']['from_user'])) {

 			$context['template_layers'][] = 'easyban_edits';

+

 			return;

 		}

 		// Find our ban groups we can append.

-		$request = $smcFunc['db_query']('', '

+		$request = $smcFunc['db_query'](

+			'',

+			'

 			SELECT id_ban_group, name

 			FROM {db_prefix}ban_groups

 			WHERE easy_bg = {int:one}

 			ORDER BY name',

-			array(

+			[

 				'one' => '1',

-			)

+			],

 		);

-		while ($row = $smcFunc['db_fetch_assoc']($request))

+

+		while ($row = $smcFunc['db_fetch_assoc']($request)) {

 			$context['ban_group_suggestions'][$row['id_ban_group']] = $row['name'];

+		}

 		$smcFunc['db_free_result']($request);

 		$context['ban_group_auto_selects'] = is_array($modSettings['aebg_auto_select']) ? $modSettings['aebg_auto_select'] : $smcFunc['json_decode']($modSettings['aebg_auto_select']);

@@ -162,18 +170,21 @@ class a2ebg

 	{

 		global $context, $smcFunc;

-		if (!isset($context['easy_ban_group']))

+		if (!isset($context['easy_ban_group'])) {

 			return;

+		}

-		$smcFunc['db_query']('', '

+		$smcFunc['db_query'](

+			'',

+			'

 			UPDATE {db_prefix}ban_groups

 			SET

 				easy_bg = {int:easy_bg}

 			WHERE id_ban_group = {int:id_ban_group}',

-			array(

+			[

 				'easy_bg' => $context['easy_ban_group'],

 				'id_ban_group' => $context['ban']['id'],

-			)

+			],

 		);

 	}

@@ -183,21 +194,26 @@ class a2ebg

 		global $smcFunc, $context;

 		// Main page seems to call this as well.

-		if (empty($context['ban']['id']))

+		if (empty($context['ban']['id'])) {

 			return;

+		}

-		$request = $smcFunc['db_query']('', '

+		$request = $smcFunc['db_query'](

+			'',

+			'

 			SELECT

 				bg.easy_bg

 			FROM {db_prefix}ban_groups AS bg

 			WHERE bg.id_ban_group = {int:current_ban}

 	',

-			array(

+			[

 				'current_ban' => $context['ban']['id'],

-			)

+			],

 		);

-		if ($smcFunc['db_num_rows']($request) == 0)

+

+		if ($smcFunc['db_num_rows']($request) == 0) {

 			fatal_lang_error('ban_not_found', false);

+		}

 		$row = $smcFunc['db_fetch_assoc']($request);

 		$context['ban']['easy_bg'] = $row['easy_bg'];

@@ -5,8 +5,7 @@ function template_easyban_above()

 	global $context, $txt;

 	// Only allow selecting a ban group if it is new.

-	if ($context['ban']['is_new'] && !empty($context['ban_group_suggestions']))

-	{

+	if ($context['ban']['is_new'] && !empty($context['ban_group_suggestions'])) {

 		echo '

 			<div class="cat_bar">

 				<h3 class="catbg">', $txt['aebg_add_existing'], '</h3>

@@ -15,9 +14,10 @@ function template_easyban_above()

 						<select name="ban_group" onchange="disableOtherFields();" id="ban_group">

 							<option value="-1" selected="selected">', $txt['aebg_new_ban_group'], '</option>';

-		foreach ($context['ban_group_suggestions'] as $id_ban_group => $ban_name)

+		foreach ($context['ban_group_suggestions'] as $id_ban_group => $ban_name) {

 			echo '

 							<option value="', $id_ban_group, '" onselect="disableOtherFields();">', $ban_name, '</option>';

+		}

 		echo '

 						</select>

 			</div>';

@@ -30,8 +30,7 @@ function template_easyban_below()

 	global $context, $modSettings;

 	// Only allow selecting a ban group if it is new.

-	if ($context['ban']['is_new'] && !empty($context['ban_group_suggestions']))

-	{

+	if ($context['ban']['is_new'] && !empty($context['ban_group_suggestions'])) {

 		echo '

 		<script type="text/javascript">

 		function disableOtherFields()

@@ -41,18 +40,21 @@ function template_easyban_below()

 			$("#manage_bans .windowbg>.ban_settings").toggle(visibility);';

 		// Do we want to auto select some options?

-		if (!empty($modSettings['aebg_auto_select']))

-		{

+		if (!empty($modSettings['aebg_auto_select'])) {

 			// Incase it isn't an array.

-			$allOptions = array_flip(array('main_ip_check', 'hostname_check', 'email_check', 'user_check'));

-			if (!empty($modSettings['disableHostnameLookup']))

+			$allOptions = array_flip(['main_ip_check', 'hostname_check', 'email_check', 'user_check']);

+

+			if (!empty($modSettings['disableHostnameLookup'])) {

 				unset($allOptions['hostname_check']);

+			}

 			$autoSelects = is_array($modSettings['aebg_auto_select']) ? $modSettings['aebg_auto_select'] : json_decode($modSettings['aebg_auto_select'], true);

-			foreach ($allOptions as $elID => $dummy)

+

+			foreach ($allOptions as $elID => $dummy) {

 				echo '

 			$("#', $elID, '").prop("checked", ', (in_array($elID, $autoSelects) ? 'true' : 'false'), ');';

 			}

+		}

 		echo '

 		}

@@ -2,32 +3,36 @@

 error_reporting(E_ALL);

 // Hopefully we have the goodies.

-if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF'))

-{

+if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF')) {

 	$using_ssi = true;

-	require_once(dirname(__FILE__) . '/SSI.php');

-}

-elseif (!defined('SMF'))

+

+	require_once dirname(__FILE__) . '/SSI.php';

+} elseif (!defined('SMF')) {

 	exit('<b>Error:</b> Cannot install - please verify you put this in the same place as SMF\'s index.php.');

+}

 global $db_prefix, $modSettings, $func, $smcFunc;

-if (version_compare('2.0 RC2', $modSettings['smfVersion']) > 0)

+if (version_compare('2.0 RC2', $modSettings['smfVersion']) > 0) {

 	exit('<b>Error:</b> Cannot install - Your SMF version is not sufficient enough.  Please upgrade to SMF 2.0 RC2 or higher');

-elseif (version_compare('2.1 RC2', $modSettings['smfVersion']) > 0 && version_compare('2.1 Beta 1', $modSettings['smfVersion']) < 0)

+}

+

+if (version_compare('2.1 RC2', $modSettings['smfVersion']) > 0 && version_compare('2.1 Beta 1', $modSettings['smfVersion']) < 0) {

 	exit('<b>Error:</b> Cannot install - Your SMF version is not sufficient enough.  Please upgrade to SMF 2.1 RC2 or higher');

+}

 // Our column.

 $smcFunc['db_add_column'](

-	$db_prefix . "ban_groups",

-	array(

+	$db_prefix . 'ban_groups',

+	[

 		'name' => 'easy_bg',

 		'type' => 'smallint',

 		'size' => '3',

 		'default' => 0,

-	)

+	],

 );

-if (!empty($using_ssi))

+if (!empty($using_ssi)) {

 	echo 'If no errors, Success!';

+}

 ?>

\ No newline at end of file

@@ -34,7 +34,7 @@ class a2ebg

 				'main_ip_check' => Lang::$txt['ban_on_ip'],

 				'hostname_check' => Lang::$txt['ban_on_hostname'],

 				'email_check' => Lang::$txt['ban_on_email'],

-					'user_check' => Lang::$txt['ban_on_username']

+				'user_check' => Lang::$txt['ban_on_username'],

 			],

 			'multiple' => true,

 		];

@@ -47,41 +47,44 @@ class a2ebg

 		$ban_info['easy_ban_group'] = empty($_POST['easy_ban_group']) ? '0' : '1';

 		// We are adding or modifying a ban normally.

-		if (empty($_POST['ban_group']))

-		{

-			if (!empty($_POST['bg']))

-			{

-				$request = Db::$db->query('', '

+		if (empty($_POST['ban_group'])) {

+			if (!empty($_POST['bg'])) {

+				$request = Db::$db->query(

+					'',

+					'

 					SELECT

 						bg.id_ban_group, bg.easy_bg

 					FROM {db_prefix}ban_groups AS bg

 					WHERE bg.id_ban_group = {int:current_ban}',

 					[

 						'current_ban' => (int) $_REQUEST['bg'],

-					]

+					],

 				);

 				$row = Db::$db->fetch_assoc($request);

 				Db::$db->free_result($request);

 				Utils::$context['ban']['id'] = (int) $row['id_ban_group'];

 				Utils::$context['ban']['easy_bg'] = $row['easy_bg'];

-			}

-			else

+			} else {

 				Utils::$context['ban']['easy_bg'] = 0;

+			}

 			Utils::$context['easy_ban_group'] = $ban_info['easy_ban_group'];

+

 			return;

 		}

 		// This occurs when we are "adding" a ban.

-		$request = Db::$db->query('', '

+		$request = Db::$db->query(

+			'',

+			'

 			SELECT

 				bg.id_ban_group, bg.name, bg.ban_time, COALESCE(bg.expire_time, 0) AS expire_time, bg.reason, bg.notes, bg.cannot_access, bg.cannot_register, bg.cannot_login, bg.cannot_post, bg.easy_bg

 			FROM {db_prefix}ban_groups AS bg

 			WHERE bg.id_ban_group = {int:current_ban}',

 			[

 				'current_ban' => (int) $_REQUEST['ban_group'],

-			]

+			],

 		);

 		$row = Db::$db->fetch_assoc($request);

 		Db::$db->free_result($request);

@@ -92,7 +95,7 @@ class a2ebg

 			'name' => $row['name'],

 			'expiration' => [

 				'status' => empty($row['expire_time']) ? 'never' : ($row['expire_time'] < time() ? 'expired' : 'one_day'),

-				'days' => (int) ($row['expire_time'] > time() ? ($row['expire_time'] - time() < 86400 ? 1 : ceil(($row['expire_time'] - time()) / 86400)) : 0)

+				'days' => (int) ($row['expire_time'] > time() ? ($row['expire_time'] - time() < 86400 ? 1 : ceil(($row['expire_time'] - time()) / 86400)) : 0),

 			],

 			'reason' => $row['reason'],

 			'notes' => $row['notes'],

@@ -134,24 +137,28 @@ class a2ebg

 		Theme::loadTemplate('Add2ExistingBanGroup');

 		// Normal way of doing a new one? Skip.

-		if (empty(Utils::$context['ban']['from_user']))

-		{

+		if (empty(Utils::$context['ban']['from_user'])) {

 			Utils::$context['template_layers'][] = 'easyban_edits';

+

 			return;

 		}

 		// Find our ban groups we can append.

-		$request = Db::$db->query('', '

+		$request = Db::$db->query(

+			'',

+			'

 			SELECT id_ban_group, name

 			FROM {db_prefix}ban_groups

 			WHERE easy_bg = {int:one}

 			ORDER BY name',

 			[

 				'one' => '1',

-			]

+			],

 		);

-		while ($row = Db::$db->fetch_assoc($request))

+

+		while ($row = Db::$db->fetch_assoc($request)) {

 			Utils::$context['ban_group_suggestions'][(int) $row['id_ban_group']] = $row['name'];

+		}

 		Db::$db->free_result($request);

 		Utils::$context['ban_group_auto_selects'] = is_array(Config::$modSettings['aebg_auto_select']) ? Config::$modSettings['aebg_auto_select'] : Utils::jsonDecode(Config::$modSettings['aebg_auto_select']);

@@ -165,10 +172,13 @@ class a2ebg

 	// We are saving a ban.  Lets update that info if needed.

 	public static function addToEditBansPost(): void

 	{

-		if (!isset(Utils::$context['easy_ban_group']))

+		if (!isset(Utils::$context['easy_ban_group'])) {

 			return;

+		}

-		Db::$db->query('', '

+		Db::$db->query(

+			'',

+			'

 			UPDATE {db_prefix}ban_groups

 			SET

 				easy_bg = {int:easy_bg}

@@ -176,7 +186,7 @@ class a2ebg

 			[

 				'easy_bg' => Utils::$context['easy_ban_group'],

 				'id_ban_group' => (int) Utils::$context['ban']['id'],

-			]

+			],

 		);

 	}

@@ -184,20 +194,25 @@ class a2ebg

 	public static function addToBanList(): void

 	{

 		// Main page seems to call this as well.

-		if (empty(Utils::$context['ban']['id']))

+		if (empty(Utils::$context['ban']['id'])) {

 			return;

+		}

-		$request = Db::$db->query('', '

+		$request = Db::$db->query(

+			'',

+			'

 			SELECT

 				bg.easy_bg

 			FROM {db_prefix}ban_groups AS bg

 			WHERE bg.id_ban_group = {int:current_ban}',

 			[

 				'current_ban' => (int) Utils::$context['ban']['id'],

-			]

+			],

 		);

-		if (Db::$db->num_rows($request) == 0)

+

+		if (Db::$db->num_rows($request) == 0) {

 			ErrorHandler::fatalLang('ban_not_found', false);

+		}

 		$row = Db::$db->fetch_assoc($request);

 		Utils::$context['ban']['easy_bg'] = $row['easy_bg'];

@@ -1,14 +1,15 @@

 <?php

 use SMF\Config;

-use SMF\Utils;

 use SMF\Lang;

+use SMF\Utils;

 function template_easyban_above()

 {

 	// Only allow selecting a ban group if it is new.

-	if (!Utils::$context['ban']['is_new'] || empty(Utils::$context['ban_group_suggestions']))

+	if (!Utils::$context['ban']['is_new'] || empty(Utils::$context['ban_group_suggestions'])) {

 		return;

+	}

 	echo '

 	<script type="text/javascript">

@@ -26,18 +27,21 @@ function template_easyban_above()

 		$("#manage_bans .windowbg>.ban_settings").toggle(visibility);';

 	// Do we want to auto select some options?

-	if (!empty(Config::$modSettings['aebg_auto_select']))

-	{

+	if (!empty(Config::$modSettings['aebg_auto_select'])) {

 		// Incase it isn't an array.

 		$allOptions = array_flip(['main_ip_check', 'hostname_check', 'email_check', 'user_check']);

-		if (!empty(Config::$modSettings['disableHostnameLookup']))

+

+		if (!empty(Config::$modSettings['disableHostnameLookup'])) {

 			unset($allOptions['hostname_check']);

+		}

 		$autoSelects = is_array(Config::$modSettings['aebg_auto_select']) ? Config::$modSettings['aebg_auto_select'] : json_decode(Config::$modSettings['aebg_auto_select'], true);

-		foreach ($allOptions as $elID => $dummy)

+

+		foreach ($allOptions as $elID => $dummy) {

 			echo '

 		$("#', $elID, '").prop("checked", ', (in_array($elID, $autoSelects) ? 'true' : 'false'), ');';

 		}

+	}

 	echo '

 	}

@@ -50,9 +54,10 @@ function template_easyban_above()

 					<select id="temp_ban_group" name="ban_group" onchange="disableOtherFields()" id="ban_group">

 						<option value="-1" selected="selected">', Lang::$txt['aebg_new_ban_group'], '</option>';

-	foreach (Utils::$context['ban_group_suggestions'] as $id_ban_group => $ban_name)

+	foreach (Utils::$context['ban_group_suggestions'] as $id_ban_group => $ban_name) {

 		echo '

 						<option value="', $id_ban_group, '" onselect="disableOtherFields()">', $ban_name, '</option>';

+	}

 	echo '

 					</select>

 		</div>';

@@ -4,13 +5,13 @@ error_reporting(E_ALL);

 use SMF\Db\DatabaseApi as Db;

 // Hopefully we have the goodies.

-if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF'))

-{

+if (file_exists(dirname(__FILE__) . '/SSI.php') && !defined('SMF')) {

 	$using_ssi = true;

-	require_once(dirname(__FILE__) . '/SSI.php');

-}

-elseif (!defined('SMF'))

+

+	require_once dirname(__FILE__) . '/SSI.php';

+} elseif (!defined('SMF')) {

 	exit('<b>Error:</b> Cannot install - please verify you put this in the same place as SMF\'s index.php.');

+}

 // Our column.

 Db::$db->add_column(

@@ -20,8 +21,9 @@ Db::$db->add_column(

 		'type' => 'smallint',

 		'size' => '3',

 		'default' => 0,

-	]

+	],

 );

-if (!empty($using_ssi))

+if (!empty($using_ssi)) {

 	echo 'If no errors, Success!';

+}