Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[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 06f5b19245df447da6eea00ca3c0e70021eff01e..a81952f10a6afe173505b99f716374baff5c36a4 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,44 +2,36 @@
  *       | 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 "helperfuncs.h"
-#include "message.h"
 #include "configreader.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-        
+/** Handle /UNINVITE
+ */     
 class cmd_uninvite : public command_t
 {
  public:
-       cmd_uninvite () : command_t("UNINVITE", 0, 2)
+       cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2)
        {
                this->source = "m_uninvite.so";
                syntax = "<nick> <channel>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec* u = ServerInstance->FindNick(parameters[0]);
                chanrec* c = ServerInstance->FindChan(parameters[1]);
@@ -55,7 +47,7 @@ class cmd_uninvite : public command_t
                                user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                        }
                                
-                       return; 
+                       return CMD_FAILURE;
                }       
 
                if (c->modes[CM_INVITEONLY])
@@ -63,7 +55,7 @@ class cmd_uninvite : public command_t
                        if (c->GetStatus(user) < STATUS_HOP)
                        {
                                user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
-                               return;
+                               return CMD_FAILURE;
                        }
                }
 
@@ -72,18 +64,20 @@ class cmd_uninvite : public command_t
                if (!u->IsInvited(xname))
                {
                        user->WriteServ("491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
-                       return;
+                       return CMD_FAILURE;
                }
                if (!c->HasUser(user))
                {
                        user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name);
-                       return;
+                       return CMD_FAILURE;
                }
 
                u->RemoveInvite(xname);
                user->WriteServ("494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
                u->WriteServ("493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
                c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -93,11 +87,11 @@ class ModuleUninvite : public Module
 
  public:
 
-       ModuleUninvite(Server* Me) : Module::Module(Me)
+       ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_uninvite();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_uninvite(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleUninvite()
@@ -106,8 +100,7 @@ class ModuleUninvite : public Module
        
        virtual Version GetVersion()
        {
-               /* Must be static, because we dont want to desync invite lists */
-               return Version(1, 0, 0, 0, VF_VENDOR|VF_STATIC);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 };
 
@@ -123,7 +116,7 @@ class ModuleUninviteFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleUninvite(Me);
        }