X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=50d87b3535c324d3bbbd9b936a7dc807c6702037;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=d73b4047d73663b8d3f1a836dba8c43c7704be4a;hpb=ab01aaeeee9aed655df2eec2522072233fe3aa57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index d73b4047d..50d87b353 100644
--- 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>
@@ -32,17 +32,23 @@ class ModuleRestrictMsg : public Module
 	Server *Srv;
  public:
  
-	ModuleRestrictMsg()
+	ModuleRestrictMsg(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
+		Srv = Me;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+	void Implements(char* List)
+	{
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+	}
+
+	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
@@ -51,21 +57,20 @@ 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)
 	{
-		return this->OnUserPreMessage(user,dest,target_type,text);
+		return this->OnUserPreMessage(user,dest,target_type,text,status);
 	}
 
 	virtual ~ModuleRestrictMsg()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
@@ -86,9 +91,9 @@ class ModuleRestrictMsgFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleRestrictMsg;
+		return new ModuleRestrictMsg(Me);
 	}
 	
 };