X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=91ed81b1e09a5d3e27e775564b823cb2308a9804;hp=82579d51aa58ffc1adca6608c96c36c4099c9745;hb=2aaf39a8b49affb264ef28e7464fc8ef92209c88;hpb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e

diff --git a/send.c b/send.c
index 82579d5..91ed81b 100644
--- a/send.c
+++ b/send.c
@@ -19,7 +19,7 @@
 #include "alias.h"
 #include "keymap.h"
 #include "copy.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 #include "mutt_idna.h"
 #include "attach.h"
 
@@ -29,6 +29,65 @@
 
 #include "remailer.h"
 
+int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
+{
+    char *t;
+    char *tmp;
+    char *headers;
+    char *tag, *value;
+    char scratch[HUGE_STRING];
+
+    int taglen;
+
+    string_list_t **last = &e->userhdrs;
+
+    if (!(t = strchr (src, ':')))
+        return -1;
+
+    if ((tmp = m_strdup(t + 1)) == NULL)
+        return -1;
+
+    if ((headers = strchr (tmp, '?')))
+        *headers++ = '\0';
+
+    url_decode(tmp);
+    e->to = rfc822_parse_adrlist(e->to, tmp);
+
+    tag = headers ? strtok (headers, "&") : NULL;
+
+    for (; tag; tag = strtok(NULL, "&")) {
+        if ((value = strchr (tag, '=')))
+            *value++ = '\0';
+        if (!value || !*value)
+            continue;
+
+        url_decode (tag);
+        url_decode (value);
+
+        if (mime_which_token(tag, -1) == MIME_BODY) {
+            if (body)
+                m_strreplace(body, value);
+        } else {
+#define SAFEPFX (option(OPTSTRICTMAILTO) ? "" : "X-Mailto-")
+            taglen = m_strlen(tag) + strlen(SAFEPFX);
+            /* mutt_parse_rfc822_line makes some assumptions */
+            snprintf(scratch, sizeof(scratch), "%s%s: %s", SAFEPFX, tag, value);
+#undef SAVEPFX
+            scratch[taglen] = '\0';
+            value = vskipspaces(&scratch[taglen + 1]);
+            last  = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);
+            /* if $strict_mailto is set, force editing headers to let
+             * users have a look at what we got */
+            if (!option (OPTSTRICTMAILTO)) {
+                set_option (OPTXMAILTO);
+                set_option (OPTEDITHDRS);
+            }
+        }
+    }
+
+    p_delete(&tmp);
+    return 0;
+}
 static void append_signature (FILE * f)
 {
   FILE *tmpfp;
@@ -38,7 +97,7 @@ static void append_signature (FILE * f)
     fprintf (f, "\n%s", SignOffString);
   }
 
