Remove InspIRCd* parameters and fields

[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 1b34c75971e88e9d33c39245d0ab696e0d577ef6..2ed25dfe5a0b83bb0a945b981f6eb175ee801a60 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -18,7 +18,7 @@
 class NoNicks : public ModeHandler
 {
  public:
-       NoNicks(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoNicks(Module* Creator) : ModeHandler(Creator, 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -47,7 +47,7 @@ class ModuleNoNickChange : public Module
 {
        NoNicks nn;
  public:
-       ModuleNoNickChange(InspIRCd* Me) : Module(Me), nn(Me, this)
+       ModuleNoNickChange() : nn(this)
        {
                ServerInstance->Modes->AddMode(&nn);
                Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
@@ -61,7 +61,7 @@ class ModuleNoNickChange : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
 
@@ -70,33 +70,34 @@ class ModuleNoNickChange : public Module
                ServerInstance->AddExtBanChar('N');
        }
 
-       virtual int OnUserPreNick(User* user, const std::string &newnick)
+       virtual ModResult OnUserPreNick(User* user, const std::string &newnick)
        {
                if (!IS_LOCAL(user))
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                // Allow forced nick changes.
-               if (user->GetExt("NICKForced"))
-                       return 0;
+               if (User::NICKForced.get(user))
+                       return MOD_RES_PASSTHRU;
 
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
-                       Channel* curr = i->first;
+                       Channel* curr = *i;
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+                       if (CHANOPS_EXEMPT('N') && curr->GetPrefixValue(user) == OP_VALUE)
                                continue;
 
-                       if (curr->IsModeSet('N') || curr->GetExtBanStatus(user, 'N') < 0)
+                       if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
                        {
-                               user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)", user->nick.c_str(), curr->name.c_str());
-                               return 1;
+                               user->WriteNumeric(ERR_CANTCHANGENICK, "%s :Can't change nickname while on %s (+N is set)",
+                                       user->nick.c_str(), curr->name.c_str());
+                               return MOD_RES_DENY;
                        }
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 };