Add is_any_op() in preperation for adding +ah, start using it instead of is_chanop...

[irc/rqf/shadowircd.git] / modules / m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index b8782d035e02067cda6b87252ac38eef3168629d..2a711e4820f558fa5335471b14a1bb7d106dbbfd 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -145,7 +145,7 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
        /* unconditionally require ops, unless the channel is +g */
        /* treat remote clients as chanops */
-       if(MyClient(source_p) && !is_chanop(msptr) &&
+       if(MyClient(source_p) && !is_any_op(msptr) && !IsOverride(source_p) &&
                        !(chptr->mode.mode & MODE_FREEINVITE))
        {
                sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
@@ -153,6 +153,14 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
+       if (IsSetNoInvite(target_p))
+       {
+               sendto_one_numeric(source_p, ERR_NOINVITE,
+                               form_str(ERR_NOINVITE),
+                               target_p->name);
+               return 0;
+       }
+
        /* store invites when they could affect the ability to join
         * for +l/+j just check if the mode is set, this varies over time
         */