X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_eline.cpp;h=6fd94d1b82e24a08a6209311e00963bc604cef39;hb=ca0083cba90c8830f5018b73eb715665a8db9dd7;hp=53e776bd200e6e0c723ce480a07c74317da7972e;hpb=1c5d26337b1bea5638332659806dd67d7f74568f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index 53e776bd2..6fd94d1b8 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -1,43 +1,64 @@
-/*       +------------------------------------+
- *       | 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) 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_eline.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** 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);
+};
 
 /** Handle /ELINE
  */
 CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	std::string target = parameters[0];
-	
+
 	if (parameters.size() >= 3)
 	{
 		IdentHostPair ih;
-		User* find = ServerInstance->FindNick(target.c_str());
-		if (find)
+		User* find = ServerInstance->FindNick(target);
+		if ((find) && (find->registered == REG_ALL))
 		{
 			ih.first = "*";
 			ih.second = find->GetIPString();
 			target = std::string("*@") + find->GetIPString();
 		}
 		else
-			ih = ServerInstance->XLines->IdentSplit(target.c_str());
+			ih = ServerInstance->XLines->IdentSplit(target);
 
         if (ih.first.empty())
         {
@@ -48,20 +69,20 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
-		long duration = ServerInstance->Duration(parameters[1].c_str());
-
-		ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
+		unsigned long duration = InspIRCd::Duration(parameters[1]);
+		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: %s",user->nick.c_str(),target.c_str(), parameters[2].c_str());
+				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();
+				std::string timestr = ServerInstance->TimeString(c_requires_crap);
 				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());
+						timestr.c_str(), parameters[2].c_str());
 			}
 		}
 		else
@@ -74,7 +95,7 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 	{
 		if (ServerInstance->XLines->DelLine(target.c_str(), "E", user))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick.c_str(),target.c_str());
+			ServerInstance->SNO->WriteToSnoMask('x',"%s removed E-line on %s",user->nick.c_str(),target.c_str());
 		}
 		else
 		{
@@ -84,3 +105,5 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandEline)