Revert automated conversion by Special, as it (unfortunately) neglects some details...

[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 88148340598fbeb5bbaf080009eb07cae358ba1b..7b9d7416bc1933ff3aafec6c72a8136e69d68c61 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,7 +16,7 @@
 #include "inspircd.h"
 
 /** Handle /UNINVITE
- */     
+ */
 class CommandUninvite : public Command
 {
  public:
@@ -27,51 +27,51 @@ class CommandUninvite : public Command
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                User* u = ServerInstance->FindNick(parameters[0]);
                Channel* c = ServerInstance->FindChan(parameters[1]);
-                        
+
                if ((!c) || (!u))
-               {       
+               {
                        if (!c)
                        {
-                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[1].c_str());
                        }
                        else
                        {
-                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
                        }
-                               
+
                        return CMD_FAILURE;
-               }       
+               }
 
-               if (c->modes[CM_INVITEONLY])
+               if (IS_LOCAL(user))
                {
                        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);
+                               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;
                        }
                }
 
-               irc::string xname(c->name);
+               irc::string xname(c->name.c_str());
 
                if (!u->IsInvited(xname))
                {
-                       user->WriteServ("491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
+                       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());
                        return CMD_FAILURE;
                }
                if (!c->HasUser(user))
                {
-                       user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name);
+                       user->WriteNumeric(492, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str());
                        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);
+               user->WriteNumeric(494, "%s %s %s :Uninvited", user->nick.c_str(), c->name.c_str(), u->nick.c_str());
+               u->WriteNumeric(493, "%s :You were uninvited from %s by %s", u->nick.c_str(), c->name.c_str(), user->nick.c_str());
+               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
 
                return CMD_SUCCESS;
        }
@@ -85,18 +85,19 @@ class ModuleUninvite : public Module
 
        ModuleUninvite(InspIRCd* Me) : Module(Me)
        {
-               
+
                mycommand = new CommandUninvite(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
-       
+
        virtual ~ModuleUninvite()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 };