Annotations

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

diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 2d14fff221396290c48bee161a199265a9343af5..aff9fcc634c9eb037cc36787d4d6cf8969e60a48 100644 (file)
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -27,32 +27,39 @@ extern "C" command_t* init_command(InspIRCd* Instance)
        return new cmd_gline(Instance);
 }
 
-void cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
                if (ServerInstance->HostMatchesEveryone(parameters[0],user))
-                       return;
+                       return CMD_FAILURE;
 
                if (!strchr(parameters[0],'@'))
                {       
                        user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
-                       return;
+                       return CMD_FAILURE;
                }
 
-               ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-               FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-
-               if (!ServerInstance->Duration(parameters[1]))
+               if (ServerInstance->XLines->add_gline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
+                       FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+
+                       if (!ServerInstance->Duration(parameters[1]))
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
+                       }
+                       else
+                       {
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       }
+
+                       ServerInstance->XLines->apply_lines(APPLY_GLINES);
                }
                else
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
                }
 
-               ServerInstance->XLines->apply_lines(APPLY_GLINES);
        }
        else
        {
@@ -63,7 +70,10 @@ void cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** G-Line %s not found in list, try /stats g.",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,parameters[0]);
                }
        }
+
+       return CMD_SUCCESS;
 }
+