X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=1a2bf1a270a681f8832347c3641ffd4df6b4a6ef;hb=00fa6d592ed2640fcdf74444786de555c1c3da25;hp=829607e5866dd2c87a8f0f5a41d66ffc5ec781e4;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 829607e58..1a2bf1a27 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,32 +12,35 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
 /** Handle /SAPART
  */
-class cmd_sapart : public command_t
+class CommandSapart : public Command
 {
  public:
-	cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
+	CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", "o", 2, 3, false, 0)
 	{
 		this->source = "m_sapart.so";
-		syntax = "<nick> <channel>";
+		syntax = "<nick> <channel> [reason]";
+		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
-		chanrec* channel = ServerInstance->FindChan(parameters[1]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[1]);
+		std::string reason = "";
+
 		if (dest && channel)
 		{
+			if (parameters.size() > 2)
+				reason = parameters[2];
+
 			if (ServerInstance->ULine(dest->server))
 			{
-				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
 				return CMD_FAILURE;
 			}
 
@@ -47,38 +50,39 @@ class cmd_sapart : public command_t
 			 */
 			if (IS_LOCAL(dest))
 			{
-				if (!channel->PartUser(dest, dest->nick))
+				if (!channel->PartUser(dest, reason))
 					delete channel;
-				chanrec* n = ServerInstance->FindChan(parameters[1]);
+
+				Channel* n = ServerInstance->FindChan(parameters[1]);
 				if (!n)
 				{
-					ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+					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->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+						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]);
+						user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
 						return CMD_FAILURE;
 					}
 				}
 			}
 			else
 			{
-				ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
+				ServerInstance->SNO->WriteToSnoMask('A', 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);
+			user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -88,25 +92,26 @@ class cmd_sapart : public command_t
 
 class ModuleSapart : public Module
 {
-	cmd_sapart*	mycommand;
+	CommandSapart*	mycommand;
  public:
 	ModuleSapart(InspIRCd* Me)
 		: Module(Me)
 	{
-		
-		mycommand = new cmd_sapart(ServerInstance);
+
+		mycommand = new CommandSapart(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
-	
+
 	virtual ~ModuleSapart()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleSapart)