From 3f426baf62601b7879d70e6831ecd04fef9a50c2 Mon Sep 17 00:00:00 2001 From: Greenbea Date: Wed, 11 Nov 2020 01:15:46 -0500 Subject: [PATCH] Add gateway ping-min/max params --- app/gateways/app_config.php | 8 ++++ app/gateways/app_languages.php | 42 +++++++++++++++++++ app/gateways/gateway_edit.php | 28 +++++++++++++ .../scripts/configuration/sofia.conf.lua | 6 +++ 4 files changed, 84 insertions(+) diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php index 5486038064..8cddfbb9c4 100644 --- a/app/gateways/app_config.php +++ b/app/gateways/app_config.php @@ -197,6 +197,14 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "ping_min"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "ping_max"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "caller_id_in_from"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php index c7fef8b760..75a4823a4f 100644 --- a/app/gateways/app_languages.php +++ b/app/gateways/app_languages.php @@ -484,6 +484,48 @@ $text['label-ping']['ru-ru'] = "Пинг"; $text['label-ping']['sv-se'] = "Ping"; $text['label-ping']['uk-ua'] = "Пінг"; +$text['label-ping_min']['en-us'] = "Ping Min"; +$text['label-ping_min']['en-gb'] = ""; +$text['label-ping_min']['ar-eg'] = ""; +$text['label-ping_min']['de-at'] = ""; +$text['label-ping_min']['de-ch'] = ""; +$text['label-ping_min']['de-de'] = ""; +$text['label-ping_min']['es-cl'] = ""; +$text['label-ping_min']['es-mx'] = ""; +$text['label-ping_min']['fr-ca'] = ""; +$text['label-ping_min']['fr-fr'] = ""; +$text['label-ping_min']['he-il'] = ""; +$text['label-ping_min']['it-it'] = ""; +$text['label-ping_min']['nl-nl'] = ""; +$text['label-ping_min']['pl-pl'] = ""; +$text['label-ping_min']['pt-br'] = ""; +$text['label-ping_min']['pt-pt'] = ""; +$text['label-ping_min']['ro-ro'] = ""; +$text['label-ping_min']['ru-ru'] = ""; +$text['label-ping_min']['sv-se'] = ""; +$text['label-ping_min']['uk-ua'] = ""; + +$text['label-ping_max']['en-us'] = "Ping Max"; +$text['label-ping_max']['en-gb'] = ""; +$text['label-ping_max']['ar-eg'] = ""; +$text['label-ping_max']['de-at'] = ""; +$text['label-ping_max']['de-ch'] = ""; +$text['label-ping_max']['de-de'] = ""; +$text['label-ping_max']['es-cl'] = ""; +$text['label-ping_max']['es-mx'] = ""; +$text['label-ping_max']['fr-ca'] = ""; +$text['label-ping_max']['fr-fr'] = ""; +$text['label-ping_max']['he-il'] = ""; +$text['label-ping_max']['it-it'] = ""; +$text['label-ping_max']['nl-nl'] = ""; +$text['label-ping_max']['pl-pl'] = ""; +$text['label-ping_max']['pt-br'] = ""; +$text['label-ping_max']['pt-pt'] = ""; +$text['label-ping_max']['ro-ro'] = ""; +$text['label-ping_max']['ru-ru'] = ""; +$text['label-ping_max']['sv-se'] = ""; +$text['label-ping_max']['uk-ua'] = ""; + $text['label-password']['en-us'] = "Password"; $text['label-password']['en-gb'] = "Password"; $text['label-password']['ar-eg'] = "كلمة السر"; diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index 17dda4f7f2..ec1eff8424 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -94,6 +94,8 @@ $retry_seconds = $_POST["retry_seconds"]; $extension = $_POST["extension"]; $ping = $_POST["ping"]; + $ping_min = $_POST["ping_min"]; + $ping_max = $_POST["ping_max"]; $channels = $_POST["channels"]; $caller_id_in_from = $_POST["caller_id_in_from"]; $supress_cng = $_POST["supress_cng"]; @@ -178,6 +180,8 @@ $array['gateways'][$x]["retry_seconds"] = $retry_seconds; $array['gateways'][$x]["extension"] = $extension; $array['gateways'][$x]["ping"] = $ping; + $array['gateways'][$x]["ping_min"] = $ping_min; + $array['gateways'][$x]["ping_max"] = $ping_max; $array['gateways'][$x]["channels"] = $channels; $array['gateways'][$x]["caller_id_in_from"] = $caller_id_in_from; $array['gateways'][$x]["supress_cng"] = $supress_cng; @@ -279,6 +283,8 @@ $retry_seconds = $row["retry_seconds"]; $extension = $row["extension"]; $ping = $row["ping"]; + $ping_min = $row["ping_min"]; + $ping_max = $row["ping_max"]; $channels = $row["channels"]; $caller_id_in_from = $row["caller_id_in_from"]; $supress_cng = $row["supress_cng"]; @@ -706,6 +712,28 @@ echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-ping_min']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-ping_min']."\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo " ".$text['label-ping_max']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-ping_max']."\n"; + echo "\n"; + echo "\n"; + if (permission_exists('gateway_channels')) { echo "\n"; echo "\n"; diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua index 71beae1443..6274ab2e4c 100644 --- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua +++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua @@ -181,6 +181,12 @@ if (string.len(field.ping) > 0) then table.insert(xml, [[ ]]); end + if (string.len(field.ping_min) > 0) then + table.insert(xml, [[ ]]); + end + if (string.len(field.ping_max) > 0) then + table.insert(xml, [[ ]]); + end if (string.len(field.context) > 0) then table.insert(xml, [[ ]]); end