X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=19b774f040755b43b056e3887b5a43f8b0317046;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=75ce9e6530bc27bf6a92d26ffd60c744de91f8fb;hpb=23e8bba13c55d33ce89d505780da36c9589e300a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 75ce9e653..19b774f04 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -24,8 +24,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */
-
 /*
  * This module supports the use of the +q and +a usermodes, but should work without them too.
  * Usage of the command is restricted to +hoaq, and you cannot remove a user with a "higher" level than yourself.
@@ -37,10 +35,13 @@
 class RemoveBase : public Command
 {
 	bool& supportnokicks;
+	ChanModeReference& nokicksmode;
 
  public:
-	RemoveBase(Module* Creator, bool& snk, const char* cmdn)
-		: Command(Creator, cmdn, 2, 3), supportnokicks(snk)
+	RemoveBase(Module* Creator, bool& snk, ChanModeReference& nkm, const char* cmdn)
+		: Command(Creator, cmdn, 2, 3)
+		, supportnokicks(snk)
+		, nokicksmode(nkm)
 	{
 	}
 
@@ -49,9 +50,6 @@ class RemoveBase : public Command
 		User* target;
 		Channel* channel;
 		std::string reason;
-		std::string protectkey;
-		std::string founderkey;
-		bool hasnokicks;
 
 		/* Set these to the parameters needed, the new version of this module switches it's parameters around
 		 * supplying a new command with the new order while keeping the old /remove with the older order.
@@ -83,8 +81,6 @@ class RemoveBase : public Command
 		int ulevel = channel->GetPrefixValue(user);
 		int tlevel = channel->GetPrefixValue(target);
 
-		hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q'));
-
 		if (ServerInstance->ULine(target->server))
 		{
 			user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame.c_str());
@@ -92,7 +88,7 @@ class RemoveBase : public Command
 		}
 
 		/* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */
-		if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks))
+		if ((!IS_LOCAL(user)) || (!supportnokicks) || (!channel->IsModeSet(nokicksmode)))
 		{
 			/* We'll let everyone remove their level and below, eg:
 			 * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1)
@@ -130,13 +126,13 @@ class RemoveBase : public Command
 		else
 		{
 			/* m_nokicks.so was loaded and +Q was set, block! */
-			user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick.c_str(), channel->name.c_str(), target->nick.c_str());
+			user->WriteServ( "484 %s %s :Can't remove user %s from channel (nokicks mode is set)", user->nick.c_str(), channel->name.c_str(), target->nick.c_str());
 			return CMD_FAILURE;
 		}
 
 		return CMD_SUCCESS;
 	}
-	virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) = 0;
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) = 0;
 };
 
 /** Handle /REMOVE
@@ -144,11 +140,11 @@ class RemoveBase : public Command
 class CommandRemove : public RemoveBase
 {
  public:
-	CommandRemove(Module* Creator, bool& snk)
-		: RemoveBase(Creator, snk, "REMOVE")
+	CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm)
+		: RemoveBase(Creator, snk, nkm, "REMOVE")
 	{
 		syntax = "<nick> <channel> [<reason>]";
-		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -170,11 +166,11 @@ class CommandRemove : public RemoveBase
 class CommandFpart : public RemoveBase
 {
  public:
-	CommandFpart(Module* Creator, bool& snk)
-		: RemoveBase(Creator, snk, "FPART")
+	CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm)
+		: RemoveBase(Creator, snk, nkm, "FPART")
 	{
 		syntax = "<channel> <nick> [<reason>]";
-		TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
+		TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -193,16 +189,20 @@ class CommandFpart : public RemoveBase
 
 class ModuleRemove : public Module
 {
+	ChanModeReference nokicksmode;
 	CommandRemove cmd1;
 	CommandFpart cmd2;
 	bool supportnokicks;
 
  public:
-	ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks)
+	ModuleRemove()
+		: nokicksmode(this, "nokick")
+		, cmd1(this, supportnokicks, nokicksmode)
+		, cmd2(this, supportnokicks, nokicksmode)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(cmd1);
 		ServerInstance->Modules->AddService(cmd2);
@@ -211,17 +211,17 @@ class ModuleRemove : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
 		tokens["REMOVE"];
 	}
 
-	virtual void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks");
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		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);
 	}