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.
*/
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,