X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_eline.cpp;h=bd9832c8a6dae8b16bc52f9cb8cde2151915e5e4;hb=4cc6e5e14fdbde499481dbab5ab2ad1257b8af9c;hp=be78e3b3515b10c5c2e015f9fdee0d926ca26a67;hpb=c2993f666f8146e75b4039b2b7bffe3455a3ac61;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index be78e3b35..bd9832c8a 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -12,24 +12,22 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_eline.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_eline(Instance);
+	return new CommandEline(Instance);
 }
 
 /** Handle /ELINE
  */
-CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
-		if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+		IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
 		if (!strchr(parameters[0],'@'))
@@ -54,6 +52,10 @@ CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 						ServerInstance->TimeString(c_requires_crap).c_str());
 			}
 		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,parameters[0]);
+		}
 	}
 	else
 	{