X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_eline.cpp;h=6c8586c01b9480d99e878ff138bc8abae62a46e5;hb=d383ce9b72bf5c58bb0571998b282cf67cf7635c;hp=cd0627178be4e2995c9c514041a3f5f3d258d98e;hpb=c45fe6715d51a0b6565fee1321c45645883fa749;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index cd0627178..6c8586c01 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -2,73 +2,124 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 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_eline.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *      the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#ifndef CMD_ELINE_H
+#define CMD_ELINE_H
+
+// include the common header files
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+#include "users.h"
+#include "channels.h"
+
+/** Handle /ELINE. 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 CommandEline : public Command
 {
-	return new CommandEline(Instance);
-}
+ public:
+	/** Constructor for eline.
+	 */
+	CommandEline ( Module* parent) : Command(parent,"ELINE",1,3) { flags_needed = 'o'; syntax = "<ident@host> [<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
+
 
 /** Handle /ELINE
  */
-CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	if (pcnt >= 3)
-	{
-		IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
-		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
-			return CMD_FAILURE;
+	std::string target = parameters[0];
 
-		if (!strchr(parameters[0],'@'))
+	if (parameters.size() >= 3)
+	{
+		IdentHostPair ih;
+		User* find = ServerInstance->FindNick(target.c_str());
+		if (find)
 		{
-			user->WriteServ("NOTICE %s :*** E-Line must contain a username, e.g. *@%s",user->nick,parameters[0]);
-			return CMD_FAILURE;
+			ih.first = "*";
+			ih.second = find->GetIPString();
+			target = std::string("*@") + find->GetIPString();
 		}
+		else
+			ih = ServerInstance->XLines->IdentSplit(target.c_str());
+
+        if (ih.first.empty())
+        {
+            user->WriteServ("NOTICE %s :*** Target not found", user->nick.c_str());
+            return CMD_FAILURE;
+        }
+
+		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
+			return CMD_FAILURE;
 
-		long duration = ServerInstance->Duration(parameters[1]);
+		long duration = ServerInstance->Duration(parameters[1].c_str());
 
-		ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str());
+		ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
 		if (ServerInstance->XLines->AddLine(el, user))
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
 			}
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,parameters[0],
-						ServerInstance->TimeString(c_requires_crap).c_str());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
+						ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
 			}
 		}
 		else
 		{
 			delete el;
-			user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick.c_str(),target.c_str());
 		}
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0], 'E', user))
+		if (ServerInstance->XLines->DelLine(target.c_str(), "E", user))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s removed E-line on %s",user->nick.c_str(),target.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick.c_str(),target.c_str());
 		}
 	}
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandEline)