From 23b6f866504ecd1c88b4e1f2134d01c7bc9608ff Mon Sep 17 00:00:00 2001 From: russell Date: Mon, 26 Mar 2007 18:33:50 +0000 Subject: Somehow the code for building the email for voicemail got out of sync. This change makes a few tweaks to get 1.4 in sync with trunk. (issue #9301) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@59217 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_voicemail.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'apps') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index c37467900..184ef125f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1905,7 +1905,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in fprintf(p, "Subject: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox); else fprintf(p, "Subject: [PBX]: New message %d in mailbox %s" ENDL, msgnum + 1, mailbox); - fprintf(p, "Message-ID: " ENDL, msgnum, (unsigned int)ast_random(), mailbox, getpid(), host); + fprintf(p, "Message-ID: " ENDL, msgnum + 1, (unsigned int)ast_random(), mailbox, getpid(), host); if(imap) { /* additional information needed for IMAP searching */ fprintf(p, "X-Asterisk-VM-Message-Num: %d" ENDL, msgnum + 1); @@ -1930,7 +1930,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in fprintf(p, "MIME-Version: 1.0" ENDL); if (attach_user_voicemail) { /* Something unique. */ - snprintf(bound, sizeof(bound), "voicemail_%d%s%d%d", msgnum, mailbox, getpid(), (unsigned int)ast_random()); + snprintf(bound, sizeof(bound), "voicemail_%d%s%d%d", msgnum + 1, mailbox, getpid(), (unsigned int)ast_random()); fprintf(p, "Content-Type: multipart/mixed; boundary=\"%s\"" ENDL ENDL ENDL, bound); @@ -1946,7 +1946,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in memset(passdata, 0, vmlen); prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, cidnum, cidname, dur, date, passdata, vmlen, category); pbx_substitute_variables_helper(ast, emailbody, passdata, vmlen); - fprintf(p, "%s\r\n", passdata); + fprintf(p, "%s" ENDL, passdata); } else ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n"); ast_channel_free(ast); @@ -1978,19 +1978,19 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in ast_log(LOG_DEBUG, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox); } fprintf(p, "--%s" ENDL, bound); - fprintf(p, "Content-Type: %s%s; name=\"msg%04d.%s\"" ENDL, ctype, format, msgnum, format); + fprintf(p, "Content-Type: %s%s; name=\"msg%04d.%s\"" ENDL, ctype, format, msgnum + 1, format); fprintf(p, "Content-Transfer-Encoding: base64" ENDL); fprintf(p, "Content-Description: Voicemail sound attachment." ENDL); - fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.%s\"" ENDL ENDL, msgnum, format); + fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.%s\"" ENDL ENDL, msgnum + 1, format); snprintf(fname, sizeof(fname), "%s.%s", attach, format); base_encode(fname, p); /* only attach if necessary */ if (imap && !strcmp(format, "gsm")) { fprintf(p, "--%s" ENDL, bound); - fprintf(p, "Content-Type: audio/x-gsm; name=\"msg%04d.%s\"" ENDL, msgnum, format); + fprintf(p, "Content-Type: audio/x-gsm; name=\"msg%04d.%s\"" ENDL, msgnum + 1, format); fprintf(p, "Content-Transfer-Encoding: base64" ENDL); fprintf(p, "Content-Description: Voicemail sound attachment." ENDL); - fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.gsm\"" ENDL ENDL, msgnum); + fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.gsm\"" ENDL ENDL, msgnum + 1); snprintf(fname, sizeof(fname), "%s.gsm", attach); base_encode(fname, p); } -- cgit v1.2.3