Fix an extremely low risk crash bug in m_connectban.

[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 4d56ad35f0ef18ed38bfdeb8009e0defbb6558de..672a48f8d9bca45091d980ebb5290efb4f2a64ca 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -23,32 +23,10 @@
 
 /* $ModDesc: Provides support for channel mode +N & extban +b N: which prevents nick changes on channel */
 
-class NoNicks : public ModeHandler
+class NoNicks : public SimpleChannelModeHandler
 {
  public:
-       NoNicks(Module* Creator) : ModeHandler(Creator, "nonick", 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('N'))
-                       {
-                               channel->SetMode('N',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('N'))
-                       {
-                               channel->SetMode('N',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       NoNicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nonick", 'N') { }
 };
 
 class ModuleNoNickChange : public Module
@@ -57,11 +35,15 @@ class ModuleNoNickChange : public Module
        bool override;
  public:
        ModuleNoNickChange() : nn(this)
+       {
+       }
+
+       void init()
        {
                OnRehash(NULL);
-               ServerInstance->Modes->AddMode(&nn);
+               ServerInstance->Modules->AddService(nn);
                Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleNoNickChange()
@@ -113,8 +95,7 @@ class ModuleNoNickChange : public Module
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-               override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
+               override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
        }
 };