X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=255648f850c0860428a10b28ac033d186c1b67d2;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=6b784c93b2fa17d8de503e362df22ee7a0129ec7;hpb=f9b4fb41816a3099d00126951ffa4fef6b175506;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 6b784c93b..255648f85 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -1,70 +1,118 @@
-// Sapart and +g support module by C.J.Edwards
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+/* $ModDesc: Provides support for unreal-style SAPART command */
 
-Server *Srv;
-	 
-void handle_sapart(char **parameters, int pcnt, userrec *user)
-{
-	userrec* dest = Srv->FindNick(std::string(parameters[0]));
-	if (dest)
-	{
-		Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::String(dest->nick)+" part "+parameters[1]);
-		Srv->PartUserFromChannel(dest,std::String(parameters[1]),std::string(dest->nick));
-	}
-}
-
-
-class ModuleSapart : public Module
+/** Handle /SAPART
+ */
+class CommandSapart : public Command
 {
  public:
-	ModuleSapart()
+	CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
 	{
-		Srv = new Server;
-		Srv->AddCommand("SAPART",handle_sapart,'o',2);
+		flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel> [reason]";
+		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
-	
-	virtual ~ModuleSapart()
+
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		delete Srv;
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[1]);
+		std::string reason = "";
+
+		if (dest && channel)
+		{
+			if (parameters.size() > 2)
+				reason = parameters[2];
+
+			if (ServerInstance->ULine(dest->server))
+			{
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
+				return CMD_FAILURE;
+			}
+
+			/* For local clients, directly part them generating a PART message. For remote clients,
+			 * just return CMD_SUCCESS knowing the protocol module will route the SAPART to the users
+			 * local server and that will generate the PART instead
+			 */
+			if (IS_LOCAL(dest))
+			{
+				if (!channel->PartUser(dest, reason))
+					delete channel;
+
+				Channel* n = ServerInstance->FindChan(parameters[1]);
+				if (!n)
+				{
+					ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+					return CMD_SUCCESS;
+				}
+				else
+				{
+					if (!n->HasUser(dest))
+					{
+						ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+						return CMD_SUCCESS;
+					}
+					else
+					{
+						user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
+						return CMD_FAILURE;
+					}
+				}
+			}
+
+			return CMD_SUCCESS;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
+		}
+
+		return CMD_FAILURE;
 	}
-	
-	virtual Version GetVersion()
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return Version(1,0,0,1);
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
 	}
-	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleSapartFactory : public ModuleFactory
+class ModuleSapart : public Module
 {
+	CommandSapart cmd;
  public:
-	ModuleSapartFactory()
+	ModuleSapart()
+		: cmd(this)
 	{
+		ServerInstance->AddCommand(&cmd);
 	}
-	
-	~ModuleSapartFactory()
+
+	virtual ~ModuleSapart()
 	{
 	}
-	
-	virtual Module * CreateModule()
+
+	virtual Version GetVersion()
 	{
-		return new ModuleSapart;
+		return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
-	
-};
 
+};
 
-extern "C" void * init_module( void )
-{
-	return new ModuleSapartFactory;
-}
+MODULE_INIT(ModuleSapart)