diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/cs_kick.c | 7 | ||||
| -rw-r--r-- | src/core/cs_modes.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 7c0c57b51..7524db1bf 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -52,16 +52,15 @@ class CommandCSKick : public Command notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); } else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) { notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, target); - } else if (!c->FindUser(u2)) { - notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); - } else if (!is_same ? !check_access(u, ci, CA_KICK) : - !check_access(u, ci, CA_KICKME)) { + } else if (!is_same ? !check_access(u, ci, CA_KICK) : !check_access(u, ci, CA_KICKME)) { notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else if (!is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) { notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else if (is_protected(u2)) { notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); + } else if (!c->FindUser(u2)) { + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); } else { if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !check_access(u, ci, CA_SIGNKICK))) ci->c->Kick(whosends(ci), u2, "%s (%s)", reason, u->nick.c_str()); diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index d3525d7cc..e2d6028bf 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -46,14 +46,14 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const char *chan, const c notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); else if (is_same ? !(u2 = u) : !(u2 = finduser(nick))) notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, nick); - else if (!c->FindUser(u2)) - notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); else if (is_same ? !check_access(u, ci, levelself) : !check_access(u, ci, level)) notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (!set && !is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (!set && is_protected(u2) && !is_same) notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); + else if (!c->FindUser(u2)) + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); else { if (set) |