bye-bye old coding style in Jabber

git-svn-id: http://svn.miranda-ng.org/main/trunk@2322 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 272 insertions, 272 deletions

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 82f82b633f..11052adb22 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -1,14 +1,14 @@
 /*

 

 Jabber Protocol Plugin for Miranda IM

-Copyright ( C ) 2002-04  Santithorn Bunchua

-Copyright ( C ) 2005-12  George Hazan

-Copyright ( C ) 2007     Maxim Mluhov

+Copyright (C) 2002-04  Santithorn Bunchua

+Copyright (C) 2005-12  George Hazan

+Copyright (C) 2007     Maxim Mluhov

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

 as published by the Free Software Foundation; either version 2

-of the License, or ( at your option ) any later version.

+of the License, or (at your option) any later version.

 

 This program is distributed in the hope that it will be useful,

 but WITHOUT ANY WARRANTY; without even the implied warranty of

@@ -139,10 +139,10 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE)
 	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);

 

 	BOOL bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *) &osvi);

-	if (!bOsVersionInfoEx)

+	if ( !bOsVersionInfoEx)

 	{

 		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);

-		if (!GetVersionEx((OSVERSIONINFO*)&osvi)) 

+		if ( !GetVersionEx((OSVERSIONINFO*)&osvi)) 

 			return FALSE;

 	}

 

@@ -188,153 +188,153 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE)
 

 			pGPI = (PGPI) GetProcAddress(hKernel, "GetProductInfo");

 			if (pGPI != NULL)

-				pGPI( osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);

+				pGPI(osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);

 

-			switch( dwType )

+			switch(dwType)

 			{

 			case PRODUCT_ULTIMATE:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Ultimate Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Ultimate Edition"));

 				break;

 			case PRODUCT_PROFESSIONAL:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Professional Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Professional Edition"));

 				break;

 			case PRODUCT_PROFESSIONAL_WMC:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Professional Edition with Media Center" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Professional Edition with Media Center"));

 				break;

 			case PRODUCT_HOME_PREMIUM:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Home Premium Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Home Premium Edition"));

 				break;

 			case PRODUCT_HOME_BASIC:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Home Basic Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Home Basic Edition"));

 				break;

 			case PRODUCT_ENTERPRISE:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition"));

 				break;

 			case PRODUCT_BUSINESS:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Business Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Business Edition"));

 				break;

 			case PRODUCT_STARTER:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Starter Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Starter Edition"));

 				break;

 			case PRODUCT_CLUSTER_SERVER:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Cluster Server Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Cluster Server Edition"));

 				break;

 			case PRODUCT_DATACENTER_SERVER:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter Edition"));

 				break;

 			case PRODUCT_DATACENTER_SERVER_CORE:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter Edition (core installation)" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter Edition (core installation)"));

 				break;

 			case PRODUCT_ENTERPRISE_SERVER:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition"));

 				break;

 			case PRODUCT_ENTERPRISE_SERVER_CORE:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition (core installation)" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition (core installation)"));

 				break;

 			case PRODUCT_ENTERPRISE_SERVER_IA64:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition for Itanium-based Systems" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition for Itanium-based Systems"));

 				break;

 			case PRODUCT_SMALLBUSINESS_SERVER:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Small Business Server" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Small Business Server"));

 				break;

 			case PRODUCT_SMALLBUSINESS_SERVER_PREMIUM:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Small Business Server Premium Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Small Business Server Premium Edition"));

 				break;

 			case PRODUCT_STANDARD_SERVER:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Standard Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Standard Edition"));

 				break;

 			case PRODUCT_STANDARD_SERVER_CORE:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Standard Edition (core installation)" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Standard Edition (core installation)"));

 				break;

 			case PRODUCT_WEB_SERVER:

-				StringCchCat(pszOS, BUFSIZE, TEXT("Web Server Edition" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Web Server Edition"));

 				break;

 			}

-			if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64 )

-				StringCchCat(pszOS, BUFSIZE, TEXT( ", 64-bit" ));

-			else if (si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_INTEL )

+			if (si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64)

+				StringCchCat(pszOS, BUFSIZE, TEXT(", 64-bit"));

+			else if (si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_INTEL)

 				StringCchCat(pszOS, BUFSIZE, TEXT(", 32-bit"));

 		}

 

-		if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2 )

+		if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)

 		{

-			if ( GetSystemMetrics(SM_SERVERR2))

-				StringCchCat(pszOS, BUFSIZE, TEXT( "Windows Server 2003 R2, "));

-			else if ( osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER )

-				StringCchCat(pszOS, BUFSIZE, TEXT( "Windows Storage Server 2003"));

-			else if ( osvi.wSuiteMask==VER_SUITE_WH_SERVER )

-				StringCchCat(pszOS, BUFSIZE, TEXT( "Windows Home Server"));

-			else if ( osvi.wProductType == VER_NT_WORKSTATION &&

+			if (GetSystemMetrics(SM_SERVERR2))

+				StringCchCat(pszOS, BUFSIZE, TEXT("Windows Server 2003 R2, "));

+			else if (osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER)

+				StringCchCat(pszOS, BUFSIZE, TEXT("Windows Storage Server 2003"));

+			else if (osvi.wSuiteMask==VER_SUITE_WH_SERVER)

+				StringCchCat(pszOS, BUFSIZE, TEXT("Windows Home Server"));

+			else if (osvi.wProductType == VER_NT_WORKSTATION &&

 				si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64)

 			{

-				StringCchCat(pszOS, BUFSIZE, TEXT( "Windows XP Professional x64 Edition"));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Windows XP Professional x64 Edition"));

 			}

 			else StringCchCat(pszOS, BUFSIZE, TEXT("Windows Server 2003, "));

 

 			// Test for the server type.

-			if ( osvi.wProductType != VER_NT_WORKSTATION )

+			if (osvi.wProductType != VER_NT_WORKSTATION)

 			{

-				if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_IA64 )

+				if (si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_IA64)

 				{

-					if ( osvi.wSuiteMask & VER_SUITE_DATACENTER )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Datacenter Edition for Itanium-based Systems" ));

-					else if ( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Enterprise Edition for Itanium-based Systems" ));

+					if (osvi.wSuiteMask & VER_SUITE_DATACENTER)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter Edition for Itanium-based Systems"));

+					else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition for Itanium-based Systems"));

 				}

 

-				else if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64 )

+				else if (si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64)

 				{

-					if ( osvi.wSuiteMask & VER_SUITE_DATACENTER )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Datacenter x64 Edition" ));

-					else if ( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Enterprise x64 Edition" ));

-					else StringCchCat(pszOS, BUFSIZE, TEXT( "Standard x64 Edition" ));

+					if (osvi.wSuiteMask & VER_SUITE_DATACENTER)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter x64 Edition"));

+					else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise x64 Edition"));

+					else StringCchCat(pszOS, BUFSIZE, TEXT("Standard x64 Edition"));

 				}

 

 				else

 				{

-					if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Compute Cluster Edition" ));

-					else if ( osvi.wSuiteMask & VER_SUITE_DATACENTER )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Datacenter Edition" ));

-					else if ( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Enterprise Edition" ));

-					else if ( osvi.wSuiteMask & VER_SUITE_BLADE )

-						StringCchCat(pszOS, BUFSIZE, TEXT( "Web Edition" ));

-					else StringCchCat(pszOS, BUFSIZE, TEXT( "Standard Edition" ));

+					if (osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Compute Cluster Edition"));

+					else if (osvi.wSuiteMask & VER_SUITE_DATACENTER)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter Edition"));

+					else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Enterprise Edition"));

+					else if (osvi.wSuiteMask & VER_SUITE_BLADE)

+						StringCchCat(pszOS, BUFSIZE, TEXT("Web Edition"));

+					else StringCchCat(pszOS, BUFSIZE, TEXT("Standard Edition"));

 				}

 			}

 		}

 

-		if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1 )

+		if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)

 		{

 			StringCchCat(pszOS, BUFSIZE, TEXT("Windows XP "));

-			if ( osvi.wSuiteMask & VER_SUITE_PERSONAL )

-				StringCchCat(pszOS, BUFSIZE, TEXT( "Home Edition" ));

-			else StringCchCat(pszOS, BUFSIZE, TEXT( "Professional" ));

+			if (osvi.wSuiteMask & VER_SUITE_PERSONAL)

+				StringCchCat(pszOS, BUFSIZE, TEXT("Home Edition"));

+			else StringCchCat(pszOS, BUFSIZE, TEXT("Professional"));

 		}

 

-		if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0 )

+		if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)

 		{

 			StringCchCat(pszOS, BUFSIZE, TEXT("Windows 2000 "));

 

-			if ( osvi.wProductType == VER_NT_WORKSTATION )

+			if (osvi.wProductType == VER_NT_WORKSTATION)

 			{

-				StringCchCat(pszOS, BUFSIZE, TEXT( "Professional" ));

+				StringCchCat(pszOS, BUFSIZE, TEXT("Professional"));

 			}

 			else 

 			{

-				if ( osvi.wSuiteMask & VER_SUITE_DATACENTER )

-					StringCchCat(pszOS, BUFSIZE, TEXT( "Datacenter Server" ));

-				else if ( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )

-					StringCchCat(pszOS, BUFSIZE, TEXT( "Advanced Server" ));

-				else StringCchCat(pszOS, BUFSIZE, TEXT( "Server" ));

+				if (osvi.wSuiteMask & VER_SUITE_DATACENTER)

+					StringCchCat(pszOS, BUFSIZE, TEXT("Datacenter Server"));

+				else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)

+					StringCchCat(pszOS, BUFSIZE, TEXT("Advanced Server"));

+				else StringCchCat(pszOS, BUFSIZE, TEXT("Server"));

 			}

 		}

 

 		// Include service pack (if any) and build number.

 

-		if ( _tcslen(osvi.szCSDVersion) > 0 )

+		if (_tcslen(osvi.szCSDVersion) > 0)

 		{

 			StringCchCat(pszOS, BUFSIZE, TEXT(" "));

 			StringCchCat(pszOS, BUFSIZE, osvi.szCSDVersion);

@@ -342,7 +342,7 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE)
 

 		TCHAR buf[80];

 

-		StringCchPrintf( buf, 80, TEXT(" (build %d)"), osvi.dwBuildNumber);

+		StringCchPrintf(buf, 80, TEXT(" (build %d)"), osvi.dwBuildNumber);

 		StringCchCat(pszOS, BUFSIZE, buf);

 

 		return TRUE; 

@@ -354,44 +354,44 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE)
 }

 

 

-BOOL CJabberProto::OnIqRequestVersion( HXML, CJabberIqInfo* pInfo )

+BOOL CJabberProto::OnIqRequestVersion(HXML, CJabberIqInfo* pInfo)

 {

 	if ( !pInfo->GetFrom())

 		return TRUE;

 

-	if ( !m_options.AllowVersionRequests )

+	if ( !m_options.AllowVersionRequests)

 		return FALSE;

 

-	XmlNodeIq iq( _T("result"), pInfo );

-	HXML query = iq << XQUERY( _T(JABBER_FEAT_VERSION));

-	query << XCHILD( _T("name"), _T("Miranda NG Jabber"));

-	query << XCHILD( _T("version"), szCoreVersion);

+	XmlNodeIq iq(_T("result"), pInfo);

+	HXML query = iq << XQUERY(_T(JABBER_FEAT_VERSION));

+	query << XCHILD(_T("name"), _T("Miranda NG Jabber"));

+	query << XCHILD(_T("version"), szCoreVersion);

 

-	if ( m_options.ShowOSVersion )

+	if (m_options.ShowOSVersion)

 	{

 		TCHAR os[256] = {0};

-		if (!GetOSDisplayString(os, SIZEOF(os)))

+		if ( !GetOSDisplayString(os, SIZEOF(os)))

 			lstrcpyn(os, _T("Microsoft Windows"), SIZEOF(os));

-		query << XCHILD( _T("os"), os );

+		query << XCHILD(_T("os"), os);

 	}

 

-	m_ThreadInfo->send( iq );

+	m_ThreadInfo->send(iq);

 	return TRUE;

 }

 

 // last activity (XEP-0012) support

-BOOL CJabberProto::OnIqRequestLastActivity( HXML, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnIqRequestLastActivity(HXML, CJabberIqInfo *pInfo)

 {

 	m_ThreadInfo->send(

-		XmlNodeIq( _T("result"), pInfo ) << XQUERY( _T(JABBER_FEAT_LAST_ACTIVITY))

-			<< XATTRI( _T("seconds"), m_tmJabberIdleStartTime ? time( 0 ) - m_tmJabberIdleStartTime : 0 ));

+		XmlNodeIq(_T("result"), pInfo) << XQUERY(_T(JABBER_FEAT_LAST_ACTIVITY))

+			<< XATTRI(_T("seconds"), m_tmJabberIdleStartTime ? time(0) - m_tmJabberIdleStartTime : 0));

 	return TRUE;

 }

 

 // XEP-0199: XMPP Ping support

-BOOL CJabberProto::OnIqRequestPing( HXML, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnIqRequestPing(HXML, CJabberIqInfo *pInfo)

 {

-	m_ThreadInfo->send( XmlNodeIq( _T("result"), pInfo ) << XATTR( _T("from"), m_ThreadInfo->fullJID ));

+	m_ThreadInfo->send(XmlNodeIq(_T("result"), pInfo) << XATTR(_T("from"), m_ThreadInfo->fullJID));

 	return TRUE;

 }

 

@@ -423,7 +423,7 @@ int GetGMTOffset(void)
 }

 

 // entity time (XEP-0202) support

-BOOL CJabberProto::OnIqRequestTime( HXML, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnIqRequestTime(HXML, CJabberIqInfo *pInfo)

 {

 	TCHAR stime[100];

 	TCHAR szTZ[10];

@@ -431,55 +431,55 @@ BOOL CJabberProto::OnIqRequestTime( HXML, CJabberIqInfo *pInfo )
 	tmi.printDateTime(UTC_TIME_HANDLE, _T("I"), stime, SIZEOF(stime), 0);

 

 	int nGmtOffset = GetGMTOffset();

-	mir_sntprintf(szTZ, SIZEOF(szTZ), _T("%+03d:%02d"), nGmtOffset / 60, nGmtOffset % 60 );

-

-	XmlNodeIq iq( _T("result"), pInfo );

-	HXML timeNode = iq << XCHILDNS( _T("time"), _T(JABBER_FEAT_ENTITY_TIME));

-	timeNode << XCHILD( _T("utc"), stime); timeNode << XCHILD( _T("tzo"), szTZ );

-	LPCTSTR szTZName = tmi.getTzName( NULL );

-	if ( szTZName )

-		timeNode << XCHILD( _T("tz"), szTZName );

-	m_ThreadInfo->send( iq );

+	mir_sntprintf(szTZ, SIZEOF(szTZ), _T("%+03d:%02d"), nGmtOffset / 60, nGmtOffset % 60);

+

+	XmlNodeIq iq(_T("result"), pInfo);

+	HXML timeNode = iq << XCHILDNS(_T("time"), _T(JABBER_FEAT_ENTITY_TIME));

+	timeNode << XCHILD(_T("utc"), stime); timeNode << XCHILD(_T("tzo"), szTZ);

+	LPCTSTR szTZName = tmi.getTzName(NULL);

+	if (szTZName)

+		timeNode << XCHILD(_T("tz"), szTZName);

+	m_ThreadInfo->send(iq);

 	return TRUE;

 }

 

-BOOL CJabberProto::OnIqProcessIqOldTime( HXML, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnIqProcessIqOldTime(HXML, CJabberIqInfo *pInfo)

 {

 	struct tm *gmt;

 	time_t ltime;

 	TCHAR stime[ 100 ], *dtime;

 

 	_tzset();

-	time( &ltime );

-	gmt = gmtime( &ltime );

-	mir_sntprintf( stime, SIZEOF(stime), _T("%.4i%.2i%.2iT%.2i:%.2i:%.2i"),

+	time(&ltime);

+	gmt = gmtime(&ltime);

+	mir_sntprintf(stime, SIZEOF(stime), _T("%.4i%.2i%.2iT%.2i:%.2i:%.2i"),

 		gmt->tm_year + 1900, gmt->tm_mon + 1,

-		gmt->tm_mday, gmt->tm_hour, gmt->tm_min, gmt->tm_sec );

-	dtime = _tctime( &ltime );

+		gmt->tm_mday, gmt->tm_hour, gmt->tm_min, gmt->tm_sec);

+	dtime = _tctime(&ltime);

 	dtime[ 24 ] = 0;

 

-	XmlNodeIq iq( _T("result"), pInfo );

-	HXML queryNode = iq << XQUERY( _T(JABBER_FEAT_ENTITY_TIME_OLD));

-	queryNode << XCHILD( _T("utc"), stime );

-	LPCTSTR szTZName = tmi.getTzName( NULL );

-	if ( szTZName )

-		queryNode << XCHILD( _T("tz"), szTZName );

-	queryNode << XCHILD( _T("display"), dtime );

-	m_ThreadInfo->send( iq );

+	XmlNodeIq iq(_T("result"), pInfo);

+	HXML queryNode = iq << XQUERY(_T(JABBER_FEAT_ENTITY_TIME_OLD));

+	queryNode << XCHILD(_T("utc"), stime);

+	LPCTSTR szTZName = tmi.getTzName(NULL);

+	if (szTZName)

+		queryNode << XCHILD(_T("tz"), szTZName);

+	queryNode << XCHILD(_T("display"), dtime);

+	m_ThreadInfo->send(iq);

 	return TRUE;

 }

 

-BOOL CJabberProto::OnIqRequestAvatar( HXML, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnIqRequestAvatar(HXML, CJabberIqInfo *pInfo)

 {

-	if ( !m_options.EnableAvatars )

+	if ( !m_options.EnableAvatars)

 		return TRUE;

 

 	int pictureType = m_options.AvatarType;

-	if ( pictureType == PA_FORMAT_UNKNOWN )

+	if (pictureType == PA_FORMAT_UNKNOWN)

 		return TRUE;

 

 	TCHAR* szMimeType;

-	switch( pictureType ) {

+	switch(pictureType) {

 		case PA_FORMAT_JPEG:	 szMimeType = _T("image/jpeg");   break;

 		case PA_FORMAT_GIF:	 szMimeType = _T("image/gif");    break;

 		case PA_FORMAT_PNG:	 szMimeType = _T("image/png");    break;

@@ -488,75 +488,75 @@ BOOL CJabberProto::OnIqRequestAvatar( HXML, CJabberIqInfo *pInfo )
 	}

 

 	TCHAR szFileName[ MAX_PATH ];

-	GetAvatarFileName( NULL, szFileName, SIZEOF(szFileName));

+	GetAvatarFileName(NULL, szFileName, SIZEOF(szFileName));

 

-	FILE* in = _tfopen( szFileName, _T("rb"));

-	if ( in == NULL )

+	FILE* in = _tfopen(szFileName, _T("rb"));

+	if (in == NULL)

 		return TRUE;

 

-	long bytes = _filelength( _fileno( in ));

-	char* buffer = ( char* )mir_alloc( bytes*4/3 + bytes + 1000 );

-	if ( buffer == NULL ) {

-		fclose( in );

+	long bytes = _filelength(_fileno(in));

+	char* buffer = (char*)mir_alloc(bytes*4/3 + bytes + 1000);

+	if (buffer == NULL) {

+		fclose(in);

 		return TRUE;

 	}

 

-	fread( buffer, bytes, 1, in );

-	fclose( in );

+	fread(buffer, bytes, 1, in);

+	fclose(in);

 

-	char* str = JabberBase64Encode( buffer, bytes );

-	m_ThreadInfo->send( XmlNodeIq( _T("result"), pInfo ) << XQUERY( _T(JABBER_FEAT_AVATAR)) << XCHILD( _T("query"), _A2T(str)) << XATTR( _T("mimetype"), szMimeType ));

-	mir_free( str );

-	mir_free( buffer );

+	char* str = JabberBase64Encode(buffer, bytes);

+	m_ThreadInfo->send(XmlNodeIq(_T("result"), pInfo) << XQUERY(_T(JABBER_FEAT_AVATAR)) << XCHILD(_T("query"), _A2T(str)) << XATTR(_T("mimetype"), szMimeType));

+	mir_free(str);

+	mir_free(buffer);

 	return TRUE;

 }

 

-BOOL CJabberProto::OnSiRequest( HXML node, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnSiRequest(HXML node, CJabberIqInfo *pInfo)

 {

-	const TCHAR* szProfile = xmlGetAttrValue( pInfo->GetChildNode(), _T("profile"));

+	const TCHAR *szProfile = xmlGetAttrValue(pInfo->GetChildNode(), _T("profile"));

 

-	if ( szProfile && !_tcscmp( szProfile, _T(JABBER_FEAT_SI_FT)))

-		FtHandleSiRequest( node );

+	if (szProfile && !_tcscmp(szProfile, _T(JABBER_FEAT_SI_FT)))

+		FtHandleSiRequest(node);

 	else {

-		XmlNodeIq iq( _T("error"), pInfo );

-		HXML error = iq << XCHILD( _T("error")) << XATTRI( _T("code"), 400 ) << XATTR( _T("type"), _T("cancel"));

-		error << XCHILDNS( _T("bad-request"), _T("urn:ietf:params:xml:ns:xmpp-stanzas"));

-		error << XCHILD( _T("bad-profile")); 

-		m_ThreadInfo->send( iq );

+		XmlNodeIq iq(_T("error"), pInfo);

+		HXML error = iq << XCHILD(_T("error")) << XATTRI(_T("code"), 400) << XATTR(_T("type"), _T("cancel"));

+		error << XCHILDNS(_T("bad-request"), _T("urn:ietf:params:xml:ns:xmpp-stanzas"));

+		error << XCHILD(_T("bad-profile")); 

+		m_ThreadInfo->send(iq);

 	}

 	return TRUE;

 }

 

-BOOL CJabberProto::OnRosterPushRequest( HXML, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnRosterPushRequest(HXML, CJabberIqInfo *pInfo)

 {

 	HXML queryNode = pInfo->GetChildNode();

 

 	// RFC 3921 #7.2 Business Rules

-	if ( pInfo->GetFrom()) {

-		TCHAR* szFrom = JabberPrepareJid( pInfo->GetFrom());

-		if ( !szFrom )

+	if (pInfo->GetFrom()) {

+		TCHAR* szFrom = JabberPrepareJid(pInfo->GetFrom());

+		if ( !szFrom)

 			return TRUE;

 

-		TCHAR* szTo = JabberPrepareJid( m_ThreadInfo->fullJID );

-		if ( !szTo ) {

-			mir_free( szFrom );

+		TCHAR* szTo = JabberPrepareJid(m_ThreadInfo->fullJID);

+		if ( !szTo) {

+			mir_free(szFrom);

 			return TRUE;

 		}

 

-		TCHAR* pDelimiter = _tcschr( szFrom, _T('/'));

-		if ( pDelimiter ) *pDelimiter = _T('\0');

+		TCHAR* pDelimiter = _tcschr(szFrom, _T('/'));

+		if (pDelimiter) *pDelimiter = _T('\0');

 

-		pDelimiter = _tcschr( szTo, _T('/'));

-		if ( pDelimiter ) *pDelimiter = _T('\0');

+		pDelimiter = _tcschr(szTo, _T('/'));

+		if (pDelimiter) *pDelimiter = _T('\0');

 

-		BOOL bRetVal = _tcscmp( szFrom, szTo ) == 0;

+		BOOL bRetVal = _tcscmp(szFrom, szTo) == 0;

 

-		mir_free( szFrom );

-		mir_free( szTo );

+		mir_free(szFrom);

+		mir_free(szTo);

 

 		// invalid JID

-		if ( !bRetVal ) {

-			Log( "<iq/> attempt to hack via roster push from " TCHAR_STR_PARAM, pInfo->GetFrom());

+		if ( !bRetVal) {

+			Log("<iq/> attempt to hack via roster push from " TCHAR_STR_PARAM, pInfo->GetFrom());

 			return TRUE;

 		}

 	}

@@ -566,85 +566,85 @@ BOOL CJabberProto::OnRosterPushRequest( HXML, CJabberIqInfo *pInfo )
 	const TCHAR *jid, *str, *name;

 	TCHAR* nick;

 

-	Log( "<iq/> Got roster push, query has %d children", xmlGetChildCount( queryNode ));

-	for ( int i=0; ; i++ ) {

-		HXML itemNode = xmlGetChild( queryNode ,i);

-		if ( !itemNode )

+	Log("<iq/> Got roster push, query has %d children", xmlGetChildCount(queryNode));

+	for (int i=0; ; i++) {

+		HXML itemNode = xmlGetChild(queryNode ,i);

+		if ( !itemNode)

 			break;

 

-		if ( _tcscmp( xmlGetName( itemNode ), _T("item")) != 0 )

+		if (_tcscmp(xmlGetName(itemNode), _T("item")) != 0)

 			continue;

-		if (( jid = xmlGetAttrValue( itemNode, _T("jid"))) == NULL )

+		if ((jid = xmlGetAttrValue(itemNode, _T("jid"))) == NULL)

 			continue;

-		if (( str = xmlGetAttrValue( itemNode, _T("subscription"))) == NULL )

+		if ((str = xmlGetAttrValue(itemNode, _T("subscription"))) == NULL)

 			continue;

 

 		// we will not add new account when subscription=remove

-		if ( !_tcscmp( str, _T("to")) || !_tcscmp( str, _T("both")) || !_tcscmp( str, _T("from")) || !_tcscmp( str, _T("none"))) {

-			if (( name = xmlGetAttrValue( itemNode, _T("name"))) != NULL )

-				nick = mir_tstrdup( name );

+		if ( !_tcscmp(str, _T("to")) || !_tcscmp(str, _T("both")) || !_tcscmp(str, _T("from")) || !_tcscmp(str, _T("none"))) {

+			if ((name = xmlGetAttrValue(itemNode, _T("name"))) != NULL)

+				nick = mir_tstrdup(name);

 			else

-				nick = JabberNickFromJID( jid );

+				nick = JabberNickFromJID(jid);

 

-			if ( nick != NULL ) {

-				if (( item=ListAdd( LIST_ROSTER, jid )) != NULL ) {

-					replaceStrT( item->nick, nick );

+			if (nick != NULL) {

+				if ((item=ListAdd(LIST_ROSTER, jid)) != NULL) {

+					replaceStrT(item->nick, nick);

 

-					HXML groupNode = xmlGetChild( itemNode , "group" );

-					replaceStrT( item->group, ( groupNode ) ? xmlGetText( groupNode ) : NULL );

+					HXML groupNode = xmlGetChild(itemNode , "group");

+					replaceStrT(item->group, (groupNode) ? xmlGetText(groupNode) : NULL);

 

-					if (( hContact=HContactFromJID( jid, 0 )) == NULL ) {

+					if ((hContact=HContactFromJID(jid, 0)) == NULL) {

 						// Received roster has a new JID.

-						// Add the jid ( with empty resource ) to Miranda contact list.

-						hContact = DBCreateContact( jid, nick, FALSE, FALSE );

+						// Add the jid (with empty resource) to Miranda contact list.

+						hContact = DBCreateContact(jid, nick, FALSE, FALSE);

 					}

-					else JSetStringT( hContact, "jid", jid );

+					else JSetStringT(hContact, "jid", jid);

 

-					if ( name != NULL ) {

+					if (name != NULL) {

 						DBVARIANT dbnick;

-						if ( !JGetStringT( hContact, "Nick", &dbnick )) {

-							if ( _tcscmp( nick, dbnick.ptszVal ) != 0 )

-								DBWriteContactSettingTString( hContact, "CList", "MyHandle", nick );

+						if ( !JGetStringT(hContact, "Nick", &dbnick)) {

+							if (_tcscmp(nick, dbnick.ptszVal) != 0)

+								db_set_ts(hContact, "CList", "MyHandle", nick);

 							else

-								DBDeleteContactSetting( hContact, "CList", "MyHandle" );

+								DBDeleteContactSetting(hContact, "CList", "MyHandle");

 

-							JFreeVariant( &dbnick );

+							db_free(&dbnick);

 						}

-						else DBWriteContactSettingTString( hContact, "CList", "MyHandle", nick );

+						else db_set_ts(hContact, "CList", "MyHandle", nick);

 					}

-					else DBDeleteContactSetting( hContact, "CList", "MyHandle" );

+					else DBDeleteContactSetting(hContact, "CList", "MyHandle");

 

-					if (!m_options.IgnoreRosterGroups)

+					if ( !m_options.IgnoreRosterGroups)

 					{

-						if ( item->group != NULL ) {

-							JabberContactListCreateGroup( item->group );

-							DBWriteContactSettingTString( hContact, "CList", "Group", item->group );

+						if (item->group != NULL) {

+							JabberContactListCreateGroup(item->group);

+							db_set_ts(hContact, "CList", "Group", item->group);

 						}

 						else 

-							DBDeleteContactSetting( hContact, "CList", "Group" );

+							DBDeleteContactSetting(hContact, "CList", "Group");

 					}

 				}

-				mir_free( nick );

+				mir_free(nick);

 		}	}

 

-		if (( item=ListGetItemPtr( LIST_ROSTER, jid )) != NULL ) {

-			if ( !_tcscmp( str, _T("both"))) item->subscription = SUB_BOTH;

-			else if ( !_tcscmp( str, _T("to"))) item->subscription = SUB_TO;

-			else if ( !_tcscmp( str, _T("from"))) item->subscription = SUB_FROM;

+		if ((item=ListGetItemPtr(LIST_ROSTER, jid)) != NULL) {

+			if ( !_tcscmp(str, _T("both"))) item->subscription = SUB_BOTH;

+			else if ( !_tcscmp(str, _T("to"))) item->subscription = SUB_TO;

+			else if ( !_tcscmp(str, _T("from"))) item->subscription = SUB_FROM;

 			else item->subscription = SUB_NONE;

-			Log( "Roster push for jid=" TCHAR_STR_PARAM ", set subscription to " TCHAR_STR_PARAM, jid, str );

+			Log("Roster push for jid=" TCHAR_STR_PARAM ", set subscription to " TCHAR_STR_PARAM, jid, str);

 			// subscription = remove is to remove from roster list

 			// but we will just set the contact to offline and not actually

 			// remove, so that history will be retained.

-			if ( !_tcscmp( str, _T("remove"))) {

-				if (( hContact=HContactFromJID( jid )) != NULL ) {

-					SetContactOfflineStatus( hContact );

-					ListRemove( LIST_ROSTER, jid );

+			if ( !_tcscmp(str, _T("remove"))) {

+				if ((hContact=HContactFromJID(jid)) != NULL) {

+					SetContactOfflineStatus(hContact);

+					ListRemove(LIST_ROSTER, jid);

 			}	}

-			else if ( JGetByte( hContact, "ChatRoom", 0 ))

-				DBDeleteContactSetting( hContact, "CList", "Hidden" );

+			else if (JGetByte(hContact, "ChatRoom", 0))

+				DBDeleteContactSetting(hContact, "CList", "Hidden");

 			else

-				UpdateSubscriptionInfo( hContact, item );

+				UpdateSubscriptionInfo(hContact, item);

 	}	}

 

 	UI_SAFE_NOTIFY(m_pDlgServiceDiscovery, WM_JABBER_TRANSPORT_REFRESH);

@@ -652,30 +652,30 @@ BOOL CJabberProto::OnRosterPushRequest( HXML, CJabberIqInfo *pInfo )
 	return TRUE;

 }

 

-BOOL CJabberProto::OnIqRequestOOB( HXML, CJabberIqInfo *pInfo )

+BOOL CJabberProto::OnIqRequestOOB(HXML, CJabberIqInfo *pInfo)

 {

 	if ( !pInfo->GetFrom() || !pInfo->GetHContact())

 		return TRUE;

 

-	HXML n = xmlGetChild( pInfo->GetChildNode(), "url" );

-	if ( !n || !xmlGetText( n ))

+	HXML n = xmlGetChild(pInfo->GetChildNode(), "url");

+	if ( !n || !xmlGetText(n))

 		return TRUE;

 

-	if ( m_options.BsOnlyIBB ) {

+	if (m_options.BsOnlyIBB) {

 		// reject

-		XmlNodeIq iq( _T("error"), pInfo );

-		HXML e = xmlAddChild( iq, _T("error"), _T("File transfer refused")); xmlAddAttr( e, _T("code"), 406 );

-		m_ThreadInfo->send( iq );

+		XmlNodeIq iq(_T("error"), pInfo);

+		HXML e = xmlAddChild(iq, _T("error"), _T("File transfer refused")); xmlAddAttr(e, _T("code"), 406);

+		m_ThreadInfo->send(iq);

 		return TRUE;

 	}

 

 	TCHAR text[ 1024 ];

 	TCHAR *str, *p, *q;

 	

-	str = ( TCHAR* )xmlGetText( n );	// URL of the file to get

-	filetransfer* ft = new filetransfer( this );

+	str = (TCHAR*)xmlGetText(n);	// URL of the file to get

+	filetransfer *ft = new filetransfer(this);

 	ft->std.totalFiles = 1;

-	ft->jid = mir_tstrdup( pInfo->GetFrom());

+	ft->jid = mir_tstrdup(pInfo->GetFrom());

 	ft->std.hContact = pInfo->GetHContact();

 	ft->type = FT_OOB;

 	ft->httpHostName = NULL;

@@ -683,111 +683,111 @@ BOOL CJabberProto::OnIqRequestOOB( HXML, CJabberIqInfo *pInfo )
 	ft->httpPath = NULL;

 

 	// Parse the URL

-	if ( !_tcsnicmp( str, _T("http://"), 7 )) {

+	if ( !_tcsnicmp(str, _T("http://"), 7)) {

 		p = str + 7;

-		if (( q = _tcschr( p, '/' )) != NULL ) {

-			if ( q-p < SIZEOF( text )) {

-				_tcsncpy( text, p, q-p );

+		if ((q = _tcschr(p, '/')) != NULL) {

+			if (q-p < SIZEOF(text)) {

+				_tcsncpy(text, p, q-p);

 				text[q-p] = '\0';

-				if (( p = _tcschr( text, ':' )) != NULL ) {

-					ft->httpPort = ( WORD )_ttoi( p+1 );

+				if ((p = _tcschr(text, ':')) != NULL) {

+					ft->httpPort = (WORD)_ttoi(p+1);

 					*p = '\0';

 				}

-				ft->httpHostName = mir_t2a( text );

+				ft->httpHostName = mir_t2a(text);

 	}	}	}

 

-	if ( pInfo->GetIdStr())

-		ft->iqId = mir_tstrdup( pInfo->GetIdStr());

+	if (pInfo->GetIdStr())

+		ft->iqId = mir_tstrdup(pInfo->GetIdStr());

 

-	if ( ft->httpHostName && ft->httpPath ) {

+	if (ft->httpHostName && ft->httpPath) {

 		TCHAR* desc = NULL;

 

-		Log( "Host=%s Port=%d Path=%s", ft->httpHostName, ft->httpPort, ft->httpPath );

-		if (( n = xmlGetChild( pInfo->GetChildNode(), "desc" )) != NULL )

-			desc = ( TCHAR* )xmlGetText( n );

+		Log("Host=%s Port=%d Path=%s", ft->httpHostName, ft->httpPort, ft->httpPath);

+		if ((n = xmlGetChild(pInfo->GetChildNode(), "desc")) != NULL)

+			desc = (TCHAR*)xmlGetText(n);

 

 		TCHAR* str2;

-		Log( "description = %s", desc );

-		if (( str2 = _tcsrchr( ft->httpPath, '/' )) != NULL )

+		Log("description = %s", desc);

+		if ((str2 = _tcsrchr(ft->httpPath, '/')) != NULL)

 			str2++;

 		else

 			str2 = ft->httpPath;

-		str2 = mir_tstrdup( str2 );

-		JabberHttpUrlDecode( str2 );

+		str2 = mir_tstrdup(str2);

+		JabberHttpUrlDecode(str2);

 

 		PROTORECVFILET pre;

 		pre.flags = PREF_TCHAR;

-		pre.timestamp = time( NULL );

+		pre.timestamp = time(NULL);

 		pre.tszDescription = desc;

 		pre.ptszFiles = &str2;

 		pre.fileCount = 1;

-		pre.lParam = ( LPARAM )ft;

+		pre.lParam = (LPARAM)ft;

 

-		CCSDATA ccs = { ft->std.hContact, PSR_FILE, 0, ( LPARAM )&pre };

-		CallService( MS_PROTO_CHAINRECV, 0, ( LPARAM )&ccs );

-		mir_free( str2 );

+		CCSDATA ccs = { ft->std.hContact, PSR_FILE, 0, (LPARAM)&pre };

+		CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);

+		mir_free(str2);

 	}

 	else {

 		// reject

-		XmlNodeIq iq( _T("error"), pInfo );

-		HXML e = xmlAddChild( iq, _T("error"), _T("File transfer refused")); xmlAddAttr( e, _T("code"), 406 );

-		m_ThreadInfo->send( iq );

+		XmlNodeIq iq(_T("error"), pInfo);

+		HXML e = xmlAddChild(iq, _T("error"), _T("File transfer refused")); xmlAddAttr(e, _T("code"), 406);

+		m_ThreadInfo->send(iq);

 		delete ft;

 	}

 	return TRUE;

 }

 

-BOOL CJabberProto::OnHandleDiscoInfoRequest( HXML iqNode, CJabberIqInfo* pInfo )

+BOOL CJabberProto::OnHandleDiscoInfoRequest(HXML iqNode, CJabberIqInfo* pInfo)

 {

 	if ( !pInfo->GetChildNode())

 		return TRUE;

 

-	const TCHAR* szNode = xmlGetAttrValue( pInfo->GetChildNode(), _T("node"));

+	const TCHAR *szNode = xmlGetAttrValue(pInfo->GetChildNode(), _T("node"));

 	// caps hack

-	if ( m_clientCapsManager.HandleInfoRequest( iqNode, pInfo, szNode ))

+	if (m_clientCapsManager.HandleInfoRequest(iqNode, pInfo, szNode))

 		return TRUE;

 

 	// ad-hoc hack:

-	if ( szNode && m_adhocManager.HandleInfoRequest( iqNode, pInfo, szNode ))

+	if (szNode && m_adhocManager.HandleInfoRequest(iqNode, pInfo, szNode))

 		return TRUE;

 

 	// another request, send empty result

 	m_ThreadInfo->send(

-		XmlNodeIq( _T("error"), pInfo )

-			<< XCHILD( _T("error")) << XATTRI( _T("code"), 404 ) << XATTR( _T("type"), _T("cancel"))

-				<< XCHILDNS( _T("item-not-found"), _T("urn:ietf:params:xml:ns:xmpp-stanzas")));

+		XmlNodeIq(_T("error"), pInfo)

+			<< XCHILD(_T("error")) << XATTRI(_T("code"), 404) << XATTR(_T("type"), _T("cancel"))

+				<< XCHILDNS(_T("item-not-found"), _T("urn:ietf:params:xml:ns:xmpp-stanzas")));

 	return TRUE;

 }

 

-BOOL CJabberProto::OnHandleDiscoItemsRequest( HXML iqNode, CJabberIqInfo* pInfo )

+BOOL CJabberProto::OnHandleDiscoItemsRequest(HXML iqNode, CJabberIqInfo* pInfo)

 {

 	if ( !pInfo->GetChildNode())

 		return TRUE;

 

 	// ad-hoc commands check:

-	const TCHAR* szNode = xmlGetAttrValue( pInfo->GetChildNode(), _T("node"));

-	if ( szNode && m_adhocManager.HandleItemsRequest( iqNode, pInfo, szNode ))

+	const TCHAR *szNode = xmlGetAttrValue(pInfo->GetChildNode(), _T("node"));

+	if (szNode && m_adhocManager.HandleItemsRequest(iqNode, pInfo, szNode))

 		return TRUE;

 

 	// another request, send empty result

-	XmlNodeIq iq( _T("result"), pInfo );

-	HXML resultQuery = iq << XQUERY( _T(JABBER_FEAT_DISCO_ITEMS));

-	if ( szNode )

-		xmlAddAttr( resultQuery, _T("node"), szNode );

+	XmlNodeIq iq(_T("result"), pInfo);

+	HXML resultQuery = iq << XQUERY(_T(JABBER_FEAT_DISCO_ITEMS));

+	if (szNode)

+		xmlAddAttr(resultQuery, _T("node"), szNode);

 

-	if ( !szNode && m_options.EnableRemoteControl )

-		resultQuery << XCHILD( _T("item")) << XATTR( _T("jid"), m_ThreadInfo->fullJID ) 

-			<< XATTR( _T("node"), _T(JABBER_FEAT_COMMANDS)) << XATTR( _T("name"), _T("Ad-hoc commands"));

+	if ( !szNode && m_options.EnableRemoteControl)

+		resultQuery << XCHILD(_T("item")) << XATTR(_T("jid"), m_ThreadInfo->fullJID) 

+			<< XATTR(_T("node"), _T(JABBER_FEAT_COMMANDS)) << XATTR(_T("name"), _T("Ad-hoc commands"));

 

-	m_ThreadInfo->send( iq );

+	m_ThreadInfo->send(iq);

 	return TRUE;

 }

 

-BOOL CJabberProto::AddClistHttpAuthEvent( CJabberHttpAuthParams *pParams )

+BOOL CJabberProto::AddClistHttpAuthEvent(CJabberHttpAuthParams *pParams)

 {

 	CLISTEVENT cle = {0};

 	char szService[256];

-	mir_snprintf( szService, sizeof(szService),"%s%s", m_szModuleName, JS_HTTP_AUTH );

+	mir_snprintf(szService, sizeof(szService),"%s%s", m_szModuleName, JS_HTTP_AUTH);

 	cle.cbSize = sizeof(CLISTEVENT);

 	cle.hIcon = (HICON) LoadIconEx("openid");

 	cle.flags = CLEF_PROTOCOLGLOBAL | CLEF_TCHAR;

@@ -800,36 +800,36 @@ BOOL CJabberProto::AddClistHttpAuthEvent( CJabberHttpAuthParams *pParams )
 	return TRUE;

 }

 

-BOOL CJabberProto::OnIqHttpAuth( HXML node, CJabberIqInfo* pInfo )

+BOOL CJabberProto::OnIqHttpAuth(HXML node, CJabberIqInfo* pInfo)

 {

-	if ( !m_options.AcceptHttpAuth )

+	if ( !m_options.AcceptHttpAuth)

 		return TRUE;

 

 	if ( !node || !pInfo->GetChildNode() || !pInfo->GetFrom() || !pInfo->GetIdStr())

 		return TRUE;

 

-	HXML pConfirm = xmlGetChild( node , "confirm" );

-	if ( !pConfirm )

+	HXML pConfirm = xmlGetChild(node , "confirm");

+	if ( !pConfirm)

 		return TRUE;

 

-	const TCHAR *szId = xmlGetAttrValue( pConfirm, _T("id"));

-	const TCHAR *szMethod = xmlGetAttrValue( pConfirm, _T("method"));

-	const TCHAR *szUrl = xmlGetAttrValue( pConfirm, _T("url"));

+	const TCHAR *szId = xmlGetAttrValue(pConfirm, _T("id"));

+	const TCHAR *szMethod = xmlGetAttrValue(pConfirm, _T("method"));

+	const TCHAR *szUrl = xmlGetAttrValue(pConfirm, _T("url"));

 

-	if ( !szId || !szMethod || !szUrl )

+	if ( !szId || !szMethod || !szUrl)

 		return TRUE;

 

-	CJabberHttpAuthParams *pParams = (CJabberHttpAuthParams *)mir_alloc( sizeof( CJabberHttpAuthParams ));

-	if ( !pParams )

+	CJabberHttpAuthParams *pParams = (CJabberHttpAuthParams *)mir_alloc(sizeof(CJabberHttpAuthParams));

+	if ( !pParams)

 		return TRUE;

-	ZeroMemory( pParams, sizeof( CJabberHttpAuthParams ));

+	ZeroMemory(pParams, sizeof(CJabberHttpAuthParams));

 	pParams->m_nType = CJabberHttpAuthParams::IQ;

-	pParams->m_szFrom = mir_tstrdup( pInfo->GetFrom());

-	pParams->m_szId = mir_tstrdup( szId );

-	pParams->m_szMethod = mir_tstrdup( szMethod );

-	pParams->m_szUrl = mir_tstrdup( szUrl );

+	pParams->m_szFrom = mir_tstrdup(pInfo->GetFrom());

+	pParams->m_szId = mir_tstrdup(szId);

+	pParams->m_szMethod = mir_tstrdup(szMethod);

+	pParams->m_szUrl = mir_tstrdup(szUrl);

 

-	AddClistHttpAuthEvent( pParams );

+	AddClistHttpAuthEvent(pParams);

 

 	return TRUE;

 }