X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_zline.cpp;h=1f8076a77485142d9356913d208002ab39294e75;hb=eb334f8c69872cc0de28ffd85b41555f196a23dd;hp=c0ddf0db69b54ec69fd51574c8fb2efb7f294778;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index c0ddf0db6..1f8076a77 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -20,7 +20,7 @@
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_zline(Instance);
 }
@@ -29,26 +29,33 @@ CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
 	{
-		if (strchr(parameters[0],'@'))
+		if (strchr(parameters[0],'@') || strchr(parameters[0],'!'))
 		{
-			user->WriteServ("NOTICE %s :*** You cannot include a username in a zline, a zline must ban only an IP mask",user->nick);
+			user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick);
 			return CMD_FAILURE;
 		}
 
 		if (ServerInstance->IPMatchesEveryone(parameters[0],user))
 			return CMD_FAILURE;
 
-		ServerInstance->XLines->add_zline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
-		if (!ServerInstance->Duration(parameters[1]))
+		if (ServerInstance->XLines->add_zline(ServerInstance->Duration(parameters[1]),user->nick,parameters[2],parameters[0]))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
-		}
-		else
-		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			int to_apply = APPLY_ZLINES;
+
+			FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
+			if (!ServerInstance->Duration(parameters[1]))
+			{
+				to_apply |= APPLY_PERM_ONLY;
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
+			}
+			else
+			{
+				time_t c_requires_crap = ServerInstance->Duration(parameters[1]) + ServerInstance->Time();
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0],
+						ServerInstance->TimeString(c_requires_crap).c_str());
+			}
+			ServerInstance->XLines->apply_lines(to_apply);
 		}
-		ServerInstance->XLines->apply_lines(APPLY_ZLINES);
 	}
 	else
 	{