diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-12 06:15:56 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-12 06:15:56 +0000 |
| commit | b94831a7c32915ee03247930391e28c3d7c7a56b (patch) | |
| tree | f97cfe68305994dbb126edd1442b1c1304195e05 | |
| parent | b4a56d7afb714509e2e776caba3baa087877d09e (diff) | |
Merged revisions 7999 via svnmerge from
/branches/1.2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8000 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 4 | ||||
| -rw-r--r-- | configs/voicemail.conf.sample | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 76407d018..4950e3608 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -451,7 +451,7 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v ast_copy_string(vmu->language, value, sizeof(vmu->language)); } else if (!strcasecmp(var, "tz")) { ast_copy_string(vmu->zonetag, value, sizeof(vmu->zonetag)); - } else if (!strcasecmp(var, "delete")) { + } else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) { ast_set2_flag(vmu, ast_true(value), VM_DELETE); } else if (!strcasecmp(var, "saycid")){ ast_set2_flag(vmu, ast_true(value), VM_SAYCID); @@ -2593,8 +2593,8 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ } } if (ast_fileexists(fn, NULL, NULL)) { - notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name); STORE(dir, vmu->mailbox, vmu->context, msgnum); + notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name); DISPOSE(dir, msgnum); } pbx_builtin_setvar_helper(chan, "VMSTATUS", "SUCCESS"); diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample index 8558235a6..fa362c95d 100644 --- a/configs/voicemail.conf.sample +++ b/configs/voicemail.conf.sample @@ -172,6 +172,7 @@ sendvoicemail=yes ; Context to Send voicemail from [option 5 from the advanced m ; This does NOT affect option 3,3 from the advanced options menu ; delete=yes ; After notification, the voicemail is deleted from the server. [per-mailbox only] ; This is intended for use with users who wish to receive their voicemail ONLY by email. + ; Note: deletevoicemail is provided as an equivalent option for Realtime configuration. ; nextaftercmd=yes ; Skips to the next message after hitting 7 or 9 to delete/save current message. ; [global option only at this time] ; forcename=yes ; Forces a new user to record their name. A new user is |