Add IPV6_V6ONLY support

[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 e7903acc411ebf21b8e6f0561e40e4006c72850b..7a6d3ffd07c51207b8eee148c5a3374380164e06 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -53,7 +53,7 @@ class ModuleNoNickChange : public Module
                OnRehash(NULL);
                ServerInstance->Modes->AddMode(&nn);
                Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual ~ModuleNoNickChange()
@@ -62,7 +62,7 @@ class ModuleNoNickChange : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR);
+               return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
        }
 
 
@@ -76,9 +76,6 @@ class ModuleNoNickChange : public Module
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
 
-               if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-                       return MOD_RES_PASSTHRU;
-
                // Allow forced nick changes.
                if (ServerInstance->NICKForced.get(user))
                        return MOD_RES_PASSTHRU;
@@ -87,8 +84,7 @@ class ModuleNoNickChange : public Module
                {
                        Channel* curr = *i;
 
-                       ModResult res;
-                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,curr,"nonick"));
+                       ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
 
                        if (res == MOD_RES_ALLOW)
                                continue;