Automatically register and unregister mode watchers

[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 1d5e7d785a4e320a97d40eb58163eac17e9ea284..a41f509011ffc51ca712fe74f61aaaffb3001ea6 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -36,14 +36,6 @@ class ModuleNoNickChange : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               OnRehash(NULL);
-               ServerInstance->Modules->AddService(nn);
-               Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
@@ -73,8 +65,8 @@ class ModuleNoNickChange : public Module
 
                        if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
                        {
-                               user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)",
-                                       user->nick.c_str(), curr->name.c_str());
+                               user->WriteNumeric(ERR_CANTCHANGENICK, ":Can't change nickname while on %s (+N is set)",
+                                       curr->name.c_str());
                                return MOD_RES_DENY;
                        }
                }
@@ -82,7 +74,7 @@ class ModuleNoNickChange : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
        }