From 197420d6c96e66d9892e1e08ecbb5d7c2183e963 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 24 Jun 2015 19:31:53 +0000 Subject: [PATCH] Minor adjustments for confirm.lua and ring groups ensure domain_name and domain_uuid are set. --- .../install/scripts/app/ring_groups/index.lua | 14 +++++++------- resources/install/scripts/confirm.lua | 8 +++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua index 17e0bdfa2b..e6b3663650 100644 --- a/resources/install/scripts/app/ring_groups/index.lua +++ b/resources/install/scripts/app/ring_groups/index.lua @@ -417,7 +417,7 @@ dialplan_detail_data = r.dialplan_detail_data:gsub("$1", destination_result); --if the session is set then process the actions if (y == 0) then - square = "[sip_invite_domain="..domain_name..","..group_confirm.."leg_timeout="..destination_timeout..",leg_delay_start="..destination_delay..",ignore_early_media=true,"; + square = "[domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_invite_domain="..domain_name..","..group_confirm.."leg_timeout="..destination_timeout..",leg_delay_start="..destination_delay..",ignore_early_media=true,"; end if (r.dialplan_detail_type == "set") then --session:execute("eval", dialplan_detail_data); @@ -511,14 +511,14 @@ if (reply == "0 total.") then --not found: user is available if (user_exists == "true") then - dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. destination_number .. "@" .. domain_name; + dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. destination_number .. "@" .. domain_name; session:execute("bridge", dial_string); elseif (tonumber(destination_number) == nil) then --sip uri - dial_string = "["..group_confirm.."sip_invite_domain="..domain_name.."]" .. destination_number; + dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]" .. destination_number; session:execute("bridge", dial_string); else - dial_string = "["..group_confirm.."sip_invite_domain="..domain_name.."]loopback/" .. destination_number; + dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]loopback/" .. destination_number; session:execute("bridge", dial_string); end else @@ -528,14 +528,14 @@ else --not found: user is available if (user_exists == "true") then - dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid.."]user/" .. destination_number .. "@" .. domain_name; + dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",dialed_extension=" .. destination_number .. ",extension_uuid="..extension_uuid..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]user/" .. destination_number .. "@" .. domain_name; session:execute("bridge", dial_string); elseif (tonumber(destination_number) == nil) then --sip uri - dial_string = "["..group_confirm.."sip_invite_domain="..domain_name.."]" .. destination_number; + dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]" .. destination_number; session:execute("bridge", dial_string); else - dial_string = "["..group_confirm.."sip_invite_domain="..domain_name.."]loopback/" .. destination_number; + dial_string = "["..group_confirm.."sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid.."]loopback/" .. destination_number; session:execute("bridge", dial_string); end end diff --git a/resources/install/scripts/confirm.lua b/resources/install/scripts/confirm.lua index 6be3e674b9..6aafb066e3 100644 --- a/resources/install/scripts/confirm.lua +++ b/resources/install/scripts/confirm.lua @@ -23,7 +23,6 @@ -- Mark J Crane --set variables - max_tries = "3"; digit_timeout = "5000"; --check if a file exists @@ -81,12 +80,11 @@ max_digits = 1; digit = ''; if (file_exists(call_screen_file)) then - max_tries = 1; - digit_timeout = 500; - digit = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", call_screen_file, "", "\\d+"); + max_tries = "1"; + digit = session:playAndGetDigits(min_digits, max_digits, max_tries, "500", "#", call_screen_file, "", "\\d+"); end if (string.len(digit) == 0) then - max_tries = 3; + max_tries = "3"; digit = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-accept_reject_voicemail.wav", "", "\\d+"); end --process the response