*/
#include "inspircd.h"
-#include "wildcard.h"
/* $ModDesc: Provides aliases of commands. */
}
public:
-
+
ModuleAlias(InspIRCd* Me)
: Module(Me)
{
ReadAliases();
- pars.resize(MAXPARAMETERS);
-
Me->Modules->Attach(I_OnPreCommand, this);
Me->Modules->Attach(I_OnRehash, this);
virtual Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("$Id$", VF_VENDOR,API_VERSION);
}
std::string GetVar(std::string varname, const std::string &original_line)
}
}
- virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+ virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
{
User *u = NULL;
/* Does it match the pattern? */
if (!Aliases[i].format.empty())
{
- if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str()))
- continue;
+ if (Aliases[i].case_sensitive)
+ {
+ if (InspIRCd::Match(compare, Aliases[i].format, case_sensitive_map))
+ continue;
+ }
+ else
+ {
+ if (InspIRCd::Match(compare, Aliases[i].format))
+ continue;
+ }
}
if ((Aliases[i].operonly) && (!IS_OPER(user)))
u = ServerInstance->FindNick(Aliases[i].requires);
if (!u)
{
- user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
+ user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
return 1;
}
}
{
if (!ServerInstance->ULine(u->server))
{
- ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
- user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
+ ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
+ user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
return 1;
}
}
SearchAndReplace(newline, "\r", "$");
irc::tokenstream ss(newline);
- const char* parv[MAXPARAMETERS];
- int x = 0;
+ pars.clear();
+ std::string command, token;
- while (ss.GetToken(pars[x]) && x < MAXPARAMETERS)
+ ss.GetToken(command);
+ while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS))
{
- parv[x] = pars[x].c_str();
- x++;
+ pars.push_back(token);
}
-
- ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
+ ServerInstance->Parser->CallHandler(command, pars, user);
}
-
+
virtual void OnRehash(User* user, const std::string ¶meter)
{
ReadAliases();