X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=6f7c1c3695de65e3173eb59cb36c7abdf791e7ac;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=1ba51a0eb411da85b08ffdf7bec1c4f464654d3d;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 1ba51a0eb..6f7c1c369 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -36,7 +36,6 @@
  */
 class RemoveBase : public Command
 {
- private:
 	bool& supportnokicks;
 
  public:
@@ -69,9 +68,9 @@ class RemoveBase : public Command
 		channel = ServerInstance->FindChan(channame);
 
 		/* Fix by brain - someone needs to learn to validate their input! */
-		if (!target || !channel)
+		if ((!target) || (target->registered != REG_ALL) || (!channel))
 		{
-			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username.c_str() : channame.c_str());
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !channel ? channame.c_str() : username.c_str());
 			return CMD_FAILURE;
 		}
 
@@ -102,6 +101,10 @@ class RemoveBase : public Command
 			 */
 			if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && (tlevel != 50000)))
 			{
+				// REMOVE/FPART will be sent to the target's server and it will reply with a PART (or do nothing if it doesn't understand the command)
+				if (!IS_LOCAL(target))
+					return CMD_SUCCESS;
+
 				std::string reasonparam;
 
 				/* If a reason is given, use it */
@@ -194,7 +197,6 @@ class ModuleRemove : public Module
 	CommandFpart cmd2;
 	bool supportnokicks;
 
-
  public:
 	ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks)
 	{
@@ -202,16 +204,16 @@ class ModuleRemove : public Module
 
 	void init()
 	{
-		ServerInstance->AddCommand(&cmd1);
-		ServerInstance->AddCommand(&cmd2);
+		ServerInstance->Modules->AddService(cmd1);
+		ServerInstance->Modules->AddService(cmd2);
 		OnRehash(NULL);
 		Implementation eventlist[] = { I_On005Numeric, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		output.append(" REMOVE");
+		tokens["REMOVE"];
 	}
 
 	virtual void OnRehash(User* user)
@@ -219,15 +221,10 @@ class ModuleRemove : public Module
 		supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks");
 	}
 
-	virtual ~ModuleRemove()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleRemove)