From 7cbbdb9f34d9f869bb844f539b5ff14aeabee3b2 Mon Sep 17 00:00:00 2001
From: SoundScopes <Musical.Flow@LIve.com>
Date: Mon, 5 Jan 2015 19:22:53 +0000
Subject: [PATCH] Stuff

---
 code/modules/admin/IsBanned.dm | 32 +++++++++++++-------------------
 code/modules/admin/NewBan.dm   | 16 ++++++++++++++++
 code/world.dm                  |  2 ++
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 95194470..c2c40831 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -1,3 +1,5 @@
+var/global/list/blacklist = list()
+
 //Blocks an attempt to connect before even creating our client datum thing.
 world/IsBanned(key,address,computer_id)
 	if(ckey(key) in admin_datums)
@@ -18,25 +20,17 @@ world/IsBanned(key,address,computer_id)
 		return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [config.banappeals]")
 
 	if(config && config.ip_blacklist_enabled)
-		testing("Loading Blacklist")
-		var/text = file2text("data/ip_blacklist.txt")
-		if (!text)
-			error("Failed to load data/ip_blacklist.txt")
+		msg_scopes("Doing blacklist stuff")
+		if(!blacklist)
+			loadBlacklist()
+		if(blacklist)
+			if(address in blacklist)
+				log_access("Failed Login: [src] - Blacklisted IP")
+				message_admins("\blue Failed Login: [src] - Blacklisted IP")
+				AddBan(ckey(key), computer_id, "Bad IP", "Automated Ban", 0, 0)
+				return list("reason"="IP Blacklisted", "desc"="\nReason: This IP has been blacklisted from the server.\nIf you believe this is a mistake, please request help at [config.banappeals]")
 		else
-			var/list/lines = text2list(text, "\n")
-			for(var/line in lines)
-				if (!line)
-					continue
-
-				if (copytext(line, 1, 2) == ";")
-					continue
-
-				var/banned_address = copytext(line, 1, length(line)+1)
-				if(banned_address == address)
-					log_access("Failed Login: [src] - Blacklisted IP")
-					message_admins("\blue Failed Login: [src] - Blacklisted IP")
-					AddBan(ckey(key), computer_id, "Bad IP", "Automated Ban", 0, 0)
-					return list("reason"="IP Blacklisted", "desc"="\nReason: This IP has been blacklisted from the server.\nIf you believe this is a mistake, please request help at [config.banappeals]")
+			msg_scopes("Where is the blacklist!")
 
 	if(config.ban_legacy_system)
 
@@ -98,4 +92,4 @@ world/IsBanned(key,address,computer_id)
 			message_admins("[key] has logged in with a blank computer id in the ban check.")
 		if (failedip)
 			message_admins("[key] has logged in with a blank ip in the ban check.")
-		return ..()	//default pager ban stuff
+		return ..()	//default pager ban stuff
\ No newline at end of file
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 3c29c486..b53438e2 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -58,6 +58,22 @@ var/savefile/Banlist
 	CMinutes = (world.realtime / 10) / 60
 	return 1
 
+/proc/loadBlacklist()
+	testing("Loading Blacklist")
+	var/text = file2text("data/ip_blacklist.txt")
+	if (!text)
+		error("Failed to load data/ip_blacklist.txt")
+		return
+	else
+		var/list/lines = text2list(text, "\n")
+		for(var/line in lines)
+			if (!line)
+				continue
+			if (copytext(line, 1, 2) == ";")
+				continue
+			blacklist += line
+	log_admin("Loaded Blacklist")
+
 /hook/startup/proc/loadBans()
 	return LoadBans()
 
diff --git a/code/world.dm b/code/world.dm
index a87c0f2a..948585b3 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -33,6 +33,8 @@
 	callHook("startup")
 	//Emergency Fix
 	load_mods()
+	if(config.ip_blacklist_enabled)
+		loadBlacklist()
 	//end-emergency fix
 
 	src.update_status()