X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_zline.cpp;h=8fea70656e550cd825cad7a4b5ce5cb500ce4293;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=9b24489b81e4c9bdf82ef3d2a460ba750dd4af6d;hpb=4cf0ae1308fe98757de42ffbe391e61844ac9e0a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 9b24489b8..8fea70656 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -2,12 +2,9 @@
  *       | 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.
  *
@@ -23,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);
 }
@@ -32,26 +29,38 @@ 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]))
+		long duration = ServerInstance->Duration(parameters[1]);
+		if (ServerInstance->XLines->add_zline(duration,user->nick,parameters[2],parameters[0]))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
+			int to_apply = APPLY_ZLINES;
+
+			FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
+			if (!duration)
+			{
+				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 = duration + 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);
 		}
 		else
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
 		}
-		ServerInstance->XLines->apply_lines(APPLY_ZLINES);
 	}
 	else
 	{