X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=8d01bdf01701a4fecb9df7eda4e3f2be0960dbac;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=98178c46a5c6f967e56d1b22c303db02307dc1b0;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 98178c46a..8d01bdf01 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -2,43 +2,34 @@
  *       | 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-2007 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 "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-
-
-
+/** Handle /SAPART
+ */
 class cmd_sapart : public command_t
 {
  public:
- cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
+	cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
 	{
 		this->source = "m_sapart.so";
 		syntax = "<nick> <channel>";
 	}
-	 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		userrec* dest = ServerInstance->FindNick(parameters[0]);
 		chanrec* channel = ServerInstance->FindChan(parameters[1]);
@@ -47,12 +38,50 @@ class cmd_sapart : public command_t
 			if (ServerInstance->ULine(dest->server))
 			{
 				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-				return;
+				return CMD_FAILURE;
 			}
-			ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
-			if (!channel->PartUser(dest, dest->nick))
-				delete channel;
+
+			/* 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, dest->nick))
+					delete channel;
+				chanrec* n = ServerInstance->FindChan(parameters[1]);
+				if (!n)
+				{
+					ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+					return CMD_SUCCESS;
+				}
+				else
+				{
+					if (!n->HasUser(dest))
+					{
+						ServerInstance->WriteOpers("*** "+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->WriteOpers("*** "+std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
+			}
+
+			return CMD_SUCCESS;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
 		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -62,7 +91,7 @@ class ModuleSapart : public Module
 	cmd_sapart*	mycommand;
  public:
 	ModuleSapart(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		mycommand = new cmd_sapart(ServerInstance);
@@ -75,7 +104,7 @@ class ModuleSapart : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
@@ -101,7 +130,7 @@ class ModuleSapartFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleSapartFactory;
 }