Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 8c413651f31859d7fd8b510421f75a16c595a009..c7d40115a6bc5769fcc96ed3e0f2217b269d347e 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for ircu style usermode +d (deaf to channel messages and channel notices) */
@@ -31,7 +28,7 @@ class User_d : public ModeHandler
                {
                        if (!dest->IsModeSet('d'))
                        {
-                               dest->WriteServ("NOTICE %s :*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT recieve any messages from any channels you are in. If you did NOT mean to do this, use /mode %s -d.", dest->nick, dest->nick);
+                               dest->WriteServ("NOTICE %s :*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode %s -d.", dest->nick, dest->nick);
                                dest->SetMode('d',true);
                                return MODEACTION_ALLOW;
                        }
@@ -53,7 +50,7 @@ class ModuleDeaf : public Module
        User_d* m1;
  public:
        ModuleDeaf(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                m1 = new User_d(ServerInstance);
                if (!ServerInstance->AddMode(m1, 'd'))
@@ -108,9 +105,10 @@ class ModuleDeaf : public Module
 
        virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if ((target_type == TYPE_CHANNEL) & (IS_LOCAL(user)))
+               if (target_type == TYPE_CHANNEL)
                {
                        chanrec* chan = (chanrec*)dest;
+
                        if (chan)
                        {
                                this->OnBuildExemptList(MSG_PRIVMSG, chan, user, status, exempt_list);
@@ -132,28 +130,4 @@ class ModuleDeaf : public Module
 
 };
 
-
-class ModuleDeafFactory : public ModuleFactory
-{
- public:
-       ModuleDeafFactory()
-       {
-       }
-       
-       ~ModuleDeafFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDeaf(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDeafFactory;
-}
-
+MODULE_INIT(ModuleDeaf)