* mode == 1 => "lite" mode (used for edit_hdrs)
* mode == 0 => normal mode. write full header + MIME headers
* mode == -1 => write just the envelope info (used for postponing messages)
- *
- * privacy != 0 => will omit any headers which may identify the user.
- * Output generated is suitable for being sent through
- * anonymous remailer chains.
- *
*/
int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
- int mode, int privacy)
+ int mode)
{
char buffer[LONG_STRING];
char *p;
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
- if (mode == 0 && !privacy)
+ if (mode == 0)
fputs (mutt_make_date (buffer, sizeof (buffer)), fp);
/* OPTUSEFROM is not consulted here so that we can still write a From:
* field if the user sets it with the `my_hdr' command
*/
- if (env->from && !privacy) {
+ if (env->from) {
buffer[0] = 0;
rfc822_addrcat(buffer, sizeof(buffer), env->from, 0);
fprintf (fp, "From: %s\n", buffer);
fputs ("Subject:\n", fp);
/* save message id if the user has set it */
- if (env->message_id && !privacy)
+ if (env->message_id)
fprintf (fp, "Message-ID: %s\n", env->message_id);
if (env->reply_to) {
/* check to see if the user has overridden the user-agent field */
if (!ascii_strncasecmp ("user-agent", tmp->data, 10)) {
has_agent = 1;
- if (privacy)
- continue;
}
fputs (tmp->data, fp);
}
}
- if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
+ if (mode == 0 && option (OPTXMAILER) && !has_agent) {
if (mod_core.operating_system) {
fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
mod_core.operating_system);
/* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
* post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
* */
- mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post, 0);
+ mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post);
/* (postponment) if this was a reply of some sort, <msgid> contians the
* Message-ID: of message replied to. Save it using a special X-Mutt-
fputc ('\n', msg->fp);
}
- /* (postponement) if the mail is to be sent through a mixmaster
- * chain, save that information
- */
- if (post && hdr->chain && hdr->chain) {
- string_list_t *p;
-
- fputs ("X-Mutt-Mix:", msg->fp);
- for (p = hdr->chain; p; p = p->next)
- fprintf (msg->fp, " %s", (char *) p->data);
-
- fputc ('\n', msg->fp);
- }
-
if (tempfp) {
char sasha[LONG_STRING];
int lines = 0;