#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
#include <lib-sys/unix.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-mx/mx.h>
#include "alias.h"
#include "mutt_idna.h"
#include "attach.h"
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#include "remailer.h"
-
int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
{
char *t;
string_list_t *uh = UserHeader;
regmatch_t pat_match[1];
-#ifdef USE_NNTP
- if (option (OPTNEWSSEND)) {
- if (en->newsgroups)
- m_strcpy(buf, sizeof(buf), en->newsgroups);
- else
- buf[0] = 0;
- if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
- return (-1);
- p_delete(&en->newsgroups);
- en->newsgroups = m_strdup(buf);
-
- if (en->followup_to)
- m_strcpy(buf, sizeof(buf), en->followup_to);
- else
- buf[0] = 0;
- if (option (OPTASKFOLLOWUP)
- && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
- return (-1);
- p_delete(&en->followup_to);
- en->followup_to = m_strdup(buf);
-
- if (en->x_comment_to)
- m_strcpy(buf, sizeof(buf), en->x_comment_to);
- else
- buf[0] = 0;
- if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
- && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
- return (-1);
- p_delete(&en->x_comment_to);
- en->x_comment_to = m_strdup(buf);
- }
- else
-#endif
- {
- if (edit_address (&en->to, "To: ") == -1 || en->to == NULL)
- return (-1);
- if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1)
- return (-1);
- if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1)
- return (-1);
- }
+ if (edit_address (&en->to, "To: ") == -1 || en->to == NULL)
+ return (-1);
+ if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1)
+ return (-1);
+ if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1)
+ return (-1);
if (en->subject) {
if (option (OPTFASTREPLY))
}
else {
mutt_error (_("Ignoring $strip_was: Subject would be empty."));
- sleep (2);
+ mutt_sleep (2);
}
}
if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) != 0 || (!buf[0]
return 0;
}
-#ifdef USE_NNTP
-static char *nntp_get_header(const char *s)
-{
- return m_strdup(skipspaces(s));
-}
-#endif
-
static void process_user_recips (ENVELOPE * env)
{
string_list_t *uh = UserHeader;
case MIME_BCC:
env->bcc = rfc822_parse_adrlist(env->bcc, p);
break;
-#ifdef USE_NNTP
- case MIME_NEWSGROUPS:
- env->newsgroups = nntp_get_header(p);
- break;
- case MIME_FOLLOWUP_TO:
- env->followup_to = nntp_get_header(p);
- break;
- case MIME_X_COMMENT_TO:
- env->x_comment_to = nntp_get_header(p);
- break;
-#endif
default: break;
}
}
case MIME_TO:
case MIME_CC:
case MIME_BCC:
-#ifdef USE_NNTP
- case MIME_NEWSGROUPS:
- case MIME_FOLLOWUP_TO:
- case MIME_X_COMMENT_TO:
-#endif
case MIME_SUPERSEDES:
case MIME_SUPERCEDES:
case MIME_SUBJECT:
}
}
- if (!option (OPTREPLYSELF) && mutt_addr_is_user (env->from)) {
+ if (mutt_addr_is_user(env->from)) {
/* mail is from the user, assume replying to recipients */
address_list_append(to, address_list_dup(env->to));
}
}
else if (!env->subject)
env->subject = m_strdup("Re: your mail");
-
-#ifdef USE_NNTP
- if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
- env->x_comment_to = m_strdup(mutt_get_name (curenv->from));
-#endif
}
static string_list_t *mutt_make_references (ENVELOPE * e)
curenv = cur->env;
if (flags & SENDREPLY) {
-#ifdef USE_NNTP
- if ((flags & SENDNEWS)) {
- /* in case followup set Newsgroups: with Followup-To: if it present */
- if (!env->newsgroups && curenv &&
- m_strcasecmp(curenv->followup_to, "poster"))
- env->newsgroups = m_strdup(curenv->followup_to);
- }
- else
-#endif
if (tag) {
HEADER *h;
if (!option(OPTFOLLOWUPTO))
return;
-#ifdef USE_NNTP
- if (option(OPTNEWSSEND)) {
- if (!e->followup_to && e->newsgroups && strrchr(e->newsgroups, ','))
- e->followup_to = m_strdup(e->newsgroups);
- return;
- }
-#endif
-
if (e->mail_followup_to)
return;
if (MAlias.from)
adr = address_dup(MAlias.from);
- else if (MCore.use_domain) {
+ else if (mod_core.use_domain) {
const char *fqdn = mutt_fqdn (1);
adr = address_new();
- adr->mailbox = p_new(char, m_strlen(MCore.username) + m_strlen(fqdn) + 2);
- sprintf(adr->mailbox, "%s@%s", NONULL(MCore.username), NONULL(fqdn));
+ adr->mailbox = p_new(char, m_strlen(mod_core.username) + m_strlen(fqdn) + 2);
+ sprintf(adr->mailbox, "%s@%s", NONULL(mod_core.username), NONULL(fqdn));
} else {
adr = address_new ();
- adr->mailbox = m_strdup(NONULL(MCore.username));
+ adr->mailbox = m_strdup(NONULL(mod_core.username));
}
return (adr);
int i;
/* Write out the message in MIME form. */
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
if (!tempfp)
return -1;
- mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
- msg->chain ? 1 : 0);
+ mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0);
fputc ('\n', tempfp); /* tie off the header. */
if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
return (-1);
}
- if (msg->chain)
- return mix_send_message (msg->chain, tempfile);
-
i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
msg->env->bcc, tempfile,
(msg->content->encoding == ENC8BIT));
int rv = -1;
-#ifdef USE_NNTP
- if (flags & SENDNEWS)
- set_option (OPTNEWSSEND);
- else
- unset_option (OPTNEWSSEND);
-#endif
-
if (!flags && !msg && quadoption (OPT_RECALL) != M_NO &&
mutt_num_postponed (1)) {
/* If the user is composing a new message, check to see if there
if ((flags =
mutt_get_postponed (ctx, msg, &cur, fcc, sizeof (fcc))) < 0)
goto cleanup;
-#ifdef USE_NNTP
- /*
- * If postponed message is a news article, it have
- * a "Newsgroups:" header line, then set appropriate flag.
- */
- if (msg->env->newsgroups) {
- flags |= SENDNEWS;
- set_option (OPTNEWSSEND);
- }
- else {
- flags &= ~SENDNEWS;
- unset_option (OPTNEWSSEND);
- }
-#endif
}
if (flags & (SENDPOSTPONED | SENDRESEND)) {
if (!tempfile) {
char buffer[_POSIX_PATH_MAX];
- tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
+ tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL);
msg->content->filename = m_strdup(buffer);
} else {
tempfp = safe_fopen(tempfile, "a+");
if (flags & SENDBATCH) {
mutt_copy_stream (stdin, tempfp);
- if (option (OPTHDRS)) {
- process_user_recips (msg->env);
- process_user_header (msg->env);
- }
+ process_user_recips (msg->env);
+ process_user_header (msg->env);
mutt_expand_aliases_env (msg->env);
}
else if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
envelope_defaults (msg->env, ctx, cur, flags) == -1)
goto cleanup;
- if (option (OPTHDRS))
- process_user_recips (msg->env);
+ process_user_recips (msg->env);
/* Expand aliases and remove duplicates/crossrefs */
mutt_fix_reply_recipients (msg->env);
-#ifdef USE_NNTP
- if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
- && !msg->env->newsgroups)
- msg->env->newsgroups = m_strdup(((NNTP_DATA *) ctx->data)->group);
-#endif
-
if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
!((flags & SENDREPLY) && option (OPTFASTREPLY))) {
if (edit_envelope (msg->env, flags) == -1)
killfrom = 0;
}
- if (option (OPTHDRS))
- process_user_header (msg->env);
+ process_user_header (msg->env);
/* include replies/forwarded messages, unless we are given a template */
if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))
* can take effect.
*/
- if (option (OPTCRYPTAUTOSIGN))
+ if (mod_crypt.autosign)
msg->security |= SIGN;
- if (option (OPTCRYPTAUTOENCRYPT))
+ if (mod_crypt.autoencrypt)
msg->security |= ENCRYPT;
- if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT))
+ if (mod_crypt.replyencrypt && cur && (cur->security & ENCRYPT))
msg->security |= ENCRYPT;
- if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN))
+ if (mod_crypt.replysign && cur && (cur->security & SIGN))
msg->security |= SIGN;
- if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur
- && (cur->security & ENCRYPT))
+ if (mod_crypt.replysignencrypted && cur && (cur->security & ENCRYPT))
msg->security |= SIGN;
if (msg->security) {
* disable individual mechanisms at run-time?
*/
if (cur) {
- if (option (OPTCRYPTAUTOPGP) && (cur->security & APPLICATION_PGP))
+ if (mod_crypt.autopgp && (cur->security & APPLICATION_PGP))
msg->security |= APPLICATION_PGP;
- else if (option (OPTCRYPTAUTOSMIME)
- && (cur->security & APPLICATION_SMIME))
+ else if (mod_crypt.autosmime && (cur->security & APPLICATION_SMIME))
msg->security |= APPLICATION_SMIME;
}
* for the decision.
*/
if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) {
- if (option (OPTCRYPTAUTOSMIME) && option (OPTSMIMEISDEFAULT))
+ if (mod_crypt.autosmime && mod_crypt.smime_is_default)
msg->security |= APPLICATION_SMIME;
- else if (option (OPTCRYPTAUTOPGP))
+ else if (mod_crypt.autopgp)
msg->security |= APPLICATION_PGP;
- else if (option (OPTCRYPTAUTOSMIME))
+ else if (mod_crypt.autosmime)
msg->security |= APPLICATION_SMIME;
}
}
i = mutt_compose_menu (msg, fcc, sizeof (fcc), cur);
if (i == -1) {
/* abort */
-#ifdef USE_NNTP
- if (flags & SENDNEWS)
- mutt_message (_("Article not posted."));
-
- else
-#endif
- mutt_message _("Mail not sent.");
+ mutt_message _("Mail not sent.");
goto cleanup;
}
else if (i == 1) {
}
}
-#ifdef USE_NNTP
- if (!(flags & SENDNEWS))
-#endif
- if (!msg->env->to && !msg->env->cc && !msg->env->bcc) {
- if (!(flags & SENDBATCH)) {
- mutt_error _("No recipients are specified!");
+ if (!msg->env->to && !msg->env->cc && !msg->env->bcc) {
+ if (!(flags & SENDBATCH)) {
+ mutt_error _("No recipients are specified!");
- goto main_loop;
- }
- else {
- puts _("No recipients were specified.");
+ goto main_loop;
+ }
+ else {
+ puts _("No recipients were specified.");
- goto cleanup;
- }
+ goto cleanup;
}
+ }
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
goto main_loop;
}
-#ifdef USE_NNTP
- if ((flags & SENDNEWS) && !msg->env->subject) {
- mutt_error _("No subject specified.");
-
- goto main_loop;
- }
-
- if ((flags & SENDNEWS) && !msg->env->newsgroups) {
- mutt_error _("No newsgroup specified.");
-
- goto main_loop;
- }
-#endif
if (msg->content->next)
msg->content = mutt_make_multipart (msg->content);
if (quadoption (OPT_ATTACH) == M_YES) {
mutt_message _("No attachments made but indicator found in text. "
"Abort sending.");
- sleep (2);
+ mutt_sleep (2);
}
mutt_message (_("Mail not sent."));
goto main_loop;
}
}
else if (!option (OPTNOCURSES))
- mutt_message (i != 0 ? _("Sending in background.") :
-#ifdef USE_NNTP
- (flags & SENDNEWS) ? _("Article posted.") :
- _("Mail sent.")
-#else
- _("Mail sent.")
-#endif
- );
+ mutt_message (i != 0 ? _("Sending in background.") : _("Mail sent."));
if (msg->security & ENCRYPT)
p_delete(&pgpkeylist);