Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 fe1e0a46d33690162dc7c2da61ab08379e52135b..c5b9f3a1c784f6dd894a4ec6b6d5237705826f73 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,19 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style channel mode +T */
+/* $ModDesc: Provides channel mode +T to block notices to the channel */
 
 class NoNotice : public SimpleChannelModeHandler
 {
@@ -29,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)
@@ -48,12 +59,7 @@ 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;
-                               }
-                               FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"nonotice"));
+                               res = ServerInstance->OnCheckExemption(user,c,"nonotice");
                                if (res == MOD_RES_ALLOW)
                                        return MOD_RES_PASSTHRU;
                                else
@@ -72,7 +78,7 @@ class ModuleNoNotice : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for unreal-style channel mode +T", VF_VENDOR);
+               return Version("Provides channel mode +T to block notices to the channel", VF_VENDOR);
        }
 };