|
a/src/internfile/mh_mail.cpp |
|
b/src/internfile/mh_mail.cpp |
|
... |
|
... |
| 490 |
// Normally the default charset is us-ascii. But it happens that
|
490 |
// Normally the default charset is us-ascii. But it happens that
|
| 491 |
// 8 bit chars exist in a message that is stated as us-ascii. Ie the
|
491 |
// 8 bit chars exist in a message that is stated as us-ascii. Ie the
|
| 492 |
// mailer used by yahoo support ('KANA') does this. We could convert
|
492 |
// mailer used by yahoo support ('KANA') does this. We could convert
|
| 493 |
// to iso-8859 only if the transfer-encoding is 8 bit, or test for
|
493 |
// to iso-8859 only if the transfer-encoding is 8 bit, or test for
|
| 494 |
// actual 8 bit chars, but what the heck, le'ts use 8859-1 as default
|
494 |
// actual 8 bit chars, but what the heck, le'ts use 8859-1 as default
|
| 495 |
string charset = "iso-8859-1";
|
495 |
string charset;
|
| 496 |
it = content_type.params.find(string("charset"));
|
496 |
it = content_type.params.find(string("charset"));
|
| 497 |
if (it != content_type.params.end())
|
497 |
if (it != content_type.params.end())
|
| 498 |
charset = it->second;
|
498 |
charset = it->second;
|
| 499 |
if (charset.empty() ||
|
499 |
if (charset.empty() ||
|
| 500 |
!stringlowercmp("us-ascii", charset) ||
|
500 |
!stringlowercmp("us-ascii", charset) ||
|
| 501 |
!stringlowercmp("default", charset) ||
|
501 |
!stringlowercmp("default", charset) ||
|
| 502 |
!stringlowercmp("x-user-defined", charset) ||
|
502 |
!stringlowercmp("x-user-defined", charset) ||
|
| 503 |
!stringlowercmp("x-unknown", charset) ||
|
503 |
!stringlowercmp("x-unknown", charset) ||
|
| 504 |
!stringlowercmp("unknown", charset) ) {
|
504 |
!stringlowercmp("unknown", charset) ) {
|
|
|
505 |
RclConfig::getMainConfig()->getConfParam("maildefcharset", charset);
|
|
|
506 |
if (charset.empty())
|
| 505 |
charset = "iso-8859-1";
|
507 |
charset = "iso-8859-1";
|
| 506 |
}
|
508 |
}
|
| 507 |
|
509 |
|
| 508 |
// Content transfer encoding
|
510 |
// Content transfer encoding
|
| 509 |
string cte = "7bit";
|
511 |
string cte = "7bit";
|
| 510 |
if (doc->h.getFirstHeader("Content-Transfer-Encoding", hi)) {
|
512 |
if (doc->h.getFirstHeader("Content-Transfer-Encoding", hi)) {
|