|
|
@ -1859,7 +1859,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
|
|
|
|
memset(passdata, 0, vmlen);
|
|
|
|
memset(passdata, 0, vmlen);
|
|
|
|
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, cidnum, cidname, dur, date, passdata, vmlen, category);
|
|
|
|
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, cidnum, cidname, dur, date, passdata, vmlen, category);
|
|
|
|
pbx_substitute_variables_helper(ast, fromstring, passdata, vmlen);
|
|
|
|
pbx_substitute_variables_helper(ast, fromstring, passdata, vmlen);
|
|
|
|
len_passdata = strlen(passdata) * 2 + 1;
|
|
|
|
len_passdata = strlen(passdata) * 2 + 3;
|
|
|
|
passdata2 = alloca(len_passdata);
|
|
|
|
passdata2 = alloca(len_passdata);
|
|
|
|
fprintf(p, "From: %s <%s>\r\n", quote(passdata, passdata2, len_passdata), who);
|
|
|
|
fprintf(p, "From: %s <%s>\r\n", quote(passdata, passdata2, len_passdata), who);
|
|
|
|
} else
|
|
|
|
} else
|
|
|
@ -1869,7 +1869,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
|
|
|
|
ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
|
|
|
|
ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|
fprintf(p, "From: Asterisk PBX <%s>\r\n", who);
|
|
|
|
fprintf(p, "From: Asterisk PBX <%s>\r\n", who);
|
|
|
|
len_passdata = strlen(vmu->fullname) * 2 + 1;
|
|
|
|
len_passdata = strlen(vmu->fullname) * 2 + 3;
|
|
|
|
passdata2 = alloca(len_passdata);
|
|
|
|
passdata2 = alloca(len_passdata);
|
|
|
|
fprintf(p, "To: %s <%s>\r\n", quote(vmu->fullname, passdata2, len_passdata), vmu->email);
|
|
|
|
fprintf(p, "To: %s <%s>\r\n", quote(vmu->fullname, passdata2, len_passdata), vmu->email);
|
|
|
|
if (emailsubject) {
|
|
|
|
if (emailsubject) {
|
|
|
|