merge rev 936, 939-943 from psychon branch:

- if a client connected before znc connected to irc and if it uses a wrong nick it
   wasnt informed of this -> fixed
- znc.cpp didnt work with --disable-modules
- some stuff which was already merged previously


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@800 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2007-05-16 22:20:10 +00:00
parent f601db2cd8
commit 9b671ee976
5 changed files with 11 additions and 9 deletions
+2 -2
View File
@@ -1564,10 +1564,10 @@ void CClient::PutModule(const CString& sModule, const CString& sLine) {
Write(":" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.com PRIVMSG " + GetNick() + " :" + sLine + "\r\n");
}
CString CClient::GetNick() const {
CString CClient::GetNick(bool bAllowIRCNick) const {
CString sRet;
if ((m_bAuthed) && (m_pIRCSock)) {
if ((bAllowIRCNick) && (m_bAuthed) && (m_pIRCSock)) {
sRet = m_pIRCSock->GetNick();
}