From 1303392be28563f979fd1769a19b64106cf621da Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Fri, 27 Sep 2019 22:48:33 -0400
Subject: [PATCH] Update {$mac}.xml (#4689)

---
 .../provision/grandstream/gxw4004/{$mac}.xml  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
index dda823ac49..582a506f5b 100644
--- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
@@ -13,15 +13,22 @@
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade., Number: 0 to 2. Mandatory -->
 		<P212>1</P212>
 		<!-- Firmware Server Path -->
-    {if isset($grandstream_firmware_path) && isset($firmware_version)}
-    <P192>{$grandstream_firmware_path}/gxw4004/{$firmware_version}</P192>
-    {elseif isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}/gxw4004</P192>
-    {else}
-    <P192>{$domain_name}{$project_path}/app/provision</P192>
-    {/if}
+                {if isset($grandstream_firmware_path) && isset($firmware_version)}
+                <P192>{$grandstream_firmware_path}/gxw4004/{$firmware_version}</P192>
+                {elseif isset($grandstream_firmware_path)}
+                <P192>{$grandstream_firmware_path}/gxw4004</P192>
+                {else}
+                <P192>{$domain_name}{$project_path}/app/provision</P192>
+                {/if}
+		
 		<!-- Config Server Path , String: serveraddress -->
-		<P237>{$domain_name}{$project_path}/app/provision</P237>
+		{if $grandstream_config_server_path=="none"}
+                <P237></P237>
+                {elseif isset($grandstream_config_server_path)}
+                <P237>{$grandstream_config_server_path}</P237>
+                {else}
+                <P237>{$domain_name}{$project_path}/app/provision</P237>
+                {/if}
 
 	<!-- Profile 1 Settings	-->
 		<!-- Profile Active.  0 - no, 1 - yes, Number: 0,1. -->