Roadmap item "Fix jointhrottle to not try 'throttle' clients during a netmerge (requi...

[user/henk/code/inspircd.git] / src / commands / cmd_kline.cpp

diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index 5edb414eab92bae983816718e8443405b6173126..7058de77f39b7d22c2a518485e16755963e74582 100644 (file)
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -42,16 +42,12 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
                }
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->add_kline(duration,user->nick,parameters[2],parameters[0]))
+               KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               if (ServerInstance->XLines->AddLine(kl,user))
                {
-                       int to_apply = APPLY_KLINES;
-
-                       FOREACH_MOD(I_OnAddKLine,OnAddKLine(duration, user, parameters[2], parameters[0]));
-       
                        if (!duration)
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
-                               to_apply |= APPLY_PERM_ONLY;
                        }
                        else
                        {
@@ -60,18 +56,18 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
 
-                       ServerInstance->XLines->apply_lines(to_apply);
+                       ServerInstance->XLines->ApplyLines();
                }
                else
                {
+                       delete kl;
                        user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,parameters[0]);
                }
        }
        else
        {
-               if (ServerInstance->XLines->del_kline(parameters[0]))
+               if (ServerInstance->XLines->DelLine(parameters[0],"K",user))
                {
-                       FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0]));
                        ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
                }
                else