X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=5043b3f8dd3dabfa51ccf7940598925fe82ccdcd;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=1fd07422d7a43b0219693abe74b147e676d6ec65;hpb=0a7af1a331126b96cc723bdc5bcba48721759835;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 1fd07422d..5043b3f8d 100644
--- 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,12 +32,13 @@ 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)
 		{
@@ -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);
 	}
 	
 };