diff options
| author | Matt O'Gorman <mogorman@digium.com> | 2007-01-15 21:12:56 +0000 |
|---|---|---|
| committer | Matt O'Gorman <mogorman@digium.com> | 2007-01-15 21:12:56 +0000 |
| commit | da9d86bfc28a4041ee88149b3dd08b2f45e82723 (patch) | |
| tree | fe50377551ccce7fe4ac1a928521fe25e18269e9 /apps/app_voicemail.c | |
| parent | 23b4d04cb93d59edbf88a899e2387d540dad98fa (diff) | |
Merged revisions 50957 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4
................
r50957 | mogorman | 2007-01-15 15:08:07 -0600 (Mon, 15 Jan 2007) | 12 lines
Merged revisions 50946 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r50946 | mogorman | 2007-01-15 14:44:53 -0600 (Mon, 15 Jan 2007) | 4 lines
Solves issue with forwarding voicemails from folders other than inbox.
patch by anthonyl.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 6a1ce5f5d..67686ab41 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2678,7 +2678,7 @@ static int messagecount(const char *context, const char *mailbox, const char *fo #endif #ifndef IMAP_STORAGE /* copy message only used by file storage */ -static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int imbox, int msgnum, long duration, struct ast_vm_user *recip, char *fmt) +static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int imbox, int msgnum, long duration, struct ast_vm_user *recip, char *fmt, char *dir) { char fromdir[PATH_MAX], todir[PATH_MAX], frompath[PATH_MAX], topath[PATH_MAX]; const char *frombox = mbox(imbox); @@ -2687,8 +2687,12 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i ast_log(LOG_NOTICE, "Copying message from %s@%s to %s@%s\n", vmu->mailbox, vmu->context, recip->mailbox, recip->context); create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, "INBOX"); + + if (!dir) + make_dir(fromdir, sizeof(fromdir), vmu->context, vmu->mailbox, frombox); + else + ast_copy_string(fromdir, dir, sizeof(fromdir)); - make_dir(fromdir, sizeof(fromdir), vmu->context, vmu->mailbox, frombox); make_file(frompath, sizeof(frompath), fromdir, msgnum); make_dir(todir, sizeof(todir), recip->context, recip->mailbox, frombox); @@ -3191,7 +3195,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ context++; } if ((recip = find_user(&recipu, context, exten))) { - copy_message(chan, vmu, 0, msgnum, duration, recip, fmt); + copy_message(chan, vmu, 0, msgnum, duration, recip, fmt, dir); free_user(recip); } } @@ -4192,7 +4196,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st sendmail(myserveremail, vmtmp, todircount, vmtmp->context, vmtmp->mailbox, S_OR(chan->cid.cid_num, NULL), S_OR(chan->cid.cid_name, NULL), vms->fn, fmt, duration, attach_user_voicemail, chan, NULL); #else - copy_message(chan, sender, 0, curmsg, duration, vmtmp, fmt); + copy_message(chan, sender, 0, curmsg, duration, vmtmp, fmt, dir); #endif saved_messages++; AST_LIST_REMOVE_CURRENT(&extensions, list); |