X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_zline.cpp;h=fdb156e0ab51a93049b4ffcd1f5f68607fe02026;hb=992674362c5f64bdb8e1942eeaa7612524529cd6;hp=c1951d44765cdb61003e4594070bc086fb2a4165;hpb=ffbd1eebf0b82bf40482879f410f58874030a695;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index c1951d447..fdb156e0a 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -1,26 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Matt Smith <dz@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
-#include "commands/cmd_zline.h"
-
-
-
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** 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 ( 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)
 {
@@ -30,71 +49,66 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 	{
 		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);
+			user->WriteNotice("*** You cannot include a nickname in a zline, a zline must ban only an IP mask");
 			return CMD_FAILURE;
 		}
 
-		User *u = ServerInstance->FindNick(target.c_str());
-		
-		if (u)
+		User *u = ServerInstance->FindNick(target);
+
+		if ((u) && (u->registered == REG_ALL))
 		{
 			target = u->GetIPString();
 		}
 
-		if (ServerInstance->IPMatchesEveryone(target.c_str(),user))
-			return CMD_FAILURE;
-
-		long duration = ServerInstance->Duration(parameters[1].c_str());
-
 		const char* ipaddr = target.c_str();
-		User* find = ServerInstance->FindNick(target.c_str());
 
-		if (find)
+		if (strchr(ipaddr,'@'))
 		{
-			ipaddr = find->GetIPString();
-		}
-		else
-		{
-			if (strchr(ipaddr,'@'))
-			{
-				while (*ipaddr != '@')
-					ipaddr++;
+			while (*ipaddr != '@')
 				ipaddr++;
-			}
+			ipaddr++;
 		}
-		ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), ipaddr);
+
+		if (ServerInstance->IPMatchesEveryone(ipaddr,user))
+			return CMD_FAILURE;
+
+		unsigned long duration = InspIRCd::Duration(parameters[1]);
+		ZLine* zl = new ZLine(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.",user->nick,target.c_str());
+				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,target.c_str(),
-						ServerInstance->TimeString(c_requires_crap).c_str());
+				std::string timestr = ServerInstance->TimeString(c_requires_crap);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s: %s",user->nick.c_str(),ipaddr,
+						timestr.c_str(), parameters[2].c_str());
 			}
 			ServerInstance->XLines->ApplyLines();
 		}
 		else
 		{
 			delete zl;
-			user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,target.c_str());
+			user->WriteNotice("*** Z-Line for " + std::string(ipaddr) + " already exists");
 		}
 	}
 	else
 	{
 		if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,target.c_str());
+			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,target.c_str());
+			user->WriteNotice("*** Z-Line " + target + " not found in list, try /stats Z.");
 			return CMD_FAILURE;
 		}
 	}
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandZline)