void OnRehash(User* user)
{
- ConfigReader Conf;
- nickrequired = Conf.ReadValue("passforward", "nick", "NickServ", 0);
- forwardmsg = Conf.ReadValue("passforward", "forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired", 0);
- forwardcmd = Conf.ReadValue("passforward", "cmd", "PRIVMSG $nickrequired :IDENTIFY $pass", 0);
+ ConfigTag* tag = ServerInstance->Config->ConfValue("passforward");
+ nickrequired = tag->getString("nick", "NickServ");
+ forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired");
+ forwardcmd = tag->getString("cmd", "PRIVMSG $nickrequired :IDENTIFY $pass");
}
- void FormatStr(std::string& result, const std::string& format, const std::string &nick, const std::string &pass)
+ void FormatStr(std::string& result, const std::string& format, const LocalUser* user)
{
for (unsigned int i = 0; i < format.length(); i++)
{
}
else if (format.substr(i, 5) == "$nick")
{
- result.append(nick);
+ result.append(user->nick);
+ i += 4;
+ }
+ else if (format.substr(i, 5) == "$user")
+ {
+ result.append(user->ident);
i += 4;
}
else if (format.substr(i,5) == "$pass")
{
- result.append(pass);
+ result.append(user->password);
i += 4;
}
else
}
std::string tmp;
- FormatStr(tmp,forwardmsg, user->nick, user->password);
+ FormatStr(tmp,forwardmsg, user);
user->WriteServ(tmp);
tmp.clear();
- FormatStr(tmp,forwardcmd, user->nick, user->password);
+ FormatStr(tmp,forwardcmd, user);
ServerInstance->Parser->ProcessBuffer(tmp,user);
}
};