X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=55b8854d2738f2c39cc0958235563a7412c52e72;hp=f786e5c137e0938eebe726af65e407c7b268c696;hb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8;hpb=82589516e2473b5451218d7b00a9dfbc3e18f3ca

diff --git a/send.c b/send.c
index f786e5c..55b8854 100644
--- a/send.c
+++ b/send.c
@@ -12,23 +12,16 @@
 #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 "keymap.h"
 #include "copy.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.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;
@@ -97,7 +90,7 @@ static void append_signature (FILE * f)
     fprintf (f, "\n%s", SignOffString);
   }
 
-  if (tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid)) {
+  if ((tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid))) {
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
     else if (SignOffString)
@@ -245,47 +238,12 @@ static int edit_envelope (ENVELOPE * en, int flags)
   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))
@@ -335,13 +293,6 @@ static int edit_envelope (ENVELOPE * en, int flags)
   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;
@@ -361,17 +312,6 @@ static void process_user_recips (ENVELOPE * env)
           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;
         }
     }
@@ -406,11 +346,6 @@ static void process_user_header(ENVELOPE * env)
           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:
@@ -477,17 +412,6 @@ void mutt_make_attribution (CONTEXT * ctx, HEADER * cur, FILE * out)
   }
 }
 
-void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out)
-{
-  char buffer[STRING];
-
-  if (PostIndentString) {
-    mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
-    fputs (buffer, out);
-    fputc ('\n', out);
-  }
-}
-
 static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
 {
   int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
@@ -495,7 +419,6 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
 
   mutt_parse_mime_message (ctx, cur);
   mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
-
   mutt_make_attribution (ctx, cur, out);
 
   if (!option (OPTHEADER))
@@ -506,9 +429,6 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
   }
 
   mutt_copy_message (out, ctx, cur, cmflags, chflags);
-
-  mutt_make_post_indent (ctx, cur, out);
-
   return 0;
 }
 
@@ -542,7 +462,7 @@ static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto)
     }
   }
 
-  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));
   }
@@ -675,11 +595,6 @@ void mutt_make_misc_reply_headers (ENVELOPE * env,
   }
   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)
@@ -784,15 +699,6 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags)
     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;
 
@@ -900,15 +806,6 @@ static int generate_body (FILE * tempfp,        /* stream for outgoing message *
     else if (i == -1)
       return -1;
   }
-  else if (flags & SENDKEY) {
-    BODY *btmp;
-
-    if ((btmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
-      return -1;
-
-    btmp->next = msg->content;
-    msg->content = btmp;
-  }
 
   mutt_clear_error ();
 
@@ -924,14 +821,6 @@ void mutt_set_followup_to (ENVELOPE * e)
     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;
 
@@ -1014,14 +903,14 @@ address_t *mutt_default_from (void)
 
   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);
@@ -1034,12 +923,11 @@ static int send_message (HEADER * msg)
   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)) {
@@ -1054,9 +942,6 @@ static int send_message (HEADER * msg)
     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));
@@ -1138,13 +1023,6 @@ int ci_send_message (int flags, /* send mode */
 
   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
@@ -1174,20 +1052,6 @@ int ci_send_message (int flags, /* send mode */
       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)) {
@@ -1210,7 +1074,7 @@ int ci_send_message (int flags, /* send mode */
     address_list_wipe(&msg->env->from);
   }
 
-  if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
+  if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
     pbody = body_new();
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
@@ -1232,7 +1096,7 @@ int ci_send_message (int flags, /* send mode */
 
     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+");
@@ -1268,10 +1132,8 @@ int ci_send_message (int flags, /* send mode */
 
   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))) {
@@ -1279,18 +1141,11 @@ int ci_send_message (int flags, /* send mode */
         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)
@@ -1336,39 +1191,30 @@ int ci_send_message (int flags, /* send mode */
       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)))
         && generate_body (tempfp, msg, flags, ctx, cur) == -1)
       goto cleanup;
 
-    if (!(flags & SENDKEY))
-      append_signature (tempfp);
+    append_signature (tempfp);
 
     /* 
      * this wants to be done _after_ generate_body, so message-hooks
      * 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 & (ENCRYPT | SIGN)) {
-      if (option (OPTPGPAUTOINLINE))
-        msg->security |= INLINE;
-      if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
-        msg->security |= INLINE;
-    }
 
     if (msg->security) {
       /* 
@@ -1381,10 +1227,9 @@ int ci_send_message (int flags, /* send mode */
        * 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;
       }
 
@@ -1393,11 +1238,11 @@ int ci_send_message (int flags, /* send mode */
        * 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;
       }
     }
@@ -1420,8 +1265,7 @@ int ci_send_message (int flags, /* send mode */
       && !(flags & (SENDRESEND | SENDPOSTPONED)))
     msg->env->from->personal = m_strdup(Realname);
 
-  if (!(flags & SENDKEY))
-    m_fclose(&tempfp);
+  m_fclose(&tempfp);
 
   if (!(flags & SENDBATCH)) {
     struct stat st;
@@ -1439,11 +1283,11 @@ int ci_send_message (int flags, /* send mode */
      *    setting of $forward_edit because the user probably needs to add the
      *    recipients.
      */
-    if (!(flags & SENDKEY) &&
-        ((flags & SENDFORWARD) == 0 ||
+    if (((flags & SENDFORWARD) == 0 ||
          (option (OPTEDITHDRS) && option (OPTAUTOEDIT)) ||
          query_quadoption (OPT_FORWEDIT,
-                           _("Edit forwarded message?")) == M_YES)) {
+                           _("Edit forwarded message?")) == M_YES))
+    {
       /* If the this isn't a text message, look for a mailcap edit command */
       if (rfc1524_mailcap_isneeded(msg->content)) {
         if (!mutt_edit_attachment (msg->content))
@@ -1469,7 +1313,7 @@ int ci_send_message (int flags, /* send mode */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
     }
 
-    if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDKEY | SENDRESEND))) {
+    if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDRESEND))) {
       if (stat (msg->content->filename, &st) == 0) {
         /* if the file was not modified, bail out now */
         if (mtime == st.st_mtime && !msg->content->next &&
@@ -1514,13 +1358,7 @@ int ci_send_message (int flags, /* send mode */
     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) {
@@ -1556,21 +1394,18 @@ int ci_send_message (int flags, /* send mode */
     }
   }
 
-#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);
@@ -1591,19 +1426,6 @@ int ci_send_message (int flags, /* send mode */
 
     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);
@@ -1799,14 +1621,7 @@ int ci_send_message (int flags, /* send mode */
     }
   }
   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);