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 f09021cabac12d40220352836a2bda139914a04b..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
         */
@@ -169,7 +177,7 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
                {
                        sendto_one(source_p, form_str(ERR_TARGCHANGE),
                                   me.name, source_p->name, target_p->name);
-                       return;
+                       return 0;
                }
                sendto_one(source_p, form_str(RPL_INVITING), 
                           me.name, source_p->name,
@@ -188,6 +196,33 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if(MyConnect(target_p))
        {
+               if(!IsOper(source_p) && (IsSetCallerId(target_p) ||
+                                       (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])) &&
+                               !accept_message(source_p, target_p))
+               {
+                       if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])
+                       {
+                               sendto_one_numeric(source_p, ERR_NONONREG,
+                                               form_str(ERR_NONONREG),
+                                               target_p->name);
+                               return 0;
+                       }
+                       else
+                       {
+                               /* instead of sending RPL_UMODEGMSG,
+                                * just let the invite through
+                                */
+                               if((target_p->localClient->last_caller_id_time +
+                                   ConfigFileEntry.caller_id_wait) >= rb_current_time())
+                               {
+                                       sendto_one_numeric(source_p, ERR_TARGUMODEG,
+                                                          form_str(ERR_TARGUMODEG),
+                                                          target_p->name);
+                                       return 0;
+                               }
+                               target_p->localClient->last_caller_id_time = rb_current_time();
+                       }
+               }
                add_reply_target(target_p, source_p);
                sendto_one(target_p, ":%s!%s@%s INVITE %s :%s", 
                           source_p->name, source_p->username, source_p->host,