Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

add patchfrom MODAPP-42

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6153 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-11-02 21:58:04 +00:00
parent f46b6ffa71
commit 0bc3be529d
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/voicemail.conf.xml
View File

@ -29,6 +29,11 @@
<param name="restart-key" value="1"/> <param name="restart-key" value="1"/>
<param name="ff-key" value="6"/> <param name="ff-key" value="6"/>
<param name="rew-key" value="4"/> <param name="rew-key" value="4"/>
<!-- the next two both must be set for this to be enabled
the extension is in the format of <dest> [<dialplan>] [<context>]
-->
<param name="operator-extension" value="operator XML default"/>
<param name="operator-key" value="9"/>
<email> <email>
<body><![CDATA[At ${voicemail_time} you were left a message from ${voicemail_caller_id_name} ${voicemail_caller_id_number} <body><![CDATA[At ${voicemail_time} you were left a message from ${voicemail_caller_id_name} ${voicemail_caller_id_number}
to your account ${voicemail_account}@${voicemail_domain} to your account ${voicemail_account}@${voicemail_domain}

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

@ -38,7 +38,7 @@
#ifdef _MSC_VER /* compilers are stupid sometimes */ #ifdef _MSC_VER /* compilers are stupid sometimes */
#define TRY_CODE(code) for(;;) {status = code; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto end; } break;} #define TRY_CODE(code) for(;;) {status = code; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto end; } break;}
#else #else
#define TRY_CODE(code) do {status = code; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto end; } break;} while(status) #define TRY_CODE(code) do { status = code; if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto end; } break;} while(status)
#endif #endif
SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load); SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load);
@ -78,7 +78,9 @@ struct vm_profile {
char ff_key[2]; char ff_key[2];
char rew_key[2]; char rew_key[2];
char urgent_key[2]; char urgent_key[2];
char operator_key[2];
char file_ext[10]; char file_ext[10];
char *operator_ext;
char *tone_spec; char *tone_spec;
char *storage_dir; char *storage_dir;
char *callback_dialplan; char *callback_dialplan;
@ -284,6 +286,8 @@ static switch_status_t load_config(void)
char *ff_key = "6"; char *ff_key = "6";
char *rew_key = "4"; char *rew_key = "4";
char *urgent_key = "*"; char *urgent_key = "*";
char *operator_key = "";
char *operator_ext = "";
char *tone_spec = "%(1000, 0, 640)"; char *tone_spec = "%(1000, 0, 640)";
char *file_ext = "wav"; char *file_ext = "wav";
char *storage_dir = ""; char *storage_dir = "";
@ -368,6 +372,10 @@ static switch_status_t load_config(void)
rew_key = val; rew_key = val;
} else if (!strcasecmp(var, "urgent-key") && !switch_strlen_zero(val)) { } else if (!strcasecmp(var, "urgent-key") && !switch_strlen_zero(val)) {
urgent_key = val; urgent_key = val;
} else if (!strcasecmp(var, "operator-key") && !switch_strlen_zero(val)) {
operator_key = val;
} else if (!strcasecmp(var, "operator-extension") && !switch_strlen_zero(val)) {
operator_ext = val;
} else if (!strcasecmp(var, "storage-dir") && !switch_strlen_zero(val)) { } else if (!strcasecmp(var, "storage-dir") && !switch_strlen_zero(val)) {
storage_dir = val; storage_dir = val;
} else if (!strcasecmp(var, "callback-dialplan") && !switch_strlen_zero(val)) { } else if (!strcasecmp(var, "callback-dialplan") && !switch_strlen_zero(val)) {
@ -492,8 +500,10 @@ static switch_status_t load_config(void)
*profile->ff_key = *ff_key; *profile->ff_key = *ff_key;
*profile->rew_key = *rew_key; *profile->rew_key = *rew_key;
*profile->urgent_key = *urgent_key; *profile->urgent_key = *urgent_key;
*profile->operator_key = *operator_key;
profile->operator_ext = switch_core_strdup(globals.pool, operator_ext);
profile->storage_dir = switch_core_strdup(globals.pool, storage_dir); profile->storage_dir = switch_core_strdup(globals.pool, storage_dir);
profile->tone_spec = switch_core_strdup(globals.pool, tone_spec); profile->tone_spec = switch_core_strdup(globals.pool, tone_spec);
profile->callback_dialplan = switch_core_strdup(globals.pool, callback_dialplan); profile->callback_dialplan = switch_core_strdup(globals.pool, callback_dialplan);
@ -1665,6 +1675,20 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, cons
if (*buf != '\0') { if (*buf != '\0') {
if (!strcasecmp(buf, profile->main_menu_key)) { if (!strcasecmp(buf, profile->main_menu_key)) {
voicemail_check_main(session, profile_name, domain_name, id, 0); voicemail_check_main(session, profile_name, domain_name, id, 0);
} else if(!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) {
int argc;
char *argv[4];
char *mycmd;
if (!switch_strlen_zero(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext))) {
argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
if(argc >= 1 && argc <= 4) {
switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
/* the application still runs after we leave it so we need to make sure that we dont do anything evil */
send_mail=0;
goto end;
}
}
} else { } else {
goto greet; goto greet;
} }