mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for bug 67504. Remove hardcoded string. R=varada, SR=bienvenu 

Fix for bug 41150. Do not reveal BCC recipients when forwarding a message. R=varada, SR=bienvenu
This commit is contained in:
ducarroz%netscape.com 2001-04-03 21:05:07 +00:00
Родитель e8ee89c80f
Коммит cc6f098f0e
2 изменённых файлов: 55 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

112
mailnews/mime/src/mimedrft.cpp
Просмотреть файл

@ -582,6 +582,20 @@ mime_intl_insert_message_header_1(char **body,
mime_SACat(body, HEADER_END_JUNK); mime_SACat(body, HEADER_END_JUNK);
} }
char *
MimeGetNamedString(PRInt32 id)
{
static char retString[256];
retString[0] = '\0';
char *tString = MimeGetStringByID(id);
if (tString)
PL_strncpy(retString, tString, sizeof(retString));
return retString;
}
static void static void
mime_insert_all_headers(char **body, mime_insert_all_headers(char **body,
MimeHeaders *headers, MimeHeaders *headers,
@ -606,21 +620,19 @@ mime_insert_all_headers(char **body,
*html_tag = 0; *html_tag = 0;
mime_SACopy(&(newBody), *body); mime_SACopy(&(newBody), *body);
*html_tag = '<'; *html_tag = '<';
mime_SACat(&newBody, mime_SACat(&newBody, "<HTML> <BR><BR>");
"<HTML> <BR><BR>-------- Original Message --------");
} }
else else
{ mime_SACopy(&(newBody), "<HTML> <BR><BR>");
mime_SACopy(&(newBody),
"<HTML> <BR><BR>-------- Original Message --------"); mime_SACat(&newBody, MimeGetNamedString(MIME_FORWARDED_MESSAGE_HTML_USER_WROTE));
}
mime_SACat(&newBody, MIME_HEADER_TABLE); mime_SACat(&newBody, MIME_HEADER_TABLE);
} }
else else
{ {
mime_SACopy(&(newBody), mime_SACopy(&(newBody), MSG_LINEBREAK MSG_LINEBREAK);
MSG_LINEBREAK MSG_LINEBREAK "-------- Original Message --------"); mime_SACat(&newBody, MimeGetNamedString(MIME_FORWARDED_MESSAGE_HTML_USER_WROTE));
} }
for (i = 0; i < headers->heads_size; i++) for (i = 0; i < headers->heads_size; i++)
{ {
@ -678,10 +690,16 @@ mime_insert_all_headers(char **body,
nsCRT::memcpy(c2, contents, end - contents); nsCRT::memcpy(c2, contents, end - contents);
c2[end - contents] = 0; c2[end - contents] = 0;
if (htmlEdit) mime_fix_up_html_address(&c2); /* Do not reveal bcc recipients when forwarding a message!
See http://bugzilla.mozilla.org/show_bug.cgi?id=41150
mime_intl_insert_message_header_1(&newBody, &c2, name, name, mailcharset, */
htmlEdit); if (nsCRT::strcasecmp(name, "bcc") != 0)
{
if (htmlEdit) mime_fix_up_html_address(&c2);
mime_intl_insert_message_header_1(&newBody, &c2, name, name, mailcharset,
htmlEdit);
}
PR_Free(name); PR_Free(name);
PR_Free(c2); PR_Free(c2);
} }
@ -708,19 +726,6 @@ mime_insert_all_headers(char **body,
} }
} }
char *
MimeGetNamedString(PRInt32 id)
{
static char retString[256];
retString[0] = '\0';
char *tString = MimeGetStringByID(id);
if (tString)
PL_strncpy(retString, tString, sizeof(retString));
return retString;
}
static void static void
mime_insert_normal_headers(char **body, mime_insert_normal_headers(char **body,
MimeHeaders *headers, MimeHeaders *headers,
@ -744,7 +749,6 @@ mime_insert_normal_headers(char **body,
PR_FALSE, PR_FALSE); PR_FALSE, PR_FALSE);
char *to = MimeHeaders_get(headers, HEADER_TO, PR_FALSE, PR_TRUE); char *to = MimeHeaders_get(headers, HEADER_TO, PR_FALSE, PR_TRUE);
char *cc = MimeHeaders_get(headers, HEADER_CC, PR_FALSE, PR_TRUE); char *cc = MimeHeaders_get(headers, HEADER_CC, PR_FALSE, PR_TRUE);
char *bcc = MimeHeaders_get(headers, HEADER_BCC, PR_FALSE, PR_TRUE);
char *newsgroups = MimeHeaders_get(headers, HEADER_NEWSGROUPS, PR_FALSE, char *newsgroups = MimeHeaders_get(headers, HEADER_NEWSGROUPS, PR_FALSE,
PR_TRUE); PR_TRUE);
char *followup_to = MimeHeaders_get(headers, HEADER_FOLLOWUP_TO, PR_FALSE, char *followup_to = MimeHeaders_get(headers, HEADER_FOLLOWUP_TO, PR_FALSE,
@ -761,14 +765,14 @@ mime_insert_normal_headers(char **body,
if (htmlEdit) if (htmlEdit)
{ {
mime_SACopy(&(newBody), mime_SACopy(&(newBody), "<HTML> <BR><BR>");
"<HTML> <BR><BR>-------- Original Message --------"); mime_SACat(&newBody, MimeGetNamedString(MIME_FORWARDED_MESSAGE_HTML_USER_WROTE));
mime_SACat(&newBody, MIME_HEADER_TABLE); mime_SACat(&newBody, MIME_HEADER_TABLE);
} }
else else
{ {
mime_SACopy(&(newBody), mime_SACopy(&(newBody), MSG_LINEBREAK MSG_LINEBREAK);
MSG_LINEBREAK MSG_LINEBREAK "-------- Original Message --------"); mime_SACat(&newBody, MimeGetNamedString(MIME_FORWARDED_MESSAGE_HTML_USER_WROTE));
} }
if (subject) if (subject)
mime_intl_insert_message_header_1(&newBody, &subject, HEADER_SUBJECT, mime_intl_insert_message_header_1(&newBody, &subject, HEADER_SUBJECT,
@ -845,14 +849,11 @@ mime_insert_normal_headers(char **body,
MimeGetNamedString(MIME_MHTML_CC), MimeGetNamedString(MIME_MHTML_CC),
mailcharset, htmlEdit); mailcharset, htmlEdit);
} }
if (bcc) /*
{ Do not reveal bcc recipients when forwarding a message!
if (htmlEdit) mime_fix_up_html_address(&bcc); See http://bugzilla.mozilla.org/show_bug.cgi?id=41150
mime_intl_insert_message_header_1(&newBody, &bcc, HEADER_BCC, */
MimeGetNamedString(MIME_MHTML_BCC), if (newsgroups)
mailcharset, htmlEdit);
}
if (newsgroups)
mime_intl_insert_message_header_1(&newBody, &newsgroups, HEADER_NEWSGROUPS, mime_intl_insert_message_header_1(&newBody, &newsgroups, HEADER_NEWSGROUPS,
MimeGetNamedString(MIME_MHTML_NEWSGROUPS), MimeGetNamedString(MIME_MHTML_NEWSGROUPS),
mailcharset, htmlEdit); mailcharset, htmlEdit);
@ -903,7 +904,6 @@ mime_insert_normal_headers(char **body,
PR_FREEIF(organization); PR_FREEIF(organization);
PR_FREEIF(to); PR_FREEIF(to);
PR_FREEIF(cc); PR_FREEIF(cc);
PR_FREEIF(bcc);
PR_FREEIF(newsgroups); PR_FREEIF(newsgroups);
PR_FREEIF(followup_to); PR_FREEIF(followup_to);
PR_FREEIF(references); PR_FREEIF(references);
@ -923,7 +923,6 @@ mime_insert_micro_headers(char **body,
char *date = MimeHeaders_get(headers, HEADER_DATE, PR_FALSE, PR_TRUE); char *date = MimeHeaders_get(headers, HEADER_DATE, PR_FALSE, PR_TRUE);
char *to = MimeHeaders_get(headers, HEADER_TO, PR_FALSE, PR_TRUE); char *to = MimeHeaders_get(headers, HEADER_TO, PR_FALSE, PR_TRUE);
char *cc = MimeHeaders_get(headers, HEADER_CC, PR_FALSE, PR_TRUE); char *cc = MimeHeaders_get(headers, HEADER_CC, PR_FALSE, PR_TRUE);
char *bcc = MimeHeaders_get(headers, HEADER_BCC, PR_FALSE, PR_TRUE);
char *newsgroups = MimeHeaders_get(headers, HEADER_NEWSGROUPS, PR_FALSE, char *newsgroups = MimeHeaders_get(headers, HEADER_NEWSGROUPS, PR_FALSE,
PR_TRUE); PR_TRUE);
const char *html_tag = PL_strcasestr(*body, "<HTML>"); const char *html_tag = PL_strcasestr(*body, "<HTML>");
@ -939,16 +938,17 @@ mime_insert_micro_headers(char **body,
if (htmlEdit) if (htmlEdit)
{ {
mime_SACopy(&(newBody), mime_SACopy(&(newBody), "<HTML> <BR><BR>");
"<HTML> <BR><BR>-------- Original Message --------"); mime_SACat(&newBody, MimeGetNamedString(MIME_FORWARDED_MESSAGE_HTML_USER_WROTE));
mime_SACat(&newBody, MIME_HEADER_TABLE); mime_SACat(&newBody, MIME_HEADER_TABLE);
} }
else else
{ {
mime_SACopy(&(newBody), mime_SACopy(&(newBody), MSG_LINEBREAK MSG_LINEBREAK);
MSG_LINEBREAK MSG_LINEBREAK "-------- Original Message --------"); mime_SACat(&newBody, MimeGetNamedString(MIME_FORWARDED_MESSAGE_HTML_USER_WROTE));
} }
if (from)
if (from)
{ {
if (htmlEdit) if (htmlEdit)
mime_fix_up_html_address(&from); mime_fix_up_html_address(&from);
@ -988,13 +988,10 @@ mime_insert_micro_headers(char **body,
MimeGetNamedString(MIME_MHTML_CC), MimeGetNamedString(MIME_MHTML_CC),
mailcharset, htmlEdit); mailcharset, htmlEdit);
} }
if (bcc) /*
{ Do not reveal bcc recipients when forwarding a message!
if (htmlEdit) mime_fix_up_html_address(&bcc); See http://bugzilla.mozilla.org/show_bug.cgi?id=41150
mime_intl_insert_message_header_1(&newBody, &bcc, HEADER_BCC, */
MimeGetNamedString(MIME_MHTML_BCC),
mailcharset, htmlEdit);
}
if (newsgroups) if (newsgroups)
mime_intl_insert_message_header_1(&newBody, &newsgroups, HEADER_NEWSGROUPS, mime_intl_insert_message_header_1(&newBody, &newsgroups, HEADER_NEWSGROUPS,
MimeGetNamedString(MIME_MHTML_NEWSGROUPS), MimeGetNamedString(MIME_MHTML_NEWSGROUPS),
@ -1024,7 +1021,6 @@ mime_insert_micro_headers(char **body,
PR_FREEIF(date); PR_FREEIF(date);
PR_FREEIF(to); PR_FREEIF(to);
PR_FREEIF(cc); PR_FREEIF(cc);
PR_FREEIF(bcc);
PR_FREEIF(newsgroups); PR_FREEIF(newsgroups);
} }

1
mailnews/mime/src/nsMimeStringResources.h
Просмотреть файл

@ -66,5 +66,6 @@
#define MIME_MSG_PARTIAL_FMT_2 1038 #define MIME_MSG_PARTIAL_FMT_2 1038
#define MIME_MSG_PARTIAL_FMT_3 1039 #define MIME_MSG_PARTIAL_FMT_3 1039
#define MIME_MSG_DEFAULT_ATTACHMENT_NAME 1040 #define MIME_MSG_DEFAULT_ATTACHMENT_NAME 1040
#define MIME_FORWARDED_MESSAGE_HTML_USER_WROTE 1041
#endif /* _NAME_OF_THIS_HEADER_FILE__ */ #endif /* _NAME_OF_THIS_HEADER_FILE__ */