dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update disa.lua

Browse Source
This commit is contained in:
FusionPBX
2019-09-29 15:35:26 -06:00
committed by GitHub
parent 822de6b21f
commit f50b7be40a
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/disa.lua
+28 -14
View File
@@ -16,15 +16,15 @@
-- --
-- The Initial Developer of the Original Code is -- The Initial Developer of the Original Code is
-- Mark J Crane <markjcrane@fusionpbx.com> -- Mark J Crane <markjcrane@fusionpbx.com>
-- Copyright (C) 2010-2018 -- Copyright (C) 2010-2019
-- the Initial Developer. All Rights Reserved. -- the Initial Developer. All Rights Reserved.
-- --
-- Contributor(s): -- Contributor(s):
-- Mark J Crane <markjcrane@fusionpbx.com> -- Mark J Crane <markjcrane@fusionpbx.com>
--predefined variables --predefined variables
predefined_destination = ""; predefined_destination = '';
fallback_destination = ""; fallback_destination = '';
--define the trim function --define the trim function
require "resources.functions.trim"; require "resources.functions.trim";
@@ -47,8 +47,8 @@
sound_extension = session:getVariable("sound_extension"); sound_extension = session:getVariable("sound_extension");
pin_number = session:getVariable("pin_number"); pin_number = session:getVariable("pin_number");
sounds_dir = session:getVariable("sounds_dir"); sounds_dir = session:getVariable("sounds_dir");
caller_id_name = session:getVariable("caller_id_name"); --caller_id_name = session:getVariable("caller_id_name");
caller_id_number = session:getVariable("caller_id_number"); --caller_id_number = session:getVariable("caller_id_number");
predefined_destination = session:getVariable("predefined_destination"); predefined_destination = session:getVariable("predefined_destination");
fallback_destination = session:getVariable("fallback_destination"); fallback_destination = session:getVariable("fallback_destination");
digit_min_length = session:getVariable("digit_min_length"); digit_min_length = session:getVariable("digit_min_length");
@@ -81,27 +81,27 @@
end end
if (not digit_timeout) then if (not digit_timeout) then
digit_timeout = "5000"; digit_timeout = "5000";
end end
if (not sound_pin) then if (not sound_pin) then
sound_pin = sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-please_enter_pin_followed_by_pound.wav"; sound_pin = sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-please_enter_pin_followed_by_pound.wav";
end end
if (not sound_extension) then if (not sound_extension) then
sound_extension = sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-enter_destination_telephone_number.wav"; sound_extension = sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-enter_destination_telephone_number.wav";
end end
if (not max_tries) then if (not max_tries) then
max_tries = "3"; max_tries = "3";
end end
if (not pin_tries) then if (not pin_tries) then
pin_tries = max_tries; pin_tries = max_tries;
end end
if (not extension_tries) then if (not extension_tries) then
extension_tries = max_tries; extension_tries = max_tries;
end end
--if the sound_greeting is provided then play it --if the sound_greeting is provided then play it
@@ -131,10 +131,11 @@
if (predefined_destination) then if (predefined_destination) then
destination_number = predefined_destination; destination_number = predefined_destination;
else else
session:sleep(1000);
dtmf = ""; --clear dtmf digits to prepare for next dtmf request dtmf = ""; --clear dtmf digits to prepare for next dtmf request
destination_number = session:playAndGetDigits(digit_min_length, digit_max_length, extension_tries, digit_timeout, "#", sound_extension, "", "\\d+"); destination_number = session:playAndGetDigits(digit_min_length, digit_max_length, extension_tries, digit_timeout, "#", sound_extension, "", "\\d+");
if (string.len(destination_number) == 0 and fallback_destination) then if (string.len(destination_number) == 0 and fallback_destination) then
destination_number = fallback_destination; destination_number = fallback_destination;
end end
--if (string.len(destination_number) == 10) then destination_number = "1"..destination_number; end --if (string.len(destination_number) == 10) then destination_number = "1"..destination_number; end
end end
@@ -178,6 +179,14 @@
end end
end end
--get the caller id number
--if (session:ready()) then
-- min_digits = 7;
-- max_digits = 20;
-- session:sleep(1000);
-- caller_id_number = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-id_number.wav", "", "\\d+");
--end
--send the destination --send the destination
if (session:ready()) then if (session:ready()) then
if (user_exists == true) then if (user_exists == true) then
@@ -185,8 +194,13 @@
session:execute("transfer", destination_number .. " XML " .. context); session:execute("transfer", destination_number .. " XML " .. context);
else else
--exteernal call --exteernal call
session:execute("set", "effective_caller_id_name="..caller_id_name); if (caller_id_name) then
session:execute("set", "effective_caller_id_number="..caller_id_number); session:execute("set", "effective_caller_id_name="..caller_id_name);
end
if (caller_id_number) then
session:execute("set", "outbound_caller_id_number="..caller_id_number);
session:execute("set", "effective_caller_id_number="..caller_id_number);
end
session:execute("transfer", destination_number .. " XML " .. context); session:execute("transfer", destination_number .. " XML " .. context);
end end
end end