X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sakick.cpp;h=454214b1c7dbb2fcc0e23f43a913762dbedd0152;hb=cbd32e195f5f574653550a3ed4954168ace30c55;hp=5755281d41a38bacf71a424582f12920ad82ab06;hpb=78ec14490c922588e2c2a9c47c01518b33a677b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 5755281d4..454214b1c 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -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)
@@ -32,7 +31,6 @@ class CommandSakick : public Command
 		User* dest = ServerInstance->FindNick(parameters[1]);
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		const char* reason = "";
-		const char* servername = NULL;
 
 		if (dest && channel)
 		{
@@ -57,8 +55,7 @@ class CommandSakick : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
-				if (!channel->ServerKickUser(dest, reason, servername))
-					delete channel;
+				channel->KickUser(ServerInstance->FakeClient, dest, reason);
 
 				Channel *n = ServerInstance->FindChan(parameters[1]);
 				if (n && n->HasUser(dest))
@@ -72,8 +69,7 @@ class CommandSakick : public Command
 			if (IS_LOCAL(user))
 			{
 				/* Locally issued command; send the snomasks */
-				ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick) + " SAKICKed " + dest->nick + " on " + parameters[0]);
-				ServerInstance->PI->SendSNONotice("A", std::string(user->nick) + " SAKICKed " + dest->nick + " on " + parameters[0]);
+				ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick) + " SAKICKed " + dest->nick + " on " + parameters[0]);
 			}
 
 			return CMD_SUCCESS;
@@ -85,19 +81,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()
@@ -106,7 +107,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);
 	}
 
 };