Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In nsHTMLUtils.cpp changed to create UTF-8 URI instead of a document charset,

Browse Source 
in mailnews changed ASCII conversion to UTF-8, bug 87202, r=ftang, sr=jst.


git-svn-id: svn://10.0.0.236/trunk@98311 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nhotta%netscape.com 2001-06-29 22:21:50 +00:00
parent d4ecaf45af
commit 0c3c57c24d
3 changed files with 123 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
mozilla/content/html/content/src/nsHTMLUtils.cpp
View File

@ -96,57 +96,68 @@ NS_MakeAbsoluteURIWithCharset(char* *aResult,
}
}
else {
// Otherwise, we'll need to use aDocument to cough up a character
// set converter, and re-encode the relative portion of the URL as
// 8-bit characters.
nsCOMPtr<nsIUnicodeEncoder> encoder;
if (aDocument) {
nsCOMPtr<nsICharsetConverterManager> convmgr;
if (aConvMgr) {
convmgr = aConvMgr;
}
else {
convmgr = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID);
}
if (! convmgr)
return NS_ERROR_FAILURE;
nsAutoString charSetID;
aDocument->GetDocumentCharacterSet(charSetID);
convmgr->GetUnicodeEncoder(&charSetID, getter_AddRefs(encoder));
}
if (encoder) {
// Got the encoder: let's party.
PRInt32 len = aSpec.Length();
PRInt32 maxlen;
encoder->GetMaxLength(aSpec.GetUnicode(), len, &maxlen);
char buf[64], *p = buf;
if (maxlen > sizeof(buf) - 1)
p = new char[maxlen + 1];
if (! p)
return NS_ERROR_OUT_OF_MEMORY;
encoder->Convert(aSpec.GetUnicode(), &len, p, &maxlen);
encoder->Finish(p, &len);
p[maxlen] = 0;
spec = p;
if (p != buf)
delete[] p;
}
else {
// No encoder, but we've got non-ASCII data. Let's UTF-8 encode
// by default.
// If the scheme is mailtourl then should not convert to a document charset
// because the charset cannot be passes to mailnews code,
// use UTF-8 instead and apply URL escape.
static const char kMailToURI[] = "mailto";
if ((pos == (PRInt32)(sizeof kMailToURI - 1)) &&
(aSpec.Left(scheme, pos) != -1) &&
scheme.EqualsIgnoreCase(kMailToURI)) {
spec = NS_ConvertUCS2toUTF8(aSpec.GetUnicode());
}
else {
// Otherwise, we'll need to use aDocument to cough up a character
// set converter, and re-encode the relative portion of the URL as
// 8-bit characters.
nsCOMPtr<nsIUnicodeEncoder> encoder;
if (aDocument) {
nsCOMPtr<nsICharsetConverterManager> convmgr;
if (aConvMgr) {
convmgr = aConvMgr;
}
else {
convmgr = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID);
}
if (! convmgr)
return NS_ERROR_FAILURE;
nsAutoString charSetID;
aDocument->GetDocumentCharacterSet(charSetID);
convmgr->GetUnicodeEncoder(&charSetID, getter_AddRefs(encoder));
}
if (encoder) {
// Got the encoder: let's party.
PRInt32 len = aSpec.Length();
PRInt32 maxlen;
encoder->GetMaxLength(aSpec.GetUnicode(), len, &maxlen);
char buf[64], *p = buf;
if (maxlen > sizeof(buf) - 1)
p = new char[maxlen + 1];
if (! p)
return NS_ERROR_OUT_OF_MEMORY;
encoder->Convert(aSpec.GetUnicode(), &len, p, &maxlen);
encoder->Finish(p, &len);
p[maxlen] = 0;
spec = p;
if (p != buf)
delete[] p;
}
else {
// No encoder, but we've got non-ASCII data. Let's UTF-8 encode
// by default.
spec = NS_ConvertUCS2toUTF8(aSpec.GetUnicode());
}
}
// Now we need to URL-escape the string. Make sure we've got an
// nsIIOService.
nsCOMPtr<nsIIOService> ioservice;

107
mozilla/content/shared/src/nsHTMLUtils.cpp
View File

