diff --git a/app/ivr_menus/app_config.php b/app/ivr_menus/app_config.php index b403e92db7..338da4b080 100644 --- a/app/ivr_menus/app_config.php +++ b/app/ivr_menus/app_config.php @@ -140,6 +140,14 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ac4ff01d-51a2-433f-9243-be9b6dd8ba9c"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "ivr_menu"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "direct_dial_digits"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "/^(\d{2,11})$/"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "26984efd-2445-4ac9-b459-bb7bda4217c6"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "limit"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "ivr_menus"; diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua index 6ab2441b6a..89770d264c 100644 --- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua +++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua @@ -114,8 +114,16 @@ ivr_menu_cid_prefix = row["ivr_menu_cid_prefix"]; ivr_menu_description = row["ivr_menu_description"]; - --set the storage path + + --set variables from settings local settings = Settings.new(dbh, domain_name, domain_uuid) + + --direct dial regex + direct_dial_digits = settings:get('ivr_menu', 'direct_dial_digits', 'text') + if (direct_dial_digits == nil or direct_dial == '') then + direct_dial_digits = '/^(\d{2,11})$/' + end + --storage path local storage_type = settings:get('recordings', 'storage_type', 'text') local storage_path = settings:get('recordings', 'storage_path', 'text') if (storage_path ~= nil) then @@ -272,11 +280,11 @@ --direct dial if (ivr_menu_direct_dial == "true") then - table.insert(xml, [[ \n]]); - table.insert(xml, [[ \n]]); - table.insert(xml, [[ \n]]); - table.insert(xml, [[ \n]]); - table.insert(xml, [[ \n]]); + table.insert(xml, [[ \n]]); + table.insert(xml, [[ \n]]); + table.insert(xml, [[ \n]]); + table.insert(xml, [[ \n]]); + table.insert(xml, [[ \n]]); end --close the extension tag if it was left open