From 7ddf3f8ae0c8edcfa37de52ceafbff398c7c606a Mon Sep 17 00:00:00 2001
From: frytimo <tim@fusionpbx.com>
Date: Tue, 13 Jan 2026 23:11:50 -0400
Subject: [PATCH] Add missing grandstream_firmware_upgrade_protocol in template
 (#7696)

---
 .../provision/grandstream/ghp6xx/{$mac}.xml        | 14 ++++++++------
 .../provision/grandstream/grp2612/{$mac}.xml       |  9 ++++++++-
 .../provision/grandstream/grp2612w/{$mac}.xml      |  9 ++++++++-
 .../provision/grandstream/grp2613/{$mac}.xml       |  9 ++++++++-
 .../provision/grandstream/grp2614/{$mac}.xml       |  9 ++++++++-
 .../provision/grandstream/grp2615/{$mac}.xml       |  9 ++++++++-
 .../provision/grandstream/grp2616/{$mac}.xml       |  9 ++++++++-
 .../provision/grandstream/grp261x/{$mac}.xml       |  9 ++++++++-
 .../provision/grandstream/gxv3370/{$mac}.xml       |  9 ++++++++-
 resources/templates/provision/grandstream/gxv3380  |  9 ++++++++-
 10 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml b/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
index c30be1d0b3..68d29e4dc5 100644
--- a/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
@@ -1958,12 +1958,14 @@
 		<!-- ############################################################################## -->
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
-		{if isset($grandstream_firmware_upgrade_protocol) }
-		<item name="provisioning.firmware.protocol">{$grandstream_firmware_upgrade_protocol}</item>
-		{else}
-		<item name="provisioning.firmware.protocol">HTTP</item>
-		{/if}
-		
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
 		<item name="provisioning.firmware.serverpath">{$grandstream_firmware_path}/{$firmware_version}</item>
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index baa70145b5..194ee08130 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -2032,7 +2032,14 @@
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
 		<!-- Pvalue P6767 -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		<!-- Pvalue P192 -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index 7f5b1543be..e33d360cc5 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -2008,7 +2008,14 @@
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
 		<!-- Pvalue P6767 -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		<!-- Pvalue P192 -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index a417d4a4a1..c4f73aeadc 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -2032,7 +2032,14 @@
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
 		<!-- Pvalue P6767 -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		<!-- Pvalue P192 -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index a417d4a4a1..c4f73aeadc 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -2032,7 +2032,14 @@
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
 		<!-- Pvalue P6767 -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		<!-- Pvalue P192 -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index a417d4a4a1..c4f73aeadc 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -2032,7 +2032,14 @@
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
 		<!-- Pvalue P6767 -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		<!-- Pvalue P192 -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index a417d4a4a1..c4f73aeadc 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -2032,7 +2032,14 @@
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
 		<!-- Pvalue P6767 -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		<!-- Pvalue P192 -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
diff --git a/resources/templates/provision/grandstream/grp261x/{$mac}.xml b/resources/templates/provision/grandstream/grp261x/{$mac}.xml
index 51ec5d26b2..ba6d0b8a55 100644
--- a/resources/templates/provision/grandstream/grp261x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp261x/{$mac}.xml
@@ -1260,7 +1260,14 @@
 		<!-- Maintenance - Upgrade -->
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
 		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
index e2afc0d845..1afd44f703 100644
--- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
@@ -1055,7 +1055,14 @@
 		<!-- Maintenance - Upgrade -->
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
 		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
diff --git a/resources/templates/provision/grandstream/gxv3380 b/resources/templates/provision/grandstream/gxv3380
index 1c81422455..c6d10b67fa 100644
--- a/resources/templates/provision/grandstream/gxv3380
+++ b/resources/templates/provision/grandstream/gxv3380
@@ -1213,7 +1213,14 @@
 		<!-- Maintenance - Upgrade -->
 		<!-- Firmware Upgrade Mode -->
 		<!-- TFTP, HTTP, HTTPS -->
-		<item name="provisioning.firmware.protocol">HTTP</item>
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+
 		<!-- Firmware Server Path -->
 		{if isset($grandstream_firmware_path) && isset($firmware_version)}
 		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>