/** Generate a GLine
*/
- XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, 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);
return new GLine(set_time, duration, source, reason, ih.first, ih.second);
/** Generate an ELine
*/
- XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, 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);
return new ELine(set_time, duration, source, reason, ih.first, ih.second);
/** Generate a KLine
*/
- XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, 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);
return new KLine(set_time, duration, source, reason, ih.first, ih.second);
/** Generate a QLine
*/
- XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, 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);
}
/** Generate a ZLine
*/
- XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, 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);
}
// deletes a line, returns true if the line existed and was removed
-bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
+bool XLineManager::DelLine(const char* hostmask, const std::string& type, std::string& reason, User* user, bool simulate)
{
ContainerIter x = lookup_lines.find(type);
if (y == x->second.end())
return false;
+ reason.assign(y->second->reason);
+
if (simulate)
return true;
ServerInstance->XLines->CheckELines();
}
-// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
+// returns a pointer to the reason if a nickname matches a Q-line, NULL if it didn't match
XLine* XLineManager::MatchesLine(const std::string &type, User* user)
{
void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
- const std::string banReason = line + "-Lined: " + reason;
+ const std::string banReason = line + "-lined: " + reason;
if (!ServerInstance->Config->XLineMessage.empty())
u->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
if (ServerInstance->Config->HideBans)
- ServerInstance->Users->QuitUser(u, line + "-Lined", &banReason);
+ ServerInstance->Users->QuitUser(u, line + "-lined", &banReason);
else
ServerInstance->Users->QuitUser(u, banReason);
void QLine::Apply(User* u)
{
- /* Force to uuid on apply of qline, no need to disconnect any more :) */
+ /* Force to uuid on apply of Q-line, no need to disconnect anymore :) */
u->ChangeNick(u->uuid);
}
void ELine::OnAdd()
{
- /* When adding one eline, only check the one eline */
+ /* When adding one E-line, only check the one E-line */
const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
{
{
bool onechar = (type.length() == 1);
ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago): %s",
- type.c_str(), (onechar ? "-Line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
+ type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
}
const std::string& ELine::Displayable()