From 647a68c65020af3637c38c953acfdffb8cf7a5fe Mon Sep 17 00:00:00 2001
From: AlexanderDCrane <40072887+AlexanderDCrane@users.noreply.github.com>
Date: Wed, 12 Sep 2018 19:24:52 -0600
Subject: [PATCH] Update {$mac}.cfg (#3407)

* Update {$mac}.cfg

* Update {$mac}.cfg

* Update {$mac}.cfg

* Update {$mac}.cfg
---
 .../provision/yealink/t40p/{$mac}.cfg         | 58 +++++++++----------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg
index 120771224f..51c781ce50 100644
--- a/resources/templates/provision/yealink/t40p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg
@@ -8,41 +8,41 @@
 #######################################################################################
 ## ranges from 1 to 6;
 ##account.X.enable =
-{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.password = {$user_password_1}
-account.1.user_name = {$user_id_1}
-account.1.sip_server_host = {$server_address_1}
-account.1.sip_server_port = {$sip_port_1}
-account.1.outbound_host = {$outbound_proxy_1}
-account.1.outbound_port = {$sip_port_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.password = {$account.1.password}
+account.1.user_name = {$account.1.user_id}
+account.1.sip_server_host = {$account.1.server_address}
+account.1.sip_server_port = {$account.1.sip_port}
+account.1.outbound_host = {$account.1.outbound_proxy}
+account.1.outbound_port = {$account.1.sip_port}
 {if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if}
 
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $sip_transport_1 == 'udp'}account.1.transport = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if}
-{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if}
+{if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.transport = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.transport = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.transport = 3{/if}
 
-account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1}
-account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1}
-account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if}
+account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
+account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
 
 {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}
 {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}
 
 #######################################################################################
@@ -58,21 +58,17 @@ account.1.failback_timeout = 3600
 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 =
-{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.address = {$account.1.server.1.address}
+account.1.sip_server.1.port = {$account.1.sip_port}
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.1.sip_server.1.expires = {$register_expires_1}
+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 =
-account.1.sip_server.2.port = 5060
-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
@@ -205,8 +201,8 @@ account.1.out_dialog_blf_enable = 0
 ##account.X.shared_line =
 
 #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA;
-{if isset($shared_line_1) }
-account.1.shared_line = {$shared_line_1}
+{if isset($account.1.shared_line) }
+account.1.shared_line = {$account.1.shared_line}
 {else}
 account.1.shared_line = 0
 {/if}