kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

[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 b2e2e60ce3175d83aad5cab0d34307ba37b86075..c51ea4850ce5fd4c03e2f9780f5d5b6a0a33386b 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -43,12 +43,12 @@ class ModuleRestrictMsg : public Module
                List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                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
@@ -64,9 +64,9 @@ class ModuleRestrictMsg : public Module
                return 0;
        }
 
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       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()