From 3ffd58ce26c77793561b4fcdb7371932dc8c1f87 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Mon, 3 Mar 2025 12:44:33 -0700
Subject: [PATCH] Fix server 2 server address and sip transport

---
 .../provision/grandstream/gxp2130/{$mac}.xml   |  6 +++++-
 .../provision/grandstream/gxp2135/{$mac}.xml   | 18 ++++++++++++++----
 .../provision/grandstream/gxp2140/{$mac}.xml   |  9 ++++++---
 .../provision/grandstream/gxp2160/{$mac}.xml   |  9 ++++++---
 .../provision/grandstream/gxp2170/{$mac}.xml   |  7 +++++--
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 2a0228b5d8..7536dc08c4 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -2131,8 +2131,12 @@
 		<item name="call.transfer.attended.mode">Dynamic</item>
 
 		<!-- # Transfer Mode via VPK/MPK. -->
-		<!-- BlindTransfer, AttendedTransfer,  NewCall -->
+		<!-- BlindTransfer, AttendedTransfer, NewCall -->
+		{if isset($grandstream_transfer_mode_via_vpk)}
+		<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
+		{else}
 		<item name="call.transfer.modeViaVpk">BlindTransfer</item>
+		{/if}
 
 		<!-- # Show On Hold Duration. Yes or No -->
 		<item name="call.hold.showHoldDuration.enable">Yes</item>
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index a622cfc585..e0d1b4748f 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -38,7 +38,11 @@
 		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
+		{if isset($row.server_address_secondary)}
 		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
+		{else}
+		<item name="account.{$row.line_number}.sip.server.2.address"/>
+		{/if}
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -176,10 +180,11 @@
 
 		<!-- SIP Transport -->
 		<!-- UDP, TCP, Tls Or Tcp -->
-		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">UDP</item>{/if}
-		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">Tls</item>{/if}
+		<!-- Variable Value: {$row.sip_transport} -->
+		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">0</item>{/if}
+		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">2</item>{/if}
 
 		<!-- SIP Listening Mode -->
 		<!-- Transport_Only, Dual, Dual_BLF_Enforced, Dual_Secured -->
@@ -909,6 +914,7 @@
 		<!-- # Mandatory -->
 		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
+
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
 		<!-- Number: 0 - 4095 -->
@@ -2132,7 +2138,11 @@
 
 		<!-- # Transfer Mode via VPK/MPK. -->
 		<!-- BlindTransfer, AttendedTransfer,  NewCall -->
+		{if isset($grandstream_transfer_mode_via_vpk)}
 		<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
+		{else}
+		<item name="call.transfer.modeViaVpk">BlindTransfer</item>
+		{/if}
 
 		<!-- # Show On Hold Duration. Yes or No -->
 		<item name="call.hold.showHoldDuration.enable">Yes</item>
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index bb5a7f2856..5fd3dc419a 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -909,7 +909,6 @@
 		<!-- # Mandatory -->
 		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
-
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
 		<!-- Number: 0 - 4095 -->
@@ -2132,8 +2131,12 @@
 		<item name="call.transfer.attended.mode">Dynamic</item>
 
 		<!-- # Transfer Mode via VPK/MPK. -->
-		<!-- BlindTransfer, AttendedTransfer,  NewCall -->
+		<!-- BlindTransfer, AttendedTransfer, NewCall -->
+		{if isset($grandstream_transfer_mode_via_vpk)}
+		<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
+		{else}
 		<item name="call.transfer.modeViaVpk">BlindTransfer</item>
+		{/if}
 
 		<!-- # Show On Hold Duration. Yes or No -->
 		<item name="call.hold.showHoldDuration.enable">Yes</item>
@@ -3318,4 +3321,4 @@
 {/foreach}
 
 	</config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 5bfc894586..d68089003f 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -909,7 +909,6 @@
 		<!-- # Mandatory -->
 		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
-
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
 		<!-- Number: 0 - 4095 -->
@@ -2132,8 +2131,12 @@
 		<item name="call.transfer.attended.mode">Dynamic</item>
 
 		<!-- # Transfer Mode via VPK/MPK. -->
-		<!-- BlindTransfer, AttendedTransfer,  NewCall -->
+		<!-- BlindTransfer, AttendedTransfer, NewCall -->
+		{if isset($grandstream_transfer_mode_via_vpk)}
+		<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
+		{else}
 		<item name="call.transfer.modeViaVpk">BlindTransfer</item>
+		{/if}
 
 		<!-- # Show On Hold Duration. Yes or No -->
 		<item name="call.hold.showHoldDuration.enable">Yes</item>
@@ -3318,4 +3321,4 @@
 {/foreach}
 
 	</config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 37c88af6e1..b51177f1e1 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -909,7 +909,6 @@
 		<!-- # Mandatory -->
 		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
-
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
 		<!-- Number: 0 - 4095 -->
@@ -2132,8 +2131,12 @@
 		<item name="call.transfer.attended.mode">Dynamic</item>
 
 		<!-- # Transfer Mode via VPK/MPK. -->
-		<!-- BlindTransfer, AttendedTransfer,  NewCall -->
+		<!-- BlindTransfer, AttendedTransfer, NewCall -->
+		{if isset($grandstream_transfer_mode_via_vpk)}
+		<item name="call.transfer.modeViaVpk">{$grandstream_transfer_mode_via_vpk}</item>
+		{else}
 		<item name="call.transfer.modeViaVpk">BlindTransfer</item>
+		{/if}
 
 		<!-- # Show On Hold Duration. Yes or No -->
 		<item name="call.hold.showHoldDuration.enable">Yes</item>