From 83aff11098353e1237e2db76b69f2114fa7d0aac Mon Sep 17 00:00:00 2001
From: wouam31200 <105128426+wouam31200@users.noreply.github.com>
Date: Wed, 12 Jul 2023 23:27:23 +0200
Subject: [PATCH] BLF Not Showing Correct Status When Using DNS-SRV (#6714)

* Update {$mac}.cfg

* Update {$mac}.cfg

* Update {$mac}.cfg

BLF Not Showing Correct Status When Using DNS-SRV

* Update y000000000095.cfg

 yealink_language

* Update y000000000097.cfg

Add {$yealink_enhanced_dss_keys}

* Update y000000000096.cfg

Add {$yealink_enhanced_dss_keys}

* Update y000000000095.cfg

Add {$yealink_enhanced_dss_keys}

* Update y000000000070.cfg

Add {$yealink_enhanced_dss_keys}
---
 resources/templates/provision/yealink/t54w/{$mac}.cfg       | 4 ++++
 resources/templates/provision/yealink/t57w/{$mac}.cfg       | 4 ++++
 resources/templates/provision/yealink/t5x/y000000000070.cfg | 2 +-
 resources/templates/provision/yealink/t5x/y000000000095.cfg | 6 +++---
 resources/templates/provision/yealink/t5x/y000000000096.cfg | 2 +-
 resources/templates/provision/yealink/t5x/y000000000097.cfg | 2 +-
 resources/templates/provision/yealink/t5x/{$mac}.cfg        | 4 ++++
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg
index dd3b1099c6..b247df1935 100644
--- a/resources/templates/provision/yealink/t54w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg
@@ -126,6 +126,10 @@ account.{$row.line_number}.password = {$row.password}
 
 {if isset($row.server.1.address)}
 account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
+account.{$row.line_number}.fallback.redundancy_type=1
+account.{$row.line_number}.fallback.timeout=10
+account.{$row.line_number}.sip_server.1.address={$row.server.1.address}
+account.{$row.line_number}.sip_server.2.address={$row.server.2.address}
 {else}
 account.{$row.line_number}.user_name = {$row.user_id}
 {/if}
diff --git a/resources/templates/provision/yealink/t57w/{$mac}.cfg b/resources/templates/provision/yealink/t57w/{$mac}.cfg
index b946bd33b8..6a887f465f 100644
--- a/resources/templates/provision/yealink/t57w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t57w/{$mac}.cfg
@@ -121,6 +121,10 @@ account.1.password = {$account.1.password}
 
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+account.{$row.line_number}.fallback.redundancy_type=1
+account.{$row.line_number}.fallback.timeout=10
+account.{$row.line_number}.sip_server.1.address={$row.server.1.address}
+account.{$row.line_number}.sip_server.2.address={$row.server.2.address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg
index 826cf28406..86b4f233d2 100644
--- a/resources/templates/provision/yealink/t5x/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg
@@ -934,7 +934,7 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #######################################################################################
 ##EDK Soft Keys(X ranges from 1 to 10)
 
-features.enhanced_dss_keys.enable=
+features.enhanced_dss_keys.enable= {$yealink_enhanced_dss_keys}
 edk.id_mode.enable=
 softkey.1.position=
 softkey.1.use.dialing=
diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg
index 1ea087f1ef..5cdf702ffd 100644
--- a/resources/templates/provision/yealink/t5x/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg
@@ -1047,7 +1047,7 @@ expkey.type_range.custom =
 ####################################################################################### 
 ##EDK Soft Keys(X ranges from 1 to 10)
 
-features.enhanced_dss_keys.enable=
+features.enhanced_dss_keys.enable= {$yealink_enhanced_dss_keys}
 edk.id_mode.enable=
 softkey.1.position=
 softkey.1.use.dialing=
@@ -1535,8 +1535,8 @@ wui_lang.delete=
 gui_input_method.delete=
 gui_lang.url=
 gui_lang.delete=
-lang.gui=
-lang.wui=
+lang.gui= {$yealink_language_gui}
+lang.wui= {$yealink_language_web}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg
index bc63d8ec04..3f7b4d9cc3 100644
--- a/resources/templates/provision/yealink/t5x/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg
@@ -1048,7 +1048,7 @@ expkey.type_range.custom =
 ####################################################################################### 
 ##EDK Soft Keys(X ranges from 1 to 10)
 
-features.enhanced_dss_keys.enable=
+features.enhanced_dss_keys.enable= {$yealink_enhanced_dss_keys}
 edk.id_mode.enable=
 softkey.1.position=
 softkey.1.use.dialing=
diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg
index e9508b2b92..83b68f1f3f 100644
--- a/resources/templates/provision/yealink/t5x/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg
@@ -1048,7 +1048,7 @@ expkey.type_range.custom =
 ####################################################################################### 
 ##EDK Soft Keys(X ranges from 1 to 10)
 
-features.enhanced_dss_keys.enable=
+features.enhanced_dss_keys.enable= {$yealink_enhanced_dss_keys}
 edk.id_mode.enable=
 softkey.1.position=
 softkey.1.use.dialing=
diff --git a/resources/templates/provision/yealink/t5x/{$mac}.cfg b/resources/templates/provision/yealink/t5x/{$mac}.cfg
index 672c289127..2a41cba4e5 100644
--- a/resources/templates/provision/yealink/t5x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t5x/{$mac}.cfg
@@ -22,6 +22,10 @@ account.{$row.line_number}.password = {$row.password}
 
 {if isset($row.server.1.address)}
 account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
+account.{$row.line_number}.fallback.redundancy_type=1
+account.{$row.line_number}.fallback.timeout=10
+account.{$row.line_number}.sip_server.1.address={$row.server.1.address}
+account.{$row.line_number}.sip_server.2.address={$row.server.2.address}
 {else}
 account.{$row.line_number}.user_name = {$row.user_id}
 {/if}