diff options
| author | Jonathan Rose <jrose@digium.com> | 2011-11-16 14:56:03 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2011-11-16 14:56:03 +0000 |
| commit | 2d67b1b37878a799be9716de2ed1087a5687ac58 (patch) | |
| tree | 940c60b71ba3e0c0273860469e6dd579efdaeb83 /apps | |
| parent | a86037d9591ee66080c6c4803a984ba26b572992 (diff) | |
Guarantee messages go into the right folders with multiple recipients
Before, using the U flag in Voicemail with multiple recipients would put urgent messages
in the INBOX folder for all users past the first thanks to a bug with the message
copying function. This would also cause messages to fail to be sent if the INBOX
directory hadn't been created for that mailbox yet.
(closes issue ASTERISK-18245)
Reported by: Matt Jordan
(closes issue ASTERISK-18246)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/1589/
........
Merged revisions 345487 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 345488 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@345489 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 1e2942b83..be604f0c1 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5303,24 +5303,27 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i { char fromdir[PATH_MAX], todir[PATH_MAX], frompath[PATH_MAX], topath[PATH_MAX]; const char *frombox = mbox(vmu, imbox); + const char *userfolder; int recipmsgnum; int res = 0; ast_log(AST_LOG_NOTICE, "Copying message from %s@%s to %s@%s\n", vmu->mailbox, vmu->context, recip->mailbox, recip->context); if (!ast_strlen_zero(flag) && !strcmp(flag, "Urgent")) { /* If urgent, copy to Urgent folder */ - create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, "Urgent"); + userfolder = "Urgent"; } else { - create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, "INBOX"); + userfolder = "INBOX"; } - + + create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, userfolder); + if (!dir) make_dir(fromdir, sizeof(fromdir), vmu->context, vmu->mailbox, frombox); else ast_copy_string(fromdir, dir, sizeof(fromdir)); make_file(frompath, sizeof(frompath), fromdir, msgnum); - make_dir(todir, sizeof(todir), recip->context, recip->mailbox, "INBOX"); + make_dir(todir, sizeof(todir), recip->context, recip->mailbox, userfolder); if (vm_lock_path(todir)) return ERROR_LOCK_PATH; @@ -6037,7 +6040,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ while (tmpptr) { struct ast_vm_user recipu, *recip; char *exten, *cntx; - + exten = strsep(&tmpptr, "&"); cntx = strchr(exten, '@'); if (cntx) { |