converting m_d* done

[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..fd885cd5814f05e2d08a43d9044b39e9435f86d8 100644 (file)
--- 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,9 +12,6 @@
  */
 
 #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. */
 
@@ -28,18 +25,16 @@ class ModuleRestrictMsg : public Module
                : Module(Me)
        {
                
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       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, 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(531, "%s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
                        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);
        }
@@ -68,7 +63,7 @@ class ModuleRestrictMsg : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
 };