Remove unneeded headers from spanningtree. This was done to the rest of the source...

[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 4f611653bb62d4b8e8ff5de0d4fc02dcab263866..b5f10eb244976a5d38cec4908266e247189cf890 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -11,13 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
@@ -29,7 +22,7 @@ class ModuleRestrictMsg : public Module
  public:
  
        ModuleRestrictMsg(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
        }
@@ -44,18 +37,19 @@ class ModuleRestrictMsg : public Module
                if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
                {
                        userrec* u = (userrec*)dest;
-                       if (*u->oper || *user->oper)
+
+                       // message allowed if:
+                       // (1) the sender is opered
+                       // (2) the recipient is opered
+                       // anything else, blocked.
+                       if (IS_OPER(u) || IS_OPER(user))
                        {
-                               // message allowed if:
-                               // (1) the sender is opered
-                               // (2) the recipient is opered
-                               // (3) both are opered
-                               // anything else, blocked.
                                return 0;
                        }
                        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...
                return 0;
        }
@@ -75,28 +69,4 @@ class ModuleRestrictMsg : public Module
        }
 };
 
-
-class ModuleRestrictMsgFactory : public ModuleFactory
-{
- public:
-       ModuleRestrictMsgFactory()
-       {
-       }
-       
-       ~ModuleRestrictMsgFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleRestrictMsg(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRestrictMsgFactory;
-}
-
+MODULE_INIT(ModuleRestrictMsg)