kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solves issue with forwarding voicemails from folders other than inbox.

Browse Source 
patch by anthonyl.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@50946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2007-01-15 20:44:53 +00:00
parent 321c032c5e
commit 741131aaa2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_voicemail.c
View File

@@ -2349,7 +2349,7 @@ static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, int msgnum, long duration, char *fmt, char *cidnum, char *cidname);
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];
char *frombox = mbox(imbox);
@@ -2358,8 +2358,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");
make_dir(fromdir, sizeof(fromdir), vmu->context, vmu->mailbox, frombox);
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);
if (vm_lock_path(todir))
@@ -2700,7 +2704,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);
}
}
@@ -3616,7 +3620,7 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
cmd = vm_forwardoptions(chan, sender, dir, curmsg, vmfmts, context, record_gain, &duration);
if (!cmd) {
while (!res && vmtmp) {
copy_message(chan, sender, 0, curmsg, duration, vmtmp, fmt);
copy_message(chan, sender, 0, curmsg, duration, vmtmp, fmt, dir);
saved_messages++;
vmfree = vmtmp;