From 0cf8d733953fd9c856c0519f2bccc94a3cb2eafa Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 5 Nov 2012 23:12:38 -0500 Subject: Added log messages for all of the other chanserv commands that should be logged --- modules/commands/cs_enforce.cpp | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'modules/commands/cs_enforce.cpp') diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp index 031b592c4..6c3fb3f39 100644 --- a/modules/commands/cs_enforce.cpp +++ b/modules/commands/cs_enforce.cpp @@ -18,32 +18,38 @@ class CommandCSEnforce : public Command { private: - void DoSet(Channel *c) + void DoSet(CommandSource &source, Channel *c) { const ChannelInfo *ci = c->ci; if (!ci) return; + Log(LOG_COMMAND, source, this) << "to enforce set"; + if (ci->HasFlag(CI_SECUREOPS)) - this->DoSecureOps(c); + this->DoSecureOps(source, c); if (ci->HasFlag(CI_RESTRICTED)) - this->DoRestricted(c); + this->DoRestricted(source, c); } - void DoModes(Channel *c) + void DoModes(CommandSource &source, Channel *c) { + Log(LOG_COMMAND, source, this) << "to enforce modes"; + if (c->HasMode(CMODE_REGISTEREDONLY)) - this->DoCModeR(c); + this->DoCModeR(source, c); } - void DoSecureOps(Channel *c) + void DoSecureOps(CommandSource &source, Channel *c) { ChannelInfo *ci = c->ci; if (!ci) return; + Log(LOG_COMMAND, source, this) << "to enforce secureops"; + /* Dirty hack to allow chan_set_correct_modes to work ok. * We pretend like SECUREOPS is on so it doesn't ignore that * part of the code. This way we can enforce SECUREOPS even @@ -67,12 +73,14 @@ class CommandCSEnforce : public Command ci->UnsetFlag(CI_SECUREOPS); } - void DoRestricted(Channel *c) + void DoRestricted(CommandSource &source, Channel *c) { ChannelInfo *ci = c->ci; if (ci == NULL) return; + Log(LOG_COMMAND, source, this) << "to enforce restricted"; + for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ) { UserContainer *uc = *it++; @@ -89,7 +97,7 @@ class CommandCSEnforce : public Command } } - void DoCModeR(Channel *c) + void DoCModeR(CommandSource &source, Channel *c) { ChannelInfo *ci = c->ci; Anope::string mask; @@ -97,6 +105,8 @@ class CommandCSEnforce : public Command if (!ci) return; + Log(LOG_COMMAND, source, this) << "to enforce registered only"; + for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ) { UserContainer *uc = *it++; @@ -134,27 +144,27 @@ class CommandCSEnforce : public Command { if (what.empty() || what.equals_ci("SET")) { - this->DoSet(c); + this->DoSet(source, c); source.Reply(_("Enforced %s"), !what.empty() ? what.c_str() : "SET"); } else if (what.equals_ci("MODES")) { - this->DoModes(c); + this->DoModes(source, c); source.Reply(_("Enforced %s"), what.c_str()); } else if (what.equals_ci("SECUREOPS")) { - this->DoSecureOps(c); + this->DoSecureOps(source, c); source.Reply(_("Enforced %s"), what.c_str()); } else if (what.equals_ci("RESTRICTED")) { - this->DoRestricted(c); + this->DoRestricted(source, c); source.Reply(_("Enforced %s"), what.c_str()); } else if (what.equals_ci("+R")) { - this->DoCModeR(c); + this->DoCModeR(source, c); source.Reply(_("Enforced %s"), what.c_str()); } else -- cgit