From 2783c82685c5d04eec942cc21ed43b9b773330fb Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 22 Dec 2010 18:28:22 -0500 Subject: Removed match_usermask --- modules/core/cs_akick.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules/core') 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; -- cgit From 11b3b8a5ff2c287c24e730712b6733ae5cd173d0 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 22 Dec 2010 19:12:04 -0500 Subject: Made SQLine clear work --- modules/core/os_sqline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/core') diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp index d5184a8cc..5688351e9 100644 --- a/modules/core/os_sqline.cpp +++ b/modules/core/os_sqline.cpp @@ -370,7 +370,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; -- cgit From 265006b69176e1d8130284c63bcb50a1b67a426f Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 23 Dec 2010 00:03:50 -0500 Subject: Fixed deleting expired SXLines --- modules/core/os_sqline.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'modules/core') diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp index 5688351e9..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::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(affected) / static_cast(UserListByNick.size()) * 100.0; -- cgit