X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rmode.cpp;h=e4345535e656c30b1292cc61738651646c13dd8f;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=7b7c66da2f0d161409ab57a7fa90090081163259;hpb=021c09faff4be2e37fa86b0fe3e61707ffddab27;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index 7b7c66da2..e4345535e 100644
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -41,20 +41,20 @@ class CommandRMode : public Command
 
 		if (chan == NULL)
 		{
-			user->WriteServ("NOTICE %s :The channel %s does not exist.", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNotice("The channel " + parameters[0] + " does not exist.");
 			return CMD_FAILURE;
 		}
 
 		mh = ServerInstance->Modes->FindMode(modeletter, MODETYPE_CHANNEL);
 		if (mh == NULL || parameters[1].size() > 1)
 		{
-			user->WriteServ("NOTICE %s :%s is not a valid channel mode.", user->nick.c_str(), parameters[1].c_str());
+			user->WriteNotice(parameters[1] + " is not a valid channel mode.");
 			return CMD_FAILURE;
 		}
 
 		if (chan->GetPrefixValue(user) < mh->GetLevelRequired())
 		{
-			user->WriteServ("NOTICE %s :You do not have access to unset %c on %s.", user->nick.c_str(), modeletter, chan->name.c_str());
+			user->WriteNotice("You do not have access to unset " + ConvToStr(modeletter) + " on " +  chan->name + ".");
 			return CMD_FAILURE;
 		}
 
@@ -67,7 +67,7 @@ class CommandRMode : public Command
 
 		if (!mh->IsListMode())
 		{
-			if (chan->IsModeSet(modeletter))
+			if (chan->IsModeSet(mh))
 				modestack.Push(modeletter);
 		}
 		else if (((prefixrank = mh->GetPrefixRank()) && (prefixchar = mh->GetPrefix())))
@@ -92,7 +92,7 @@ class CommandRMode : public Command
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :Could not remove channel mode %c", user->nick.c_str(), modeletter);
+			user->WriteNotice("Could not remove channel mode " + ConvToStr(modeletter));
 			return CMD_FAILURE;
 		}
 
@@ -100,7 +100,7 @@ class CommandRMode : public Command
 		stackresult.push_back(chan->name);
 		while (modestack.GetStackedLine(stackresult))
 		{
-			ServerInstance->SendMode(stackresult, user);
+			ServerInstance->Modes->Process(stackresult, user);
 			stackresult.erase(stackresult.begin() + 1, stackresult.end());
 		}
 
@@ -115,12 +115,12 @@ class ModuleRMode : public Module
  public:
 	ModuleRMode() : cmd(this) { }
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Allows glob-based removal of list modes", VF_VENDOR);
 	}