Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_nonicks.cpp

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index c82107be8c5e4d8ac88c8305238a5093cad151e2..a796495a81d95a0b6e72fb883a85a8efe996251c 100644 (file)
--- 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,7 +54,7 @@ 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)))
@@ -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)