X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_sapart.cpp;h=f7807824f980f9e04d58da3d92840f3192b8a7dd;hb=da074814501f23680b579feb1ad649c86e8a1348;hp=9203b7d36f4ecbe7286adc27508e524701d83c9d;hpb=a551684ab05b850d1c9e84f710ec9d1ccf1e83d8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 9203b7d36..f7807824f 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -2,72 +2,107 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-static Server *Srv;
-
-class cmd_sapart : public command_t
+/** Handle /SAPART
+ */
+class CommandSapart : public Command
 {
  public:
-	cmd_sapart () : command_t("SAPART", 'o', 2)
+	CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", "o", 2, false, 0)
 	{
 		this->source = "m_sapart.so";
+		syntax = "<nick> <channel> [reason]";
+		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
-	 
-	void Handle (char **parameters, int pcnt, userrec *user)
+
+	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
 	{
-		userrec* dest = Srv->FindNick(std::string(parameters[0]));
-		if (dest)
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[1]);
+		std::string reason;
+
+		if (dest && channel)
 		{
-			if (Srv->IsUlined(dest->server))
+			ServerInstance->Logs->Log("m_sapart",DEBUG, "SAPART: pcnt is %d", pcnt);
+			if (pcnt == 3)
+				reason = parameters[2];
+			else
+				reason = dest->nick;
+
+			if (ServerInstance->ULine(dest->server))
 			{
-				WriteServ(user->fd,"990 %s :Cannot use an SA command on a u-lined client",user->nick);
-				return;
+				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				return CMD_FAILURE;
 			}
-			if (!IsValidChannelName(parameters[1]))
+
+			/* 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))
 			{
-				Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-				return;
+				if (!channel->PartUser(dest, reason.c_str()))
+					delete channel;
+				Channel* n = ServerInstance->FindChan(parameters[1]);
+				if (!n)
+				{
+					ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+					return CMD_SUCCESS;
+				}
+				else
+				{
+					if (!n->HasUser(dest))
+					{
+						ServerInstance->SNO->WriteToSnoMask('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, dest->nick, parameters[1]);
+						return CMD_FAILURE;
+					}
+				}
+			}
+			else
+			{
+				ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
 			}
 
-			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));
+			return CMD_SUCCESS;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
 		}
+
+		return CMD_FAILURE;
 	}
 };
 
 
 class ModuleSapart : public Module
 {
-	cmd_sapart*	mycommand;
+	CommandSapart*	mycommand;
  public:
-	ModuleSapart(Server* Me)
-		: Module::Module(Me)
+	ModuleSapart(InspIRCd* Me)
+		: Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_sapart();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new CommandSapart(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+
 	}
 	
 	virtual ~ModuleSapart()
@@ -76,34 +111,10 @@ class ModuleSapart : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
-	}
-	
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSapartFactory : public ModuleFactory
-{
- public:
-	ModuleSapartFactory()
-	{
-	}
-	
-	~ModuleSapartFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
-	{
-		return new ModuleSapart(Me);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSapartFactory;
-}
+MODULE_INIT(ModuleSapart)