Run DelMode and DelModeWatcher in RemoveModule

[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 eab78bea9bea82b2952772a9e8b9ff9f1b8b3465..d27ccfaadc700382f113bf204c229b46fabc6548 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -18,7 +18,7 @@
 class AuditoriumMode : public ModeHandler
 {
  public:
-       AuditoriumMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'u', PARAM_NONE, MODETYPE_CHANNEL)
+       AuditoriumMode(Module* Creator) : ModeHandler(Creator, 'u', PARAM_NONE, MODETYPE_CHANNEL)
        {
                levelrequired = OP_VALUE;
        }
@@ -44,8 +44,8 @@ class ModuleAuditorium : public Module
        bool ShowOps;
        bool OperOverride;
  public:
-       ModuleAuditorium(InspIRCd* Me)
-               : Module(Me), aum(Me, this)
+       ModuleAuditorium()
+               : aum(this)
        {
                if (!ServerInstance->Modes->AddMode(&aum))
                        throw ModuleException("Could not add new modes!");
@@ -53,25 +53,24 @@ class ModuleAuditorium : public Module
                OnRehash(NULL);
 
                Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle };
-               Me->Modules->Attach(eventlist, this, 7);
+               ServerInstance->Modules->Attach(eventlist, this, 7);
 
        }
 
        ~ModuleAuditorium()
        {
-               ServerInstance->Modes->DelMode(&aum);
        }
 
        void OnRehash(User* user)
        {
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
                ShowOps = conf.ReadFlag("auditorium", "showops", 0);
                OperOverride = conf.ReadFlag("auditorium", "operoverride", 0);
        }
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)