Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

[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 eea722a7413433ff2b7494144de6d1b029835780..495ec05111d613bbec52da4f9ad33cb3c5e8941d 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,9 +20,8 @@
 class CommandUninvite : public Command
 {
  public:
-       CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
+       CommandUninvite(Module* Creator) : Command(Creator,"UNINVITE", 2)
        {
-               this->source = "m_uninvite.so";
                syntax = "<nick> <channel>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
@@ -48,9 +47,9 @@ class CommandUninvite : public Command
 
                if (IS_LOCAL(user))
                {
-                       if (c->GetStatus(user) < STATUS_HOP)
+                       if (c->GetPrefixValue(user) < HALFOP_VALUE)
                        {
-                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetStatus(u) == STATUS_HOP ? "" : "half-");
+                               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetPrefixValue(u) == HALFOP_VALUE ? "" : "half-");
                                return CMD_FAILURE;
                        }
                }
@@ -75,20 +74,22 @@ class CommandUninvite : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleUninvite : public Module
 {
-       CommandUninvite *mycommand;
+       CommandUninvite cmd;
 
  public:
 
-       ModuleUninvite(InspIRCd* Me) : Module(Me)
+       ModuleUninvite(InspIRCd* Me) : Module(Me), cmd(this)
        {
-
-               mycommand = new CommandUninvite(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleUninvite()
@@ -97,7 +98,7 @@ class ModuleUninvite : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 };