From 54128e2124bf1642d3041322d71bab5a8d392ec2 Mon Sep 17 00:00:00 2001
From: AlexanderDCrane <40072887+AlexanderDCrane@users.noreply.github.com>
Date: Wed, 12 Sep 2018 19:13:08 -0600
Subject: [PATCH] Update {$mac}.cfg (#3431)

---
 .../provision/yealink/t58v/{$mac}.cfg         | 57 ++++++++-----------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index a37ff34e77..ada81677ea 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -6,48 +6,48 @@
 #######################################################################################
 ##                           Account1 Basic Settings                                 ##
 #######################################################################################
-{if isset($user_password_1) }
+{if isset($account.1.user_password) }
 account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$display_name_1}
-account.1.display_name = {$display_name_1}
-account.1.auth_name = {$auth_id_1} 
-account.1.user_name = {$user_id_1} 
-account.1.password = {$user_password_1}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.auth_name = {$account.1.auth_id} 
+account.1.user_name = {$account.1.user_id} 
+account.1.password = {$account.1.password}
 account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if}
 
-account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1}
+account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
 {if isset($outbound_proxy_1_port)}
 account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
 {else}
-account.1.outbound_proxy.1.port = 5060
+account.1.outbound_proxy.1.port = {$account.1.sip_port}
 {/if}   
 account.1.dial_tone =
-account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1}
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
 {if isset($outbound_proxy_1_port)}
 account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
 {else}
-account.1.outbound_proxy.2.port = 5060
+account.1.outbound_proxy.2.port = {$account.1.sip_port}
 {/if}
 account.1.outbound_proxy_fallback_interval = 120
 
 ##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0.
 
-{if $sip_transport_1 == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
-{if $sip_transport_1 == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
 
 ##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
 ##The default value is 0. 
 
-{if $sip_transport_2 == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
-{if $sip_transport_2 == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
-{if $sip_transport_2 == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
-{if $sip_transport_2 == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
 
 #######################################################################################
 ##                          Failback                                                 ##
@@ -56,25 +56,16 @@ account.1.outbound_proxy_fallback_interval = 120
 account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
-account.1.sip_server.1.address = {$server_address_1}
-{if $sip_transport_1 == 'dns srv'}
-account.1.sip_server.1.port = 0
-{else}
-account.1.sip_server.1.port = {$sip_port_1}
-{/if}
-account.1.sip_server.1.expires = {$register_expires_1}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+account.1.sip_server.1.port = {$account.1.sip_port}
+account.1.sip_server.1.expires = {$account.1.register_expires}
 account.1.sip_server.1.retry_counts = 3
 account.1.sip_server.1.failback_mode = 0
 account.1.sip_server.1.failback_timeout = 3600
 account.1.sip_server.1.register_on_enable = 0
-
-account.1.sip_server.2.address =
-{if $sip_transport_2 == 'dns srv'}
-account.1.sip_server.2.port = 0
-{else}
-account.1.sip_server.2.port = {$sip_port_2}
-{/if}
-account.1.sip_server.2.expires = 3600
+account.1.sip_server.2.address = {$account.1.server.2.address}
+account.1.sip_server.2.port = {$account.1.sip_port}
+account.1.sip_server.2.expires = {$account.1.register_expires}
 account.1.sip_server.2.retry_counts = 3 
 account.1.sip_server.2.failback_mode =  0
 account.1.sip_server.2.failback_timeout = 3600