kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-24 11:48:48 +00:00
Code Issues Projects Releases Wiki Activity

fix vm_inject to a group and change syntax for sending to a whole domain to domain= for clarity sake

Browse Source
This commit is contained in:
Anthony Minessale 2010-09-10 12:55:50 -05:00 committed by Brian West
parent fb48d5ca9d
commit f30a1cc688
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -2687,23 +2687,29 @@ static switch_status_t voicemail_inject(const char *data, switch_core_session_t
if ((domain = strchr(user, '@'))) { if ((domain = strchr(user, '@'))) {
*domain++ = '\0'; *domain++ = '\0';
} else {
domain = user;
}
if ((profile_name = strchr(domain, '@'))) { if ((profile_name = strchr(domain, '@'))) {
*profile_name++ = '\0'; *profile_name++ = '\0';
} else { } else {
profile_name = domain; profile_name = domain;
}
} }
if (switch_stristr("group=", user)) { if (switch_stristr("group=", user)) {
user += 6; user += 6;
isgroup++; isgroup++;
} else if (user == domain) { } else if (switch_stristr("domain=", user)) {
user += 7;
domain = user;
profile_name = domain;
isall++; isall++;
} }
if (zstr(domain)) {
domain = switch_core_get_variable("domain");
profile_name = domain;
}
if (!(user && domain)) { if (!(user && domain)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid syntax [%s][%s]\n", switch_str_nil(user), switch_str_nil(domain)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid syntax [%s][%s]\n", switch_str_nil(user), switch_str_nil(domain));
status = SWITCH_STATUS_FALSE; status = SWITCH_STATUS_FALSE;
@ -2747,6 +2753,7 @@ static switch_status_t voicemail_inject(const char *data, switch_core_session_t
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate domain %s\n", domain); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate domain %s\n", domain);
status = SWITCH_STATUS_FALSE; status = SWITCH_STATUS_FALSE;
switch_event_destroy(&my_params); switch_event_destroy(&my_params);
profile_rwunlock(profile);
goto end; goto end;
} }
@ -3962,7 +3969,7 @@ static void do_web(vm_profile_t *profile, const char *user_in, const char *domai
} }
} }
#define VM_INJECT_USAGE "[group=]<box> <sound_file> [<cid_num>] [<cid_name>]" #define VM_INJECT_USAGE "[group=<group>[@domain]|domain=<domain>|<box>[@<domain>]] <sound_file> [<cid_num>] [<cid_name>]"
SWITCH_STANDARD_API(voicemail_inject_api_function) SWITCH_STANDARD_API(voicemail_inject_api_function)
{ {
if (voicemail_inject(cmd, session) == SWITCH_STATUS_SUCCESS) { if (voicemail_inject(cmd, session) == SWITCH_STATUS_SUCCESS) {