diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php index 30f4f9eb95..29b3754eb4 100644 --- a/app/gateways/app_config.php +++ b/app/gateways/app_config.php @@ -185,6 +185,10 @@ $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'] = "contact_params"; + $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'] = "retry_seconds"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php index 262aee33c6..51384894a0 100644 --- a/app/gateways/app_languages.php +++ b/app/gateways/app_languages.php @@ -357,6 +357,27 @@ $text['label-register_transport']['ru-ru'] = "Регистрация Транс $text['label-register_transport']['sv-se'] = "Register Transport"; $text['label-register_transport']['uk-ua'] = "Транспорт для реєстрації"; +$text['label-contact_params']['en-us'] = "Contact Params"; +$text['label-contact_params']['en-gb'] = "Contact Params"; +$text['label-contact_params']['ar-eg'] = ""; +$text['label-contact_params']['de-at'] = ""; //copied from de-de +$text['label-contact_params']['de-ch'] = ""; //copied from de-de +$text['label-contact_params']['de-de'] = ""; +$text['label-contact_params']['es-cl'] = ""; +$text['label-contact_params']['es-mx'] = ""; //copied from es-cl +$text['label-contact_params']['fr-ca'] = ""; //copied from fr-fr +$text['label-contact_params']['fr-fr'] = ""; +$text['label-contact_params']['he-il'] = ""; +$text['label-contact_params']['it-it'] = ""; +$text['label-contact_params']['nl-nl'] = ""; +$text['label-contact_params']['pl-pl'] = ""; +$text['label-contact_params']['pt-br'] = ""; +$text['label-contact_params']['pt-pt'] = ""; +$text['label-contact_params']['ro-ro'] = ""; +$text['label-contact_params']['ru-ru'] = ""; +$text['label-contact_params']['sv-se'] = ""; +$text['label-contact_params']['uk-ua'] = ""; + $text['label-register_proxy']['en-us'] = "Register Proxy"; $text['label-register_proxy']['en-gb'] = "Register Proxy"; $text['label-register_proxy']['ar-eg'] = ""; @@ -1042,7 +1063,7 @@ $text['description-retry_seconds']['fr-fr'] = "Insérer ici la temps en secondes $text['description-retry_seconds']['he-il'] = ""; $text['description-retry_seconds']['it-it'] = "Inserire qui i retry-seconds."; $text['description-retry_seconds']['nl-nl'] = "Voer herhaal tijd (seconden) in. "; -$text['description-retry_seconds']['pl-pl'] = " Wprowadź wartość ponownej próby {sek)"; +$text['description-retry_seconds']['pl-pl'] = "Wprowadź wartość ponownej próby {sek)"; $text['description-retry_seconds']['pt-br'] = "Insira o tempo de reconexão (em segundos)"; $text['description-retry_seconds']['pt-pt'] = "Introduza o tempo de reconexão (em segundos) aqui."; $text['description-retry_seconds']['ro-ro'] = "Introduceți secunde Reîncercare aici"; @@ -1071,6 +1092,27 @@ $text['description-register_transport']['ru-ru'] = "Выберите предп $text['description-register_transport']['sv-se'] = "Välj om registrera transport eller ej."; $text['description-register_transport']['uk-ua'] = "Choose whether to register-transport."; +$text['description-contact_params']['en-us'] = "Enter the contact params here."; +$text['description-contact_params']['en-gb'] = "Enter the contact params here."; +$text['description-contact_params']['ar-eg'] = ""; +$text['description-contact_params']['de-at'] = ""; +$text['description-contact_params']['de-ch'] = ""; +$text['description-contact_params']['de-de'] = ""; +$text['description-contact_params']['es-cl'] = ""; +$text['description-contact_params']['es-mx'] = ""; +$text['description-contact_params']['fr-ca'] = ""; +$text['description-contact_params']['fr-fr'] = ""; +$text['description-contact_params']['he-il'] = ""; +$text['description-contact_params']['it-it'] = ""; +$text['description-contact_params']['nl-nl'] = ""; +$text['description-contact_params']['pl-pl'] = ""; +$text['description-contact_params']['pt-br'] = ""; +$text['description-contact_params']['pt-pt'] = ""; +$text['description-contact_params']['ro-ro'] = ""; +$text['description-contact_params']['ru-ru'] = ""; +$text['description-contact_params']['sv-se'] = ""; +$text['description-contact_params']['uk-ua'] = ""; + $text['description-register_proxy']['en-us'] = "Enter the hostname or IP address of the register proxy. host[:port]"; $text['description-register_proxy']['en-gb'] = "Enter the hostname or IP address of the register proxy. host[:port]"; $text['description-register_proxy']['ar-eg'] = "أدخل اسم المضيف أو عنوان إب الخاص بروكسي السجل. (وهذا يمكن أن تتخذ شكل المضيف: ميناء)"; diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php index feefb68684..8f1b684e70 100644 --- a/app/gateways/gateway_copy.php +++ b/app/gateways/gateway_copy.php @@ -71,6 +71,7 @@ $expire_seconds = $row["expire_seconds"]; $register = $row["register"]; $register_transport = $row["register_transport"]; + $contact_params = $row["contact_params"]; $retry_seconds = $row["retry_seconds"]; $extension = $row["extension"]; $codec_prefs = $row["codec_prefs"]; @@ -116,6 +117,7 @@ $array['gateways'][0]['expire_seconds'] = $expire_seconds; $array['gateways'][0]['register'] = $register; $array['gateways'][0]['register_transport'] = $register_transport; + $array['gateways'][0]['contact_params'] = $contact_params; $array['gateways'][0]['retry_seconds'] = $retry_seconds; $array['gateways'][0]['extension'] = $extension; $array['gateways'][0]['codec_prefs'] = $codec_prefs; @@ -123,7 +125,7 @@ //$array['gateways'][0]['channels'] = $channels; $array['gateways'][0]['caller_id_in_from'] = $caller_id_in_from; $array['gateways'][0]['supress_cng'] = $supress_cng; - $array['gateways'][0]['sip_cid_type'] = $sip_cid_type; + $array['gateways'][0]['sip_cid_type'] = $sip_cid_type; $array['gateways'][0]['extension_in_contact'] = $extension_in_contact; $array['gateways'][0]['context'] = $context; $array['gateways'][0]['profile'] = $profile; diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index 922610db0a..fb96fdc6ab 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -94,6 +94,7 @@ $expire_seconds = $_POST["expire_seconds"]; $register = $_POST["register"]; $register_transport = $_POST["register_transport"]; + $contact_params = $_POST["contact_params"]; $retry_seconds = $_POST["retry_seconds"]; $extension = $_POST["extension"]; $ping = $_POST["ping"]; @@ -181,6 +182,7 @@ $array['gateways'][$x]["expire_seconds"] = $expire_seconds; $array['gateways'][$x]["register"] = $register; $array['gateways'][$x]["register_transport"] = $register_transport; + $array['gateways'][$x]["contact_params"] = $contact_params; $array['gateways'][$x]["retry_seconds"] = $retry_seconds; $array['gateways'][$x]["extension"] = $extension; $array['gateways'][$x]["ping"] = $ping; @@ -285,6 +287,7 @@ $expire_seconds = $row["expire_seconds"]; $register = $row["register"]; $register_transport = $row["register_transport"]; + $contact_params = $row["contact_params"]; $retry_seconds = $row["retry_seconds"]; $extension = $row["extension"]; $ping = $row["ping"]; @@ -588,6 +591,17 @@ echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-contact_params']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-contact_params']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-register_proxy']."\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 4789520cc9..44eab72475 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 @@ -172,12 +172,16 @@ table.insert(xml, [[ ]]); elseif (field.register_transport == "tls") then table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); + else table.insert(xml, [[ ]]); end end + if (field.contact_params) then + table.insert(xml, [[ ]]); + end + if (string.len(field.retry_seconds) > 0) then table.insert(xml, [[ ]]); end diff --git a/resources/switch.php b/resources/switch.php index 902ba72cba..4a5f749a03 100644 --- a/resources/switch.php +++ b/resources/switch.php @@ -308,13 +308,16 @@ function save_gateway_xml() { break; case "tls": $xml .= " \n"; - $xml .= " \n"; break; default: $xml .= " \n"; } } + if (strlen($row['contact_params']) > 0) { + $xml .= " \n"; + } + if (strlen($row['retry_seconds']) > 0) { $xml .= " \n"; }