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

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 803f08b03..bd9832c8a 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -11,24 +11,23 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "xline.h"
 #include "commands/cmd_eline.h"
 
-extern "C" 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],'@'))
@@ -37,21 +36,26 @@ CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 			return CMD_FAILURE;
 		}
 
-		if (ServerInstance->XLines->add_eline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
+		long duration = ServerInstance->Duration(parameters[1]);
+		if (ServerInstance->XLines->add_eline(duration,user->nick,parameters[2],parameters[0]))
 		{
-			FOREACH_MOD(I_OnAddELine,OnAddELine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+			FOREACH_MOD(I_OnAddELine,OnAddELine(duration, user, parameters[2], parameters[0]));
 
-			if (!ServerInstance->Duration(parameters[1]))
+			if (!duration)
 			{
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
 			}
 			else
 			{
-				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				time_t c_requires_crap = duration + ServerInstance->Time();
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,parameters[0],
-						ctime(&c_requires_crap));
+						ServerInstance->TimeString(c_requires_crap).c_str());
 			}
 		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,parameters[0]);
+		}
 	}
 	else
 	{