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

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index ecda26050..b0f0f9d1c 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *		       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.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -21,33 +21,63 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-Server *Srv;
-
+/** Handle /SAPART
+ */
 class cmd_sapart : public command_t
 {
  public:
-	cmd_sapart () : command_t("SAPART", 'o', 2)
+	cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
 	{
 		this->source = "m_sapart.so";
+		syntax = "<nick> <channel>";
 	}
-	 
-	void Handle (char **parameters, int pcnt, userrec *user)
+
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
-		userrec* dest = Srv->FindNick(std::string(parameters[0]));
-		if (dest)
+		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		chanrec* channel = ServerInstance->FindChan(parameters[1]);
+		if (dest && channel)
 		{
-			if (!IsValidChannelName(parameters[1]))
+			if (ServerInstance->ULine(dest->server))
 			{
-				Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-				return;
+				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				return CMD_FAILURE;
 			}
 
-			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));
+			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;
+				}
+			}
+
+			return CMD_SUCCESS;
 		}
+		else
+		{
+			user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
+		}
+
+		return CMD_FAILURE;
 	}
 };
 
@@ -56,12 +86,12 @@ class ModuleSapart : public Module
 {
 	cmd_sapart*	mycommand;
  public:
-	ModuleSapart(Server* Me)
+	ModuleSapart(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_sapart();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_sapart(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSapart()
@@ -70,7 +100,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);
 	}
 	
 };
@@ -88,7 +118,7 @@ class ModuleSapartFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSapart(Me);
 	}