Start of splitting up. WARNING: This is far from tidy or finished in terms of code...

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

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 56ec75a8f299c9a841a5dfd5d42797a07cb0e92c..de1cb8366369da6a6e1b0e9724854ab7798d7477 100644 (file)
--- 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
        {