From cdd4cb5ccdfb8703e17714d8850ea8077714d3d7 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Sat, 24 Oct 2015 21:00:22 -0600 Subject: [PATCH] Add vm_say_caller_id_number option for true or false. --- .../install/scripts/app/voicemail/index.lua | 1 + .../resources/functions/listen_to_recording.lua | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua index 056127af3b..ee9e79e5cd 100644 --- a/resources/install/scripts/app/voicemail/index.lua +++ b/resources/install/scripts/app/voicemail/index.lua @@ -73,6 +73,7 @@ skip_instructions = session:getVariable("skip_instructions"); skip_greeting = session:getVariable("skip_greeting"); vm_message_ext = session:getVariable("vm_message_ext"); + vm_say_caller_id_number = session:getVariable("vm_say_caller_id_number"); vm_disk_quota = session:getVariable("vm-disk-quota"); if (not vm_disk_quota) then vm_disk_quota = session:getVariable("vm_disk_quota"); diff --git a/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua b/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua index 3ce7fb9196..f798f63c40 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua @@ -40,16 +40,21 @@ if (session:ready()) then reply = api:executeString("uuid_display "..session:get_uuid().." "..caller_id_number); end - --say the caller id number - if (session:ready() and caller_id_number ~= nil) then - session:say(caller_id_number, default_language, "name_spelled", "iterated"); - end --say the message number if (session:ready()) then - if (string.len(dtmf_digits) == 0) then + if (string.len(dtmf_digits) == 0) then dtmf_digits = macro(session, "message_number", 1, 100, ''); end end + --say the caller id number + if (session:ready() and caller_id_number ~= nil) then + if (vm_say_caller_id_number ~= nil) then + if (vm_say_caller_id_number == "true") then + session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-message_from.wav"); + session:say(caller_id_number, default_language, "name_spelled", "iterated"); + end + end + end --say the number if (session:ready()) then if (string.len(dtmf_digits) == 0) then @@ -65,7 +70,6 @@ session:say(created_epoch, default_language, "current_date_time", "pronounced"); end end - --get the recordings from the database if (storage_type == "base64") then sql = [[SELECT * FROM v_voicemail_messages