diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_override.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_timedbans.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 6edc656c7..21b427dea 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -146,7 +146,7 @@ class ModuleOverride : public Module { // If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) || - (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE)) + (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE)) { ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")"); return MOD_RES_ALLOW; diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 47fbd7fb6..8dd334230 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -135,13 +135,13 @@ class CommandTban : public Command if (sendnotice) { - const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", + const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.", mask.c_str(), user->nick.c_str(), channel->name.c_str(), InspIRCd::DurationString(duration).c_str()); - // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above - PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); - char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above + PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); + char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; - channel->WriteRemoteNotice(message, pfxchar); + channel->WriteRemoteNotice(message, pfxchar); } return CMD_SUCCESS; @@ -236,13 +236,13 @@ class ModuleTimedBans : public Module if (cmd.sendnotice) { - const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", + const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.", mask.c_str(), i->setter.c_str(), cr->name.c_str()); - // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above - PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); - char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; + // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above + PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); + char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; - cr->WriteRemoteNotice(message, pfxchar); + cr->WriteRemoteNotice(message, pfxchar); } Modes::ChangeList setban; |