Spotted problem: must clear out all prefixes attached to a user when they quit or...

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

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index f62c7058aa7404ec1296bbd054131fa043d6e311..17fdeed16352591e81bace9a6849f14dd4c1153d 100644 (file)
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -21,10 +21,10 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_zline.h"
 
-extern InspIRCd* ServerInstance;
+
 
 void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 {
@@ -35,23 +35,23 @@ void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
                        user->WriteServ("NOTICE %s :*** You cannot include a username in a zline, a zline must ban only an IP mask",user->nick);
                        return;
                }
-               if (ip_matches_everyone(parameters[0],user))
+               if (ServerInstance->IPMatchesEveryone(parameters[0],user))
                        return;
-               add_zline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration(parameters[1]), user, parameters[2], parameters[0]));
-               if (!duration(parameters[1]))
+               ServerInstance->XLines->add_zline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
+               FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+               if (!ServerInstance->Duration(parameters[1]))
                {
                        ServerInstance->WriteOpers("*** %s added permanent Z-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       ServerInstance->WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+                       ServerInstance->WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
                }
-               apply_lines(APPLY_ZLINES);
+               ServerInstance->XLines->apply_lines(APPLY_ZLINES);
        }
        else
        {
-               if (del_zline(parameters[0]))
+               if (ServerInstance->XLines->del_zline(parameters[0]))
                {
                        FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
                        ServerInstance->WriteOpers("*** %s Removed Z-line on %s.",user->nick,parameters[0]);