diff options
| author | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-01-10 20:21:45 +0000 |
|---|---|---|
| committer | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-01-10 20:21:45 +0000 |
| commit | 4a8a6b8a4e9d12ae0b4e2dc59b7c32c50a08cc18 (patch) | |
| tree | 7ad53bdaf6f9a1e64b8fe40be078b4c9286574a0 | |
| parent | 264fb0c8bfe69ef61227693e96f283ccbd8779bb (diff) | |
BUILD : 1.7.18 (1224) BUGS : 663 NOTES : Fixed BotServ kicks to now obey the SignKick setting of the channel
git-svn-id: svn://svn.anope.org/anope/trunk@1224 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@943 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | src/botserv.c | 18 | ||||
| -rw-r--r-- | version.log | 6 |
3 files changed, 22 insertions, 3 deletions
@@ -9,6 +9,7 @@ Anope Version S V N 01/06 F MySQL code not always reporting Services Root flags correctly. [#659] 01/10 F Minor syntax error in anoperc. [#665] 01/10 F CHAN_SYMBOL_REQUIRED claimed one can register local (&) channels. [#666] +01/10 F BotServ kicks now obeys the channel's SignKick option. [#663] Anope Version 1.7.18 -------------------- diff --git a/src/botserv.c b/src/botserv.c index 1b6f98eb0..2d72030f9 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -947,7 +947,15 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, av[2] = reason; } - anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); + /* Check if we need to do a signkick or not -GD */ + if ((ci->flags & CI_SIGNKICK) + || ((ci->flags & CI_SIGNKICK_LEVEL) + && !check_access(requester, ci, CA_SIGNKICK))) + anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s (%s)", av[2], + requester->nick); + else + anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); + do_kick(ci->bi->nick, 3, av); } @@ -987,7 +995,13 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, av[2] = reason; } - anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); + if ((ci->flags & CI_SIGNKICK) + || ((ci->flags & CI_SIGNKICK_LEVEL) + && !check_access(requester, ci, CA_SIGNKICK))) + anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s (%s)", av[2], + requester->nick); + else + anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); do_kick(ci->bi->nick, 3, av); } diff --git a/version.log b/version.log index 405907d87..2aea3c543 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="18" VERSION_EXTRA="-svn" -VERSION_BUILD="1223" +VERSION_BUILD="1224" # $Log$ # +# BUILD : 1.7.18 (1224) +# BUGS : 663 +# NOTES : Fixed BotServ kicks to now obey the SignKick setting of the channel +# # BUILD : 1.7.18 (1223) # BUGS : 666 # NOTES : Fixed CHAN_SYMBOL_REQUIRED which claimed one can register local (&) channels (sorry Rob, i should have left this bug for you) |