Improve speed of these, and only send out snotice if the gline doesnt already exist

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6287 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 16 insertions, 11 deletions

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 56ec75a8f..de1cb8366 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -37,19 +37,24 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 			return CMD_FAILURE;
 		}
 
-		ServerInstance->XLines->add_kline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-
-		if (!ServerInstance->Duration(parameters[1]))
-		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
-		}
-		else
+		if (ServerInstance->XLines->add_kline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
-		}
+			int to_apply = APPLY_KLINES;
+
+			FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+	
+			if (!ServerInstance->Duration(parameters[1]))
+			{
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
+				to_apply |= APPLY_PERM_ONLY;
+			}
+			else
+			{
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			}
 
-		ServerInstance->XLines->apply_lines(APPLY_KLINES);
+			ServerInstance->XLines->apply_lines(to_apply);
+		}
 	}
 	else
 	{