m_namedmodes Only show chan key to members and opers with channels/auspex

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index ccb44ccde70ff1e8f33a43a13645ff5d2f00fc34..c5b9f3a1c784f6dd894a4ec6b6d5237705826f73 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -37,10 +37,13 @@ class ModuleNoNotice : public Module
        ModuleNoNotice()
                : nt(this)
        {
-               if (!ServerInstance->Modes->AddMode(&nt))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(nt);
                Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual void On005Numeric(std::string &output)
@@ -56,11 +59,6 @@ class ModuleNoNotice : public Module
                        Channel* c = (Channel*)dest;
                        if (!c->GetExtBanStatus(user, 'T').check(!c->IsModeSet('T')))
                        {
-                               if (ServerInstance->ULine(user->server))
-                               {
-                                       // ulines are exempt.
-                                       return MOD_RES_PASSTHRU;
-                               }
                                res = ServerInstance->OnCheckExemption(user,c,"nonotice");
                                if (res == MOD_RES_ALLOW)
                                        return MOD_RES_PASSTHRU;