From 590e58c388297d51acabe25de756287e4971eff2 Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Sat, 29 Mar 2025 11:27:03 -0600
Subject: [PATCH] Update extension_edit to populate device servers (#7347)

This pull request fixes the code for adding extensions and a device is added to the extension.

These device fields are populated if they are defined and enabled in default setttings. This works if the data types = text (the default) and it works if the data types = array (very useful for server clusters)
---
 app/extensions/extension_edit.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 1617c26c26..e61a0b694a 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -67,9 +67,9 @@
 	$provision_line_label                 = $settings->get('provision','line_label', null);
 	$provision_line_display_name          = $settings->get('provision','line_display_name', null);
 	$provision_outbound_proxy_primary     = $settings->get('provision','outbound_proxy_primary', null);
-	$provision_outbound_proxy_secondary   = $settings->get('provision','outbound_proxy_primary', null);
-	$provision_server_address_primary     = $settings->get('provision','outbound_proxy_primary', null);
-	$provision_server_address_secondary   = $settings->get('provision','outbound_proxy_primary', null);
+	$provision_outbound_proxy_secondary   = $settings->get('provision','outbound_proxy_secondary', null);
+	$provision_server_address_primary     = $settings->get('provision','server_address_primary', null);
+	$provision_server_address_secondary   = $settings->get('provision','server_address_secondary', null);
 	$provision_line_sip_port              = $settings->get('provision','line_sip_port', null);
 	$provision_line_sip_transport         = $settings->get('provision','line_sip_transport', null);
 	$provision_line_register_expires      = $settings->get('provision','line_register_expires', null);
@@ -695,10 +695,14 @@
 													$array["devices"][$j]["device_lines"][0]["device_line_uuid"] = uuid();
 													$array["devices"][$j]["device_lines"][0]["domain_uuid"] = $domain_uuid;
 													$array["devices"][$j]["device_lines"][0]["server_address"] = $domain_name;
-													if ($provision_outbound_proxy_primary !== null) $array["devices"][$j]["device_lines"][0]["outbound_proxy_primary"] = $provision_outbound_proxy_primary;
-													if ($provision_outbound_proxy_secondary !== null) $array["devices"][$j]["device_lines"][0]["outbound_proxy_secondary"] = $provision_outbound_proxy_secondary;
-													if ($provision_server_address_primary !== null) $array["devices"][$j]["device_lines"][0]["server_address_primary"] = $provision_server_address_primary;
-													if ($provision_server_address_secondary !== null) $array["devices"][$j]["device_lines"][0]["server_address_secondary"] = $provision_server_address_secondary;
+													//return the first item if data type = array, returns value if data type = text 
+													function getFirstItem($value) {
+													    return is_array($value) ? $value[0] : $value;
+													}
+													$array["devices"][$j]["device_lines"][0]["outbound_proxy_primary"] = getFirstItem($provision_outbound_proxy_primary);
+													$array["devices"][$j]["device_lines"][0]["outbound_proxy_secondary"] = getFirstItem($provision_outbound_proxy_secondary);
+													$array["devices"][$j]["device_lines"][0]["server_address_primary"] = getFirstItem($provision_server_address_primary);
+													$array["devices"][$j]["device_lines"][0]["server_address_secondary"] = getFirstItem($provision_server_address_secondary);
 													$array["devices"][$j]["device_lines"][0]["label"] = $line_label;
 													$array["devices"][$j]["device_lines"][0]["display_name"] = $line_display_name;
 													$array["devices"][$j]["device_lines"][0]["user_id"] = $extension;