X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nonicks.cpp;h=a796495a81d95a0b6e72fb883a85a8efe996251c;hb=5a2af6ded883d71c6c4c9f1497cca1721f8b0742;hp=fbf772e0cd2f487e23a09a69ff2f1789b2386cb1;hpb=565544fac966b14e046bb3042ab485f79bcf7c9e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index fbf772e0c..a796495a8 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -26,7 +26,6 @@ class ModuleNoNickChange : public Module
 {
 	CheckExemption::EventProvider exemptionprov;
 	SimpleChannelModeHandler nn;
-	bool override;
  public:
 	ModuleNoNickChange()
 		: exemptionprov(this)
@@ -36,7 +35,7 @@ class ModuleNoNickChange : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
+		return Version("Provides channel mode +N and extban 'N' which prevents nick changes on the channel", VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -55,12 +54,12 @@ class ModuleNoNickChange : public Module
 			if (res == MOD_RES_ALLOW)
 				continue;
 
-			if (override && user->IsOper())
+			if (user->HasPrivPermission("channels/ignore-nonicks"))
 				continue;
 
 			if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
 			{
-				user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (+N is set)",
+				user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (+N is set)",
 					curr->name.c_str()));
 				return MOD_RES_DENY;
 			}
@@ -68,11 +67,6 @@ class ModuleNoNickChange : public Module
 
 		return MOD_RES_PASSTHRU;
 	}
-
-	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
-	{
-		override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
-	}
 };
 
 MODULE_INIT(ModuleNoNickChange)