mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-21 12:54:56 +00:00
Merged revisions 14821 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r14821 | tilghman | 2006-03-24 22:09:04 -0600 (Fri, 24 Mar 2006) | 2 lines Bug 6783 - When context is specified, voicemail should look for mailboxes in that context ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14822 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3473,11 +3473,13 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
|
|||||||
return res;
|
return res;
|
||||||
if (flag==1) {
|
if (flag==1) {
|
||||||
struct leave_vm_options leave_options;
|
struct leave_vm_options leave_options;
|
||||||
|
char mailbox[AST_MAX_EXTENSION * 2 + 2];
|
||||||
|
snprintf(mailbox, sizeof(mailbox), "%s@%s", username, context);
|
||||||
|
|
||||||
/* Send VoiceMail */
|
/* Send VoiceMail */
|
||||||
memset(&leave_options, 0, sizeof(leave_options));
|
memset(&leave_options, 0, sizeof(leave_options));
|
||||||
leave_options.record_gain = record_gain;
|
leave_options.record_gain = record_gain;
|
||||||
cmd = leave_voicemail(chan, username, &leave_options);
|
cmd = leave_voicemail(chan, mailbox, &leave_options);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
/* Forward VoiceMail */
|
/* Forward VoiceMail */
|
||||||
@@ -6635,13 +6637,15 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
|
|||||||
} else {
|
} else {
|
||||||
if (find_user(NULL, vmu->context, num)) {
|
if (find_user(NULL, vmu->context, num)) {
|
||||||
struct leave_vm_options leave_options;
|
struct leave_vm_options leave_options;
|
||||||
|
char mailbox[AST_MAX_EXTENSION * 2 + 2];
|
||||||
|
snprintf(mailbox, sizeof(mailbox), "%s@%s", num, vmu->context);
|
||||||
|
|
||||||
if (option_verbose > 2)
|
if (option_verbose > 2)
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Leaving voicemail for '%s' in context '%s'\n", num, vmu->context);
|
ast_verbose(VERBOSE_PREFIX_3 "Leaving voicemail for '%s' in context '%s'\n", num, vmu->context);
|
||||||
|
|
||||||
memset(&leave_options, 0, sizeof(leave_options));
|
memset(&leave_options, 0, sizeof(leave_options));
|
||||||
leave_options.record_gain = record_gain;
|
leave_options.record_gain = record_gain;
|
||||||
res = leave_voicemail(chan, num, &leave_options);
|
res = leave_voicemail(chan, mailbox, &leave_options);
|
||||||
if (!res)
|
if (!res)
|
||||||
res = 't';
|
res = 't';
|
||||||
return res;
|
return res;
|
||||||
|
Reference in New Issue
Block a user