X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=4f7bfdb1f7410d0ae28cb57d7a7b679f2a4124f8;hb=b4599531f97a9e6207b6bb8d728d7523b6995523;hp=c6137c561d216e32823bc5cb3d0ad9cffee4a23e;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index c6137c561..4f7bfdb1f 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -28,12 +28,15 @@ class CommandSapart : public Command
  public:
 	CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
 	{
-		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel> [reason]";
+		flags_needed = 'o'; syntax = "<nick> <channel>[,<channel>]+ [:<reason>]";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
+		if (CommandParser::LoopCall(user, this, parameters, 1))
+			return CMD_FAILURE;
+
 		User* dest = ServerInstance->FindNick(parameters[0]);
 		Channel* channel = ServerInstance->FindChan(parameters[1]);
 		std::string reason;
@@ -43,9 +46,15 @@ class CommandSapart : public Command
 			if (parameters.size() > 2)
 				reason = parameters[2];
 
-			if (ServerInstance->ULine(dest->server))
+			if (dest->server->IsULine())
+			{
+				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
+				return CMD_FAILURE;
+			}
+
+			if (!channel->HasUser(dest))
 			{
-				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+				user->WriteNotice("*** " + dest->nick + " is not on " + channel->name);
 				return CMD_FAILURE;
 			}
 
@@ -56,26 +65,7 @@ class CommandSapart : public Command
 			if (IS_LOCAL(dest))
 			{
 				channel->PartUser(dest, reason);
-
-				Channel* n = ServerInstance->FindChan(parameters[1]);
-				if (!n)
-				{
-					ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+parameters[1]);
-					return CMD_SUCCESS;
-				}
-				else
-				{
-					if (!n->HasUser(dest))
-					{
-						ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+parameters[1]);
-						return CMD_SUCCESS;
-					}
-					else
-					{
-						user->WriteNotice("*** Unable to make " + dest->nick + " part " + parameters[1]);
-						return CMD_FAILURE;
-					}
-				}
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+channel->name);
 			}
 
 			return CMD_SUCCESS;
@@ -88,12 +78,9 @@ class CommandSapart : public Command
 		return CMD_FAILURE;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		User* dest = ServerInstance->FindNick(parameters[0]);
-		if (dest)
-			return ROUTE_OPT_UCAST(dest->server);
-		return ROUTE_LOCALONLY;
+		return ROUTE_OPT_UCAST(parameters[0]);
 	}
 };
 
@@ -107,11 +94,6 @@ class ModuleSapart : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR);