Author: anthm Date: Fri Oct 10 16:30:05 2008 New Revision: 9945 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_time.c Log: fix voicemail e-mail time 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 Fri Oct 10 16:30:05 2008 @@ -2222,8 +2222,10 @@ message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); - switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); + if (switch_strlen_zero(vm_timezone) || (switch_strftime_tz(vm_timezone, profile->date_fmt, date, sizeof(date)) != SWITCH_STATUS_SUCCESS)) { + switch_time_exp_lt(&tm, switch_timestamp_now()); + switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); + } switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_current_folder", myfolder); switch_snprintf(tmpvar, sizeof(tmpvar), "%d", total_new_messages); @@ -2240,15 +2242,7 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_caller_id_name", caller_id_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_file_path", file_path); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_read_flags", read_flags); - - if (!switch_strlen_zero(vm_timezone)) { - char tz_date[80] = ""; - if ((switch_strftime_tz(vm_timezone, profile->date_fmt, tz_date, sizeof(tz_date)) == SWITCH_STATUS_SUCCESS) && !switch_strlen_zero_buf(tz_date)) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", tz_date); - } else { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); - } - } + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date); switch_snprintf(tmpvar, sizeof(tmpvar), "%d", priority); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_priority", tmpvar); Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Fri Oct 10 16:30:05 2008 @@ -572,10 +572,11 @@ tztime( &timep, tzdef, &tm ); tm2switchtime( &tm, &stm ); switch_strftime(date, &retsize, len, switch_strlen_zero(format) ? "%Y-%m-%d %T" : format, &stm); - return SWITCH_STATUS_SUCCESS; - } else { - return SWITCH_STATUS_FALSE; + if (!switch_strlen_zero_buf(date)) { + return SWITCH_STATUS_SUCCESS; + } } + return SWITCH_STATUS_FALSE; } SWITCH_MODULE_LOAD_FUNCTION(softtimer_load)