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

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

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index 95063c8e288c7e529b7c720acd85b267b6bf5e61..520bea30653de9b1c637b919cee27139062a9412 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -36,9 +36,17 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                        return CMD_FAILURE;
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->AddZLine(duration,user->nick,parameters[2],parameters[0]))
+
+               const char* ipaddr = parameters[0]; 
+               if (strchr(ipaddr,'@'))
+               {
+                       while (*ipaddr != '@')
+                               ipaddr++;
+                       ipaddr++;
+               }
+               ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr);
+               if (ServerInstance->XLines->AddLine(zl,user))
                {
-                       FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
                        if (!duration)
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
@@ -53,14 +61,14 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
+                       delete zl;
                        user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
                }
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(parameters[0],'Z'))
+               if (ServerInstance->XLines->DelLine(parameters[0],"Z",user))
                {
-                       FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
                        ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
                }
                else