add voicemail_formatted_caller_id_number param for templates in vm

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 29da21dd5b4ccba694e9387134e23feb2c7042ab..343a2ce62e24631832ef4f27686a6f6436da2ac4 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -832,6 +832,7 @@ SWITCH_DECLARE(const char *) switch_inet_ntop(int af, void const *src, char *dst
 #endif
 
 SWITCH_DECLARE(char *) switch_uuid_str(char *buf, switch_size_t len);
+SWITCH_DECLARE(char *) switch_format_number(const char *num);
 
 SWITCH_END_EXTERN_C
 #endif

diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c
index 24b2c5ea9e4c50de0dd0c67dd3bb1d9addc574a3..c3a95532f5de1509bca9dfe6c3fce5f246c87b76 100644 (file)
--- a/src/mod/applications/mod_voicemail/mod_voicemail.c
+++ b/src/mod/applications/mod_voicemail/mod_voicemail.c
@@ -1693,7 +1693,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
                                        switch_time_t l_duration = 0;
                                        switch_core_time_duration_t duration;
                                        char duration_str[80];
-
+                                       char *formatted_cid_num = NULL;
                                        if (!strcasecmp(cbt->read_flags, URGENT_FLAG_STRING)) {
                                                priority = 1;
                                        }
@@ -1704,6 +1704,8 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
                                        switch_time_exp_lt(&tm, switch_time_make(atol(cbt->created_epoch), 0));
                                        switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm);
 
+                                       formatted_cid_num = switch_format_number(cbt->cid_number);
+
                                        switch_snprintf(tmp, sizeof(tmp), "%d", total_new_messages);
                                        switch_channel_set_variable(channel, "voicemail_total_new_messages", tmp);
                                        switch_snprintf(tmp, sizeof(tmp), "%d", total_saved_messages);
@@ -1716,6 +1718,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
                                        switch_channel_set_variable(channel, "voicemail_account", cbt->user);
                                        switch_channel_set_variable(channel, "voicemail_domain", cbt->domain);
                                        switch_channel_set_variable(channel, "voicemail_caller_id_number", cbt->cid_number);
+                                       switch_channel_set_variable(channel, "voicemail_formatted_caller_id_number", formatted_cid_num);
                                        switch_channel_set_variable(channel, "voicemail_caller_id_name", cbt->cid_name);
                                        switch_channel_set_variable(channel, "voicemail_file_path", cbt->file_path);
                                        switch_channel_set_variable(channel, "voicemail_read_flags", cbt->read_flags);
@@ -1723,6 +1726,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
                                        switch_snprintf(tmp, sizeof(tmp), "%d", priority);
                                        switch_channel_set_variable(channel, "voicemail_priority", tmp);
                                        message_len = atoi(cbt->message_len);
+                                       switch_safe_free(formatted_cid_num);
 
                                        l_duration = switch_time_make(atol(cbt->message_len), 0);
                                        switch_core_measure_time(l_duration, &duration);
@@ -2707,6 +2711,7 @@ static switch_status_t deliver_vm(vm_profile_t *profile,
                switch_time_exp_t tm;
                char date[80] = "";
                switch_size_t retsize;
+               char *formatted_cid_num = NULL;
 
                message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages,
                                          &total_new_urgent_messages, &total_saved_urgent_messages);
@@ -2716,6 +2721,7 @@ static switch_status_t deliver_vm(vm_profile_t *profile,
                        switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm);
                }
 
+               formatted_cid_num = switch_format_number(caller_id_number);
                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_current_folder", myfolder);
                switch_snprintf(tmpvar, sizeof(tmpvar), "%d", total_new_messages);
                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_total_new_messages", tmpvar);
@@ -2728,11 +2734,14 @@ static switch_status_t deliver_vm(vm_profile_t *profile,
                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_account", myid);
                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_domain", domain_name);
                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_caller_id_number", caller_id_number);
+               switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_formatted_caller_id_number", formatted_cid_num);         
                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);
                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date);
 
+               switch_safe_free(formatted_cid_num);
+
                switch_snprintf(tmpvar, sizeof(tmpvar), "%d", priority);
                switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_priority", tmpvar);
                if (vm_email) {

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 6c8d29307d8a0f91af315dcae2f9e528bae96544..d9f4648ac36581c6fcafcb747d795b049f3abf12 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -2887,6 +2887,32 @@ SWITCH_DECLARE(char *) switch_uuid_str(char *buf, switch_size_t len)
 }
 
 
+SWITCH_DECLARE(char *) switch_format_number(const char *num)
+{
+       char *r;
+       size_t len;
+       const char *p = num;
+       
+       if(*p == '+') {
+               p++;
+       }
+
+       len = strlen(p);
+       
+       /* region 1, TBD add more....*/
+       if (len == 11 && p[0] == '1') {
+               r = switch_mprintf("%c (%c%c%c) %c%c%c-%c%c%c%c", p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7],p[8],p[9],p[10]);
+       } else if (len == 10) {
+               r = switch_mprintf("1 (%c%c%c) %c%c%c-%c%c%c%c", p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7],p[8],p[9]);
+       } else {
+               r = strdup(num);
+       }
+       
+
+       return r;
+}
+
+
 /* For Emacs:
  * Local Variables:
  * mode:c