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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 6a1ce5f5d1e9a872ede590c4390bdd0b0663a9b2..67686ab417f5a76efe56f24ad69e1d41fa0fe24c 100644 (file)
--- 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);