From df7d62151bc3f95157b0da218b9dd2078f244be0 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Wed, 24 Aug 2016 17:56:41 -0600 Subject: [PATCH] Update the yealink templates. --- .../provision/yealink/cp860/{$mac}.cfg | 88 ++++----- .../provision/yealink/t21p/{$mac}.cfg | 2 +- .../provision/yealink/t23g/{$mac}.cfg | 7 +- .../provision/yealink/t23p/{$mac}.cfg | 183 ++++++++++-------- .../provision/yealink/t27p/{$mac}.cfg | 18 +- .../provision/yealink/t29g/{$mac}.cfg | 6 +- .../provision/yealink/t41p/{$mac}.cfg | 16 +- .../provision/yealink/t42g/{$mac}.cfg | 15 +- .../provision/yealink/t46g/{$mac}.cfg | 2 +- .../provision/yealink/t48g/{$mac}.cfg | 15 +- .../provision/yealink/t49g/{$mac}.cfg | 15 +- .../provision/yealink/vp530/{$mac}.cfg | 2 +- 12 files changed, 190 insertions(+), 179 deletions(-) diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg index a63ce47887..8b466f5a50 100644 --- a/resources/templates/provision/yealink/cp860/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg @@ -1,11 +1,11 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -48,7 +48,7 @@ account.1.outbound_proxy.2.port = 5060 ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -102,7 +102,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -154,7 +154,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -169,7 +169,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -184,7 +184,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -201,7 +201,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -481,7 +481,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -513,7 +513,7 @@ account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -563,7 +563,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -615,7 +615,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -630,7 +630,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -645,7 +645,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -662,7 +662,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -979,7 +979,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -1011,7 +1011,7 @@ account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1061,7 +1061,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1113,7 +1113,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1128,7 +1128,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1143,7 +1143,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1160,7 +1160,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1468,7 +1468,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 4 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1499,7 +1499,7 @@ account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1549,7 +1549,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1601,7 +1601,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1616,7 +1616,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1631,7 +1631,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1648,7 +1648,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1954,7 +1954,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1985,7 +1985,7 @@ account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2035,7 +2035,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2087,7 +2087,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2102,7 +2102,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2117,7 +2117,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2134,7 +2134,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2440,7 +2440,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2471,7 +2471,7 @@ account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2521,7 +2521,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2550,7 +2550,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2572,7 +2572,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2587,7 +2587,7 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.6.subscribe_mwi = 0 @@ -2602,7 +2602,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2619,7 +2619,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg index 7ee31e8352..dd5989b706 100644 --- a/resources/templates/provision/yealink/t21p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg index 2154b7296d..fa526c6311 100644 --- a/resources/templates/provision/yealink/t23g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## @@ -2760,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -3032,7 +3032,6 @@ programablekey.3.label = #programablekey.4.history_type = #programablekey.4.label = - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## @@ -3079,4 +3078,4 @@ expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = #expansion_module.2.key.1.label = #expansion_module.2.key.1.xml_phonebook = #expansion_module.2.key.1.type = -#expansion_module.2.key.1.label = +#expansion_module.2.key.1.label = diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg index ee68c86443..fa526c6311 100644 --- a/resources/templates/provision/yealink/t23p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg @@ -1,11 +1,11 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -19,7 +19,6 @@ 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 = 5060 account.1.sip_listen_port = 5060 @@ -30,8 +29,8 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == '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.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} {if isset($outbound_proxy_1_port)} account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} @@ -47,7 +46,7 @@ account.1.outbound_proxy.2.port = 5060 ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -101,7 +100,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -153,7 +152,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -168,7 +167,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -183,7 +182,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -200,7 +199,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -394,7 +393,7 @@ account.1.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.1.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.1.compact_header_enable = ####################################################################################### @@ -480,7 +479,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -494,7 +493,6 @@ account.2.password = {$user_password_2} account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} - account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -508,11 +506,10 @@ account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} - ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -562,7 +559,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -614,7 +611,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -629,7 +626,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -644,7 +641,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -661,7 +658,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -855,7 +852,7 @@ account.2.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.2.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.2.compact_header_enable = ####################################################################################### @@ -978,7 +975,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -992,7 +989,6 @@ account.3.password = {$user_password_3} account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} - account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -1009,7 +1005,7 @@ account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1059,7 +1055,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1111,7 +1107,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1126,7 +1122,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1141,7 +1137,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1158,7 +1154,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1352,7 +1348,7 @@ account.3.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.3.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.3.compact_header_enable = ####################################################################################### @@ -1461,11 +1457,10 @@ network.internet_port.gateway = {if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if} {if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if} - ####################################################################################### ## Account 4 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1479,7 +1474,6 @@ account.4.password = {$user_password_4} account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} - account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1496,7 +1490,7 @@ account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1546,7 +1540,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1598,7 +1592,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1613,7 +1607,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1628,7 +1622,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1645,7 +1639,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1839,7 +1833,7 @@ account.4.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.4.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.4.compact_header_enable = ####################################################################################### @@ -1951,7 +1945,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1965,7 +1959,6 @@ account.5.password = {$user_password_5} account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} - account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1982,7 +1975,7 @@ account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2032,7 +2025,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2084,7 +2077,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2099,7 +2092,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2114,7 +2107,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2131,7 +2124,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2325,7 +2318,7 @@ account.5.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.5.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.5.compact_header_enable = ####################################################################################### @@ -2437,7 +2430,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2451,7 +2444,6 @@ account.6.password = {$user_password_6} account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} - account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2468,7 +2460,7 @@ account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{ ####################################################################################### ## Failback ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2518,7 +2510,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2547,7 +2539,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2569,7 +2561,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2584,7 +2576,7 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.6.subscribe_mwi = 0 @@ -2599,7 +2591,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2616,7 +2608,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2768,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -2810,7 +2802,7 @@ account.6.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.6.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.6.compact_header_enable = ####################################################################################### @@ -2992,16 +2984,15 @@ memorykey.{$row.device_key_id}.sub_type = #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. {foreach $keys as $row} -+ {if $row.device_key_category == "programmable"} -+ programablekey.{$row.device_key_id}.type = {$row.device_key_type} -+ programablekey.{$row.device_key_id}.line = {$row.device_key_line} -+ programablekey.{$row.device_key_id}.value = {$row.device_key_value} -+ programablekey.{$row.device_key_id}.xml_phonebook = -+ programablekey.{$row.device_key_id}.history_type = -+ programablekey.{$row.device_key_id}.label = {$row.device_key_label} -+ {/if} -+{/foreach} -+ + {if $row.device_key_category == "programmable"} + programablekey.{$row.device_key_id}.type = {$row.device_key_type} + programablekey.{$row.device_key_id}.line = {$row.device_key_line} + programablekey.{$row.device_key_id}.value = {$row.device_key_value} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. @@ -3009,13 +3000,37 @@ memorykey.{$row.device_key_id}.sub_type = #programablekey.x.label--This parameter is only available to the key 1 to key 4. -#programablekey.1.type = -#programablekey.1.line = -#programablekey.1.value = +#History +#programablekey.1.type = 28 +#programablekey.1.line = 1 +#programablekey.1.value = #programablekey.1.xml_phonebook = #programablekey.1.history_type = #programablekey.1.label = +#Directory +#programablekey.2.type = 29 +#programablekey.2.line = 1 +#programablekey.2.value = +#programablekey.2.xml_phonebook = +#programablekey.2.history_type = +#programablekey.2.label = + +#N/A - Disable DND +programablekey.3.type = 0 +programablekey.3.line = +programablekey.3.value = +programablekey.3.xml_phonebook = +programablekey.3.history_type = +programablekey.3.label = + +#Menu +#programablekey.4.type = 30 +#programablekey.4.line = +#programablekey.4.value = +#programablekey.4.xml_phonebook = +#programablekey.4.history_type = +#programablekey.4.label = ########################################################################################## ## Expansion Module 1 ## @@ -3032,7 +3047,7 @@ memorykey.{$row.device_key_id}.sub_type = {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{if $rownum <= 40} expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type} expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} @@ -3040,14 +3055,14 @@ expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extensi expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = {else} -+expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} -+expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} -+expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} -+expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} -+expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} -+expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = -+{/if} -+{$rownum = $rownum + 1} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach} @@ -3063,4 +3078,4 @@ expansion_module.1.key.{$row.device_key_id}.xml_phonebook = #expansion_module.2.key.1.label = #expansion_module.2.key.1.xml_phonebook = #expansion_module.2.key.1.type = -#expansion_module.2.key.1.label = +#expansion_module.2.key.1.label = diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg index 2b5252843c..fa526c6311 100644 --- a/resources/templates/provision/yealink/t27p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## @@ -393,7 +393,7 @@ account.1.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.1.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.1.compact_header_enable = ####################################################################################### @@ -852,7 +852,7 @@ account.2.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.2.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.2.compact_header_enable = ####################################################################################### @@ -1348,7 +1348,7 @@ account.3.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.3.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.3.compact_header_enable = ####################################################################################### @@ -1833,7 +1833,7 @@ account.4.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.4.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.4.compact_header_enable = ####################################################################################### @@ -2318,7 +2318,7 @@ account.5.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.5.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.5.compact_header_enable = ####################################################################################### @@ -2760,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -2802,7 +2802,7 @@ account.6.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.6.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.6.compact_header_enable = ####################################################################################### @@ -3078,4 +3078,4 @@ expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = #expansion_module.2.key.1.label = #expansion_module.2.key.1.xml_phonebook = #expansion_module.2.key.1.type = -#expansion_module.2.key.1.label = +#expansion_module.2.key.1.label = diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg index 78ce136f82..fa526c6311 100644 --- a/resources/templates/provision/yealink/t29g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## @@ -2760,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -3078,4 +3078,4 @@ expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = #expansion_module.2.key.1.label = #expansion_module.2.key.1.xml_phonebook = #expansion_module.2.key.1.type = -#expansion_module.2.key.1.label = +#expansion_module.2.key.1.label = diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg index 38ef3b5749..fa526c6311 100644 --- a/resources/templates/provision/yealink/t41p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## @@ -852,7 +852,7 @@ account.2.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.2.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.2.compact_header_enable = ####################################################################################### @@ -1348,7 +1348,7 @@ account.3.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.3.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.3.compact_header_enable = ####################################################################################### @@ -1833,7 +1833,7 @@ account.4.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.4.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.4.compact_header_enable = ####################################################################################### @@ -2318,7 +2318,7 @@ account.5.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.5.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.5.compact_header_enable = ####################################################################################### @@ -2760,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -2802,7 +2802,7 @@ account.6.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.6.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.6.compact_header_enable = ####################################################################################### @@ -3078,4 +3078,4 @@ expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = #expansion_module.2.key.1.label = #expansion_module.2.key.1.xml_phonebook = #expansion_module.2.key.1.type = -#expansion_module.2.key.1.label = +#expansion_module.2.key.1.label = diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg index e2d7984626..fa526c6311 100644 --- a/resources/templates/provision/yealink/t42g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## @@ -852,7 +852,7 @@ account.2.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.2.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.2.compact_header_enable = ####################################################################################### @@ -1348,7 +1348,7 @@ account.3.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.3.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.3.compact_header_enable = ####################################################################################### @@ -1833,7 +1833,7 @@ account.4.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.4.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.4.compact_header_enable = ####################################################################################### @@ -2318,7 +2318,7 @@ account.5.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.5.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.5.compact_header_enable = ####################################################################################### @@ -2760,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -2802,7 +2802,7 @@ account.6.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.6.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.6.compact_header_enable = ####################################################################################### @@ -3032,7 +3032,6 @@ programablekey.3.label = #programablekey.4.history_type = #programablekey.4.label = - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg index a52e7c8858..fa526c6311 100644 --- a/resources/templates/provision/yealink/t46g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg index 2b2f952134..4856871d64 100644 --- a/resources/templates/provision/yealink/t48g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## @@ -852,7 +852,7 @@ account.2.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.2.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.2.compact_header_enable = ####################################################################################### @@ -1348,7 +1348,7 @@ account.3.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.3.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.3.compact_header_enable = ####################################################################################### @@ -1833,7 +1833,7 @@ account.4.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.4.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.4.compact_header_enable = ####################################################################################### @@ -2318,7 +2318,7 @@ account.5.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.5.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.5.compact_header_enable = ####################################################################################### @@ -2760,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -2802,7 +2802,7 @@ account.6.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.6.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.6.compact_header_enable = ####################################################################################### @@ -3032,7 +3032,6 @@ programablekey.3.label = #programablekey.4.history_type = #programablekey.4.label = - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg index 2b2f952134..4856871d64 100644 --- a/resources/templates/provision/yealink/t49g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.## @@ -852,7 +852,7 @@ account.2.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.2.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.2.compact_header_enable = ####################################################################################### @@ -1348,7 +1348,7 @@ account.3.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.3.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.3.compact_header_enable = ####################################################################################### @@ -1833,7 +1833,7 @@ account.4.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.4.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.4.compact_header_enable = ####################################################################################### @@ -2318,7 +2318,7 @@ account.5.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.5.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.5.compact_header_enable = ####################################################################################### @@ -2760,7 +2760,7 @@ account.6.conf_uri = ## cid source ## ####################################################################################### #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; -account.5.cid_source = +account.6.cid_source = account.6.cid_source_privacy = 1 account.6.cid_source_ppi = 1 @@ -2802,7 +2802,7 @@ account.6.100rel_enable = #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.6.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.6.compact_header_enable = ####################################################################################### @@ -3032,7 +3032,6 @@ programablekey.3.label = #programablekey.4.history_type = #programablekey.4.label = - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg index 2b5252843c..fcea79eea8 100644 --- a/resources/templates/provision/yealink/vp530/{$mac}.cfg +++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg @@ -1,4 +1,4 @@ -#!version:1.0.0.1 REV 71 +#!version:1.0.0.1 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##