/* 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;
}
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,