[Freeswitch-svn] [commit] r12850 - freeswitch/trunk/src/mod/applications/mod_voicemail
FreeSWITCH SVN
anthm at freeswitch.org
Tue Mar 31 06:14:16 PDT 2009
Author: anthm
Date: Tue Mar 31 08:14:16 2009
New Revision: 12850
Log:
MODAPP-240
Modified:
freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Mar 31 08:14:16 2009
@@ -2997,24 +2997,34 @@
}
}
- switch_channel_get_variables(channel, &vars);
- status = deliver_vm(profile, x_user, domain_name, file_path, message_len, read_flags, vars,
- switch_core_session_get_pool(session), caller_id_name, caller_id_number, SWITCH_FALSE);
- switch_event_destroy(&vars);
- if (status == SWITCH_STATUS_SUCCESS) {
- if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) {
- char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name);
- if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
+ switch_event_t *params = NULL;
+
+ switch_event_create(¶ms, SWITCH_EVENT_REQUEST_PARAMS);
+ switch_assert(params);
+ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", id);
+
+ if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"),
+ &x_domain_root, &x_domain, &x_user, NULL, params) == SWITCH_STATUS_SUCCESS) {
+
+ switch_channel_get_variables(channel, &vars);
+ status = deliver_vm(profile, x_user, domain_name, file_path, message_len, read_flags, vars,
+ switch_core_session_get_pool(session), caller_id_name, caller_id_number, SWITCH_FALSE);
+ switch_event_destroy(&vars);
+ if (status == SWITCH_STATUS_SUCCESS) {
+ if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) {
+ char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name);
+ if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
+ }
}
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to deliver message\n");
+ TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL));
}
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to deliver message\n");
- TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL));
}
-
+ switch_event_destroy(¶ms);
end:
if (x_domain_root) {
More information about the Freeswitch-svn
mailing list