X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_eline.cpp;h=277367b45759f58411b74902c05104d5ddf71f87;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=e25f2b7fe66316e11ffd44d7488078306f1eb739;hpb=d54fbc71e2a2e0f70002e2d36c669c4aa3d59e17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index e25f2b7fe..277367b45 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -3,63 +3,67 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *		       E-mail:
+ *		<brain@chatspike.net>
+ *		<Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    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 "cmd_eline.h"
+#include "commands/cmd_eline.h"
 
-extern int MODCOUNT;
-extern ServerConfig* Config;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_eline(Instance);
+}
 
-void cmd_eline::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /ELINE
+ */
+CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (host_matches_everyone(parameters[0],user))
-			return;
+		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+			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;
+		}
 
-		add_eline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddELine,OnAddELine(duration(parameters[1]), user, parameters[2], parameters[0]));
+		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 (!duration(parameters[1]))
+		if (!ServerInstance->Duration(parameters[1]))
 		{
-			WriteOpers("*** %s added permenant E-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			WriteOpers("*** %s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],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
 	{
-		if (del_eline(parameters[0]))
+		if (ServerInstance->XLines->del_eline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelELine,OnDelELine(user, parameters[0]));
-			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
 		{
-			WriteServ(user->fd,"NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]);
 		}
 	}
 
-	// no need to apply the lines for an eline
+	return CMD_SUCCESS;
 }