Restore <options:exemptchanops> with long names

[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 70ecfdae005bcd7c8bdb5b1b1ba41172d3c673be..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
@@ -18,7 +18,7 @@
 class NoNicks : public ModeHandler
 {
  public:
-       NoNicks(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
+       NoNicks(Module* Creator) : ModeHandler(Creator, "nonick", 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -46,22 +46,23 @@ class NoNicks : public ModeHandler
 class ModuleNoNickChange : public Module
 {
        NoNicks nn;
+       bool override;
  public:
-       ModuleNoNickChange(InspIRCd* Me) : Module(Me), nn(Me, this)
+       ModuleNoNickChange() : nn(this)
        {
+               OnRehash(NULL);
                ServerInstance->Modes->AddMode(&nn);
-               Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual ~ModuleNoNickChange()
        {
-               ServerInstance->Modes->DelMode(&nn);
        }
 
        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_VENDOR);
        }
 
 
@@ -75,18 +76,20 @@ 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 (User::NICKForced.get(user))
+               if (ServerInstance->NICKForced.get(user))
                        return MOD_RES_PASSTHRU;
 
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
                        Channel* curr = *i;
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetPrefixValue(user) == OP_VALUE)
+                       ModResult res = ServerInstance->OnCheckExemption(user,curr,"nonick");
+
+                       if (res == MOD_RES_ALLOW)
+                               continue;
+
+                       if (override && IS_OPER(user))
                                continue;
 
                        if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet('N')))
@@ -99,6 +102,12 @@ class ModuleNoNickChange : public Module
 
                return MOD_RES_PASSTHRU;
        }
+
+       virtual void OnRehash(User* user)
+       {
+               ConfigReader Conf;
+               override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
+       }
 };
 
 MODULE_INIT(ModuleNoNickChange)