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 d87caea9d7ac3bf7488f4b6cdbf87287fdd1709d..7b9d7416bc1933ff3aafec6c72a8136e69d68c61 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -16,7 +16,7 @@
 #include "inspircd.h"
 
 /** Handle /UNINVITE
- */     
+ */
 class CommandUninvite : public Command
 {
  public:
@@ -31,9 +31,9 @@ class CommandUninvite : public Command
        {
                User* u = ServerInstance->FindNick(parameters[0]);
                Channel* c = ServerInstance->FindChan(parameters[1]);
-                        
+
                if ((!c) || (!u))
-               {       
+               {
                        if (!c)
                        {
                                user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[1].c_str());
@@ -42,16 +42,15 @@ class CommandUninvite : public Command
                        {
                                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->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;
                        }
                }
@@ -86,16 +85,16 @@ class ModuleUninvite : public Module
 
        ModuleUninvite(InspIRCd* Me) : Module(Me)
        {
-               
+
                mycommand = new CommandUninvite(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
        }
-       
+
        virtual ~ModuleUninvite()
        {
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);