Remove Implements() method from every module. booya.

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

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 3845c23ee2943e79e6f60247a7f5d29d74f04d5e..caed54ebe6eab1eec9b5aecfe486729d8b9334ed 100644 (file)
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -42,16 +42,12 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
                }
 
                long duration = ServerInstance->Duration(parameters[1]);
-               if (ServerInstance->XLines->add_gline(duration,user->nick,parameters[2],parameters[0]))
+               GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+               if (ServerInstance->XLines->AddLine(gl, user))
                {
-                       int to_apply = APPLY_GLINES;
-
-                       FOREACH_MOD(I_OnAddGLine,OnAddGLine(duration, user, parameters[2], parameters[0]));
-
                        if (!duration)
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
-                               to_apply |= APPLY_PERM_ONLY;
                        }
                        else
                        {
@@ -60,19 +56,19 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
 
-                       ServerInstance->XLines->apply_lines(to_apply);
+                       ServerInstance->XLines->ApplyLines();
                }
                else
                {
+                       delete gl;
                        user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
                }
 
        }
        else
        {
-               if (ServerInstance->XLines->del_gline(parameters[0]))
+               if (ServerInstance->XLines->DelLine(parameters[0],"G",user))
                {
-                       FOREACH_MOD(I_OnDelGLine,OnDelGLine(user, parameters[0]));
                        ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
                }
                else