Annotations

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

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 27cad8c210fcfcdd48e88d1827eb3c4f76a080a0..3a11fe024f6833cf329c8c313ba4aa4b3d7146b7 100644 (file)
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -14,29 +14,30 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
-
 #include "commands/cmd_eline.h"
 
 
 
-void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_eline(Instance);
+}
+
+CmdResult cmd_eline::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 :*** E-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
-                       return;
+                       return CMD_FAILURE;
                }
 
                ServerInstance->XLines->add_eline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
@@ -44,11 +45,11 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 
                if (!ServerInstance->Duration(parameters[1]))
                {
-                       ServerInstance->WriteOpers("*** %s added permanent E-line for %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
                }
                else
                {
-                       ServerInstance->WriteOpers("*** %s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
                }
        }
        else
@@ -56,7 +57,7 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
                if (ServerInstance->XLines->del_eline(parameters[0]))
                {
                        FOREACH_MOD(I_OnDelELine,OnDelELine(user, parameters[0]));
-                       ServerInstance->WriteOpers("*** %s Removed E-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]);
                }
                else
                {
@@ -64,5 +65,5 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
                }
        }
 
-       // no need to apply the lines for an eline
+       return CMD_SUCCESS;
 }