smfmod_sfs

@@ -364,7 +364,7 @@ class SFS

 		if ($response === [])

 		{

 			$this->logAllStats('error', $checks, 'error');

-			log_error($this->txt('sfs_request_failure_nodata') . ':' . $requestURL, 'critical');

+			log_error($this->txt('sfs_request_failure_nodata') . ':' . $this->buildServerURL(), 'critical');

 			return true;

 		}

@@ -465,6 +465,7 @@ class SFS

 			'email' => !empty($this->modSettings['sfs_emailcheck']) && !empty($response['email'])

 		];

+		$requestBlocked = '';

 		foreach ($checkMap as $key => $checkEnabled)

 			if (empty($requestBlocked) && $checkEnabled)

 				$requestBlocked = call_user_func(array($this, 'sfsCheck_' . $key), $response[$key], $area);

@@ -901,7 +902,7 @@ class SFS

 		// Standard options.

 		$options = $this->Decode($this->modSettings[$optionsKey]);

-		if (empty($options))

+		if (empty($options) || !is_array($options))

 			$options = [];

 		// Extras.

@@ -83,9 +83,9 @@ class SFSA

 	 * @uses integrate__admin_areas - Hook SMF2.1

 	 * @return void No return is generated

 	 */

-	public static function hook_admin_areas(array &$admin_areas)

+	public static function hook_admin_areas(array &$admin_areas): void

 	{

-		return self::selfClass()->setupAdminAreas($admin_areas);

+		self::selfClass()->setupAdminAreas($admin_areas);

 	}

 	/**

@@ -152,9 +152,9 @@ class SFSA

 	 * @uses integrate_modify_modifications - Hook SMF2.1

 	 * @return void No return is generated

 	 */

-	public static function hook_modify_modifications(array &$subActions)

+	public static function hook_modify_modifications(array &$subActions): void

 	{

-		return self::selfClass()->setupModifyModifications($subActions);

+		self::selfClass()->setupModifyModifications($subActions);

 	}

 	/**

@@ -347,14 +347,6 @@ class SFSA

 	 */

 	public static function hook_manage_registrations(array &$subActions): bool

 	{

-		global $context;

-

-		// Add our logs sub action.

-		$subActions['sfstest'] = ['SFSA::startupTest', 'admin_forum'];

-

-		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'sfstest' && allowedTo('admin_forum'))

-			$context['sub_action'] = 'sfstest';

-

 		return self::selfClass()->AddToRegCenterMenu($subActions);

 	}

@@ -371,6 +363,12 @@ class SFSA

 	 */

 	public function AddToRegCenterMenu(array &$subActions): bool

 	{

+		// Add our logs sub action.

+		$subActions['sfstest'] = ['SFSA::startupTest', 'admin_forum'];

+

+		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'sfstest' && allowedTo('admin_forum'))

+			$this->context['sub_action'] = 'sfstest';

+

 		$this->context[$this->context['admin_menu_name']]['tab_data']['tabs']['sfstest'] = [

 			'description' => $this->SFSclass->txt('sfs_admin_test_desc'),

 		];

@@ -395,7 +393,7 @@ class SFSA

 	 */

 	public static function startupTest(bool $return_config = false): array

 	{

-		return self::selfClass()->loadTestAPI();

+		return self::selfClass()->loadTestAPI($return_config);

 	}

 	/**

@@ -150,7 +150,7 @@ class SFSB

 		$id_ban_group = $this->getBanGroup();

 		if (!empty($id_ban_group))

 		{

-			updateSettings(['sfs_ipcheck_autoban_group' => $ban_data['id_ban_group']]);

+			updateSettings(['sfs_ipcheck_autoban_group' => $id_ban_group]);

 			return true;

 		}

@@ -198,7 +198,6 @@ class SFSB

 	 */

 	private function getBanGroup(): ?int

 	{

-		$ban_group_id = null;

 		// Maybe just got unlinked, if we can find the matching name, relink it.

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

 			SELECT id_ban_group

@@ -215,14 +214,12 @@ class SFSB

 			$this->smcFunc['db_free_result']($request);

 			if (!empty($ban_data['id_ban_group']))

-			{

-				$ban_group_id = $ban_data['id_ban_group'];

-				return true;

-			}

+				return $ban_data['id_ban_group'];

 		}

+		else

 			$this->smcFunc['db_free_result']($request);

-		return $ban_group_id;

+		return null;

 	}

 	/**

@@ -170,10 +170,6 @@ class SFSP

 		$cache_key = 'sfs_check_member-' . $this->memID;

 		// Do we have a message?

-		$poster_name = null;

-		$poster_email = null;

-		$poster_ip = null;

-		$post_body = null;

 		if (isset($_GET['msg']) && intval($_GET['msg']) > 0)

 		{

 			$row = $this->TrackSFSMessage((int) $_GET['msg']);

@@ -285,8 +281,8 @@ class SFSP

 		// Now we have a URL, lets go get it.

 		$result = fetch_web_data('https://www.stopforumspam.com/add', $post_data);

-		if (strpos($result, 'data submitted successfully') === false)

-			$this->context['submission_failed'] = $this->txt('sfs_submission_error');

+		if ($result === false || strpos($result, 'data submitted successfully') === false)

+			$this->context['submission_failed'] = $this->SFSclass->txt('sfs_submission_error');

 		elseif (isset($_POST['sfs_submitban']))

 			redirectexit($this->scripturl . '?action=admin;area=ban;sa=add;u=' . $this->memID);

 		else