X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=cf139f4a3d5dbe9032039dd18009e5ad872e3fff;hb=402a1bb010522a35600325c1a3084e092b40ca22;hp=b84a906eb44112bfc292a3fa09f773a60b1f4e88;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index b84a906eb..cf139f4a3 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -47,8 +47,6 @@ class RemoveBase : public Command
 
 	CmdResult HandleRMB(const std::vector<std::string>& parameters, User *user, bool neworder)
 	{
-		const char* channame;
-		const char* username;
 		User* target;
 		Channel* channel;
 		std::string reason;
@@ -61,19 +59,22 @@ class RemoveBase : public Command
 		 * /remove <nick> <channel> [reason ...]
 		 * /fpart <channel> <nick> [reason ...]
 		 */
-		channame = parameters[ neworder ? 0 : 1].c_str();
-		username = parameters[ neworder ? 1 : 0].c_str();
+		const std::string& channame = parameters[neworder ? 0 : 1];
+		const std::string& username = parameters[neworder ? 1 : 0];
 
 		/* Look up the user we're meant to be removing from the channel */
-		target = ServerInstance->FindNick(username);
+		if (IS_LOCAL(user))
+			target = ServerInstance->FindNickOnly(username);
+		else
+			target = ServerInstance->FindNick(username);
 
 		/* And the channel we're meant to be removing them from */
 		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 : channame);
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !channel ? channame.c_str() : username.c_str());
 			return CMD_FAILURE;
 		}
 
@@ -88,8 +89,9 @@ class RemoveBase : public Command
 
 		hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q'));
 
-		if((ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick.c_str()))){
-			user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame);
+		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());
 			return CMD_FAILURE;
 		}
 
@@ -103,23 +105,22 @@ class RemoveBase : public Command
 			 */
 			if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && (tlevel != 50000)))
 			{
-				// no you can't just go from a std::ostringstream to a std::string, Om. -nenolod
-				// but you can do this, nenolod -brain
+				// 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("No reason given");
+				std::string reasonparam;
 
 				/* If a reason is given, use it */
 				if(parameters.size() > 2)
-				{
-					/* Join params 2 ... pcnt - 1 (inclusive) into one */
-					irc::stringjoiner reason_join(" ", parameters, 2, parameters.size() - 1);
-					reasonparam = reason_join.GetJoined();
-				}
+					reasonparam = parameters[2];
+				else
+					reasonparam = "No reason given";
 
 				/* Build up the part reason string. */
-				reason = std::string("Removed by ") + user->nick + ": " + reasonparam;
+				reason = "Removed by " + user->nick + ": " + reasonparam;
 
-				channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
+				channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
 				target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick.c_str(), user->nick.c_str(), channel->name.c_str(), reasonparam.c_str());
 
 				channel->PartUser(target, reason);
@@ -204,14 +205,17 @@ class ModuleRemove : public Module
  public:
 	ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks)
 	{
-		ServerInstance->AddCommand(&cmd1);
-		ServerInstance->AddCommand(&cmd2);
+	}
+
+	void init()
+	{
+		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)
 	{
 		output.append(" REMOVE");
@@ -219,8 +223,7 @@ class ModuleRemove : public Module
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader conf;
-		supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
+		supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks");
 	}
 
 	virtual ~ModuleRemove()