X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_zline.cpp;h=183fec5d5e32f5168d41de7063950c47d082a3f4;hb=547ee1342e8b07bcdf46bc81343d1a1f7a2998e5;hp=00396a1ae0c6b50ccf763a1352916d4b7cea65e2;hpb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 00396a1ae..183fec5d5 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -14,18 +14,20 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
 #include "xline.h"
-#include "helperfuncs.h"
 #include "commands/cmd_zline.h"
 
 
 
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_zline(Instance);
+}
+
 void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (pcnt >= 3)
@@ -35,26 +37,26 @@ void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 			user->WriteServ("NOTICE %s :*** You cannot include a username in a zline, a zline must ban only an IP mask",user->nick);
 			return;
 		}
-		if (ip_matches_everyone(parameters[0],user))
+		if (ServerInstance->IPMatchesEveryone(parameters[0],user))
 			return;
-		add_zline(duration(parameters[1]),user->nick,parameters[2],parameters[0]);
-		FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration(parameters[1]), user, parameters[2], parameters[0]));
-		if (!duration(parameters[1]))
+		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]))
 		{
-			ServerInstance->WriteOpers("*** %s added permanent Z-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			ServerInstance->WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],duration(parameters[1]));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
 		}
-		apply_lines(APPLY_ZLINES);
+		ServerInstance->XLines->apply_lines(APPLY_ZLINES);
 	}
 	else
 	{
-		if (del_zline(parameters[0]))
+		if (ServerInstance->XLines->del_zline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
-			ServerInstance->WriteOpers("*** %s Removed Z-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{