Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

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

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index a419a94231169149292d2ca067a142f51ee3dfef..4f611653bb62d4b8e8ff5de0d4fc02dcab263866 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -21,25 +18,33 @@
 #include "channels.h"
 #include "modules.h"
 
+#include "inspircd.h"
+
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
 
 
 class ModuleRestrictMsg : public Module
 {
-       Server *Srv;
+       
  public:
  
-       ModuleRestrictMsg()
+       ModuleRestrictMsg(InspIRCd* Me)
+               : Module::Module(Me)
+       {
+               
+       }
+
+       void Implements(char* List)
        {
-               Srv = new Server;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               if (target_type == TYPE_USER)
+               if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
                {
                        userrec* u = (userrec*)dest;
-                       if ((strchr(u->modes,'o')) || (strchr(user->modes,'o')))
+                       if (*u->oper || *user->oper)
                        {
                                // message allowed if:
                                // (1) the sender is opered
@@ -48,26 +53,25 @@ class ModuleRestrictMsg : public Module
                                // anything else, blocked.
                                return 0;
                        }
-                       WriteServ(user->fd,"531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
+                       user->WriteServ("531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
                        return 1;
                }
                // however, we must allow channel messages...
                return 0;
        }
 
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return this->OnUserPreMessage(user,dest,target_type,text);
+               return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
        virtual ~ModuleRestrictMsg()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,0);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 };
 
@@ -83,9 +87,9 @@ class ModuleRestrictMsgFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleRestrictMsg;
+               return new ModuleRestrictMsg(Me);
        }
        
 };