X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=de7737e66993a4dbd8c9145c21900669d5a02b7f;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=cf8f198e6de80877ec5e30ec4f08ad259f57149a;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index cf8f198e6..de7737e66 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -18,19 +18,18 @@
 
 class ModuleRestrictMsg : public Module
 {
-	
+
  public:
- 
-	ModuleRestrictMsg(InspIRCd* Me)
-		: Module(Me)
-	{
-		
+
+	ModuleRestrictMsg()
+			{
+
 		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 
-	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
 		{
@@ -42,17 +41,17 @@ class ModuleRestrictMsg : public Module
 			// anything else, blocked.
 			if (IS_OPER(u) || IS_OPER(user))
 			{
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
-			user->WriteServ("531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
-			return 1;
+			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 MOD_RES_DENY;
 		}
 
 		// however, we must allow channel messages...
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual ModResult 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);
 	}
@@ -60,10 +59,10 @@ class ModuleRestrictMsg : public Module
 	virtual ~ModuleRestrictMsg()
 	{
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR,API_VERSION);
 	}
 };