Implement feature in bug #395 reported by stealth, and tidy up a bit

[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 d03e2455e7d2c2f20301146858d00a1b06f9e7cc..bb1843a958e20b6eae05c41f65b387ee7e760e8a 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -11,12 +11,12 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
 #include "configreader.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for channel mode +N which prevents nick changes on channel */
 
@@ -53,7 +53,7 @@ class ModuleNoNickChange : public Module
        NoNicks* nn;
  public:
        ModuleNoNickChange(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                nn = new NoNicks(ServerInstance);
@@ -83,42 +83,20 @@ class ModuleNoNickChange : public Module
                        for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                        {
                                chanrec* curr = i->first;
-                               if ((curr->IsModeSet('N')) && (!IS_OPER(user)))
+
+                               if (curr->IsModeSet('N'))
                                {
-                                       // don't allow the nickchange, theyre on at least one channel with +N set
-                                       // and theyre not an oper
+                                       if (CHANOPS_EXEMPT(ServerInstance, 'N') && curr->GetStatus(user) == STATUS_OP)
+                                               continue;
+
                                        user->WriteServ("447 %s :Can't change nickname while on %s (+N is set)", user->nick, curr->name);
                                        return 1;
                                }
                        }
                }
-               return 0;
-       }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleNoNickChangeFactory : public ModuleFactory
-{
- public:
-       ModuleNoNickChangeFactory()
-       {
-       }
-       
-       ~ModuleNoNickChangeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleNoNickChange(Me);
+               return 0;
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoNickChangeFactory;
-}
-
+MODULE_INIT(ModuleNoNickChange)