summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-01-26 10:26:45 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-01-26 10:26:45 +0000
commitb0f9385857803606451dfcb9eff84b7bcdd257b6 (patch)
treef4df0291e8c1794e6146db4b982587c137492a61
parent42b72b522fc5ad1d8f777b2960b6553b2bc294cc (diff)
BUILD : 1.7.21 (1359) BUGS : 838 NOTES : Fixed various checks for LogBot in bs_say and bs_act
git-svn-id: svn://svn.anope.org/anope/trunk@1359 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1074 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/core/bs_act.c5
-rw-r--r--src/core/bs_say.c2
-rw-r--r--version.log6
4 files changed, 9 insertions, 5 deletions
diff --git a/Changes b/Changes
index acef90c75..91f0c275f 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,7 @@ Anope Version S V N
01/26 F Channel walking for mass modes and restoring topics. [#835]
01/26 F Memory leaks in OperServ CLEARMODES. [#836]
01/26 F Check for LogChannel when running with -logchan option. [#837]
+01/26 F Enough LogChannel checks for bs_say and bs_act with LogBot on. [#838]
Provided by Jan Milants <jan_renee@msn.com> - 2008
01/16 F Server traversion with next_server() failed to list all servers. [#831]
diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index e342c7617..1f92b7e42 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -82,10 +82,9 @@ int do_act(User * u)
notice_lang(s_BotServ, u, ACCESS_DENIED);
else {
strnrepl(text, BUFSIZE, "\001", "");
- anope_cmd_privmsg(ci->bi->nick, ci->name, "%cACTION %s %c", 1,
- text, 1);
+ anope_cmd_action(ci->bi->nick, ci->name, "%s", text);
ci->bi->lastmsg = time(NULL);
- if (logchan && LogBot)
+ if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
anope_cmd_privmsg(ci->bi->nick, LogChannel, "ACT %s %s %s",
u->nick, ci->name, text);
}
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 3f088b4f2..508efe320 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -86,7 +86,7 @@ int do_say(User * u)
if (text[0] != '\001') {
anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", text);
ci->bi->lastmsg = time(NULL);
- if (logchan && LogBot)
+ if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
anope_cmd_privmsg(ci->bi->nick, LogChannel,
"SAY %s %s %s", u->nick, ci->name, text);
} else {
diff --git a/version.log b/version.log
index 1ac175b8b..515d21af1 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="21"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1358"
+VERSION_BUILD="1359"
# $Log$
#
+# BUILD : 1.7.21 (1359)
+# BUGS : 838
+# NOTES : Fixed various checks for LogBot in bs_say and bs_act
+#
# BUILD : 1.7.21 (1358)
# BUGS : 837
# NOTES : Added a check for LogChannel when running with -logchan switch