kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tweak 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6406 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-11-27 01:15:13 +00:00
parent e715379871
commit ba448989c8
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,8 +297,8 @@ static switch_status_t load_config(void)
char *storage_dir = "";
char *callback_dialplan = "XML";
char *callback_context = "default";
char *email_body = "";
char *email_headers = "";
char *email_body = NULL;
char *email_headers = NULL;
char *email_from = "";
char *date_fmt = "%A, %B %d %Y, %I %M %p";
uint32_t record_threshold = 200;
@ -311,12 +311,12 @@ static switch_status_t load_config(void)
db = NULL;
if ((x_email = switch_xml_child(x_profile, "email"))) {
if ((param = switch_xml_child(x_email,"body"))) {
email_body = switch_core_strdup(globals.pool,param->txt);
if ((param = switch_xml_child(x_email, "body"))) {
email_body = switch_core_strdup(globals.pool, param->txt);
}
if ((param = switch_xml_child(x_email,"headers"))) {
email_headers = switch_core_strdup(globals.pool,param->txt);
if ((param = switch_xml_child(x_email, "headers"))) {
email_headers = switch_core_strdup(globals.pool, param->txt);
}
@ -1120,11 +1120,11 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
switch_event_fire(&event);
}
if(!switch_strlen_zero(profile->email_headers)) {
body = switch_mprintf("Voicemail from %s %s",
cbt->cid_name, cbt->cid_number);
if (profile->email_body) {
body = switch_channel_expand_variables(channel, profile->email_body);
} else {
body = switch_channel_expand_variables(channel,profile->email_body);
body = switch_mprintf("%u second Voicemail from %s %s", message_len,
cbt->cid_name, cbt->cid_number);
}
switch_simple_email(cbt->email, from, header_string, body, cbt->file_path);
@ -1913,11 +1913,12 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, cons
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "voicemail");
switch_event_fire(&event);
}
if (!switch_strlen_zero(profile->email_headers)) {
body = switch_mprintf("Voicemail from %s %s",
caller_profile->caller_id_name, caller_profile->caller_id_number);
if (profile->email_body) {
body = switch_channel_expand_variables(channel, profile->email_body);
} else {
body = switch_channel_expand_variables(channel,profile->email_body);
body = switch_mprintf("%u second Voicemail from %s %s", message_len,
caller_profile->caller_id_name, caller_profile->caller_id_number);
}
if (email_attach) {

2
src/switch_utils.c
View File

@ -220,7 +220,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, const char *fr
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf);
}
//unlink(filename);
unlink(filename);
if (file) {