From 992b18389a580151125f2c6b0d783985584c036e Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 10 Apr 2025 17:55:27 -0600
Subject: [PATCH] GRP add grandstream_wifi_enabled This is needed to prevent
 removing wifi settings that were set manually.

---
 .../provision/grandstream/grp2612/{$mac}.xml  |  4 +-
 .../provision/grandstream/grp2613/{$mac}.xml  |  2 +
 .../provision/grandstream/grp2614/{$mac}.xml  |  4 +-
 .../provision/grandstream/grp2615/{$mac}.xml  | 37 ++++++++++++-------
 .../provision/grandstream/grp2616/{$mac}.xml  |  4 +-
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index 6c9def82f8..05a8a23214 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -1478,6 +1478,7 @@
 		<!-- ########################################################################################## -->
 		<!-- ## Network/WiFi Settings         GRP2614/GRP2615/GRP2616/GRP2624/GRP2634/GRP2670/GRP2650/GRP2636           -->
 		<!-- ########################################################################################## -->
+		{if isset($grandstream_wifi_enabled) && $grandstream_wifi_enabled == 'Yes'}
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
@@ -1846,6 +1847,7 @@
 		<!-- # VoWLan Target Delay. Low, Medium, or High -->
 		<!-- Pvalue P82281 -->
 		<item name="wifi.vowlan_target_delay">Low</item>
+		{/if}
 
 		<!-- ############################################################################## -->
 		<!-- ##  Maintenance/ Web Access     ## -->
@@ -4760,4 +4762,4 @@
 
 
 	</config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 43c43304d6..c7f92e3630 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -1478,6 +1478,7 @@
 		<!-- ########################################################################################## -->
 		<!-- ## Network/WiFi Settings         GRP2614/GRP2615/GRP2616/GRP2624/GRP2634/GRP2670/GRP2650/GRP2636           -->
 		<!-- ########################################################################################## -->
+		{if isset($grandstream_wifi_enabled) && $grandstream_wifi_enabled == 'Yes'}
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
@@ -1846,6 +1847,7 @@
 		<!-- # VoWLan Target Delay. Low, Medium, or High -->
 		<!-- Pvalue P82281 -->
 		<item name="wifi.vowlan_target_delay">Low</item>
+		{/if}
 
 		<!-- ############################################################################## -->
 		<!-- ##  Maintenance/ Web Access     ## -->
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 6c9def82f8..05a8a23214 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -1478,6 +1478,7 @@
 		<!-- ########################################################################################## -->
 		<!-- ## Network/WiFi Settings         GRP2614/GRP2615/GRP2616/GRP2624/GRP2634/GRP2670/GRP2650/GRP2636           -->
 		<!-- ########################################################################################## -->
+		{if isset($grandstream_wifi_enabled) && $grandstream_wifi_enabled == 'Yes'}
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
@@ -1846,6 +1847,7 @@
 		<!-- # VoWLan Target Delay. Low, Medium, or High -->
 		<!-- Pvalue P82281 -->
 		<item name="wifi.vowlan_target_delay">Low</item>
+		{/if}
 
 		<!-- ############################################################################## -->
 		<!-- ##  Maintenance/ Web Access     ## -->
@@ -4760,4 +4762,4 @@
 
 
 	</config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index 2aecc22a81..05a8a23214 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -142,7 +142,7 @@
 		<item name="account.{$row.line_number}.network.natTraversal">{$grandstream_nat_traversal}</item>
 		{else}
 		<item name="account.{$row.line_number}.network.natTraversal">Auto</item>
-		{/if}
+		{/if}		
 
 		<!-- Support Rport (RFC 3581) -->
 		<!-- Yes, No -->
@@ -1478,9 +1478,10 @@
 		<!-- ########################################################################################## -->
 		<!-- ## Network/WiFi Settings         GRP2614/GRP2615/GRP2616/GRP2624/GRP2634/GRP2670/GRP2650/GRP2636           -->
 		<!-- ########################################################################################## -->
+		{if isset($grandstream_wifi_enabled) && $grandstream_wifi_enabled == 'Yes'}
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
-<?comment		<!-- Pvalue P7800 -->
+		<!-- Pvalue P7800 -->
 		<item name="network.wifi.enable">Off</item>
 
 		<!-- # Access Point 1 -->
