X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_zline.cpp;h=81476a032f961be3c77824a563b25b8df9b5e3d2;hb=91df762e93212958db487d8517addba1a63a4ddd;hp=7e5d9b7b29b2d1143ec70d3ba43e2ff8405f22d3;hpb=4840d5e77572f42b710501912d59b5dbb6d2c2af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index 7e5d9b7b2..81476a032 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -2,73 +2,131 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 #include "inspircd.h"
 #include "xline.h"
-#include "commands/cmd_zline.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *      the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
+#ifndef __CMD_ZLINE_H__
+#define __CMD_ZLINE_H__
 
+// include the common header files
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+#include "users.h"
+#include "channels.h"
+
+/** Handle /ZLINE. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandZline : public Command
 {
-	return new CommandZline(Instance);
-}
+ public:
+	/** Constructor for zline.
+	 */
+	CommandZline (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"ZLINE","o",1,3,false,0) { syntax = "<ipmask> [<duration> :<reason>]"; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
+
+#endif
+
 
-CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
+
+
+CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	if (pcnt >= 3)
+	std::string target = parameters[0];
+
+	if (parameters.size() >= 3)
 	{
-		if (strchr(parameters[0],'@') || strchr(parameters[0],'!'))
+		if (target.find('!') != std::string::npos)
 		{
-			user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick);
+			user->WriteServ("NOTICE %s :*** You cannot include a nickname in a zline, a zline must ban only an IP mask",user->nick.c_str());
 			return CMD_FAILURE;
 		}
 
-		if (ServerInstance->IPMatchesEveryone(parameters[0],user))
+		User *u = ServerInstance->FindNick(target.c_str());
+
+		if (u)
+		{
+			target = u->GetIPString();
+		}
+
+		const char* ipaddr = target.c_str();
+
+		if (strchr(ipaddr,'@'))
+		{
+			while (*ipaddr != '@')
+				ipaddr++;
+			ipaddr++;
+		}
+
+		if (ServerInstance->IPMatchesEveryone(ipaddr,user))
 			return CMD_FAILURE;
 
-		long duration = ServerInstance->Duration(parameters[1]);
-		if (ServerInstance->XLines->add_zline(duration,user->nick,parameters[2],parameters[0]))
+		long duration = ServerInstance->Duration(parameters[1].c_str());
+
+		ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
+		if (ServerInstance->XLines->AddLine(zl,user))
 		{
-			FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
 			if (!duration)
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s: %s", user->nick.c_str(), ipaddr, parameters[2].c_str());
 			}
 			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->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s: %s",user->nick.c_str(),ipaddr,
+						ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
 			}
-			ServerInstance->XLines->apply_lines();
+			ServerInstance->XLines->ApplyLines();
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
+			delete zl;
+			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick.c_str(),ipaddr);
 		}
 	}
 	else
 	{
-		if (ServerInstance->XLines->del_zline(parameters[0]))
+		if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
 		{
-			FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick.c_str(),target.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick.c_str(),target.c_str());
 			return CMD_FAILURE;
 		}
 	}
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandZline)