diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index 5171d2fe23e..f4cc1cdc852 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -1,5 +1,5 @@ //Blocks an attempt to connect before even creating our client datum thing. -/world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE, check_2fa = TRUE, check_guest = TRUE, log_info = TRUE) +/world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE, check_2fa = TRUE, check_guest = TRUE, log_info = TRUE, check_tos = TRUE) if(!key || !address || !computer_id) log_adminwarn("Failed Login (invalid data): [key] [address]-[computer_id]") @@ -44,7 +44,7 @@ return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a BYOND account.") // Check if we are checking TOS consent before connecting - if(SSdbcore.IsConnected() && GLOB.configuration.system.external_tos_handler) + if(SSdbcore.IsConnected() && GLOB.configuration.system.external_tos_handler && check_tos) // Check if they have a TOS consent var/datum/db_query/check_query = SSdbcore.NewQuery("SELECT ckey FROM privacy WHERE ckey=:ckey AND consent=1", list("ckey" = ckey(key))) diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm index 0fbb6fc405a..010484f4e39 100644 --- a/goon/code/datums/browserOutput.dm +++ b/goon/code/datums/browserOutput.dm @@ -188,7 +188,7 @@ var/list/chatResources = list( var/list/row = connectionHistory[i] if(!row || row.len < 3 || !(row["ckey"] && row["compid"] && row["ip"])) return - if(world.IsBanned(key=row["ckey"], address=row["ip"], computer_id=row["compid"], type=null, check_ipintel=FALSE, check_2fa=FALSE, check_guest=FALSE, log_info=FALSE)) + if(world.IsBanned(key=row["ckey"], address=row["ip"], computer_id=row["compid"], type=null, check_ipintel=FALSE, check_2fa=FALSE, check_guest=FALSE, log_info=FALSE, check_tos=FALSE)) found = row break CHECK_TICK