Note that we dont allow upgrades to version 3 of GPL, just to re-iterate.

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

diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 3bffa2f343b8d2ea7fefe26c6bd54fee13094600..951f39df835b8767aac9b8fbaef33da447439a97 100644 (file)
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -37,17 +37,22 @@ 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]))
+               if (ServerInstance->XLines->add_qline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
-               }
-               else
-               {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       int to_apply = APPLY_QLINES;
+
+                       FOREACH_MOD(I_OnAddQLine,OnAddQLine(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 Q-line for %s.",user->nick,parameters[0]);
+                       }
+                       else
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-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_QLINES);
        }
        else
        {