From cb62fb115ea2f75c4117c9fed7fe6a444cf87d83 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Thu, 1 Mar 2018 19:17:01 -0500
Subject: [PATCH] Update {$mac}.xml

---
 .../provision/grandstream/gxp1450/{$mac}.xml  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index bc29567ee4..5f172f5367 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -1531,16 +1531,17 @@
 <P238>0</P238>
 
 <!-- XML Config File Password -->
-<!-- String -->
-<P1359></P1359>
+<!-- String; between ascii values 33 and 126 -->
+<!-- Mandatory -->
+<P1359>{$http_auth_password}</P1359>
 
-<!-- HTTP/HTTPS User Name -->
-<!-- String -->
-<P1360></P1360>
+<!--  HTTP/HTTPS User Name -->
+<!--  String; between ascii values 33 and 126 -->
+<P1360>{$http_auth_username}</P1360>
 
-<!-- HTTP/HTTPS Password -->
-<!-- String -->
-<P1361></P1361>
+<!--  HTTP/HTTPS Password -->
+<!--  String; between ascii values 33 and 126 -->
+<P1361>{$http_auth_password}</P1361>
 
 <!-- Firmware Upgrade Via. 0 - TFTP Upgrade,  1 - HTTP Upgrade, 2 - HTTPS Upgrade. Default is 1 -->
 <!-- Number: 0, 1, 2 -->
@@ -1549,7 +1550,11 @@
 
 <!-- Firmware Server Path -->
 <!-- String -->
-<P192>fm.grandstream.com/gs</P192>
+{if isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}</P192>
+{else}
+<P192>{$domain_name}{$project_path}/app/provision</P192>
+{/if}
 
 <!-- Config Server Path -->
 <!-- String -->