pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-04 21:43:13 +02:00
Code Activity

Fix potential issues if msgbypass extban module is not loaded.

Browse Source 
[skip ci]
This commit is contained in:
Bram Matthys
2019-09-06 20:54:06 +02:00
parent a3e911a174
commit dc5fd50a54
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/chanmodes/censor.c
+2 -2
View File
@@ -265,11 +265,11 @@ char *censor_pre_chanmsg(aClient *sptr, aChannel *chptr, MessageTag *mtags, char
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(sptr, chptr, BYPASS_CHANMSG_CENSOR);
if (i == HOOK_ALLOW)
return text; /* bypass */
if (i != HOOK_CONTINUE)
break;
}
if (i == HOOK_ALLOW)
return text; /* bypass */
text = stripbadwords_channel(text, &blocked);
if (blocked)
src/modules/chanmodes/nocolor.c
+2 -2
View File
@@ -95,11 +95,11 @@ char *nocolor_prechanmsg(aClient *sptr, aChannel *chptr, MessageTag *mtags, char
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(sptr, chptr, BYPASS_CHANMSG_COLOR);
if (i == HOOK_ALLOW)
return text; /* bypass */
if (i != HOOK_CONTINUE)
break;
}
if (i == HOOK_ALLOW)
return text; /* bypass */
if (!notice)
{
src/modules/chanmodes/nonotice.c
+2 -2
View File
@@ -76,11 +76,11 @@ int nonotice_check_can_send(aClient *cptr, aChannel *chptr, Membership *lp, char
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(cptr, chptr, BYPASS_CHANMSG_NOTICE);
if (i == HOOK_ALLOW)
return HOOK_CONTINUE; /* bypass restriction */
if (i != HOOK_CONTINUE)
break;
}
if (i == HOOK_ALLOW)
return HOOK_CONTINUE; /* bypass restriction */
*errmsg = "NOTICEs are not permitted in this channel";
return HOOK_DENY; /* block notice */
}
src/modules/chanmodes/regonlyspeak.c
+2 -2
View File
@@ -94,11 +94,11 @@ int regonlyspeak_can_send(aClient *cptr, aChannel *chptr, Membership *lp, char *
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(cptr, chptr, BYPASS_CHANMSG_MODERATED);
if (i == HOOK_ALLOW)
return HOOK_CONTINUE; /* bypass +M restriction */
if (i != HOOK_CONTINUE)
break;
}
if (i == HOOK_ALLOW)
return HOOK_CONTINUE; /* bypass +M restriction */
*errmsg = "You must have a registered nick (+r) to talk on this channel";
return HOOK_DENY; /* BLOCK message */
src/modules/chanmodes/stripcolor.c
+2 -2
View File
@@ -83,11 +83,11 @@ char *stripcolor_prechanmsg(aClient *sptr, aChannel *chptr, MessageTag *mtags, c
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(sptr, chptr, BYPASS_CHANMSG_COLOR);
if (i == HOOK_ALLOW)
return text; /* bypass */
if (i != HOOK_CONTINUE)
break;
}
if (i == HOOK_ALLOW)
return text; /* bypass */
text = StripColors(text);
}
src/modules/nocodes.c
+4 -4
View File
@@ -68,11 +68,11 @@ char *nocodes_pre_chanmsg(aClient *sptr, aChannel *chptr, MessageTag *mtags, cha
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(sptr, chptr, BYPASS_CHANMSG_COLOR);
if (i == HOOK_ALLOW)
return text; /* bypass */
if (i != HOOK_CONTINUE)
break;
}
if (i == HOOK_ALLOW)
return text; /* bypass */
strlcpy(retbuf, StripControlCodes(text), sizeof(retbuf));
return retbuf;
@@ -84,11 +84,11 @@ char *nocodes_pre_chanmsg(aClient *sptr, aChannel *chptr, MessageTag *mtags, cha
for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
{
i = (*(h->func.intfunc))(sptr, chptr, BYPASS_CHANMSG_COLOR);
if (i == HOOK_ALLOW)
return text; /* bypass */
if (i != HOOK_CONTINUE)
break;
}
if (i == HOOK_ALLOW)
return text; /* bypass */
sendnumeric(sptr, ERR_CANNOTSENDTOCHAN, chptr->chname,
"Control codes (bold/underline/reverse) are not permitted in this channel",