-  if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
+  if ((tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid))) {
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
     else if (SignOffString)
@@ -285,66 +344,85 @@ static char *nntp_get_header(const char *s)
 
 static void process_user_recips (ENVELOPE * env)
 {
-  string_list_t *uh = UserHeader;
+    string_list_t *uh = UserHeader;
 
-  for (; uh; uh = uh->next) {
-    if (ascii_strncasecmp ("to:", uh->data, 3) == 0)
-      env->to = rfc822_parse_adrlist (env->to, uh->data + 3);
-    else if (ascii_strncasecmp ("cc:", uh->data, 3) == 0)
-      env->cc = rfc822_parse_adrlist (env->cc, uh->data + 3);
-    else if (ascii_strncasecmp ("bcc:", uh->data, 4) == 0)
-      env->bcc = rfc822_parse_adrlist (env->bcc, uh->data + 4);
+    for (; uh; uh = uh->next) {
+        const char *p = strchr(uh->data, ':');
+        if (!p)
+            continue;
+
+        switch (mime_which_token(uh->data, p++ - uh->data)) {
+          case MIME_TO:
+            env->to = rfc822_parse_adrlist(env->to, p);
+            break;
+          case MIME_CC:
+            env->cc = rfc822_parse_adrlist(env->cc, p);
+            break;
+          case MIME_BCC:
+            env->bcc = rfc822_parse_adrlist(env->bcc, p);
+            break;
 #ifdef USE_NNTP
-    else if (ascii_strncasecmp ("newsgroups:", uh->data, 11) == 0)
-      env->newsgroups = nntp_get_header (uh->data + 11);
-    else if (ascii_strncasecmp ("followup-to:", uh->data, 12) == 0)
-      env->followup_to = nntp_get_header (uh->data + 12);
-    else if (ascii_strncasecmp ("x-comment-to:", uh->data, 13) == 0)
-      env->x_comment_to = nntp_get_header (uh->data + 13);
+          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;
+        }
+    }
 }
 
-static void process_user_header (ENVELOPE * env)
+static void process_user_header(ENVELOPE * env)
 {
-  string_list_t *uh = UserHeader;
-  string_list_t *last = env->userhdrs;
-
-  if (last)
-    while (last->next)
-      last = last->next;
-
-  for (; uh; uh = uh->next) {
-    if (ascii_strncasecmp ("from:", uh->data, 5) == 0) {
-      /* User has specified a default From: address.  Remove default address */
-      address_list_wipe(&env->from);
-      env->from = rfc822_parse_adrlist (env->from, uh->data + 5);
-    }
-    else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) {
-      address_list_wipe(&env->reply_to);
-      env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
-    }
-    else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
-      m_strreplace(&env->message_id, uh->data + 11);
-    else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
-             ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
-             ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
+    string_list_t *uh;
+    string_list_t **last = string_list_last(&env->userhdrs);
+
+    for (uh = UserHeader; uh; uh = uh->next) {
+        const char *p = strchr(uh->data, ':');
+        if (!p)
+          continue;
+
+        switch (mime_which_token(uh->data, p++ - uh->data)) {
+          case MIME_FROM:
+            /* User has specified a default From: address.  Remove default address */
+            address_list_wipe(&env->from);
+            env->from = rfc822_parse_adrlist(env->from, p);
+            break;
+
+          case MIME_REPLY_TO:
+            address_list_wipe(&env->reply_to);
+            env->reply_to = rfc822_parse_adrlist (env->reply_to, p);
+            break;
+
+          case MIME_MESSAGE_ID:
+            m_strreplace(&env->message_id, p);
+            break;
+
+          case MIME_TO:
+          case MIME_CC:
+          case MIME_BCC:
 #ifdef USE_NNTP
-             ascii_strncasecmp ("newsgroups:", uh->data, 11) != 0 &&
-             ascii_strncasecmp ("followup-to:", uh->data, 12) != 0 &&
-             ascii_strncasecmp ("x-comment-to:", uh->data, 13) != 0 &&
+          case MIME_NEWSGROUPS:
+          case MIME_FOLLOWUP_TO:
+          case MIME_X_COMMENT_TO:
 #endif
-             ascii_strncasecmp ("supersedes:", uh->data, 11) != 0 &&
-             ascii_strncasecmp ("subject:", uh->data, 8) != 0) {
-      if (last) {
-        last->next = string_item_new();
-        last = last->next;
-      }
-      else
-        last = env->userhdrs = string_item_new();
-      last->data = m_strdup(uh->data);
+          case MIME_SUPERSEDES:
+          case MIME_SUPERCEDES:
+          case MIME_SUBJECT:
+            break;
+
+          default:
+            *last = string_item_new();
+            (*last)->data = m_strdup(uh->data);
+            last = &(*last)->next;
+            break;
+        }
     }
-  }
 }
 
 void mutt_forward_intro (FILE * fp, HEADER * cur)
@@ -371,11 +449,6 @@ static int include_forward (CONTEXT * ctx, HEADER * cur, FILE * out)
   mutt_parse_mime_message (ctx, cur);
   mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
 
-  if ((cur->security & ENCRYPT) && option (OPTFORWDECODE)) {
-    /* make sure we have the user's passphrase before proceeding... */
-    crypt_valid_passphrase (cur->security);
-  }
-
   mutt_forward_intro (out, cur);
 
   if (option (OPTFORWDECODE)) {
@@ -420,11 +493,6 @@ static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
   int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
   int chflags = CH_DECODE;
 
-  if ((cur->security & ENCRYPT)) {
-    /* make sure we have the user's passphrase before proceeding... */
-    crypt_valid_passphrase (cur->security);
-  }
-
   mutt_parse_mime_message (ctx, cur);
   mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
 
@@ -832,15 +900,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 ();
 
@@ -910,7 +969,7 @@ void mutt_set_followup_to (ENVELOPE * e)
    from field */
 static address_t *set_reverse_name (ENVELOPE * env)
 {
-    address_t *tmp;
+    address_t *tmp = NULL;
 
     for (tmp = env->to; tmp; tmp = tmp->next) {
         if (mutt_addr_is_user(tmp))
@@ -924,6 +983,8 @@ static address_t *set_reverse_name (ENVELOPE * env)
     if (!mutt_addr_is_user(env->from))
         return NULL;
 
+    tmp = env->from;
+
   found:
     tmp = address_dup(tmp);
     if (!option(OPTREVREAL) || !tmp->personal) {
@@ -942,16 +1003,16 @@ address_t *mutt_default_from (void)
    * Is this the right thing to do?
    */
 
-  if (From)
-    adr = address_dup(From);
-  else if (option (OPTUSEDOMAIN)) {
+  if (MAlias.from)
+    adr = address_dup(MAlias.from);
+  else if (MCore.use_domain) {
     const char *fqdn = mutt_fqdn (1);
     adr = address_new();
-    adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
-    sprintf(adr->mailbox, "%s@%s", NONULL(Username), NONULL(fqdn));
+    adr->mailbox = p_new(char, m_strlen(MCore.username) + m_strlen(fqdn) + 2);
+    sprintf(adr->mailbox, "%s@%s", NONULL(MCore.username), NONULL(fqdn));
   } else {
     adr = address_new ();
-    adr->mailbox = m_strdup(NONULL(Username));
+    adr->mailbox = m_strdup(NONULL(MCore.username));
   }
 
   return (adr);
@@ -964,7 +1025,7 @@ static int send_message (HEADER * msg)
   int i;
 
   /* Write out the message in MIME form. */
-  tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
   if (!tempfp)
     return -1;
 
@@ -1140,7 +1201,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;
@@ -1162,7 +1223,7 @@ int ci_send_message (int flags, /* send mode */
 
     if (!tempfile) {
       char buffer[_POSIX_PATH_MAX];
-      tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL);
+      tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
       msg->content->filename = m_strdup(buffer);
     } else {
       tempfp = safe_fopen(tempfile, "a+");
@@ -1269,17 +1330,12 @@ int ci_send_message (int flags, /* send mode */
     if (option (OPTHDRS))
       process_user_header (msg->env);
 
-
-    if (option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
-      append_signature (tempfp);
-
     /* 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 (!option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
-      append_signature (tempfp);
+    append_signature (tempfp);
 
     /* 
      * this wants to be done _after_ generate_body, so message-hooks
@@ -1297,12 +1353,6 @@ int ci_send_message (int flags, /* send mode */
     if (option (OPTCRYPTREPLYSIGNENCRYPTED) && 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) {
       /* 
@@ -1354,8 +1404,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;
@@ -1373,23 +1422,22 @@ 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))
           goto cleanup;
       } else if (option (OPTEDITHDRS)) {
         mutt_env_to_local (msg->env);
-        mutt_edit_headers (Editor, msg->content->filename, msg, fcc,
-                           sizeof (fcc));
+        mutt_edit_headers(msg->content->filename, msg, fcc, sizeof (fcc));
         mutt_env_to_idna (msg->env, NULL, NULL);
       }
       else {
-        mutt_edit_file (Editor, msg->content->filename);
+        mutt_edit_file(msg->content->filename);
 
         if (stat (msg->content->filename, &st) == 0) {
           if (mtime != st.st_mtime)
@@ -1404,7 +1452,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 &&