Prevent using invalid UIDs and enforce UID/SID matching

[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 169626e61480621e7c9765f3f9ee3c98c46d4fff..b3f3d8da6e7f24215c480a30c5bb6e620048e3d7 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -42,6 +42,7 @@ class ModuleNoNotice : public Module
 
        virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
+               ModResult res;
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
@@ -52,11 +53,9 @@ class ModuleNoNotice : public Module
                                        // ulines are exempt.
                                        return MOD_RES_PASSTHRU;
                                }
-                               else if (CHANOPS_EXEMPT('T') && c->GetPrefixValue(user) == OP_VALUE)
-                               {
-                                       // channel ops are exempt if set in conf.
+                               res = ServerInstance->OnCheckExemption(user,c,"nonotice");
+                               if (res == MOD_RES_ALLOW)
                                        return MOD_RES_PASSTHRU;
-                               }
                                else
                                {
                                        user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
@@ -73,7 +72,7 @@ class ModuleNoNotice : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style channel mode +T", VF_VENDOR);
        }
 };