diff options
| author | Adam <Adam@anope.org> | 2010-11-30 03:02:33 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-12-12 19:37:02 -0500 |
| commit | 0ba566491ea246fcc895862d0ef80bdf4ee43b4b (patch) | |
| tree | 9852671d32476ddad58e264a8e074c41fef9f69f /modules/core/cs_akick.cpp | |
| parent | 2a4d57a1cacd22084abea5dd21c87dc733a7b5bf (diff) | |
Allowing adding hostmasks to channel access lists
Diffstat (limited to 'modules/core/cs_akick.cpp')
| -rw-r--r-- | modules/core/cs_akick.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp index 4df83d121..20ceb7c10 100644 --- a/modules/core/cs_akick.cpp +++ b/modules/core/cs_akick.cpp @@ -202,7 +202,9 @@ class CommandCSAKick : public Command * or whether the mask matches a user with higher/equal access - Viper */ if (ci->HasFlag(CI_PEACE) && nc) { - if (nc == ci->founder || get_access_level(ci, nc) >= get_access(u, ci)) + ChanAccess *nc_access = ci->GetAccess(nc), *u_access = ci->GetAccess(u); + int16 nc_level = nc_access ? nc_access->level : 0, u_level = u_access ? u_access->level : 0; + if (nc == ci->founder || nc_level >= u_level) { source.Reply(ACCESS_DENIED); return; @@ -216,7 +218,9 @@ class CommandCSAKick : public Command { User *u2 = *it; - if ((check_access(u2, ci, CA_FOUNDER) || get_access(u2, ci) >= get_access(u, ci)) && match_usermask(mask, u2)) + 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)) { source.Reply(ACCESS_DENIED); return; @@ -232,7 +236,9 @@ class CommandCSAKick : public Command if (na2->HasFlag(NS_FORBIDDEN)) continue; - if (na2->nc && (na2->nc == ci->founder || get_access_level(ci, na2->nc) >= get_access(u, ci))) + ChanAccess *na2_access = ci->GetAccess(na2->nc), *u_access = ci->GetAccess(u); + int16 na2_level = na2_access ? na2_access->level : 0, u_level = u_access ? u_access->level : 0; + if (na2->nc && (na2->nc == ci->founder || na2_level >= u_level)) { Anope::string buf = na2->nick + "!" + na2->last_usermask; if (Anope::Match(buf, mask)) |