Removed superfluous semicolons

[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 86b960b63f84da4d0a980720a185d446862b550e..26965d319f8b30c2a6d23cd1cba194b36cbac89b 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -1,33 +1,27 @@
-/*   +------------------------------------+
- *   | Inspire Internet Relay Chat Daemon |
- *   +------------------------------------+
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                   E-mail:
- *            <brain@chatspike.net>
- *            <Craig@chatspike.net>
- * 
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- * the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
 
 class NoInvite : public ModeHandler
 {
  public:
-       NoInvite() : ModeHandler('V', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       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)
        {
@@ -54,72 +48,41 @@ class NoInvite : public ModeHandler
 
 class ModuleNoInvite : public Module
 {
-       Server *Srv;
        NoInvite *ni;
-       
-       public:
- 
-               ModuleNoInvite(Server* Me) : Module::Module(Me)
-               {
-                       Srv = Me;
-                       ni = new NoInvite();
-                       Srv->AddMode(ni, 'V');
-               }
-
-               void Implements(char* List)
-               {
-                       List[I_On005Numeric] = List[I_OnUserPreInvite] = 1;
-               }
-
-               virtual void On005Numeric(std::string &output)
-               {
-                       InsertMode(output,"V",4);
-               }
+ public:
 
+       ModuleNoInvite(InspIRCd* Me) : Module(Me)
+       {
+               ni = new NoInvite(ServerInstance);
+               if (!ServerInstance->AddMode(ni, 'V'))
+                       throw ModuleException("Could not add new modes!");
+       }
 
-               virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
-               {
-                       if (channel->IsModeSet('V'))
-                       {
-                               WriteServ(user->fd,"492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
-                               return 1;
-                       }
-                       return 0;
-               }
+       void Implements(char* List)
+       {
+               List[I_OnUserPreInvite] = 1;
+       }
 
-               virtual ~ModuleNoInvite()
-               {
-                       DELETE(ni);
-               }
-       
-               virtual Version GetVersion()
+       virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+       {
+               if (channel->IsModeSet('V'))
                {
-                       return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+                       user->WriteServ("492 %s %s :Can't invite %s to channel (+V set)",user->nick, channel->name, dest->nick);
+                       return 1;
                }
-};
-
+               return 0;
+       }
 
-class ModuleNoInviteFactory : public ModuleFactory
-{
-       public:
-               ModuleNoInviteFactory()
-               {
-               }
-       
-               ~ModuleNoInviteFactory()
-               {
-               }
-       
-               virtual Module * CreateModule(Server* Me)
-               {
-                       return new ModuleNoInvite(Me);
-               }
+       virtual ~ModuleNoInvite()
+       {
+               ServerInstance->Modes->DelMode(ni);
+               DELETE(ni);
+       }
        
+       virtual Version GetVersion()
+       {
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+       }
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoInviteFactory;
-}
-
+MODULE_INIT(ModuleNoInvite)