public:
CommandChghost(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
{
+ allow_empty_last_param = false;
flags_needed = 'o';
syntax = "<nick> <newhost>";
TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
{
if (!hostmap[(unsigned char)*x])
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :*** CHGHOST: Invalid characters in hostname");
+ user->WriteServ("NOTICE "+user->nick+" :*** CHGHOST: Invalid characters in hostname");
return CMD_FAILURE;
}
}
User* dest = ServerInstance->FindNick(parameters[0]);
- if (!dest)
+ // Allow services to change the host of unregistered users
+ if ((!dest) || ((dest->registered != REG_ALL) && (!ServerInstance->ULine(user->server))))
{
user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
return CMD_FAILURE;
if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server)))
{
// fix by brain - ulines set hosts silently
- ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
+ ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
}
}
char hostmap[256];
public:
ModuleChgHost() : cmd(this, hostmap)
+ {
+ }
+
+ void init()
{
OnRehash(NULL);
- ServerInstance->AddCommand(&cmd);
+ ServerInstance->Modules->AddService(cmd);
Implementation eventlist[] = { I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
-
void OnRehash(User* user)
{
- ConfigReader Conf;
- std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
-
- if (hmap.empty())
- hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+ std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
memset(hostmap, 0, sizeof(hostmap));
for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)