Added some stuff to NEWS (primarily about metadata and OACCEPT).

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

diff --git a/modules/m_invite.c b/modules/m_invite.c
index b8782d035e02067cda6b87252ac38eef3168629d..cd33afff54dbdfcf44e15c02ff20633a5929035d 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -145,11 +145,26 @@ 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) &&
                        !(chptr->mode.mode & MODE_FREEINVITE))
        {
-               sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-                          me.name, source_p->name, parv[2]);
+               if(IsOverride(source_p))
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+                                       "%s is overriding INVITE [%s] on [%s]",
+                                       get_oper_name(source_p), target_p->name, chptr->chname);
+               else
+               {
+                       sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+                                       me.name, source_p->name, parv[2]);
+                       return 0;
+               }
+       }
+
+       if (IsSetNoInvite(target_p))
+       {
+               sendto_one_numeric(source_p, ERR_NOINVITE,
+                               form_str(ERR_NOINVITE),
+                               target_p->name);
                return 0;
        }