cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change many of the ERR_CANNOTSENDTOCHAN messages to say WHY the user 

can not send to the channel for the new chmodes.
This commit is contained in:
JD Horelick 2010-03-07 17:03:12 -05:00
parent a9f16d808d
commit b6a3d80129
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/core/m_message.c
View File

@ -508,8 +508,7 @@ msg_channel(int p_or_n, const char *command,
if(!(strcmp(md->value, text2))) if(!(strcmp(md->value, text2)))
{ {
if(p_or_n != NOTICE) if(p_or_n != NOTICE)
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Message blocked due to repeating (+K set)", chptr->chname);
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
return; return;
} }
} }
@ -548,23 +547,20 @@ msg_channel(int p_or_n, const char *command,
} }
if(((caps*100)/(len)) >= 50) if(((caps*100)/(len)) >= 50)
{ {
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Your message contains mostly capital letters (+G set)", chptr->chname);
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
return; return;
} }
} }
if (p_or_n != PRIVMSG && chptr->mode.mode & MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr))) if (p_or_n != PRIVMSG && chptr->mode.mode & MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr)))
{ {
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Notices are disallowed (+T set)", chptr->chname);
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
return; return;
} }
if (p_or_n != NOTICE && chptr->mode.mode & MODE_NOACTION && if (p_or_n != NOTICE && chptr->mode.mode & MODE_NOACTION &&
!strncasecmp(text + 1, "ACTION", 6) && !strncasecmp(text + 1, "ACTION", 6) &&
(!ConfigChannel.exempt_cmode_D || !is_any_op(msptr))) (!ConfigChannel.exempt_cmode_D || !is_any_op(msptr)))
{ {
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - ACTIONs are disallowed (+D set)", chptr->chname);
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
return; return;
} }
if (p_or_n != NOTICE && *text == '\001' && if (p_or_n != NOTICE && *text == '\001' &&
@ -572,8 +568,7 @@ msg_channel(int p_or_n, const char *command,
{ {
if (chptr->mode.mode & MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr))) if (chptr->mode.mode & MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr)))
{ {
sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - CTCPs to this channel are disallowed (+C set)", chptr->chname);
form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);
return; return;
} }
else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2)) else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2))