X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=1713e07c0cba3fa041314283e8e48a8d634689ee;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=b341b4c283f00c7e3713f9c8a54f57b816435860;hpb=8dba4b8122e228d6ba1ef1c475fc9500d06e1e56;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index b341b4c28..1713e07c0 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#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 */
 
@@ -43,27 +41,38 @@ class cmd_sapart : public command_t
 				return CMD_FAILURE;
 			}
 
-			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
+			/* 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 (!n->HasUser(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
 				{
-					user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]);
-					return CMD_FAILURE;
+					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;
 		}
@@ -82,7 +91,7 @@ class ModuleSapart : public Module
 	cmd_sapart*	mycommand;
  public:
 	ModuleSapart(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		mycommand = new cmd_sapart(ServerInstance);
@@ -95,34 +104,10 @@ class ModuleSapart : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-	}
-	
-};
-
-// 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(InspIRCd* 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)