msptr = find_channel_membership(chptr, source_p);
- if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr))
+ if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr) && !IsOverride(source_p))
{
sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
get_id(&me, source_p),
}
/* XXX Controversial? allow opers always to send through a +g */
else if(!IsServer(source_p) && (IsSetCallerId(target_p) ||
+ (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) ||
(IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])))
{
/* Here is the anti-flood bot/spambot code -db */
form_str(ERR_NONONREG),
target_p->name);
}
+ else if (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p))
+ {
+ if (p_or_n != NOTICE)
+ sendto_one_numeric(source_p, ERR_NOCOMMONCHAN,
+ form_str(ERR_NOCOMMONCHAN),
+ target_p->name);
+ }
else
{
/* check for accept, flag recipient incoming message */