return CMD_FAILURE;
long duration = ServerInstance->Duration(parameters[1]);
- if (ServerInstance->XLines->add_zline(duration,user->nick,parameters[2],parameters[0]))
+
+ const char* ipaddr = parameters[0];
+ if (strchr(ipaddr,'@'))
+ {
+ while (*ipaddr != '@')
+ ipaddr++;
+ ipaddr++;
+ }
+ ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr);
+ if (ServerInstance->XLines->AddLine(zl,user))
{
- FOREACH_MOD(I_OnAddZLine,OnAddZLine(duration, user, parameters[2], parameters[0]));
if (!duration)
{
ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0],
ServerInstance->TimeString(c_requires_crap).c_str());
}
- ServerInstance->XLines->apply_lines();
+ ServerInstance->XLines->ApplyLines();
}
else
{
+ delete zl;
user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
}
}
else
{
- if (ServerInstance->XLines->del_zline(parameters[0]))
+ if (ServerInstance->XLines->DelLine(parameters[0],"Z",user))
{
- FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
}
else