diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2010-12-23 07:15:32 +0100 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2010-12-23 07:15:32 +0100 |
| commit | a0ad3c4fef7e35c68dee128950ef95c0c56849fe (patch) | |
| tree | a9096244ac74dc31d959e9b6426453de90c28d03 /modules/core | |
| parent | 184e7b3f64beb104e2d676048fc5bf485c5ad743 (diff) | |
| parent | 265006b69176e1d8130284c63bcb50a1b67a426f (diff) | |
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/cs_akick.cpp | 4 | ||||
| -rw-r--r-- | modules/core/os_sqline.cpp | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp index 20ceb7c10..1e2d910b7 100644 --- a/modules/core/cs_akick.cpp +++ b/modules/core/cs_akick.cpp @@ -220,7 +220,9 @@ class CommandCSAKick : public Command ChanAccess *u2_access = ci->GetAccess(nc), *u_access = ci->GetAccess(u); int16 u2_level = u2_access ? u2_access->level : 0, u_level = u_access ? u_access->level : 0; - if ((check_access(u2, ci, CA_FOUNDER) || u2_level >= u_level) && match_usermask(mask, u2)) + Entry entry_mask(mask); + + if ((check_access(u2, ci, CA_FOUNDER) || u2_level >= u_level) && entry_mask.Matches(u2)) { source.Reply(ACCESS_DENIED); return; diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp index d5184a8cc..3a49099cc 100644 --- a/modules/core/os_sqline.cpp +++ b/modules/core/os_sqline.cpp @@ -170,12 +170,9 @@ class CommandOSSQLine : public Command reason += " " + params[3]; if (!mask.empty() && !reason.empty()) { - User *user = finduser(mask); - if (user) - mask = "*@" + user->host; unsigned int affected = 0; for (patricia_tree<User *>::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it) - if (Anope::Match((*it)->GetIdent() + "@" + (*it)->host, mask)) + if (Anope::Match((*it)->nick, mask)) ++affected; float percent = static_cast<float>(affected) / static_cast<float>(UserListByNick.size()) * 100.0; @@ -370,7 +367,7 @@ class CommandOSSQLine : public Command { User *u = source.u; FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SQLINE)); - SGLine->Clear(); + SQLine->Clear(); source.Reply(OPER_SQLINE_CLEAR); return MOD_CONT; |