Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 0bc03fab15b829836997d08967570b996cb999da..9a9c9ad5fd70d8eda9c6b6df395fc3266cd65e7b 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -22,20 +22,21 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
 
 
 class ModuleRestrictMsg : public Module
 {
-       Server *Srv;
+       
  public:
  
-       ModuleRestrictMsg(Server* Me)
+       ModuleRestrictMsg(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
        }
 
        void Implements(char* List)
@@ -48,7 +49,7 @@ class ModuleRestrictMsg : public Module
                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
@@ -57,7 +58,7 @@ 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...
@@ -66,7 +67,7 @@ class ModuleRestrictMsg : public Module
 
        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()
@@ -75,7 +76,7 @@ class ModuleRestrictMsg : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 };
 
@@ -91,7 +92,7 @@ class ModuleRestrictMsgFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleRestrictMsg(Me);
        }