New 'Implements' system

[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..5043b3f8dd3dabfa51ccf7940598925fe82ccdcd 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -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,18 @@ class ModuleRestrictMsg : public Module
        Server *Srv;
  public:
  
-       ModuleRestrictMsg()
+       ModuleRestrictMsg(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
        }
 
-       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)
        {
                if (target_type == TYPE_USER)
                {
                        userrec* u = (userrec*)dest;
-                       if (strchr(u->modes,'o')) || (strchr(user->modes,'o')))
+                       if ((strchr(u->modes,'o')) || (strchr(user->modes,'o')))
                        {
                                // message allowed if:
                                // (1) the sender is opered
@@ -55,14 +59,18 @@ class ModuleRestrictMsg : public Module
                return 0;
        }
 
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       {
+               return this->OnUserPreMessage(user,dest,target_type,text);
+       }
+
        virtual ~ModuleRestrictMsg()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,1,VF_VENDOR);
        }
 };
 
@@ -78,9 +86,9 @@ class ModuleRestrictMsgFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleRestrictMsg;
+               return new ModuleRestrictMsg(Me);
        }
        
 };