From 6197dbe4c7c665b7e78b4214c545aa732d299b0e Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Fri, 13 Jul 2007 17:36:13 +0000
Subject: [PATCH] Fix UHNAMES support

- messages from server werent parsed right (ident got messed up)
- ZNC generated joins (/detach #chan /join #chan) never included
	the UHNAMES info.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@812 726aef4b-f618-498e-8847-2d620e286838
---
 Chan.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Chan.cpp b/Chan.cpp
index 428e6b90..131daae5 100644
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -107,7 +107,7 @@ void CChan::JoinUser(bool bForce, const CString& sKey, CClient* pClient) {
 					sPerm += c;
 				}
 			}
-			if(pThisClient->HasUHNames() && !a->second->GetIdent().empty() && a->second->GetHost().empty()) {
+			if(pThisClient->HasUHNames() && !a->second->GetIdent().empty() && !a->second->GetHost().empty()) {
 				sNick = a->first + "!" + a->second->GetIdent() + "@" + a->second->GetHost();
 			} else {
 				sNick = a->first;
@@ -425,7 +425,7 @@ bool CChan::AddNick(const CString& sNick) {
 	}
 
 	sTmp = p;
-	sIdent = sTmp.Token(1, true, "!").Token(0, true, "@");
+	sIdent = sTmp.Token(1, true, "!").Token(0, false, "@");
 	sHost = sTmp.Token(1, true, "@");
 	sTmp = sTmp.Token(0, false, "!");