class CoreExport RLine : public XLine
{
- public:
+ public:
/** Create a R-Line.
* @param s_time The set time
if (!regex)
{
ServerInstance->SNO->WriteToSnoMask('x',"Error in regular expression: %s at offset %d: %s\n", regexs, erroffset, error);
- throw CoreException("Bad regex pattern.");
+ throw ModuleException("Bad regex pattern.");
}
}
this->source = "m_rline.so";
}
- CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- if (pcnt >= 3)
+ if (parameters.size() >= 3)
{
// Adding - XXX todo make this respect <insane> tag perhaps..
try
{
- r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+ r = new RLine(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
}
catch (...)
{
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick, parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-Line for %s.", user->nick.c_str(), parameters[0].c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s", user->nick, parameters[0],
+ ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-Line for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
ServerInstance->TimeString(c_requires_crap).c_str());
}
else
{
delete r;
- user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick, parameters[0]);
+ user->WriteServ("NOTICE %s :*** R-Line for %s already exists", user->nick.c_str(), parameters[0].c_str());
}
}
}
else
{
- if (ServerInstance->XLines->DelLine(parameters[0], "R", user))
+ if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "R", user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick.c_str(),parameters[0].c_str());
}
else
{
// XXX todo implement stats
- user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats g.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** R-Line %s not found in list, try /stats g.",user->nick.c_str(),parameters[0].c_str());
}
}
virtual ~ModuleRLine()
{
+ ServerInstance->XLines->DelAll("R");
ServerInstance->XLines->UnregisterFactory(f);
}
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
virtual void OnUserConnect(User* user)
virtual void OnUserPostNick(User *user, const std::string &oldnick)
{
if (!IS_LOCAL(user))
- return 0;
+ return;
if (!MatchOnNickChange)
- return 0;
+ return;
XLine *rl = ServerInstance->XLines->MatchesLine("R", user);