Removed a pointless check in ./configure --clean that made it only work with one...

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

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 9e9274de7aa4c42050b95afa35c5619ee875c00f..df2455f863a948305916b52b250e0f8d7efcbc33 100644 (file)
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -2,47 +2,51 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
 #include "commands/cmd_eline.h"
 
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_eline(Instance);
+}
 
-
-void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /ELINE
+ */
+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 CMD_FAILURE;
+               }
 
                ServerInstance->XLines->add_eline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
                FOREACH_MOD(I_OnAddELine,OnAddELine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 
                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
@@ -50,7 +54,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
                {
@@ -58,5 +62,5 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
                }
        }
 
-       // no need to apply the lines for an eline
+       return CMD_SUCCESS;
 }