From ff2623126d7b88dfbfd140d31f5a05f40f90572f Mon Sep 17 00:00:00 2001
From: AlexanderDCrane <40072887+AlexanderDCrane@users.noreply.github.com>
Date: Sat, 20 Oct 2018 21:22:48 -0600
Subject: [PATCH] Update {$mac}.xml (#3686)

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

diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index f7863c0c53..3b1a4b95be 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -17,38 +17,38 @@
 <!--  Account Active. 0 - No, 1 - Yes. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-{if isset($user_password_1)}
+{if isset($account.1.password)}
 <P271>1</P271>
 {else}
 <P271>0</P271>
 {/if}
 <!--  Account Name -->
 <!--  String -->
-<P270>{$display_name_1}</P270>
+<P270>{$account.1.display_name}</P270>
 <!--  SIP Server -->
 <!--  String -->
-<P47>{$server_address_1}</P47>
+<P47>{$account.1.server_address}</P47>
 <!--  Secondary SIP Server -->
 <!--  String -->
 <P2312></P2312>
 <!--  Outbound Proxy -->
 <!--  String -->
-<P48>{$outbound_proxy_1}</P48>
+<P48>{$account.1.outbound_proxy}</P48>
 <!--  Backup Outbound Proxy -->
 <!--  String -->
 <P2333></P2333>
 <!--  SIP User ID -->
 <!--  String -->
-<P35>{$user_id_1}</P35>
+<P35>{$account.1.user_id}</P35>
 <!--  Authenticate ID -->
 <!--  String -->
-<P36>{$auth_id_1}</P36>
+<P36>{$account.1.auth_id}</P36>
 <!--  Authenticate Password -->
 <!--  String -->
-<P34>{$user_password_1}</P34>
+<P34>{$account.1.password}</P34>
 <!--  Name -->
 <!--  String -->
-<P3>{$display_name_1}</P3>
+<P3>{$account.1.display_name}</P3>
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P33>*97</P33>
@@ -75,8 +75,8 @@
 <!--  NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!--  Number: 0, 1, 2, 3, 4, 5 -->
 <!--  Mandatory -->
-{if isset($nat_traversal_1) }
-<P52>{$nat_traversal_1}</P52>
+{if isset($account.1.nat_traversal) }
+<P52>{$account.1.nat_traversal}</P52>
 {else}
 <P52>0</P52>
 {/if}
@@ -144,10 +144,10 @@
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
 {$tp=0}
-{if $sip_transport_1 == 'udp'}{$tp=0}{/if}
-{if $sip_transport_1 == 'tcp'}{$tp=1}{/if}
-{if $sip_transport_1 == 'tls'}{$tp=2}{/if}
-{if $sip_transport_1 == 'dns srv'}{$tp=1}{/if}
+{if $account.1.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.1.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.1.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if}
 <P130>{$tp}</P130>
 <!--  SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!--  Number: 0, 1 -->
@@ -594,7 +594,7 @@
 <!--  Account Active. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-{if isset($user_password_2)}
+{if isset($account.2.password)}
 <P401>1</P401>
 {else}
 <P401>0</P401>
@@ -602,10 +602,10 @@
 
 <!--  Account Name -->
 <!--  String -->
-<P417>{$display_name_2}</P417>
+<P417>{$account.2.display_name}</P417>
 <!--  SIP Server -->
 <!--  String -->
-<P402>{$server_address_2}</P402>
+<P402>{$account.2.server_address}</P402>
 
 <!--  Secondary SIP Server -->
 <!--  String -->
@@ -613,26 +613,26 @@
 
 <!--  Outbound Proxy -->
 <!--  String -->
-<P403>{$outbound_proxy_2}</P403>
+<P403>{$account.2.outbound_proxy}</P403>
 
 <!--  Backup Outbound Proxy -->
 <!--  String -->
 <P2433></P2433>
 <!--  SIP User ID -->
 <!--  String -->
-<P404>{$user_id_2}</P404>
+<P404>{$account.2.user_id}</P404>
 
 <!--  Authenticate ID -->
 <!--  String -->
-<P405>{$auth_id_2}</P405>
+<P405>{$account.2.auth_id}</P405>
 
 <!--  Authenticate password -->
 <!--  String -->
-<P406>{$user_password_2}</P406>
+<P406>{$account.2.password}</P406>
 
 <!--  Name -->
 <!--  String -->
-<P407>{$display_name_2}</P407>
+<P407>{$account.2.display_name}</P407>
 
 <!--  Voice Mail UserID -->
 <!--  String -->
@@ -643,8 +643,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($dns_mode_2) }
-<P408>{$dns_mode_2}</P408>
+{if isset($account.2.dns_mode) }
+<P408>{$account.2.dns_mode}</P408>
 {else}
 <P408>0</P408>
 {/if}
