Atheme wont work right, because this wasnt VF_COMMON. If its not VF_COMMON, its not...

[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 a1b483690469bc4c8cf4f00ba5f13e671b0f29f1..b967b34963b9937ff2f2690525a1a7db0c388f20 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -22,23 +22,23 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "inspircd.h"
 
 
-extern InspIRCd* ServerInstance;
+
         
 class cmd_uninvite : public command_t
 {
  public:
- cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"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]);
@@ -54,7 +54,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])
@@ -62,7 +62,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;
                        }
                }
 
@@ -71,18 +71,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;
        }
 };
 
@@ -105,8 +107,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, 0, 0, 0, VF_VENDOR);
        }
 };