From 05f5f8692d5e41a4646176a511da8032a276c050 Mon Sep 17 00:00:00 2001
From: demonspork <demonspork@gmail.com>
Date: Sun, 18 Oct 2020 12:34:52 -0500
Subject: [PATCH] Fix Config URLs for unconfigured Grandstream Phones

Fix config URL so that the phones don't get an invalid URL when $domain_name is unset. They would previously receive `/app/provision` with no domain/ip included, which makes the phone unable to provision again once they have been added to the Devices page without manually re-setting the config URL or factory defaulting the device.

The alternative solution is that the PHP code could always ensure that the $domain_name variable is set even if the device doesn't exist. My suggestion is to see if it can be set to the same domain/IP as the original provision request from this unconfigured device
---
 resources/templates/provision/grandstream/dp715.sm/{$mac}.xml  | 2 +-
 resources/templates/provision/grandstream/dp715/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/dp750/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/gac2500/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gds3705/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gds3710/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/grp2612/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/grp2612w/{$mac}.xml  | 2 +-
 resources/templates/provision/grandstream/grp2613/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/grp2614/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/grp2615/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/grp2616/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/grp26xx/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp110x/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp116x/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp140x/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml | 2 +-
 resources/templates/provision/grandstream/gxp1450/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml | 2 +-
 resources/templates/provision/grandstream/gxp16xx/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp17xx/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp20xx/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp2100/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp2124/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp2130/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp2135/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp2140/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp2160/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp2170/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp21xx/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml | 2 +-
 resources/templates/provision/grandstream/gxp2200/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxp3240/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxv300x/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxv3140/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxv3175/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml | 2 +-
 resources/templates/provision/grandstream/gxv3240/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxv3275/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxv3504/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxw4004/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxw4008/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxw40xx/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxw410x/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/gxw42xx/{$mac}.xml   | 2 +-
 resources/templates/provision/grandstream/ht502/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/ht503/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/ht701/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/ht702/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/ht704/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/ht802/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/ht818/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/htx86/{$mac}.xml     | 2 +-
 resources/templates/provision/grandstream/wp820/{$mac}.xml     | 2 +-
 54 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index 34a4a3a753..a6d55a3c99 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -80,7 +80,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index 03e799b669..defae594d4 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -42,7 +42,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 	
diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index b759950d6f..3976b06932 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -2921,7 +2921,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
index 44958da1f2..24904d30c7 100644
--- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
@@ -4168,7 +4168,7 @@
 	<P237></P237>
 	{elseif isset($grandstream_config_server_path)}
 	<P237>{$grandstream_config_server_path}</P237>
-	{else}
+	{elseif isset($domain_name)}
 	<P237>{$domain_name}{$project_path}/app/provision</P237>
 	{/if}
 
