diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-08-06 21:30:39 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-08-06 21:30:39 +0000 |
| commit | ef7f8017585d3d2c4f7d7a0de39cd46063465f44 (patch) | |
| tree | 0dce2cedebb814d05b0cf79e05d1fa08c6e280a6 /apps/app_voicemail.c | |
| parent | e8d4d3e6a2df01cefc8e51aec1ce64ae4e392898 (diff) | |
Fix pager voicemail notification from string (bug #2142), MOG's first patch!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3585 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rwxr-xr-x | apps/app_voicemail.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 7f22806ad..c66d845ac 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -275,6 +275,7 @@ static char *emailbody = NULL; static int pbxskip = 0; static char *emailsubject = NULL; static char fromstring[100]; +static char pagerfromstring[100]; static char emailtitle[100]; static char charset[32] = "ISO-8859-1"; @@ -1031,7 +1032,23 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *mailbox, char strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", &tm); fprintf(p, "Date: %s\n", date); - fprintf(p, "From: Asterisk PBX <%s>\n", who); + + if (*pagerfromstring) { + struct ast_channel *ast = ast_channel_alloc(0); + if (ast) { + char *passdata; + int vmlen = strlen(fromstring)*3 + 200; + if ((passdata = alloca(vmlen))) { + memset(passdata, 0, vmlen); + prep_email_sub_vars(ast,vmu,msgnum + 1,mailbox,callerid,dur,date,passdata, vmlen); + pbx_substitute_variables_helper(ast,pagerfromstring,passdata,vmlen); + fprintf(p, "From: %s <%s>\n",passdata,who); + } else + ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n"); + ast_channel_free(ast); + } else ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n"); + } else + fprintf(p, "From: Asterisk PBX <%s>\n", who); fprintf(p, "To: %s\n", pager); fprintf(p, "Subject: New VM\n\n"); strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm); @@ -4431,6 +4448,7 @@ static int load_config(void) cat = ast_category_browse(cfg, cat); } memset(fromstring,0,sizeof(fromstring)); + memset(pagerfromstring,0,sizeof(pagerfromstring)); memset(emailtitle,0,sizeof(emailtitle)); strncpy(charset, "ISO-8859-1", sizeof(charset) - 1); if (emailbody) { @@ -4445,6 +4463,8 @@ static int load_config(void) pbxskip = ast_true(s); if ((s=ast_variable_retrieve(cfg, "general", "fromstring"))) strncpy(fromstring,s,sizeof(fromstring)-1); + if ((s=ast_variable_retrieve(cfg, "general", "pagerfromstring"))) + strncpy(pagerfromstring,s,sizeof(pagerfromstring)-1); if ((s=ast_variable_retrieve(cfg, "general", "charset"))) strncpy(charset,s,sizeof(charset)-1); if ((s=ast_variable_retrieve(cfg, "general", "emailtitle"))) { |