WHEEEEE!!!!!

[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 d340cad777c0992d43bdd45448391d73fc5c1b99..50d87b3535c324d3bbbd9b936a7dc807c6702037 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -14,12 +14,15 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include <string>
 #include <vector>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
 
@@ -29,17 +32,23 @@ class ModuleRestrictMsg : public Module
        Server *Srv;
  public:
  
-       ModuleRestrictMsg()
+       ModuleRestrictMsg(Server* Me)
+               : Module::Module(Me)
+       {
+               Srv = Me;
+       }
+
+       void Implements(char* List)
        {
-               Srv = new Server;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-       virtual int OnUserPreNotice(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)
        {
                if (target_type == TYPE_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,21 +57,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, char status)
+       {
+               return this->OnUserPreMessage(user,dest,target_type,text,status);
+       }
+
        virtual ~ModuleRestrictMsg()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,1,VF_VENDOR);
        }
 };
 
@@ -78,9 +91,9 @@ class ModuleRestrictMsgFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleRestrictMsg;
+               return new ModuleRestrictMsg(Me);
        }
        
 };