X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sakick.cpp;h=fa4d95c969582cf9330ee1ac495c54a431c01c4d;hb=78aabc62e7510af5075b2056f703f0aa42e328a4;hp=af70c58002f671a1ba39aee68982c75775bc8089;hpb=b0884a94ef85f28fa964adc1b4f0732f2986ca7a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index af70c5800..fa4d95c96 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -20,11 +20,10 @@
 class CommandSakick : public Command
 {
  public:
-	CommandSakick (InspIRCd* Instance) : Command(Instance,"SAKICK", "o", 2, 3, false, 0)
+	CommandSakick(Module* Creator) : Command(Creator,"SAKICK", 2, 3)
 	{
-		this->source = "m_sakick.so";
-		syntax = "<channel> <nick> [reason]";
-		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
+		flags_needed = 'o'; Penalty = 0; syntax = "<channel> <nick> [reason]";
+		TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -47,7 +46,7 @@ class CommandSakick : public Command
 
 			if (ServerInstance->ULine(dest->server))
 			{
-				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client", user->nick.c_str());
 				return CMD_FAILURE;
 			}
 
@@ -60,29 +59,19 @@ class CommandSakick : public Command
 				if (!channel->ServerKickUser(dest, reason, servername))
 					delete channel;
 
-				Channel* n = ServerInstance->FindChan(parameters[1]);
-				if (!n)
+				Channel *n = ServerInstance->FindChan(parameters[1]);
+				if (n && n->HasUser(dest))
 				{
-					ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]);
-					return CMD_SUCCESS;
-				}
-				else
-				{
-					if (!n->HasUser(dest))
-					{
-						ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" SAKICKed "+dest->nick+" on "+parameters[0]);
-						return CMD_SUCCESS;
-					}
-					else
-					{
-						user->WriteServ("NOTICE %s :*** Unable to kick %s from %s",user->nick.c_str(), dest->nick.c_str(), parameters[0].c_str());
-						return CMD_FAILURE;
-					}
+					/* Sort-of-bug: If the command was issued remotely, this message won't be sent */
+					user->WriteServ("NOTICE %s :*** Unable to kick %s from %s", user->nick.c_str(), dest->nick.c_str(), parameters[0].c_str());
+					return CMD_FAILURE;
 				}
 			}
-			else
+
+			if (IS_LOCAL(user))
 			{
-				ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" sent remote SAKICK to kick "+dest->nick+" from "+parameters[0]);
+				/* Locally issued command; send the snomasks */
+				ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " SAKICKed " + dest->nick + " on " + parameters[0]);
 			}
 
 			return CMD_SUCCESS;
@@ -94,19 +83,24 @@ class CommandSakick : public Command
 
 		return CMD_FAILURE;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[1]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
+	}
 };
 
 class ModuleSakick : public Module
 {
-	CommandSakick*	mycommand;
+	CommandSakick cmd;
  public:
-	ModuleSakick(InspIRCd* Me)
-		: Module(Me)
+	ModuleSakick()
+		: cmd(this)
 	{
-
-		mycommand = new CommandSakick(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	virtual ~ModuleSakick()
@@ -115,7 +109,7 @@ class ModuleSakick : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR, API_VERSION);
 	}
 
 };