X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=18aee2f935ded41bbd96879f9cb99af567e53464;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=faa272b131bd6ed9fe6c7991daf79b5b7d3b9790;hpb=65774100a356b4b90e1cac7bd41046aa661ef850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index faa272b13..18aee2f93 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,34 +12,29 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
 
 
 class ModuleRestrictMsg : public Module
 {
-	
+
  public:
- 
+
 	ModuleRestrictMsg(InspIRCd* Me)
 		: Module(Me)
 	{
-		
-	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 
 			// message allowed if:
 			// (1) the sender is opered
@@ -49,7 +44,7 @@ class ModuleRestrictMsg : public Module
 			{
 				return 0;
 			}
-			user->WriteServ("531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
+			user->WriteNumeric(ERR_CANTSENDTOUSER, "%s %s :You are not permitted to send private messages to this user",user->nick.c_str(),u->nick.c_str());
 			return 1;
 		}
 
@@ -57,7 +52,7 @@ class ModuleRestrictMsg : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
@@ -65,11 +60,11 @@ class ModuleRestrictMsg : public Module
 	virtual ~ModuleRestrictMsg()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
 };
 
-MODULE_INIT(ModuleRestrictMsg);
+MODULE_INIT(ModuleRestrictMsg)