@@ -660,8 +660,8 @@
 <!--  NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!--  Number: 0, 1, 2, 3, 4, 5 -->
 <!--  Mandatory -->
-{if isset($nat_traversal_2) }
-<P414>{$nat_traversal_2}</P414>
+{if isset($account.2.nat_traversal) }
+<P414>{$account.2.nat_traversal}</P414>
 {else}
 <P414>0</P414>
 {/if}
@@ -730,10 +730,10 @@
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
 {$tp=0}
-{if $sip_transport_2 == 'udp'}{$tp=0}{/if}
-{if $sip_transport_2 == 'tcp'}{$tp=1}{/if}
-{if $sip_transport_2 == 'tls'}{$tp=2}{/if}
-{if $sip_transport_2 == 'dns srv'}{$tp=1}{/if}
+{if $account.2.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.2.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.2.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if}
 <P448>{$tp}</P448>
 <!--  SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!--  Number: 0, 1 -->
@@ -1160,7 +1160,7 @@
 <!--  Account Active. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-{if isset($user_password_3)}
+{if isset($account.3.password)}
 <P501>1</P501>
 {else}
 <P501>0</P501>
@@ -1168,37 +1168,37 @@
 
 <!--  Account Name -->
 <!--  String -->
-<P517>{$display_name_3}</P517>
+<P517>{$account.3.display_name}</P517>
 
 <!--  SIP Server -->
 <!--  String -->
-<P502>{$server_address_3}</P502>
+<P502>{$account.3.server_address}</P502>
 
 <!--  Secondary SIP Server -->
 <!--  String -->
 <P2512></P2512>
 <!--  Outbound Proxy -->
 <!--  String -->
-<P503>{$outbound_proxy_3}</P503>
+<P503>{$account.3.outbound_proxy}</P503>
 
 <!--  Backup Outbound Proxy -->
 <!--  String  -->
 <P2533></P2533>
 <!--  SIP User ID -->
 <!--  String -->
-<P504>{$user_id_3}</P504>
+<P504>{$account.3.user_id}</P504>
 
 <!--  Authenticate ID -->
 <!--  String -->
-<P505>{$auth_id_3}</P505>
+<P505>{$account.3.auth_id}</P505>
 
 <!--  Authenticate Password -->
 <!--  String -->
-<P506>{$user_password_3}</P506>
+<P506>{$account.3.password}</P506>
 
 <!--  Name -->
 <!--  String -->
-<P507>{$display_name_3}</P507>
+<P507>{$account.3.display_name}</P507>
 
 <!--  Voice Mail UserID -->
 <!--  String -->
@@ -1209,8 +1209,8 @@
 <!--  DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-{if isset($dns_mode_3) }
-<P508>{$dns_mode_3}</P508>
+{if isset($account.3.dns_mode) }
+<P508>{$account.3.dns_mode}</P508>
 {else}
 <P508>0</P508>
 {/if}
@@ -1226,8 +1226,8 @@
 <!--  NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!--  Number: 0, 1, 2, 3, 4, 5 -->
 <!--  Mandatory -->
-{if isset($nat_traversal_3) }
-<P514>{$nat_traversal_3}</P514>
+{if isset($account.3.nat_traversal) }
+<P514>{$account.3.nat_traversal}</P514>
 {else}
 <P514>0</P514>
 {/if}
@@ -1296,10 +1296,10 @@
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
 {$tp=0}
-{if $sip_transport_3 == 'udp'}{$tp=0}{/if}
-{if $sip_transport_3 == 'tcp'}{$tp=1}{/if}
-{if $sip_transport_3 == 'tls'}{$tp=2}{/if}
-{if $sip_transport_3 == 'dns srv'}{$tp=1}{/if}
+{if $account.3.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.3.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.3.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if}
 <P548>{$tp}</P548>
 <!--  SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!--  Number: 0, 1 -->