X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=850864be2d612435838e3b50f2f21d9a8b8d0b52;hb=08d2ff86b0c7ed91549d832cf3e572c8623dc8e8;hp=d643bc0cd46475c0130c2bd5a175d85863711ec7;hpb=0412378109ae9f618e47b2bb60729c0d8f29fe8d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index d643bc0cd..850864be2 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -47,7 +47,7 @@ class RemoveBase : public Command
 	{
 	}
 
-	CmdResult HandleRMB(const std::vector<std::string>& parameters, User *user, bool fpart)
+	CmdResult HandleRMB(User* user, const CommandBase::Params& parameters,  bool fpart)
 	{
 		User* target;
 		Channel* channel;
@@ -74,21 +74,26 @@ class RemoveBase : public Command
 		channel = ServerInstance->FindChan(channame);
 
 		/* Fix by brain - someone needs to learn to validate their input! */
-		if ((!target) || (target->registered != REG_ALL) || (!channel))
+		if (!channel)
 		{
-			user->WriteNumeric(Numerics::NoSuchNick(channel ? username.c_str() : channame.c_str()));
+			user->WriteNumeric(Numerics::NoSuchChannel(channame));
+			return CMD_FAILURE;
+		}
+		if ((!target) || (target->registered != REG_ALL))
+		{
+			user->WriteNumeric(Numerics::NoSuchNick(username));
 			return CMD_FAILURE;
 		}
 
 		if (!channel->HasUser(target))
 		{
-			user->WriteNotice(InspIRCd::Format("*** The user %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
+			user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
 			return CMD_FAILURE;
 		}
 
 		if (target->server->IsULine())
 		{
-			user->WriteNumeric(482, channame, "Only a u-line may remove a u-line from a channel.");
+			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel.");
 			return CMD_FAILURE;
 		}
 
@@ -97,7 +102,7 @@ class RemoveBase : public Command
 		{
 			/* 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)
-			 * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
+			  a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
 			 * Nobody may remove people with >= protectedrank rank.
 			 */
 			unsigned int ulevel = channel->GetPrefixValue(user);
@@ -108,8 +113,8 @@ class RemoveBase : public Command
 				if (!IS_LOCAL(target))
 				{
 					// Send an ENCAP REMOVE with parameters being in the old <user> <chan> order which is
-					// compatible with both 2.0 and 2.2. This also turns FPART into REMOVE.
-					std::vector<std::string> p;
+					// compatible with both 2.0 and 3.0. This also turns FPART into REMOVE.
+					CommandBase::Params p;
 					p.push_back(target->uuid);
 					p.push_back(channel->name);
 					if (parameters.size() > 2)
@@ -137,14 +142,14 @@ class RemoveBase : public Command
 			}
 			else
 			{
-				user->WriteNotice(InspIRCd::Format("*** You do not have access to /remove %s from %s", target->nick.c_str(), channel->name.c_str()));
+				user->WriteNotice(InspIRCd::Format("*** You do not have access to /REMOVE %s from %s", target->nick.c_str(), channel->name.c_str()));
 				return CMD_FAILURE;
 			}
 		}
 		else
 		{
 			/* m_nokicks.so was loaded and +Q was set, block! */
-			user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (nokicks mode is set)", target->nick.c_str()));
+			user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (+Q is set)", target->nick.c_str()));
 			return CMD_FAILURE;
 		}
 
@@ -160,13 +165,13 @@ class CommandRemove : public RemoveBase
 	CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm)
 		: RemoveBase(Creator, snk, nkm, "REMOVE")
 	{
-		syntax = "<channel> <nick> [<reason>]";
+		syntax = "<channel> <nick> [:<reason>]";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		return HandleRMB(parameters, user, false);
+		return HandleRMB(user, parameters, false);
 	}
 };
 
@@ -178,13 +183,13 @@ class CommandFpart : public RemoveBase
 	CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm)
 		: RemoveBase(Creator, snk, nkm, "FPART")
 	{
-		syntax = "<channel> <nick> [<reason>]";
+		syntax = "<channel> <nick> [:<reason>]";
 		TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		return HandleRMB(parameters, user, true);
+		return HandleRMB(user, parameters, true);
 	}
 };
 
@@ -212,12 +217,12 @@ class ModuleRemove : public Module
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("remove");
 		supportnokicks = tag->getBool("supportnokicks");
-		cmd1.protectedrank = cmd2.protectedrank = tag->getInt("protectedrank", 50000);
+		cmd1.protectedrank = cmd2.protectedrank = tag->getUInt("protectedrank", 50000);
 	}
 
 	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);
+		return Version("Provides the REMOVE command as an alternative to KICK, it makes users appear to have left the channel", VF_OPTCOMMON | VF_VENDOR);
 	}
 };