/** Get the time as a string
*/
-inline std::string stringtime()
+inline std::string stringtime(InspIRCd* Instance)
{
std::ostringstream TIME;
- TIME << time(NULL);
+ TIME << Instance->Time();
return TIME.str();
}
{
for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
{
- user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), it->nick.c_str(), it->time.c_str());
+ user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (it->nick.length() ? it->nick.c_str() : ServerInstance->Config->ServerName), it->time.c_str());
}
}
user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
ListItem e;
e.mask = parameter;
e.nick = servermode ? ServerInstance->Config->ServerName : source->nick;
- e.time = stringtime();
+ e.time = stringtime(ServerInstance);
el->push_back(e);
return MODEACTION_ALLOW;
{
if (LM->extban && it->mask.length() > 1 && it->mask[0] == LM->extban && it->mask[1] == ':')
{
+ static std::string ext = it->mask.substr(2);
if (LM->user)
{
- if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask.substr(2)) || InspIRCd::Match(LM->user->GetFullHost(), it->mask.substr(2)) || (InspIRCd::MatchCIDR(LM->literal, it->mask.substr(2))))
+ if (InspIRCd::Match(LM->user->GetFullRealHost(), ext) || InspIRCd::Match(LM->user->GetFullHost(), ext) || (InspIRCd::MatchCIDR(LM->literal, ext)))
return it->mask.c_str();
}
- else if (InspIRCd::Match(LM->literal, it->mask.substr(2)))
+ else if (InspIRCd::Match(LM->literal, ext))
return it->mask.c_str();
}
else