Remove InspIRCd* parameters and fields

[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 0e95660b22eedd563bfdf1bf3dcf92ce766daef0..de7737e66993a4dbd8c9145c21900669d5a02b7f 100644 (file)
--- 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.
@@ -12,34 +12,28 @@
  */
 
 #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;
+       ModuleRestrictMsg()
+                       {
+
+               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 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)))
                {
-                       userrec* u = (userrec*)dest;
+                       User* u = (User*)dest;
 
                        // message allowed if:
                        // (1) the sender is opered
@@ -47,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(userrec* 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);
        }
@@ -65,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);
        }
 };