Remove useless vector copy

[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 1761f354c049cab08b2f915711642e6ff0dda594..2cadc852421469bec7c9fa83973688f943c6e49b 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -46,12 +46,11 @@ class CommandUninvite : public Command
                        return CMD_FAILURE;
                }
 
-               if (c->modes[CM_INVITEONLY])
+               if (IS_LOCAL(user))
                {
                        if (c->GetStatus(user) < STATUS_HOP)
                        {
-                               user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick.c_str(), c->name.c_str(),
-                                               ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
+                               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-");
                                return CMD_FAILURE;
                        }
                }
@@ -60,7 +59,7 @@ class CommandUninvite : public Command
 
                if (!u->IsInvited(xname))
                {
-                       user->WriteNumeric(491, "%s %s %s :Is not invited to channel %s", user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
+                       user->WriteNumeric(505, "%s %s %s :Is not invited to channel %s", user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
                        return CMD_FAILURE;
                }
                if (!c->HasUser(user))
@@ -80,16 +79,13 @@ class CommandUninvite : public Command
 
 class ModuleUninvite : public Module
 {
-       CommandUninvite *mycommand;
+       CommandUninvite cmd;
 
  public:
 
-       ModuleUninvite(InspIRCd* Me) : Module(Me)
+       ModuleUninvite(InspIRCd* Me) : Module(Me), cmd(Me)
        {
-
-               mycommand = new CommandUninvite(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleUninvite()
@@ -98,7 +94,7 @@ class ModuleUninvite : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 };