X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=b0f0f9d1cd49aaf793c14a05385b6472fa6050c3;hb=bcac49dca78631687975771c6d0a76b595171664;hp=177a77d9b1d1678215eabc98d449973bb4dee7f3;hpb=268e6a408792045abf729214f40abd250250f3f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 177a77d9b..b0f0f9d1c 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -1,52 +1,106 @@
-// Sapart and +g support module by C.J.Edwards
+/*       +------------------------------------+
+ *       | 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.
+ * This program is free but copyrighted software; see
+ *	    the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
 
 #include <stdio.h>
 #include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-Server *Srv;
-	 
-void handle_sapart(char **parameters, int pcnt, userrec *user)
+/** Handle /SAPART
+ */
+class cmd_sapart : public command_t
 {
-	userrec* dest = Srv->FindNick(std::string(parameters[0]));
-	if (dest)
+ public:
+	cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
 	{
-		for (int x = 0; x < strlen(parameters[1]); x++)
+		this->source = "m_sapart.so";
+		syntax = "<nick> <channel>";
+	}
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	{
+		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		chanrec* channel = ServerInstance->FindChan(parameters[1]);
+		if (dest && channel)
 		{
-				if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
+			if (ServerInstance->ULine(dest->server))
+			{
+				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				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
+			{
+				if (!n->HasUser(dest))
 				{
-					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-					return;
+					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;
+				}
+			}
+
+			return CMD_SUCCESS;
+		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
 		}
 
-		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_FAILURE;
 	}
-}
+};
 
 
 class ModuleSapart : public Module
 {
+	cmd_sapart*	mycommand;
  public:
-	ModuleSapart()
+	ModuleSapart(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-		Srv->AddCommand("SAPART",handle_sapart,'o',2);
+		
+		mycommand = new cmd_sapart(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSapart()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1);
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
@@ -64,9 +118,9 @@ class ModuleSapartFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		return new ModuleSapart;
+		return new ModuleSapart(Me);
 	}
 	
 };