Remove spanningtree override of /LUSERS

[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 50b4503ddb8e2598278e87ed422a67b820f9ad8b..48eafff7a8bad711935db7c242b3d943efcd7e0f 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -18,9 +18,9 @@
 class NoNicks : public ModeHandler
 {
  public:
-       NoNicks(InspIRCd* Instance) : ModeHandler(Instance, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoNicks(Module* Creator) : ModeHandler(Creator, "nonick", 'N', PARAM_NONE, MODETYPE_CHANNEL) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -45,26 +45,24 @@ class NoNicks : public ModeHandler
 
 class ModuleNoNickChange : public Module
 {
-       NoNicks* nn;
+       NoNicks nn;
+       bool override;
  public:
-       ModuleNoNickChange(InspIRCd* Me) : Module(Me)
+       ModuleNoNickChange() : nn(this)
        {
-
-               nn = new NoNicks(ServerInstance);
-               ServerInstance->Modes->AddMode(nn);
-               Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               OnRehash(NULL);
+               ServerInstance->Modes->AddMode(&nn);
+               Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual ~ModuleNoNickChange()
        {
-               ServerInstance->Modes->DelMode(nn);
-               delete 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_COMMON | VF_VENDOR);
        }
 
 
@@ -73,33 +71,46 @@ 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 (ServerInstance->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;
+
+                       ModResult res;
+                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,curr,"nonick"));
+
+                       if (res == MOD_RES_ALLOW)
+                               continue;
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+                       if (override && IS_OPER(user))
                                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;
+       }
+
+       virtual void OnRehash(User* user)
+       {
+               ConfigReader Conf;
+               override = Conf.ReadFlag("nonicks", "operoverride", "no", 0);
        }
 };