ExpandString %network%, alphabeticize ExpandString list

This commit is contained in:
Jos Ahrens
2015-10-02 20:23:53 +02:00
parent d66cb36cc3
commit 2c8baa8193
2 changed files with 16 additions and 11 deletions

View File

@@ -1434,12 +1434,14 @@ CString CIRCNetwork::ExpandString(const CString& sStr) const {
CString& CIRCNetwork::ExpandString(const CString& sStr, CString& sRet) const {
sRet = sStr;
sRet.Replace("%defnick%", GetNick());
sRet.Replace("%nick%", GetCurNick());
sRet.Replace("%altnick%", GetAltNick());
sRet.Replace("%ident%", GetIdent());
sRet.Replace("%realname%", GetRealName());
sRet.Replace("%bindhost%", GetBindHost());
sRet.Replace("%defnick%", GetNick());
sRet.Replace("%ident%", GetIdent());
sRet.Replace("%network%", GetName());
sRet.Replace("%nick%", GetCurNick());
sRet.Replace("%realname%", GetRealName());
return m_pUser->ExpandString(sRet, sRet);
}