I not i

[user/henk/code/inspircd.git] / src / modules / m_noinvite.cpp

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 219c1c78fee0aeff85bb5f3a8e057c64b994151a..efa0af0e10957763c236d0b21b79a8597f568935 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.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: Provides support for unreal-style channel mode +V */
 
@@ -23,7 +20,7 @@ class NoInvite : public ModeHandler
  public:
        NoInvite(InspIRCd* Instance) : ModeHandler(Instance, 'V', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -54,20 +51,18 @@ class ModuleNoInvite : public Module
        ModuleNoInvite(InspIRCd* Me) : Module(Me)
        {
                ni = new NoInvite(ServerInstance);
-               if (!ServerInstance->AddMode(ni, 'V'))
+               if (!ServerInstance->Modes->AddMode(ni))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreInvite] = 1;
-       }
 
-       virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+       virtual int OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
        {
                if (channel->IsModeSet('V'))
                {
-                       user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+                       user->WriteNumeric(492, "%s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
                        return 1;
                }
                return 0;
@@ -76,36 +71,13 @@ class ModuleNoInvite : public Module
        virtual ~ModuleNoInvite()
        {
                ServerInstance->Modes->DelMode(ni);
-               DELETE(ni);
+               delete ni;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
-       }
-};
-
-
-class ModuleNoInviteFactory : public ModuleFactory
-{
- public:
-       ModuleNoInviteFactory()
-       {
-       }
-
-       ~ModuleNoInviteFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleNoInvite(Me);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleNoInviteFactory;
-}
-
+MODULE_INIT(ModuleNoInvite)