diff options
| author | Adam <Adam@anope.org> | 2013-03-13 09:44:43 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-03-13 09:45:15 -0500 |
| commit | 1d16629a6da2f1d5b65557028e75abc7de51cad5 (patch) | |
| tree | d356ef0186eee4bf54f849bca09f4b98071d6266 /modules/commands/cs_akick.cpp | |
| parent | 72aa27ede5f265fe976f8e9935239aed9930ff3a (diff) | |
Allow opers to override chanserv kick/ban, botserv say/act, and akick's peace setting
Diffstat (limited to 'modules/commands/cs_akick.cpp')
| -rw-r--r-- | modules/commands/cs_akick.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index dea6446ba..b388620fc 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -83,9 +83,13 @@ class CommandCSAKick : public Command } } + bool override = !source.AccessFor(ci).HasPriv("AKICK"); + /* Opers overriding get to bypass PEACE */ + if (override) + ; /* Check whether target nick has equal/higher access * or whether the mask matches a user with higher/equal access - Viper */ - if (ci->HasExt("PEACE") && nc) + else if (ci->HasExt("PEACE") && nc) { AccessGroup nc_access = ci->AccessFor(nc), u_access = source.AccessFor(ci); if (nc == ci->GetFounder() || nc_access >= u_access) @@ -152,7 +156,6 @@ class CommandCSAKick : public Command else akick = ci->AddAkick(source.GetNick(), mask, reason); - bool override = !source.AccessFor(ci).HasPriv("AKICK"); Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to add " << mask << (reason == "" ? "" : ": ") << reason; FOREACH_MOD(I_OnAkickAdd, OnAkickAdd(source, ci, akick)); |