Merge commands and modules in source, since they are already merged in install

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11734 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 106 insertions, 0 deletions

diff --git a/src/modules/cmd_zline.cpp b/src/modules/cmd_zline.cpp
new file mode 100644
index 000000000..e2cca7649
--- /dev/null
+++ b/src/modules/cmd_zline.cpp
@@ -0,0 +1,106 @@
+/*       +------------------------------------+
+ *       | 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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "xline.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
+{
+ public:
+	/** Constructor for zline.
+	 */
+	CommandZline ( Module* parent) : Command(parent,"ZLINE",1,3) { flags_needed = 'o'; Penalty = 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);
+};
+
+CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User *user)
+{
+	std::string target = parameters[0];
+
+	if (parameters.size() >= 3)
+	{
+		if (target.find('!') != std::string::npos)
+		{
+			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;
+		}
+
+		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].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))
+		{
+			if (!duration)
+			{
+				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: %s",user->nick.c_str(),ipaddr,
+						ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+			}
+			ServerInstance->XLines->ApplyLines();
+		}
+		else
+		{
+			delete zl;
+			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick.c_str(),ipaddr);
+		}
+	}
+	else
+	{
+		if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
+		{
+			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.c_str(),target.c_str());
+			return CMD_FAILURE;
+		}
+	}
+
+	return CMD_SUCCESS;
+}
+
+COMMAND_INIT(CommandZline)