summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-03-23 00:30:16 +0000
committercyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-03-23 00:30:16 +0000
commit96f98ebbb654aa452ee821fbf1dd2caaf31d6325 (patch)
tree297966f5b488bafc1e80ddbc11808f3eb2728119 /src
parentd6522b5220f400788a989e763662881bba86fd5c (diff)
Really fix bug #1062, patch from Adam, BS ACT and BS SAY should no longer send revealing error messages to users without access.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2186 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/core/bs_act.c12
-rw-r--r--src/core/bs_say.c13
2 files changed, 13 insertions, 12 deletions
diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 56fde927e..3c0472c7c 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -41,21 +41,21 @@ class CommandBSAct : public Command
return MOD_CONT;
}
- if (!ci->bi)
+ if (!check_access(u, ci, CA_SAY))
{
- notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
+ notice_lang(s_BotServ, u, ACCESS_DENIED);
return MOD_CONT;
}
- if (!ci->c || ci->c->usercount < BSMinUsers)
+ if (!ci->bi)
{
- notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
+ notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
return MOD_CONT;
}
- if (!check_access(u, ci, CA_SAY))
+ if (!ci->c || ci->c->usercount < BSMinUsers)
{
- notice_lang(s_BotServ, u, ACCESS_DENIED);
+ notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
return MOD_CONT;
}
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 18f029b1c..e1c2934c8 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -43,21 +43,22 @@ class CommandBSSay : public Command
return MOD_CONT;
}
- if (!ci->bi)
+ if (!check_access(u, ci, CA_SAY))
{
- notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
+ notice_lang(s_BotServ, u, ACCESS_DENIED);
return MOD_CONT;
}
- if (!ci->c || ci->c->usercount < BSMinUsers)
+
+ if (!ci->bi)
{
- notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
+ notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
return MOD_CONT;
}
- if (!check_access(u, ci, CA_SAY))
+ if (!ci->c || ci->c->usercount < BSMinUsers)
{
- notice_lang(s_BotServ, u, ACCESS_DENIED);
+ notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
return MOD_CONT;
}