From 785436c3db3b495aca6fd024963a3c07133b149d Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 18 Dec 2008 08:01:28 +0000
Subject: [PATCH] ipban: enforce always

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5262 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/ipban.qc | 46 ++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/data/qcsrc/server/ipban.qc b/data/qcsrc/server/ipban.qc
index d87675fab..d582d3db4 100644
--- a/data/qcsrc/server/ipban.qc
+++ b/data/qcsrc/server/ipban.qc
@@ -357,6 +357,30 @@ float Ban_MaybeEnforceBan(entity client)
 	return FALSE;
 }
 
+string Ban_Enforce(float i, string reason)
+{
+	string s;
+	entity e;
+
+	// Enforce our new ban
+	s = "";
+	FOR_EACH_REALCLIENT(e)
+		if(Ban_IsClientBanned(e, i))
+		{
+			if(reason != "")
+			{
+				if(s == "")
+					reason = strcat(reason, ": affects ");
+				else
+					reason = strcat(reason, ", ");
+				reason = strcat(reason, e.netname);
+			}
+			s = strcat(s, "^1NOTE:^7 banned client ", e.netname, "^7 has to go\n");
+			dropclient(e);
+		}
+	bprint(s);
+}
+
 float Ban_Insert(string ip, float bantime, string reason, float dosync)
 {
 	float i;
@@ -376,6 +400,9 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 				print(ip, "'s ban has been prolonged to ", ftos(bantime), " seconds from now\n");
 			}
 
+			// and enforce
+			reason = Ban_Enforce(i, reason);
+
 			// and abort
 			if(dosync)
 				if(reason != "")
@@ -384,6 +411,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 
 			return FALSE;
 		}
+
 	// do we have a free slot?
 	for(i = 0; i < ban_count; ++i)
 		if(time > ban_expire[i])
@@ -415,23 +443,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
 
 	Ban_SaveBans();
 
-	// Enforce our new ban
-	s = "";
-	FOR_EACH_REALCLIENT(e)
-		if(Ban_IsClientBanned(e, i))
-		{
-			if(reason != "")
-			{
-				if(s == "")
-					reason = strcat(reason, ": affects ");
-				else
-					reason = strcat(reason, ", ");
-				reason = strcat(reason, e.netname);
-			}
-			s = strcat(s, "^1NOTE:^7 banned client ", e.netname, "^7 has to go\n");
-			dropclient(e);
-		}
-	bprint(s);
+	reason = Ban_Enforce(i, reason);
 
 	// and abort
 	if(dosync)
-- 
2.39.2