summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorcertus certus@31f1291d-b8d6-0310-a050-a5561fc1590b <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-03-01 14:08:00 +0000
committercertus certus@31f1291d-b8d6-0310-a050-a5561fc1590b <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-03-01 14:08:00 +0000
commit88b67f00f7c5036990492e6b64f2f7caa5b98583 (patch)
tree5b52b3c13c5c4e8e1445d423f0edae2feaf65288 /src/core
parent3a61b5a6064e2cd260af9d35e9f288c089bfc2f6 (diff)
git-svn-id: svn://svn.anope.org/anope/trunk@981 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@706 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/core')
-rw-r--r--src/core/bs_unassign.c5
-rw-r--r--src/core/cs_invite.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 1789189ba..1bc978c81 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -79,9 +79,10 @@ int do_unassign(User * u)
notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
else if (!is_services_admin(u) && !check_access(u, ci, CA_ASSIGN))
notice_lang(s_BotServ, u, ACCESS_DENIED);
+ else if (!ci->bi)
+ notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
else {
- if (ci->bi)
- unassign(u, ci);
+ unassign(u, ci);
notice_lang(s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name);
}
return MOD_CONT;
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index bd3bb8e2b..1687151fc 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -79,6 +79,8 @@ int do_invite(User * u)
notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan);
} else if (ci->flags & CI_VERBOTEN) {
notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
+ } else if (ci->flags & CI_SUSPENDED) {
+ notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan);
} else if (!u || !check_access(u, ci, CA_INVITE)) {
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
} else {