From f8075c0a2d214a12b52267f78add4ace42e15d63 Mon Sep 17 00:00:00 2001 From: pk910 Date: Fri, 22 Jul 2011 03:38:07 +0200 Subject: [PATCH] KICK user only if he's really in the channel! --- src/mod-watchdog.c | 3 ++- src/proto-p10.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mod-watchdog.c b/src/mod-watchdog.c index e62bcd0..65935bd 100644 --- a/src/mod-watchdog.c +++ b/src/mod-watchdog.c @@ -360,7 +360,8 @@ watchdog_detected_badword(struct userNode *user, struct chanNode *chan, struct b free(hostmask); case BADACTION_KICK: - KickChannelUser(user, chan, watchdog, reason); + if(GetUserMode(chan, user)) + KickChannelUser(user, chan, watchdog, reason); break; case BADACTION_KILL: DelUser(user, watchdog, 1, reason); diff --git a/src/proto-p10.c b/src/proto-p10.c index f807401..1e47027 100644 --- a/src/proto-p10.c +++ b/src/proto-p10.c @@ -1777,11 +1777,10 @@ static CMD_FUNC(cmd_relay) } else { devnull[0] = 0; } - /* // currently disabled because of a ircu incompatibility + /* if(!HANDLE_FLAGGED(hi, AUTOHIDE)) { sprintf(tmp,"%s LA %s 0 %s\n",argv[3],hi->handle,devnull); - } else - */ + } else */ if(getfakehost(argv[4])) { sprintf(tmp,"%s LA %s %s %s\n",argv[3],hi->handle,getfakehost(argv[4]),devnull); } else { -- 2.20.1