From 20c79083de6342819ce1b39ee0525425e927f2e8 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Fri, 30 Apr 2010 10:50:33 +0000
Subject: [PATCH] Don't use "ip:port" but "ip port" for display purposes

With ipv6 addresses, ip:port just looks wrong.

Found by KiNgMaR, thanks.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1955 726aef4b-f618-498e-8847-2d620e286838
---
 DCCBounce.cpp         | 6 +++---
 modules/extra/log.cpp | 2 +-
 znc.cpp               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DCCBounce.cpp b/DCCBounce.cpp
index c3b5e23d..eedaf058 100644
--- a/DCCBounce.cpp
+++ b/DCCBounce.cpp
@@ -111,7 +111,7 @@ void CDCCBounce::Timeout() {
 	if (IsRemote()) {
 		CString sHost = Csock::GetHostName();
 		if (!sHost.empty()) {
-			sHost = " to [" + sHost + ":" + CString(Csock::GetPort()) + "]";
+			sHost = " to [" + sHost + " " + CString(Csock::GetPort()) + "]";
 		} else {
 			sHost = ".";
 		}
@@ -128,7 +128,7 @@ void CDCCBounce::ConnectionRefused() {
 	CString sType = (m_bIsChat) ? "Chat" : "Xfer";
 	CString sHost = Csock::GetHostName();
 	if (!sHost.empty()) {
-		sHost = " to [" + sHost + ":" + CString(Csock::GetPort()) + "]";
+		sHost = " to [" + sHost + " " + CString(Csock::GetPort()) + "]";
 	} else {
 		sHost = ".";
 	}
@@ -143,7 +143,7 @@ void CDCCBounce::SockError(int iErrno) {
 	if (IsRemote()) {
 		CString sHost = Csock::GetHostName();
 		if (!sHost.empty()) {
-			sHost = "[" + sHost + ":" + CString(Csock::GetPort()) + "]";
+			sHost = "[" + sHost + " " + CString(Csock::GetPort()) + "]";
 		}
 
 		m_pUser->PutStatus("DCC " + sType + " Bounce (" + m_sRemoteNick + "): Socket error [" + CString(strerror(iErrno)) + "]" + sHost);
diff --git a/modules/extra/log.cpp b/modules/extra/log.cpp
index f807dfc3..204c6ae9 100644
--- a/modules/extra/log.cpp
+++ b/modules/extra/log.cpp
@@ -97,7 +97,7 @@ CString CLogMod::GetServer()
 
 	if (pServer->IsSSL())
 		sSSL = "+";
-	return pServer->GetName() + ":" + sSSL + CString(pServer->GetPort());
+	return pServer->GetName() + " " + sSSL + CString(pServer->GetPort());
 }
 
 void CLogMod::OnIRCConnected()
diff --git a/znc.cpp b/znc.cpp
index 8d872b25..c3dbaa70 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -151,8 +151,8 @@ bool CZNC::ConnectUser(CUser *pUser) {
 
 	m_sConnectThrottle.AddItem(pServer->GetName());
 
-	DEBUG("User [" << pUser->GetUserName() << "] is connecting to [" << pServer->GetName() << ":" << pServer->GetPort() << "] ...");
-	pUser->PutStatus("Attempting to connect to [" + pServer->GetName() + ":" + CString(pServer->GetPort()) + "] ...");
+	DEBUG("User [" << pUser->GetUserName() << "] is connecting to [" << pServer->GetName() << " " << pServer->GetPort() << "] ...");
+	pUser->PutStatus("Attempting to connect to [" + pServer->GetName() + " " + CString(pServer->GetPort()) + "] ...");
 
 	pIRCSock = new CIRCSock(pUser);
 	pIRCSock->SetPass(pServer->GetPass());