fixed some indentation and spacing in modules

[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..5670286b88fd9311ab7c65b9511f912915d33e13 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
@@ -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. */
@@ -25,42 +18,41 @@
 
 class ModuleRestrictMsg : public Module
 {
-       
+
  public:
- 
+
        ModuleRestrictMsg(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
-               
-       }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               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 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;
-                       if (*u->oper || *user->oper)
+                       User* u = (User*)dest;
+
+                       // 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);
+                       user->WriteNumeric(531, "%s %s :You are not permitted to send private messages to this user",user->nick.c_str(),u->nick.c_str());
                        return 1;
                }
+
                // however, we must allow channel messages...
                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,35 +60,11 @@ class ModuleRestrictMsg : public Module
        virtual ~ModuleRestrictMsg()
        {
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-       }
-};
 
-
-class ModuleRestrictMsgFactory : public ModuleFactory
-{
- public:
-       ModuleRestrictMsgFactory()
-       {
-       }
-       
-       ~ModuleRestrictMsgFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleRestrictMsg(Me);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRestrictMsgFactory;
-}
-
+MODULE_INIT(ModuleRestrictMsg)