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

Fix voicemail forwarding when using ODBC storage.

Browse Source 
(closes issue #13387)
Reported by: moliveras
Patches:
      13387.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, moliveras



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@140850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-09-03 14:29:15 +00:00
parent cb07ce5fa0
commit 3bf0a6c221
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_voicemail.c
View File

@@ -3515,7 +3515,18 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i
recipmsgnum++; recipmsgnum++;
} while (recipmsgnum < recip->maxmsg); } while (recipmsgnum < recip->maxmsg);
if (recipmsgnum < recip->maxmsg) { if (recipmsgnum < recip->maxmsg) {
if (EXISTS(fromdir, msgnum, frompath, chan->language)) {
COPY(fromdir, msgnum, todir, recipmsgnum, recip->mailbox, recip->context, frompath, topath); COPY(fromdir, msgnum, todir, recipmsgnum, recip->mailbox, recip->context, frompath, topath);
} else {
/* For ODBC storage, if the file we want to copy isn't yet in the database, then the SQL
* copy will fail. Instead, we need to create a local copy, store it, and delete the local
* copy. We don't have to #ifdef this because if file storage reaches this point, there's a
* much worse problem happening and IMAP storage doesn't call this function
*/
copy_plain_file(frompath, topath);
STORE(todir, recip->mailbox, recip->context, recipmsgnum, chan, recip, fmt, duration, NULL);
vm_delete(topath);
}
} else { } else {
ast_log(LOG_ERROR, "Recipient mailbox %s@%s is full\n", recip->mailbox, recip->context); ast_log(LOG_ERROR, "Recipient mailbox %s@%s is full\n", recip->mailbox, recip->context);
} }
@@ -4743,7 +4754,6 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
snprintf(duration_str, 11, "%d", prepend_duration); snprintf(duration_str, 11, "%d", prepend_duration);
if (!ast_variable_update(msg_cat, "duration", duration_str, NULL, 0)) { if (!ast_variable_update(msg_cat, "duration", duration_str, NULL, 0)) {
config_text_file_save(textfile, msg_cfg, "app_voicemail"); config_text_file_save(textfile, msg_cfg, "app_voicemail");
STORE(curdir, vmu->mailbox, context, curmsg, chan, vmu, vmfmts, prepend_duration, vms);
} }
} }
@@ -5054,6 +5064,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
/* Remove surrogate file */ /* Remove surrogate file */
vm_delete(msgfile); vm_delete(msgfile);
DISPOSE(dir, curmsg);
} }
/* If anything failed above, we still have this list to free */ /* If anything failed above, we still have this list to free */