Good job we test, because often we find bugs ;p

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

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index c0ddf0db69b54ec69fd51574c8fb2efb7f294778..46d24f3bd11a7b4c3d35d368fc533ac55c190511 100644 (file)
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -38,17 +38,22 @@ CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->IPMatchesEveryone(parameters[0],user))
                        return CMD_FAILURE;
 
-               ServerInstance->XLines->add_zline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-               if (!ServerInstance->Duration(parameters[1]))
+               if (ServerInstance->XLines->add_zline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
-               }
-               else
-               {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       int to_apply = APPLY_ZLINES;
+
+                       FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+                       if (!ServerInstance->Duration(parameters[1]))
+                       {
+                               to_apply |= APPLY_PERM_ONLY;
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
+                       }
+                       else
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       }
+                       ServerInstance->XLines->apply_lines(to_apply);
                }
-               ServerInstance->XLines->apply_lines(APPLY_ZLINES);
        }
        else
        {