Fix a silly bug we never thought was a bug, in m_messageflood - the message that...

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

diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp
index 16927d2346718de0142c8430af93f02ac4465794..97d26ba9f14d07592c93e9398d879e0bd97830e1 100644 (file)
--- a/src/commands/cmd_qline.cpp
+++ b/src/commands/cmd_qline.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandQline(Instance);
 }
 
-CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandQline::Handle (const char* const* parameters, int pcnt, User *user)
 {
        if (pcnt >= 3)
        {
@@ -36,13 +36,11 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
                }
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->add_qline(duration,user->nick,parameters[2],parameters[0]))
+               QLine* ql = new QLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+               if (ServerInstance->XLines->AddLine(ql,user))
                {
-                       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
@@ -51,18 +49,18 @@ CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
                                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);
+                       ServerInstance->XLines->ApplyLines();
                }
                else
                {
+                       delete ql;
                        user->WriteServ("NOTICE %s :*** Q-Line for %s already exists",user->nick,parameters[0]);
                }
        }
        else
        {
-               if (ServerInstance->XLines->del_qline(parameters[0]))
+               if (ServerInstance->XLines->DelLine(parameters[0],"Q",user))
                {
-                       FOREACH_MOD(I_OnDelQLine,OnDelQLine(user, parameters[0]));
                        ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]);
                }
                else