diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-04-15 00:19:27 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-04-15 00:19:27 +0000 |
| commit | 0cc1bf692bcfc7f3f9ffef9d62c6621cd9ab9f4a (patch) | |
| tree | c64d488cef73dca0411c8cf763badac4c88bbd14 | |
| parent | 51aec737506aeeb32bcd7b14fcf6e783ec0dcb29 (diff) | |
Make paging support apply to forwarded messages too
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@851 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | apps/app_voicemail.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 50427e3a6..52a570cb9 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1400,10 +1400,12 @@ forward_message(struct ast_channel *chan, struct ast_config *cfg, char *dir, int char sys[256]; char todir[256]; int todircount=0; + long duration; struct ast_config *mif; char miffile[256]; - char *copy, *name, *passwd, *email; - char *mycopy, *myname, *mypasswd, *myemail; + char *copy, *name, *passwd, *email, *pager; + char *mycopy, *myname, *mypasswd, *myemail, *mypager; + char *astemail; char fn[256]; char callerid[512]; @@ -1454,6 +1456,7 @@ forward_message(struct ast_channel *chan, struct ast_config *cfg, char *dir, int passwd = strsep(&stringp, ","); name = strsep(&stringp, ","); email = strsep(&stringp, ","); + pager = strsep(&stringp, ","); } if ((mycopy = ast_variable_retrieve(cfg, NULL, myusername))) { @@ -1464,18 +1467,22 @@ forward_message(struct ast_channel *chan, struct ast_config *cfg, char *dir, int mypasswd = strsep(&mystringp, ","); myname = strsep(&mystringp, ","); myemail = strsep(&mystringp, ","); + mypager = strsep(&mystringp, ","); } - if (email) { - snprintf(callerid, sizeof(callerid), "FWD from: %s from %s", myname, ast_variable_retrieve(mif, NULL, "callerid")); - sendmail(ast_variable_retrieve(cfg, "general", "serveremail"), - email, name, todircount, username, - callerid, - fn, - "wav", - atol(ast_variable_retrieve(mif, NULL, "duration")) - ); - } + /* set the outbound email from address */ + if (!(astemail = ast_variable_retrieve(cfg, "general", "serveremail"))) + astemail = ASTERISK_USERNAME; + + /* set callerid and duration variables */ + snprintf(callerid, sizeof(callerid), "FWD from: %s from %s", myname, ast_variable_retrieve(mif, NULL, "callerid")); + duration = atol(ast_variable_retrieve(mif, NULL, "duration")); + + if (email) + sendmail(astemail, email, name, todircount, username, callerid, fn, "wav", atol(ast_variable_retrieve(mif, NULL, "duration"))); + + if (pager) + sendpage(astemail, pager, todircount, username, callerid, duration); free(copy); /* no leaks here */ free(mycopy); /* or here */ |