From 9e45cc8acca62008dea2fa718fc42a39159ac860 Mon Sep 17 00:00:00 2001 From: blackc2004 Date: Tue, 5 Jan 2016 12:14:03 -0800 Subject: [PATCH] change ldap settings to be consistent across all yealink files --- .../provision/yealink/cp860/y000000000037.cfg | 20 +++++-- .../provision/yealink/t20p/y000000000007.cfg | 32 +++++------ .../provision/yealink/t21p/y000000000052.cfg | 42 +++++++++------ .../provision/yealink/t22p/y000000000005.cfg | 53 +++++++------------ .../provision/yealink/t23g/y000000000044.cfg | 42 +++++++++------ .../provision/yealink/t23p/y000000000044.cfg | 42 +++++++++------ .../provision/yealink/t27p/y000000000045.cfg | 42 +++++++++------ .../provision/yealink/t28p/y000000000000.cfg | 53 +++++++------------ .../provision/yealink/t29g/y000000000046.cfg | 42 +++++++++------ .../provision/yealink/t32g/y000000000032.cfg | 32 +++++------ .../provision/yealink/t38g/y000000000038.cfg | 32 +++++------ .../provision/yealink/t41p/y000000000036.cfg | 42 +++++++++------ .../provision/yealink/t42g/y000000000029.cfg | 42 +++++++++------ .../provision/yealink/t46g/y000000000028.cfg | 37 +++++++++---- .../provision/yealink/t48g/y000000000035.cfg | 42 +++++++++------ 15 files changed, 340 insertions(+), 255 deletions(-) diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg index 3b633a861a..bf74289c56 100644 --- a/resources/templates/provision/yealink/cp860/y000000000037.cfg +++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg @@ -559,20 +559,24 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### -#Configure the search criteria for name and number lookups. ldap.enable = {$ldap_enable} -ldap.name_filter = {$ldap_namefilter} -ldap.number_filter = {$ldap_numberfilter} + +#Configure the search criteria for name and number lookups. +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + ldap.host = {$ldap_host} ldap.port = {$ldap_port} + ldap.base = {$ldap_base} ldap.user = {$ldap_user} ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. ldap.max_hits = {$ldap_max_hits} + ldap.name_attr = {$ldap_name_attr} ldap.numb_attr = {$ldap_numb_attr} ldap.display_name = {$ldap_display_name} @@ -580,11 +584,17 @@ ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). ldap.version = {$ldap_version} +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = + #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = {$ldap_sort} +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg index a5eb6a659a..7a190c41ee 100644 --- a/resources/templates/provision/yealink/t20p/y000000000007.cfg +++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg @@ -919,38 +919,40 @@ remote_phonebook.data.1.name = ####################################################################################### ## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.name_filter = -ldap.number_filter = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} -ldap.host = 0.0.0.0 -ldap.port = 389 +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} -ldap.base = -ldap.user = -ldap.password = +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = +ldap.max_hits = {$ldap_max_hits} -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} #Conifugre the search delay time. It ranges from 0 to 2000 (default). ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} #Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; -ldap.dial_lookup = +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Phone Features ## diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg index 7e540ed1fe..522216d202 100644 --- a/resources/templates/provision/yealink/t21p/y000000000052.cfg +++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg @@ -519,32 +519,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg index 96a4a75ec9..3d21ff9011 100644 --- a/resources/templates/provision/yealink/t22p/y000000000005.cfg +++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg @@ -917,40 +917,27 @@ remote_phonebook.data.1.url = remote_phonebook.data.1.name = ####################################################################################### -## LDAP Settings ## +## LDAP ## ####################################################################################### -#Configure the search criteria for name and number lookups. -ldap.name_filter = -ldap.number_filter = - -ldap.host = 0.0.0.0 -ldap.port = 389 - -ldap.base = -ldap.user = -ldap.password = - -#Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = - -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = - -#Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = - -#Conifugre the search delay time. It ranges from 0 to 2000 (default). -ldap.search_delay = - -#Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = - -#Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = - -#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; -ldap.dial_lookup = +#Configure the backlight time (in seconds). The valid values are: 1-Always on, 60 (default), 120, 300, 600, 1800. +security.trust_certificates = 0 +phone_setting.backlight_time = 0 +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} +ldap.host = {$ldap_host} +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} +ldap.display_name = {$ldap_display_name} +ldap.version = {$ldap_version} +ldap.call_in_lookup = {$ldap_call_in_lookup} +ldap.dial_lookup = {$ldap_dial_lookup} +ldap.enable = {$ldap_enable} +ldap.ldap_sort = {$ldap_sort} +ldap.port = {$ldap_port} +ldap.max_hits = {$ldap_max_hits} +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} ####################################################################################### ## Phone Features ## diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg index 7e540ed1fe..522216d202 100644 --- a/resources/templates/provision/yealink/t23g/y000000000044.cfg +++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg @@ -519,32 +519,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg index 7e540ed1fe..522216d202 100644 --- a/resources/templates/provision/yealink/t23p/y000000000044.cfg +++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg @@ -519,32 +519,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg index 7293266e9c..cb83c9464c 100644 --- a/resources/templates/provision/yealink/t27p/y000000000045.cfg +++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg @@ -519,32 +519,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t28p/y000000000000.cfg b/resources/templates/provision/yealink/t28p/y000000000000.cfg index 509319b136..48f691212b 100644 --- a/resources/templates/provision/yealink/t28p/y000000000000.cfg +++ b/resources/templates/provision/yealink/t28p/y000000000000.cfg @@ -917,40 +917,27 @@ remote_phonebook.data.1.url = remote_phonebook.data.1.name = ####################################################################################### -## LDAP Settings ## +## LDAP ## ####################################################################################### -#Configure the search criteria for name and number lookups. -ldap.name_filter = -ldap.number_filter = - -ldap.host = 0.0.0.0 -ldap.port = 389 - -ldap.base = -ldap.user = -ldap.password = - -#Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = - -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = - -#Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = - -#Conifugre the search delay time. It ranges from 0 to 2000 (default). -ldap.search_delay = - -#Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = - -#Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = - -#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; -ldap.dial_lookup = +#Configure the backlight time (in seconds). The valid values are: 1-Always on, 60 (default), 120, 300, 600, 1800. +security.trust_certificates = 0 +phone_setting.backlight_time = 0 +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} +ldap.host = {$ldap_host} +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} +ldap.display_name = {$ldap_display_name} +ldap.version = {$ldap_version} +ldap.call_in_lookup = {$ldap_call_in_lookup} +ldap.dial_lookup = {$ldap_dial_lookup} +ldap.enable = {$ldap_enable} +ldap.ldap_sort = {$ldap_sort} +ldap.port = {$ldap_port} +ldap.max_hits = {$ldap_max_hits} +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} ####################################################################################### ## Phone Features ## diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg index 9d7ea59c52..349d6ac557 100644 --- a/resources/templates/provision/yealink/t29g/y000000000046.cfg +++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg @@ -519,32 +519,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg index 311f3a0890..4ec6d60dec 100644 --- a/resources/templates/provision/yealink/t32g/y000000000032.cfg +++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg @@ -919,38 +919,40 @@ remote_phonebook.data.1.name = ####################################################################################### ## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.name_filter = -ldap.number_filter = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} -ldap.host = 0.0.0.0 -ldap.port = 389 +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} -ldap.base = -ldap.user = -ldap.password = +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = +ldap.max_hits = {$ldap_max_hits} -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} #Conifugre the search delay time. It ranges from 0 to 2000 (default). ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} #Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; -ldap.dial_lookup = +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Phone Features ## diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg index 6e87fb7548..3147b6cf37 100644 --- a/resources/templates/provision/yealink/t38g/y000000000038.cfg +++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg @@ -919,38 +919,40 @@ remote_phonebook.data.1.name = ####################################################################################### ## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.name_filter = -ldap.number_filter = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} -ldap.host = 0.0.0.0 -ldap.port = 389 +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} -ldap.base = -ldap.user = -ldap.password = +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = +ldap.max_hits = {$ldap_max_hits} -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} #Conifugre the search delay time. It ranges from 0 to 2000 (default). ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} #Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; -ldap.dial_lookup = +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Phone Features ## diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg index 50ac9f95fb..d726b6c15d 100644 --- a/resources/templates/provision/yealink/t41p/y000000000036.cfg +++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg @@ -559,32 +559,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg index 298895e307..0054cc8ebb 100644 --- a/resources/templates/provision/yealink/t42g/y000000000029.cfg +++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg @@ -559,32 +559,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg index 4fdd27011c..5fcc953691 100644 --- a/resources/templates/provision/yealink/t46g/y000000000028.cfg +++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg @@ -558,27 +558,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### -#Configure the backlight time (in seconds). The valid values are: 1-Always on, 60 (default), 120, 300, 600, 1800. -security.trust_certificates = 0 -phone_setting.backlight_time = 0 +ldap.enable = {$ldap_enable} + +#Configure the search criteria for name and number lookups. ldap.name_filter = {$ldap_name_filter} ldap.number_filter = {$ldap_number_filter} + ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + ldap.base = {$ldap_base} ldap.user = {$ldap_user} ldap.password = {$ldap_password} -ldap.display_name = {$ldap_display_name} -ldap.version = {$ldap_version} -ldap.call_in_lookup = {$ldap_call_in_lookup} -ldap.dial_lookup = {$ldap_dial_lookup} -ldap.enable = {$ldap_enable} -ldap.ldap_sort = {$ldap_sort} -ldap.port = {$ldap_port} + +#Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. ldap.max_hits = {$ldap_max_hits} + ldap.name_attr = {$ldap_name_attr} ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} + +#Configure the LDAP version. The valid value is 2 or 3 (default). +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = + +#Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; +ldap.call_in_lookup = {$ldap_call_in_lookup} + +#Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ## diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg index db5057e912..95889ff196 100644 --- a/resources/templates/provision/yealink/t48g/y000000000035.cfg +++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg @@ -559,32 +559,42 @@ directory.incoming_call_match_enable = 1 bw.directory_enable = 0 ####################################################################################### -## LDAP ## +## LDAP Settings ## ####################################################################################### +ldap.enable = {$ldap_enable} + #Configure the search criteria for name and number lookups. -ldap.enable = -ldap.name_filter = -ldap.number_filter = -ldap.host = 0.0.0.0 -ldap.port = 389 -ldap.base = -ldap.user = -ldap.password = +ldap.name_filter = {$ldap_name_filter} +ldap.number_filter = {$ldap_number_filter} + +ldap.host = {$ldap_host} +ldap.port = {$ldap_port} + +ldap.base = {$ldap_base} +ldap.user = {$ldap_user} +ldap.password = {$ldap_password} #Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50. -ldap.max_hits = -ldap.name_attr = -ldap.numb_attr = -ldap.display_name = +ldap.max_hits = {$ldap_max_hits} + +ldap.name_attr = {$ldap_name_attr} +ldap.numb_attr = {$ldap_numb_attr} +ldap.display_name = {$ldap_display_name} #Configure the LDAP version. The valid value is 2 or 3 (default). -ldap.version = +ldap.version = {$ldap_version} + +#Conifugre the search delay time. It ranges from 0 to 2000 (default). +ldap.search_delay = #Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled; -ldap.call_in_lookup = +ldap.call_in_lookup = {$ldap_call_in_lookup} #Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled; -ldap.ldap_sort = +ldap.ldap_sort = {$ldap_sort} + +#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled; +ldap.dial_lookup = {$ldap_dial_lookup} ####################################################################################### ## Features ##