Fix potential for duplicate SID if the SID is auto generated.

[user/henk/code/inspircd.git] / src / modules / m_auditorium.cpp

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index c49391d2f438f6d2d413d53864ebe8b86930253d..de54a22bb59422264860cf827dda43c86d6171ca 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */
@@ -54,7 +51,7 @@ class ModuleAuditorium : public Module
        CUList except_list;
  public:
        ModuleAuditorium(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                aum = new AuditoriumMode(ServerInstance);
                if (!ServerInstance->AddMode(aum, 'u'))
@@ -107,7 +104,7 @@ class ModuleAuditorium : public Module
 
                                /* Show all the opped users */
                                nl = *(Ptr->GetOppedUsers());
-                               nl[user] = user;
+                               nl[user] = user->nick;
                                nameslist = &nl;
                                return 0;
                        }
@@ -188,26 +185,4 @@ class ModuleAuditorium : public Module
        }
 };
 
-class ModuleAuditoriumFactory : public ModuleFactory
-{
- public:
-       ModuleAuditoriumFactory()
-       {
-       }
-       
-       ~ModuleAuditoriumFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAuditorium(Me);
-       }
-       
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleAuditoriumFactory;
-}
-
+MODULE_INIT(ModuleAuditorium)