@ -96,57 +96,68 @@ NS_MakeAbsoluteURIWithCharset(char* *aResult,
}
}
else {
// Otherwise, we'll need to use aDocument to cough up a character
// set converter, and re-encode the relative portion of the URL as
// 8-bit characters.
nsCOMPtr<nsIUnicodeEncoder> encoder;
if (aDocument) {
nsCOMPtr<nsICharsetConverterManager> convmgr;
if (aConvMgr) {
convmgr = aConvMgr;
}
else {
convmgr = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID);
}
if (! convmgr)
return NS_ERROR_FAILURE;
nsAutoString charSetID;
aDocument->GetDocumentCharacterSet(charSetID);
convmgr->GetUnicodeEncoder(&charSetID, getter_AddRefs(encoder));
}
if (encoder) {
// Got the encoder: let's party.
PRInt32 len = aSpec.Length();
PRInt32 maxlen;
encoder->GetMaxLength(aSpec.GetUnicode(), len, &maxlen);
char buf[64], *p = buf;
if (maxlen > sizeof(buf) - 1)
p = new char[maxlen + 1];
if (! p)
return NS_ERROR_OUT_OF_MEMORY;
encoder->Convert(aSpec.GetUnicode(), &len, p, &maxlen);
encoder->Finish(p, &len);
p[maxlen] = 0;
spec = p;
if (p != buf)
delete[] p;
}
else {
// No encoder, but we've got non-ASCII data. Let's UTF-8 encode
// by default.
// If the scheme is mailtourl then should not convert to a document charset
// because the charset cannot be passes to mailnews code,
// use UTF-8 instead and apply URL escape.
static const char kMailToURI[] = "mailto";
if ((pos == (PRInt32)(sizeof kMailToURI - 1)) &&
(aSpec.Left(scheme, pos) != -1) &&
scheme.EqualsIgnoreCase(kMailToURI)) {
spec = NS_ConvertUCS2toUTF8(aSpec.GetUnicode());
}
else {
// Otherwise, we'll need to use aDocument to cough up a character
// set converter, and re-encode the relative portion of the URL as
// 8-bit characters.
nsCOMPtr<nsIUnicodeEncoder> encoder;
if (aDocument) {
nsCOMPtr<nsICharsetConverterManager> convmgr;
if (aConvMgr) {
convmgr = aConvMgr;
}
else {
convmgr = do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID);
}
if (! convmgr)
return NS_ERROR_FAILURE;
nsAutoString charSetID;
aDocument->GetDocumentCharacterSet(charSetID);
convmgr->GetUnicodeEncoder(&charSetID, getter_AddRefs(encoder));
}
if (encoder) {
// Got the encoder: let's party.
PRInt32 len = aSpec.Length();
PRInt32 maxlen;
encoder->GetMaxLength(aSpec.GetUnicode(), len, &maxlen);
char buf[64], *p = buf;
if (maxlen > sizeof(buf) - 1)
p = new char[maxlen + 1];
if (! p)
return NS_ERROR_OUT_OF_MEMORY;
encoder->Convert(aSpec.GetUnicode(), &len, p, &maxlen);
encoder->Finish(p, &len);
p[maxlen] = 0;
spec = p;
if (p != buf)
delete[] p;
}
else {
// No encoder, but we've got non-ASCII data. Let's UTF-8 encode
// by default.
spec = NS_ConvertUCS2toUTF8(aSpec.GetUnicode());
}
}
// Now we need to URL-escape the string. Make sure we've got an
// nsIIOService.
nsCOMPtr<nsIIOService> ioservice;

10
mozilla/mailnews/compose/src/nsMsgComposeService.cpp
View File

@ -242,12 +242,12 @@ NS_IMETHODIMP nsMsgComposeService::OpenComposeWindowWithURI(const char * aMsgCom
rv = OpenComposeWindowWithValues(aMsgComposeWindowURL,
nsIMsgCompType::MailToUrl,
format,
NS_ConvertASCIItoUCS2(aToPart).GetUnicode(),
NS_ConvertASCIItoUCS2(aCcPart).GetUnicode(),
NS_ConvertASCIItoUCS2(aBccPart).GetUnicode(),
NS_ConvertUTF8toUCS2(aToPart).GetUnicode(),
NS_ConvertUTF8toUCS2(aCcPart).GetUnicode(),
NS_ConvertUTF8toUCS2(aBccPart).GetUnicode(),
aNewsgroup,
NS_ConvertASCIItoUCS2(aSubjectPart).GetUnicode(),
NS_ConvertASCIItoUCS2(aBodyPart).GetUnicode(),
NS_ConvertUTF8toUCS2(aSubjectPart).GetUnicode(),
NS_ConvertUTF8toUCS2(aBodyPart).GetUnicode(),
aAttachmentPart,
nsnull);
}