Change default --with-nicklen to 31, like atheme-services.

[solanum.git] / modules / m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index f09021cabac12d40220352836a2bda139914a04b..e31907476cb7760022d1b0892dd16a548a9ae164 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -92,14 +92,6 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
-       if(!IsChannelName(parv[2]))
-       {
-               if(MyClient(source_p))
-                       sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
-                                          form_str(ERR_NOSUCHCHANNEL), parv[2]);
-               return 0;
-       }
-
        /* Do not send local channel invites to users if they are not on the
         * same server as the person sending the INVITE message. 
         */
@@ -169,7 +161,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 +180,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,