YAY for LDAP oper blocks! :D

[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 9fbd6dfb07140c4448924f0d6fe367fd2d51f7c5..3499d5051ccdc972eacb40125e52a1b690d01afa 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
@@ -17,17 +17,17 @@
 
 /** Handle /UNINVITE
  */     
-class cmd_uninvite : public Command
+class CommandUninvite : public Command
 {
  public:
-       cmd_uninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
+       CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
        {
                this->source = "m_uninvite.so";
                syntax = "<nick> <channel>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                User* u = ServerInstance->FindNick(parameters[0]);
                Channel* c = ServerInstance->FindChan(parameters[1]);
@@ -50,7 +50,8 @@ class cmd_uninvite : public Command
                {
                        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->WriteServ("482 %s %s :You must be at least a%soperator to change modes on this channel",user->nick, c->name,
+                                               ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
                                return CMD_FAILURE;
                        }
                }
@@ -79,15 +80,16 @@ class cmd_uninvite : public Command
 
 class ModuleUninvite : public Module
 {
-       cmd_uninvite *mycommand;
+       CommandUninvite *mycommand;
 
  public:
 
        ModuleUninvite(InspIRCd* Me) : Module(Me)
        {
                
-               mycommand = new cmd_uninvite(ServerInstance);
+               mycommand = new CommandUninvite(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleUninvite()