Whitelist -> Allowlist

Author: codeling

bfstop.php

@@ -301,9 +301,9 @@ public function onUserLoginFailure($user, $options=null)
 			$this->logger->log('Empty IP address!', JLog::ERROR);
 			return;
 		}
-		if ($this->mydb->isIPWhiteListed($ipAddress))
+		if ($this->mydb->isIPOnAllowList($ipAddress))
 		{
-			$this->logger->log('Ignoring failed login by whitelisted address '.$ipAddress, JLog::INFO);
+			$this->logger->log('Ignoring failed login by allowed address '.$ipAddress, JLog::INFO);
 			return;
 		}
 		JPlugin::loadLanguage('plg_system_bfstop');
@@ -385,7 +385,7 @@ public function onAfterInitialise()
 			}
 		}
 		$ipaddress = $this->getIPAddr();
-		if ($this->mydb->isIPWhiteListed($ipaddress))
+		if ($this->mydb->isIPOnAllowList($ipaddress))
 		{
 			return;
 		}

helpers/db.php

@@ -216,13 +216,13 @@ public function isIPBlocked($ipaddress)
 		return ($entryCount > 0);
 	}
 
-	public function isIPWhiteListed($ipaddress)
+	public function isIPOnAllowList($ipaddress)
 	{
-		$sqlCheckPattern = "SELECT id, ipaddress from #__bfstop_whitelist WHERE %s";
+		$sqlCheckPattern = "SELECT id, ipaddress from #__bfstop_allowlist WHERE %s";
 		$sqlIPCheck = sprintf($sqlCheckPattern, $this->ipAddressMatch($ipaddress));
 		$sqlSubNetIPv4Check = sprintf($sqlCheckPattern, $this->ipSubNetIPv4Match($ipaddress));
-		$entryCount = $this->checkForEntries($sqlIPCheck, "Whitelisted");
-		$entryCount += $this->checkForEntries($sqlSubNetIPv4Check, "Whitelisted");
+		$entryCount = $this->checkForEntries($sqlIPCheck, "Allowed");
+		$entryCount += $this->checkForEntries($sqlSubNetIPv4Check, "Allowed");
 		return ($entryCount > 0);
 	}
 

sql/updates/1.5.0.sql

@@ -1,3 +1,5 @@
 DELETE FROM #__update_sites WHERE location LIKE 'https://github.com/codeling%';
 
 ALTER TABLE #__bfstop_failedlogin MODIFY username varchar(150) NOT NULL;
+
+RENAME TABLE `#__bfstop_whitelist` TO `#__bfstop_allowlist`;