From 64d1f3862d19a67f1464297a39731e37b5821b08 Mon Sep 17 00:00:00 2001
From: Mendel <44873735+rabbidiesel@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:03:40 -0500
Subject: [PATCH] Yealink dialnow patchs (#6206)

* Update provision.php

* Update y000000000124.cfg

Added {$yealink_dnd_allow} so that you can remove DND from the phone

* Update app_config.php

* Update y000000000053.cfg

* Update y000000000007.cfg

* Update y000000000052.cfg

* Update y000000000005.cfg

* Update y000000000066.cfg

* Update y000000000108.cfg

* Update y000000000124.cfg

* Update y000000000065.cfg

* Update y000000000004.cfg

* Update y000000000044.cfg

* Update y000000000097.cfg

* Match the yealink default

Co-authored-by: FusionPBX <markjcrane@gmail.com>
---
 app/yealink/app_config.php                                | 8 ++++++++
 .../templates/provision/yealink/t19p/y000000000053.cfg    | 5 ++---
 .../templates/provision/yealink/t20p/y000000000007.cfg    | 5 ++---
 .../templates/provision/yealink/t21p/y000000000052.cfg    | 6 +++---
 .../templates/provision/yealink/t22p/y000000000005.cfg    | 2 +-
 .../templates/provision/yealink/t23g/y000000000044.cfg    | 6 +++---
 .../templates/provision/yealink/t26p/y000000000004.cfg    | 2 +-
 .../templates/provision/yealink/t33g/y000000000124.cfg    | 2 +-
 .../templates/provision/yealink/t46s/y000000000066.cfg    | 6 +++---
 .../templates/provision/yealink/t46u/y000000000108.cfg    | 2 +-
 .../templates/provision/yealink/t48s/y000000000065.cfg    | 2 +-
 .../templates/provision/yealink/t57w/y000000000097.cfg    | 3 +--
 12 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index cb0e0269ab..63a3bf1fd2 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -830,6 +830,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The language used in phone interface.";
+		$y++;		
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3f7a5ed6-364c-4d5c-ba7e-4c6e9bdf9131";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_dialplan_dialnow_delay";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Time in second till dialnow activates.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b2d1e9c4-7097-4fc8-bb14-5aba6df4ef32";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
diff --git a/resources/templates/provision/yealink/t19p/y000000000053.cfg b/resources/templates/provision/yealink/t19p/y000000000053.cfg
index 31971ad2f2..7bc807ac54 100644
--- a/resources/templates/provision/yealink/t19p/y000000000053.cfg
+++ b/resources/templates/provision/yealink/t19p/y000000000053.cfg
@@ -1,4 +1,4 @@
-#!version:1.0.0.1
+ #!version:1.0.0.1
 
 ##File header "#!version:1.0.0.1" can not be edited or deleted.##
 
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 phone_setting.is_deal180 =
 
 #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1.
-phone_setting.dialnow_delay =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
@@ -1328,4 +1328,3 @@ web_item_level.url =
 #######################################################################################
 
 sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
-
diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg
index a7ac7b7da8..0454e18f26 100644
--- a/resources/templates/provision/yealink/t20p/y000000000007.cfg
+++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 phone_setting.is_deal180 =
 
 #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1.
-phone_setting.dialnow_delay =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
@@ -1327,5 +1327,4 @@ web_item_level.url =
 ##                                   SIP Advanced                                    ##
 #######################################################################################
 
-sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
-
+sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index 7974aac10a..c061276af4 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -875,7 +875,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1.
-phone_setting.dialnow_delay =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Configure the emergency number, each separated by a comma. The default value is 112,911,110.
 phone_setting.emergency.number = {$yealink_emergency_number}
@@ -1321,8 +1321,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg
index ec3744478d..80752affe6 100644
--- a/resources/templates/provision/yealink/t22p/y000000000005.cfg
+++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 phone_setting.is_deal180 =
 
 #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1.
-phone_setting.dialnow_delay =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index 2b14360fd9..2c301c539e 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -915,7 +915,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1.
-phone_setting.dialnow_delay =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Configure the emergency number, each separated by a comma. The default value is 112,911,110.
 phone_setting.emergency.number = {$yealink_emergency_number}
@@ -1361,8 +1361,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg
index 7d962a307f..88c41446fa 100644
--- a/resources/templates/provision/yealink/t26p/y000000000004.cfg
+++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 phone_setting.is_deal180 =
 
 #Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1.
-phone_setting.dialnow_delay =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg
index d5b65ccf12..65215902a1 100644
--- a/resources/templates/provision/yealink/t33g/y000000000124.cfg
+++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg
@@ -1490,7 +1490,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialplan.dialnow.line_id.1=
 dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg
index 4509b48b54..37308242b5 100644
--- a/resources/templates/provision/yealink/t46s/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg
@@ -991,8 +991,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code = {$yealink_forward_always_off_code}
-forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
 forward.no_answer.target=
 forward.busy.target=
 forward.always.target=
@@ -1330,7 +1330,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialnow.item.1=
 dialplan.dialnow.line_id.1=
diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg
index 19ec84e5c6..e454c60062 100644
--- a/resources/templates/provision/yealink/t46u/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg
@@ -1491,7 +1491,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialplan.dialnow.line_id.1=
 dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg
index 7d0fbccd68..d0fd8f3bcd 100644
--- a/resources/templates/provision/yealink/t48s/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg
@@ -1379,7 +1379,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialnow.item.1=
 dialplan.dialnow.line_id.1=
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index 37c79ffc8e..868b24eb2a 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -1479,7 +1479,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialplan.dialnow.line_id.1=
 
@@ -1973,4 +1973,3 @@ phone_setting.end_call_on_hook.enable=
 
 directory_setting.shared_contact.enable=
 shared_contact_list.url=
-