Remove /summon and /users (I think 15+ years of being marked deprecated is enough...

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

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 1f8076a77485142d9356913d208002ab39294e75..4a70069ab6619eb2a1bc9cb79ee45ec79289816b 100644 (file)
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_zline.h"
 
@@ -38,24 +35,29 @@ CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->IPMatchesEveryone(parameters[0],user))
                        return CMD_FAILURE;
 
-               if (ServerInstance->XLines->add_zline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
+               long duration = ServerInstance->Duration(parameters[1]);
+               if (ServerInstance->XLines->add_zline(duration,user->nick,parameters[2],parameters[0]))
                {
                        int to_apply = APPLY_ZLINES;
 
-                       FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-                       if (!ServerInstance->Duration(parameters[1]))
+                       FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
+                       if (!duration)
                        {
                                to_apply |= APPLY_PERM_ONLY;
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
                        }
                        else
                        {
-                               time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+                               time_t c_requires_crap = duration + ServerInstance->Time();
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0],
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
                        ServerInstance->XLines->apply_lines(to_apply);
                }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
+               }
        }
        else
        {