From 5b77e3d62bf8206ae7df2f791afbca85f5cfb438 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 22 Mar 2025 16:06:18 -0600 Subject: [PATCH] Ring Ready support disabling it in dialplan #6536 --- app/ring_groups/app_config.php | 8 ++++++++ app/ring_groups/ring_group_edit.php | 4 +++- app/switch/resources/scripts/app/ring_groups/index.lua | 5 ----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php index eec6ef0dd1..080774ed3b 100644 --- a/app/ring_groups/app_config.php +++ b/app/ring_groups/app_config.php @@ -236,6 +236,14 @@ $apps[$x]['default_settings'][$y]['default_setting_value'] = ""; $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'] = "50cbb1bb-3d67-4320-9f7e-0b09aa09676d"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "ring_group"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "ring_ready"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Add ring_ready in the dialplan to send 180 ringing to calling party"; //schema details $y=0; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index 647ebb4e18..3f85c598d5 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -474,7 +474,9 @@ //build the xml dialplan $dialplan_xml = "\n"; $dialplan_xml .= " \n"; - $dialplan_xml .= " \n"; + if ($settings->get('ring_group', 'ring_ready', true)) { + $dialplan_xml .= " \n"; + } $dialplan_xml .= " \n"; $dialplan_xml .= " \n"; $dialplan_xml .= " \n"; diff --git a/app/switch/resources/scripts/app/ring_groups/index.lua b/app/switch/resources/scripts/app/ring_groups/index.lua index 789ad81b42..df1a2e8525 100644 --- a/app/switch/resources/scripts/app/ring_groups/index.lua +++ b/app/switch/resources/scripts/app/ring_groups/index.lua @@ -182,11 +182,6 @@ log = require "resources.functions.log".ring_group call_direction = "local"; end ---set ring ready - if (session:ready()) then - session:execute("ring_ready", ""); - end - --define additional variables external = "false";