Replace all erroneous space indentation with tab indentation.

This commit is contained in:
Sadie Powell 2020-07-29 11:54:49 +01:00
parent 587e898d86
commit 88df35c715
4 changed files with 31 additions and 31 deletions

View File

@ -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 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) || 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+")"); ServerInstance->SNO->WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")");
return MOD_RES_ALLOW; return MOD_RES_ALLOW;

View File

@ -135,13 +135,13 @@ class CommandTban : public Command
if (sendnotice) 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()); 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 // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
channel->WriteRemoteNotice(message, pfxchar); channel->WriteRemoteNotice(message, pfxchar);
} }
return CMD_SUCCESS; return CMD_SUCCESS;
@ -236,13 +236,13 @@ class ModuleTimedBans : public Module
if (cmd.sendnotice) 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()); 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 // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h'); PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@'; char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
cr->WriteRemoteNotice(message, pfxchar); cr->WriteRemoteNotice(message, pfxchar);
} }
Modes::ChangeList setban; Modes::ChangeList setban;

View File

@ -1145,7 +1145,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
/* check if host matches.. */ /* check if host matches.. */
if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) && if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
!InspIRCd::MatchCIDR(this->GetRealHost(), c->GetHost(), NULL)) !InspIRCd::MatchCIDR(this->GetRealHost(), c->GetHost(), NULL))
{ {
ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "No host match (for %s)", c->GetHost().c_str()); ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "No host match (for %s)", c->GetHost().c_str());
continue; continue;

View File

@ -67,15 +67,15 @@ class ELineFactory : public XLineFactory
class KLineFactory : public XLineFactory class KLineFactory : public XLineFactory
{ {
public: public:
KLineFactory() : XLineFactory("K") { } KLineFactory() : XLineFactory("K") { }
/** Generate a KLine /** Generate a KLine
*/ */
XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
{ {
IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
return new KLine(set_time, duration, source, reason, ih.first, ih.second); return new KLine(set_time, duration, source, reason, ih.first, ih.second);
} }
}; };
/** An XLineFactory specialized to generate QLine* pointers /** An XLineFactory specialized to generate QLine* pointers
@ -83,14 +83,14 @@ class KLineFactory : public XLineFactory
class QLineFactory : public XLineFactory class QLineFactory : public XLineFactory
{ {
public: public:
QLineFactory() : XLineFactory("Q") { } QLineFactory() : XLineFactory("Q") { }
/** Generate a QLine /** Generate a QLine
*/ */
XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
{ {
return new QLine(set_time, duration, source, reason, xline_specific_mask); return new QLine(set_time, duration, source, reason, xline_specific_mask);
} }
}; };
/** An XLineFactory specialized to generate ZLine* pointers /** An XLineFactory specialized to generate ZLine* pointers
@ -98,14 +98,14 @@ class QLineFactory : public XLineFactory
class ZLineFactory : public XLineFactory class ZLineFactory : public XLineFactory
{ {
public: public:
ZLineFactory() : XLineFactory("Z") { } ZLineFactory() : XLineFactory("Z") { }
/** Generate a ZLine /** Generate a ZLine
*/ */
XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
{ {
return new ZLine(set_time, duration, source, reason, xline_specific_mask); return new ZLine(set_time, duration, source, reason, xline_specific_mask);
} }
}; };
@ -608,7 +608,7 @@ bool KLine::Matches(User *u)
if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{ {
if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{ {
return true; return true;
} }
@ -631,7 +631,7 @@ bool GLine::Matches(User *u)
if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{ {
if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{ {
return true; return true;
} }
@ -650,7 +650,7 @@ bool ELine::Matches(User *u)
if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
{ {
if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) || if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
{ {
return true; return true;
} }