diff --git a/resources/templates/provision/grandstream/gds3705/{$mac}.xml b/resources/templates/provision/grandstream/gds3705/{$mac}.xml
index 36576d913f..24f049aa17 100644
--- a/resources/templates/provision/grandstream/gds3705/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gds3705/{$mac}.xml
@@ -690,7 +690,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     <!-- HTTP/HTTPS User Name -->
diff --git a/resources/templates/provision/grandstream/gds3710/{$mac}.xml b/resources/templates/provision/grandstream/gds3710/{$mac}.xml
index 456a9013b2..b9c4a39462 100644
--- a/resources/templates/provision/grandstream/gds3710/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gds3710/{$mac}.xml
@@ -743,7 +743,7 @@ E0Fw0O5Kx31JPa+aSBLDMZAG1+SZ/zfxRYQe7VH8p1g=
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     <!-- Config HTTP/HTTPS User Name -->
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index 26f623e5fd..99cbfd181f 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -2451,7 +2451,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index 5b3e26f4cd..9bf41b5f06 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -2545,7 +2545,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 113de1258a..4a5db26b0b 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -3277,7 +3277,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 29ca189204..f7302cceb4 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -4483,7 +4483,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index 1bd69836d5..3135feaff7 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -5430,7 +5430,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index efb9fc2ef2..803ab969a9 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -6381,7 +6381,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 3532664e4b..1c0669429b 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -5746,7 +5746,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index 516c02b91b..b059454eab 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -940,7 +940,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index a563803545..c36b2ed07e 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -814,7 +814,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index 9a9b3c0acb..77384b2f14 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1186,7 +1186,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index b2073dec5f..e0fc2ae56b 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1186,7 +1186,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index d9a5c8c87d..f10e7bab05 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -1569,7 +1569,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index d222f2762c..bed1089f00 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1376,7 +1376,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index a33b9bbca9..bf0d1ca349 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -2073,7 +2073,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 <!--  Config HTTP/HTTPS User Name -->
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index fe878be725..1ef300b899 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -6039,7 +6039,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
index 7574d645a2..9b59b2fa28 100644
--- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
@@ -85,7 +85,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 2751136ec3..9f4fea1e42 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -2809,7 +2809,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 353fbb0256..026c4b5d4a 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -1925,7 +1925,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index c240ea921f..26ed86c5cb 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -6305,7 +6305,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index efaf755057..9550de47be 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -6305,7 +6305,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index efaf755057..9550de47be 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -6305,7 +6305,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 611dc4afc2..fe9b6f4ca1 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -6305,7 +6305,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index e350b82463..8b967be7cd 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -6305,7 +6305,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 41ed4aeb41..71a6875deb 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -2714,7 +2714,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index c706818fd9..a7b0ede910 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -48,7 +48,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 6c0051972a..9db2cf0a43 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3016,7 +3016,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index 71dd325f17..565eb48969 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -3226,7 +3226,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
index ddb2fcbce3..154caa70dd 100644
--- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
@@ -78,7 +78,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
index 01a3cc3cfe..933fc02783 100644
--- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
@@ -1385,7 +1385,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
index 6da83e7eb9..ca06cf43b6 100644
--- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
@@ -1268,7 +1268,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
index 331264c920..2ffd13d9f9 100644
--- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
@@ -767,7 +767,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index 158da35e69..8f1afc86b5 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -4820,7 +4820,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index 16a159f70e..92ab217ab4 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -3225,7 +3225,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
index a72548ece3..e27719804d 100644
--- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
@@ -580,7 +580,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
index 582a506f5b..4e0771d049 100644
--- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
@@ -26,7 +26,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
index 835a1e4725..99a5b06450 100644
--- a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
@@ -26,7 +26,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index e79d12eec1..667ebb2dc5 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -63,7 +63,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
index 895ea6cd13..03746c750d 100644
--- a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
@@ -43,7 +43,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index e2b556976a..cec5dab2bc 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -171,7 +171,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 4f849515a1..c6eba5a6e7 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -53,7 +53,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 		
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index e8ee007b2b..1c94f26119 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -150,7 +150,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index abcbef51d8..3d3ece9a50 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -75,7 +75,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 8589ea4b32..344292f5dc 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -86,7 +86,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 6e0727c8d8..119f449844 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -81,7 +81,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index 1478b0aedc..bae03d7ce1 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -105,7 +105,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 
diff --git a/resources/templates/provision/grandstream/ht818/{$mac}.xml b/resources/templates/provision/grandstream/ht818/{$mac}.xml
index aef0fff087..c1520e6a0b 100644
--- a/resources/templates/provision/grandstream/ht818/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht818/{$mac}.xml
@@ -94,7 +94,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 
diff --git a/resources/templates/provision/grandstream/htx86/{$mac}.xml b/resources/templates/provision/grandstream/htx86/{$mac}.xml
index 35e64e54f0..68441bc895 100644
--- a/resources/templates/provision/grandstream/htx86/{$mac}.xml
+++ b/resources/templates/provision/grandstream/htx86/{$mac}.xml
@@ -57,7 +57,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 
diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml
index ffa7d518cb..845c100845 100644
--- a/resources/templates/provision/grandstream/wp820/{$mac}.xml
+++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml
@@ -2235,7 +2235,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}