From 1154dbb580f8c05b42b0812150205030dcda9f1c Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Sat, 29 Jul 2017 01:38:45 -0400
Subject: [PATCH] Update {$mac}.xml

---
 .../provision/grandstream/ht704/{$mac}.xml    | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 039a96f731..534500a972 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -68,7 +68,11 @@
 <P212>2</P212>
 
 <!-- Firmware Server Path -->
-<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 -->
 <P237>{$domain_name}{$project_path}/app/provision</P237>
@@ -110,7 +114,11 @@
 <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No.-->
 <!-- Number: 0, 1, 2, 3-->
 <!-- Mandatory-->
+{if isset($grandstream_auto_upgrade)}
+<P194>{$grandstream_auto_upgrade}</P194>
+{else}
 <P194>0</P194>
+{/if}
 
 <!-- Check for new firmware/config file every () minutes, unit is in minute, minimum 60 minutes, default is 7 days. -->
 <!-- Number: 60 to 5256000-->
@@ -245,18 +253,26 @@
 
 <!-- Syslog Server (name of the server, max length is 64 characters)-->
 <!-- Server address-->
-<P207></P207>
+<P207>{$grandstream_syslog_server}</P207>
 
 <!-- Syslog Level (Default setting is NONE)-->
 <!-- 0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR, 5 - EXTRA DEBUG-->
 <!-- Number: 0, 1, 2, 3, 4, 5-->
 <!-- Mandatory-->
+{if isset($grandstream_syslog_level)}
+<P208>{$grandstream_syslog_level}</P208>
+{else}
 <P208>0</P208>
+{/if}
 
 <!-- Send SIP Log. 0 - No, 1 - Yes. (If set to yes, The unit will replicate the received and send SIP packets on the syslog)-->
 <!-- Number: 0, 1-->
 <!-- Mandatory-->
+{if isset($grandstream_send_sip_log)}
+<P1387>{$grandstream_send_sip_log}</P1387>
+{else}
 <P1387>0</P1387>
+{/if}
 
 <!-- Primary RADIUS Server-->
 <!-- Server address-->
@@ -338,10 +354,17 @@
 <!-- Mandatory-->
 <P130>0</P130>
 
-<!-- NAT Traversal (STUN) 0 - No, 2 - No but send keep-alive, 1 - Yes, 3 - UPnP-->
-<!-- Number: 0, 1, 2, 3-->
-<!-- Mandatory-->
+<!-- DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default value is 0 -->
+<!-- Number: 0, 1, 2 -->
+<P103>1</P103>
+
+<!-- NAT Traversal. 0 - NAT No, 1 - STUN, 2 - Keep-alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default value is 2 -->
+<!-- Number: 0, 1, 2, 3, 4, 5 -->
+{if isset($grandstream_nat_traversal_1)}
+<P52>{$grandstream_nat_traversal_1}</P52>
+{else}
 <P52>0</P52>
+{/if}
 
 <!-- DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV.-->
 <!-- Number: 0, 1, 2-->
@@ -438,10 +461,15 @@
 <!-- Mandatory-->
 <P4340>0</P4340>
 
-<!-- Check SIP UserID for incoming INVITE. 0 - No, 1 - Yes (no direct IP calling if Yes)-->
-<!-- Number: 0, 1-->
-<!-- Mandatory-->
+<!-- Check SIP User ID for Incoming INVITE -->
+<!-- 0 - No, 1 - Yes. Default value is 0 -->
+<!-- Number: 0, 1 -->
+
+{if isset($grandstream_check_sip_user_id)}
+<P258>1</P258>
+{else}
 <P258>0</P258>
+{/if}
 
 <!-- Authenticate incoming INVITE-->
 <!-- Number: 0, 1-->
@@ -1943,7 +1971,7 @@
 <!-- <value=customize> Using self-defined Time Zone -->
 <!-- String -->
 <!-- Mandatory  -->
-<P64>customize</P64>
+<P64>{$grandstream_gxp_time_zone}</P64>
 
 <!-- Self-Defined Time Zone -->
 <!-- String -->