mir_urlDecode & mir_urlEncode to return CMStringA

4 files changed, 11 insertions, 15 deletions

diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp
index 5f54249d69..02da53e8c9 100644
--- a/protocols/MSN/src/msn_auth.cpp
+++ b/protocols/MSN/src/msn_auth.cpp
@@ -559,16 +559,16 @@ CMStringA CMsnProto::HotmailLogin(const char* url)
 	derive_key(key2, key1, key1len, data1, data1len);

 

 	CMStringA result;

-	result.Format("%s&da=%s&nonce=", url, ptrA(mir_urlEncode(hotAuthToken)));

+	result.Format("%s&da=%s&nonce=", url, mir_urlEncode(hotAuthToken).c_str());

 

 	ptrA noncenc(mir_base64_encode(nonce, sizeof(nonce)));

-	result.Append(ptrA(mir_urlEncode(noncenc)));

+	result.Append(mir_urlEncode(noncenc));

 

 	BYTE hash[MIR_SHA1_HASH_SIZE];

 	unsigned int len;

 	HMAC(EVP_sha1(), key2, sizeof(key2), (BYTE*)result.GetString(), result.GetLength(), hash, &len);

 	ptrA szHash(mir_base64_encode(hash, sizeof(hash)));

-	result.AppendFormat("&hash=%s", ptrA(mir_urlEncode(szHash)));

+	result.AppendFormat("&hash=%s", mir_urlEncode(szHash).c_str());

 	return result;

 }

 

@@ -690,7 +690,7 @@ bool CMsnProto::RefreshOAuth(const char *pszRefreshToken, const char *pszService
 	nlhr.headers[1].szValue = "application/x-www-form-urlencoded";

 	nlhr.headers[2].szName = "Cookie";

 	nlhr.headers[2].szValue = authCookies;

-	post.Format("client_id=00000000480BC46C&scope=%s&grant_type=refresh_token&refresh_token=%s", ptrA(mir_urlEncode(pszService)), pszRefreshToken);

+	post.Format("client_id=00000000480BC46C&scope=%s&grant_type=refresh_token&refresh_token=%s", mir_urlEncode(pszService).c_str(), pszRefreshToken);

 

 	nlhr.pData = (char*)(const char*)post;

 	nlhr.dataLength = (int)mir_strlen(nlhr.pData);

@@ -930,8 +930,7 @@ bool CMsnProto::parseLoginPage(char *pszHTML, NETLIBHTTPREQUEST *nlhr, CMStringA
 		if (db_get_static(NULL, m_szModuleName, "Password", szPassword, sizeof(szPassword)))

 			return false;

 		szPassword[99] = 0;

-		post->Format("PPFT=%s&login=%s&passwd=%s", ptrA(mir_urlEncode(pPPFT)),

-			ptrA(mir_urlEncode(MyOptions.szEmail)), ptrA(mir_urlEncode(szPassword)));

+		post->Format("PPFT=%s&login=%s&passwd=%s", mir_urlEncode(pPPFT).c_str(), mir_urlEncode(MyOptions.szEmail).c_str(), mir_urlEncode(szPassword).c_str());

 

 		/* Do the login and get the required tokens */

 		nlhr->dataLength = post->GetLength();

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index b216212d37..70c00d637f 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -59,7 +59,7 @@ INT_PTR CMsnProto::MsnSendHotmail(WPARAM hContact, LPARAM)
 	if (MSN_IsMeByContact(hContact, szEmail))

 		MsnGotoInbox(0, 0);

 	else if (msnLoggedIn)

-		MsnInvokeMyURL(true, CMStringA().Format("http://mail.live.com?rru=compose?to=%s", ptrA(mir_urlEncode(szEmail))));

+		MsnInvokeMyURL(true, CMStringA().Format("http://mail.live.com?rru=compose?to=%s", mir_urlEncode(szEmail).c_str()));

 

 	return 0;

 }

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index 0557aeba8c..2946b53418 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -254,10 +254,8 @@ int CMsnProto::MSN_SetMyAvatar(const wchar_t* sztFname, void* pData, size_t cbLe
 

 	//	ezxml_set_attr(xmlp, "SHA1C", szSha1c);

 

-	char* szBuffer = ezxml_toxml(xmlp, false);

+	ptrA szBuffer(ezxml_toxml(xmlp, false));

 	ezxml_free(xmlp);

-	ptrA szEncodedBuffer(mir_urlEncode(szBuffer));

-	free(szBuffer);

 

 	const wchar_t *szExt;

 	int fmt = ProtoGetBufferFormat(pData, &szExt);

@@ -279,7 +277,7 @@ int CMsnProto::MSN_SetMyAvatar(const wchar_t* sztFname, void* pData, size_t cbLe
 		if (!db_get_static(NULL, m_szModuleName, "AvatarHash", szAvatarHashdOld, sizeof(szAvatarHashdOld))) {

 			char *szAvatarHash = arrayToHex(sha1d, sizeof(sha1d));

 			if (mir_strcmp(szAvatarHashdOld, szAvatarHash)) {

-				setString("PictObject", szEncodedBuffer);

+				setString("PictObject", mir_urlEncode(szBuffer));

 				setString("AvatarHash", szAvatarHash);

 			}

 			mir_free(szAvatarHash);

@@ -405,7 +403,7 @@ int ThreadData::sendMessage(int, const char *email, int netId, const char *parMs
 							break;

 

 					if (*p == 0) {

-						strncpy_s(tFontName, sizeof(tFontName), ptrA(mir_urlEncode(dbv.pszVal)), _TRUNCATE);

+						strncpy_s(tFontName, sizeof(tFontName), mir_urlEncode(dbv.pszVal), _TRUNCATE);

 						db_free(&dbv);

 					}

 				}

@@ -710,10 +708,10 @@ void CMsnProto::MsnInvokeMyURL(bool ismail, const char* url)
 	if (p)

 		*p = 0;

 

-	CMStringA post = HotmailLogin(CMStringA().Format(postdata, (unsigned)time(0), ptrA(mir_urlEncode(url))));

+	CMStringA post = HotmailLogin(CMStringA().Format(postdata, (unsigned)time(0), mir_urlEncode(url).c_str()));

 	if (!post.IsEmpty()) {

 		CMStringA hippy(passport);

-		hippy.AppendFormat("/ppsecure/sha1auth.srf?lc=%d&token=%s", itoa(langpref, passport, 10), ptrA(mir_urlEncode(post)));

+		hippy.AppendFormat("/ppsecure/sha1auth.srf?lc=%d&token=%s", itoa(langpref, passport, 10), mir_urlEncode(post).c_str());

 

 		debugLogA("Starting URL: '%s'", hippy.c_str());

 		Utils_OpenUrl(hippy.GetString());

diff --git a/protocols/MSN/src/stdafx.h b/protocols/MSN/src/stdafx.h
index bf6c0703c8..ab5303e074 100644
--- a/protocols/MSN/src/stdafx.h
+++ b/protocols/MSN/src/stdafx.h
@@ -61,7 +61,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_timezones.h>

 #include <m_extraicons.h>

 #include <m_nudge.h>

-#include <m_string.h>

 #include <m_json.h>

 

 #include "m_proto_listeningto.h"