Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index b967b34963b9937ff2f2690525a1a7db0c388f20..cd3296ce649f90c812f0437a0dcee3fecacefc65 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,33 +2,21 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /* $ModDesc: Provides the UNINVITE command which lets users un-invite other users from channels (!) */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
-#include "configreader.h"
 #include "inspircd.h"
 
-
-
-        
+/** Handle /UNINVITE
+ */     
 class cmd_uninvite : public command_t
 {
  public:
@@ -36,6 +24,7 @@ class cmd_uninvite : public command_t
        {
                this->source = "m_uninvite.so";
                syntax = "<nick> <channel>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
@@ -94,7 +83,7 @@ class ModuleUninvite : public Module
 
  public:
 
-       ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
+       ModuleUninvite(InspIRCd* Me) : Module(Me)
        {
                
                mycommand = new cmd_uninvite(ServerInstance);
@@ -107,31 +96,9 @@ class ModuleUninvite : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
-       }
-};
-
-
-class ModuleUninviteFactory : public ModuleFactory
-{
- public:
-       ModuleUninviteFactory()
-       {
-       }
-       
-       ~ModuleUninviteFactory()
-       {
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleUninvite(Me);
-       }
-       
 };
 
+MODULE_INIT(ModuleUninvite)
 
-extern "C" void * init_module( void )
-{
-       return new ModuleUninviteFactory;
-}