From 4ca524b443ddf629af37f6aa4d73f11d579e1006 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Mon, 31 Jan 2022 15:25:50 -0700 Subject: [PATCH] Add destination_delay_max and destination_timeout_max --- app/ring_groups/app_config.php | 16 ++++++++++++++++ app/ring_groups/ring_group_edit.php | 11 +++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php index 2b7c6b23d1..66cf51a405 100644 --- a/app/ring_groups/app_config.php +++ b/app/ring_groups/app_config.php @@ -154,6 +154,22 @@ $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'] = "9917d8e3-1c3c-4771-b2c6-e931c448d6e0"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "ring_group"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "destination_delay_max"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "999"; + $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'] = "c54fc772-7aa5-40de-8da8-39e0e707658e"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "ring_group"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "destination_timeout_max"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "999"; + $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'] = "de655030-ae71-4b53-8068-5cf0b14cf635"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "limit"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "ring_groups"; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index e7a244223c..6f3ed74a24 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -500,6 +500,8 @@ } //set the default + $destination_delay_max = $_SESSION['ring_group']['destination_delay_max']['numeric']; + $destination_timeout_max = $_SESSION['ring_group']['destination_timeout_max']['numeric']; if (strlen($ring_group_ringback) == 0) { $ring_group_ringback = '${us-ring}'; } @@ -696,7 +698,7 @@ echo "\n"; $selected = false; foreach ($value as $row) { - if ($ring_group_greeting == $row["value"]) { + if ($ring_group_greeting == $row["value"]) { $selected = true; echo " \n"; } @@ -772,7 +774,7 @@ echo " \n"; echo " \n"; + $i = 5; - while($i <= 999) { + while($i <= $destination_timeout_max) { if ($i == $row['destination_timeout']) { echo " \n"; } @@ -1056,7 +1059,7 @@ echo "\n"; echo "\n"; } - + if (permission_exists("ring_group_context")) { echo "\n"; echo "\n";