m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 03b99c77c88fb671470fc25836757ab931a1a4f0..747c16d83a1cf98f1b70158ef68829b8ce18a709 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -20,8 +20,6 @@
  */
 
 
-/* $ModDesc: Provides user and channel +G mode */
-
 #define _CRT_SECURE_NO_DEPRECATE
 #define _SCL_SECURE_NO_DEPRECATE
 
@@ -62,8 +60,6 @@ class ModuleCensor : public Module
                OnRehash(NULL);
                ServerInstance->Modules->AddService(cu);
                ServerInstance->Modules->AddService(cc);
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        // format of a config entry is <badword text="shit" replace="poo">
@@ -75,11 +71,11 @@ class ModuleCensor : public Module
                bool active = false;
 
                if (target_type == TYPE_USER)
-                       active = ((User*)dest)->IsModeSet('G');
+                       active = ((User*)dest)->IsModeSet(cu);
                else if (target_type == TYPE_CHANNEL)
                {
-                       active = ((Channel*)dest)->IsModeSet('G');
                        Channel* c = (Channel*)dest;
+                       active = c->IsModeSet(cc);
                        ModResult res = ServerInstance->OnCheckExemption(user,c,"censor");
 
                        if (res == MOD_RES_ALLOW)