Fix part of bug #419 (source nick showing in KILL message to user with hidekills on)

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

diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 3bffa2f343b8d2ea7fefe26c6bd54fee13094600..41643c5d6fec52a0f0ea0f3b77348e80b2a119eb 100644 (file)
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -11,15 +11,13 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "xline.h"
 #include "commands/cmd_qline.h"
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_qline(Instance);
 }
@@ -37,17 +35,28 @@ CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
                        return CMD_FAILURE;
                }
 
-               ServerInstance->XLines->add_qline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddQLine,OnAddQLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-               if (!ServerInstance->Duration(parameters[1]))
+               long duration = ServerInstance->Duration(parameters[1]);
+               if (ServerInstance->XLines->add_qline(duration,user->nick,parameters[2],parameters[0]))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
+                       int to_apply = APPLY_QLINES;
+                       FOREACH_MOD(I_OnAddQLine,OnAddQLine(duration, user, parameters[2], parameters[0]));
+                       if (!duration)
+                       {
+                               to_apply |= APPLY_PERM_ONLY;
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
+                       }
+                       else
+                       {
+                               time_t c_requires_crap = duration + ServerInstance->Time();
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s",user->nick,parameters[0],
+                                         ServerInstance->TimeString(c_requires_crap).c_str());
+                       }
+                       ServerInstance->XLines->apply_lines(to_apply);
                }
                else
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick,parameters[0]);
                }
-               ServerInstance->XLines->apply_lines(APPLY_QLINES);
        }
        else
        {