@@ -1846,6 +1847,7 @@
 		<!-- # VoWLan Target Delay. Low, Medium, or High -->
 		<!-- Pvalue P82281 -->
 		<item name="wifi.vowlan_target_delay">Low</item>
+		{/if}
 
 		<!-- ############################################################################## -->
 		<!-- ##  Maintenance/ Web Access     ## -->
@@ -3754,12 +3756,19 @@
 		<!-- # System Settings -->
 		<!-- # NTP Server -->
 		<!-- Pvalue P30 -->
+		{if isset($ntp_server_primary)}
+		<item name="dateTime.ntp.server.1">{$ntp_server_primary}</item>
+		{else}
 		<item name="dateTime.ntp.server.1">pool.ntp.org</item>
+		{/if}
 
 		<!-- # Secondary NTP Server -->
 		<!-- # String -->
-		<!-- Pvalue P8333 -->
-		<item name="dateTime.ntp.server.2"></item>
+		{if isset($ntp_server_secondary)}
+		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
+		{else}
+		<item name="dateTime.ntp.server.2">2.us.pool.ntp.org</item>
+		{/if}
 
 		<!-- # NTP Update Interval -->
 		<!-- # String -->
@@ -4463,14 +4472,14 @@
 		<!-- # Virtual Multi-Purpose Keys (VPKs) -->
 		<!-- # Note: 1. Fixed VPKs can only be edited. Adding or deleting Fixed VPK is not allowed. -->
 		<!-- #       2. Even if a Dynamic VPK has mode set to None, it should be added in sequence. Skipping one will remove everything after that VPK.  -->
-		<!-- #       3. For GRP2650 -->
-		<!-- #       4. For GRP2670/GRP2636 -->
-		<!-- #       5. For GRP2624/34 -->
-		<!-- #       6. For GRP2616  -->
-		<!-- #       7. For GRP2615 -->
-		<!-- #       8. For GRP2614 -->
-		<!-- #       9. For GRP2613 -->
-		<!-- #       10. For GRP2612 -->
+		<!-- #       3. For GRP2650 --> 
+		<!-- #       4. For GRP2670/GRP2636 --> 
+		<!-- #       5. For GRP2624/34 --> 
+		<!-- #       6. For GRP2616  --> 
+		<!-- #       7. For GRP2615 --> 
+		<!-- #       8. For GRP2614 --> 
+		<!-- #       9. For GRP2613 --> 
+		<!-- #       10. For GRP2612 --> 
 		<!-- ###################################################################################### -->
 
 		<!-- # Key Mode for line VPK. -->
@@ -4528,8 +4537,8 @@
 
 		<!-- ###################################################################################### -->
 		<!-- ## Programmable Keys/Physical Multi-Purpose Keys
-		<!-- # Note: 1. For GRP2634 -->
-		<!-- #       2. For GRP2614/GRP2616/GRP2636 -->
+		<!-- # Note: 1. For GRP2634 --> 
+		<!-- #       2. For GRP2614/GRP2616/GRP2636 --> 
 		<!-- ###################################################################################### -->
 
 {foreach $keys['memory'] as $row}
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index 6c9def82f8..05a8a23214 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -1478,6 +1478,7 @@
 		<!-- ########################################################################################## -->
 		<!-- ## Network/WiFi Settings         GRP2614/GRP2615/GRP2616/GRP2624/GRP2634/GRP2670/GRP2650/GRP2636           -->
 		<!-- ########################################################################################## -->
+		{if isset($grandstream_wifi_enabled) && $grandstream_wifi_enabled == 'Yes'}
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
@@ -1846,6 +1847,7 @@
 		<!-- # VoWLan Target Delay. Low, Medium, or High -->
 		<!-- Pvalue P82281 -->
 		<item name="wifi.vowlan_target_delay">Low</item>
+		{/if}
 
 		<!-- ############################################################################## -->
 		<!-- ##  Maintenance/ Web Access     ## -->
@@ -4760,4 +4762,4 @@
 
 
 	</config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>