Include untranslated user/channel metadata in CHECK output

[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 a7f7b142f996d6f974a2f14e0a25af3e11cdb2cd..b3b739807dc03054e0a9b874ec37df19dd975492 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.
@@ -45,21 +45,18 @@ class NoNicks : public ModeHandler
 
 class ModuleNoNickChange : public Module
 {
-       NoNicks* nn;
+       NoNicks nn;
  public:
-       ModuleNoNickChange(InspIRCd* Me) : Module(Me)
+       ModuleNoNickChange(InspIRCd* Me) : Module(Me), nn(Me)
        {
-
-               nn = new NoNicks(ServerInstance);
-               ServerInstance->Modes->AddMode(nn);
+               ServerInstance->Modes->AddMode(&nn);
                Implementation eventlist[] = { I_OnUserPreNick, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleNoNickChange()
        {
-               ServerInstance->Modes->DelMode(nn);
-               delete nn;
+               ServerInstance->Modes->DelMode(&nn);
        }
 
        virtual Version GetVersion()
@@ -81,6 +78,10 @@ class ModuleNoNickChange : public Module
                if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
                        return 0;
 
+               // Allow forced nick changes.
+               if (user->GetExt("NICKForced"))
+                       return 0;
+
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
                        Channel* curr = i->first;
@@ -88,7 +89,7 @@ class ModuleNoNickChange : public Module
                        if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
                                continue;
 
-                       if (curr->IsModeSet('N') || curr->IsExtBanned(user, 'N'))
+                       if (curr->IsModeSet('N') || curr->GetExtBanStatus(user, 'N') < 0)
                        {
                                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;