From 6f5a5af1ab185d85eb5de891e4634271186c646b Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 15 Mar 2014 13:23:21 +0000 Subject: [PATCH] Remove extra white spaces and a few other adjustments for the Yealinks phones. --- .../provision/yealink/t20p/y000000000007.cfg | 3 ++ .../provision/yealink/t26p/y000000000004.cfg | 3 ++ .../provision/yealink/t28p/y000000000000.cfg | 3 ++ .../provision/yealink/t32g/y000000000032.cfg | 4 +-- .../provision/yealink/t38g/y000000000038.cfg | 30 +++++++++---------- .../provision/yealink/t38g/{$mac}.cfg | 26 ++++++++++------ .../provision/yealink/t42g/y000000000029.cfg | 23 +++++++------- .../provision/yealink/t46g/y000000000028.cfg | 23 +++++++------- .../provision/yealink/t48g/y000000000035.cfg | 23 +++++++------- .../provision/yealink/w52p/y000000000025.cfg | 4 +-- 10 files changed, 75 insertions(+), 67 deletions(-) diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg index 18e328f24a..d053dba4a6 100644 --- a/resources/templates/provision/yealink/t20p/y000000000007.cfg +++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg @@ -1059,6 +1059,9 @@ features.pickup.blf_audio_enable = #0-Disabled (default), 1-Enabled; features.blf_and_callpark_idle_led_enable = +#Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; +#features.factory_pwd_enable = + #Configure the time (in seconds) the phone automatically dial out the dialed digits. It ranges from 1 to 14, the default value is 4. phone_setting.inter_digit_time = diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg index 3446652442..e465cfdb48 100644 --- a/resources/templates/provision/yealink/t26p/y000000000004.cfg +++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg @@ -1059,6 +1059,9 @@ features.pickup.blf_audio_enable = #0-Disabled (default), 1-Enabled; features.blf_and_callpark_idle_led_enable = +#Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; +features.factory_pwd_enable = + #Configure the time (in seconds) the phone automatically dial out the dialed digits. It ranges from 1 to 14, the default value is 4. phone_setting.inter_digit_time = diff --git a/resources/templates/provision/yealink/t28p/y000000000000.cfg b/resources/templates/provision/yealink/t28p/y000000000000.cfg index 8d143b09b6..0824a234ad 100644 --- a/resources/templates/provision/yealink/t28p/y000000000000.cfg +++ b/resources/templates/provision/yealink/t28p/y000000000000.cfg @@ -1059,6 +1059,9 @@ features.pickup.blf_audio_enable = #0-Disabled (default), 1-Enabled; features.blf_and_callpark_idle_led_enable = +#Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; +#features.factory_pwd_enable = 1 + #Configure the time (in seconds) the phone automatically dial out the dialed digits. It ranges from 1 to 14, the default value is 4. phone_setting.inter_digit_time = diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg index 8004922f79..ed8456b163 100644 --- a/resources/templates/provision/yealink/t32g/y000000000032.cfg +++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg @@ -1059,8 +1059,8 @@ features.pickup.blf_audio_enable = #0-Disabled (default), 1-Enabled; features.blf_and_callpark_idle_led_enable = -#Enable or disable reset by long press on OK key. 0-Disable 1-Enable(Defautl) -#features.reset_by_long_press_enable = 0 +#Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; +#features.factory_pwd_enable = 1 #Configure the time (in seconds) the phone automatically dial out the dialed digits. It ranges from 1 to 14, the default value is 4. phone_setting.inter_digit_time = diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg index 5f063d5d29..c0a0a5c070 100644 --- a/resources/templates/provision/yealink/t38g/y000000000038.cfg +++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg @@ -16,7 +16,7 @@ network.internet_port.ip = network.internet_port.mask = network.internet_port.gateway = network.primary_dns= -network.secondary_dns = +network.secondary_dns = #Configure the username and password for PPPOE connection. #Require reboot; @@ -25,7 +25,7 @@ network.pppoe.password = #Configure the PC port type; 0-Router, 1-Bridge (default); #Require reboot; -network.bridge_mode = +network.bridge_mode = #Configure the IP address and mask when the PC port is configured as Router. #Require reboot; @@ -42,27 +42,27 @@ network.dhcp.end_ip = #Enable or disable the VLAN of WAN port; 0-Disabled (default), 1-Enabled; #Require reboot; -network.vlan.internet_port_enable = +network.vlan.internet_port_enable = #Configure the VLAN ID, it ranges from 0 to 4094, the default value is 1. #Require reboot; -network.vlan.internet_port_vid = +network.vlan.internet_port_vid = #Configure the VLAN priority, it ranges from 0 (default) to 7. -#Require reboot; -network.vlan.internet_port_priority = - +#Require reboot; +network.vlan.internet_port_priority = + #Enable or disable the VLAN of PC port; 0-Disabled (default), 1-Enabled; #Require reboot; -network.vlan.pc_port_enable = +network.vlan.pc_port_enable = #Configure the VLAN ID, it ranges from 0 to 4094, the default value is 1. #Require reboot; -network.vlan.pc_port_vid = +network.vlan.pc_port_vid = #Configure the VLAN priority, it ranges from 0 (default) to 7. #Require reboot; -network.vlan.pc_port_priority = +network.vlan.pc_port_priority = #Configure the access type of the web server; 0-Disabled, 1-HTTP & HTTPS (default), 2-HTTP Only, 3-HTTPS Only; #Require reboot; @@ -590,7 +590,7 @@ programablekey.1.history_type = programablekey.1.label = ########################################################################################## -## Expansion Key £¨For T38G only£© ## +## Expansion Key £¨For T38G only£© ## ########################################################################################## #X ranges from 1 to 6, Y ranges from 1 to 39. #expansion_module.x.key.y.type = 37 (Switch by default) @@ -1057,10 +1057,10 @@ features.pickup.blf_audio_enable = #Enable or disable the phone to turn off the indicator LEDs of BLF and Call Park keys when the monitored states is idle. #0-Disabled (default), 1-Enabled; -features.blf_and_callpark_idle_led_enable = +features.blf_and_callpark_idle_led_enable = 1 -#Enable or disable reset by long press on OK key. 0-Disable 1-Enable(Defautl) -#features.reset_by_long_press_enable = 0 +#Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; +features.factory_pwd_enable = 1 #Configure the time (in seconds) the phone automatically dial out the dialed digits. It ranges from 1 to 14, the default value is 4. phone_setting.inter_digit_time = @@ -1075,7 +1075,7 @@ phone_setting.lock = phone_setting.phone_lock.unlock_pin = phone_setting.phone_lock.lock_time_out = -#Configure the ring tone for the phone. System ring tones are: Ring1.wav (default), Ring2.wav¡­¡­Ring8.wav. +#Configure the ring tone for the phone. System ring tones are: Ring1.wav (default), Ring2.wav - Ring8.wav. #You can configure the custom ring tone (Busy.wav) for the phone, the value is: phone_setting.ring_type = Busy.wav phone_setting.ring_type = diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg index 93ffca75b3..4c3d86fc23 100644 --- a/resources/templates/provision/yealink/t38g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg @@ -237,7 +237,7 @@ account.1.advanced.timer_t1 = account.1.advanced.timer_t2 = account.1.advanced.timer_t4 = -#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.1.ringtone.ring_type = @@ -550,7 +550,7 @@ account.2.advanced.timer_t1 = account.2.advanced.timer_t2 = account.2.advanced.timer_t4 = -#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.2.ringtone.ring_type = @@ -863,7 +863,7 @@ account.3.advanced.timer_t1 = account.3.advanced.timer_t2 = account.3.advanced.timer_t4 = -#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.3.ringtone.ring_type = @@ -1176,7 +1176,7 @@ account.4.advanced.timer_t1 = account.4.advanced.timer_t2 = account.4.advanced.timer_t4 = -#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.4.ringtone.ring_type = @@ -1490,7 +1490,7 @@ account.5.advanced.timer_t1 = account.5.advanced.timer_t2 = account.5.advanced.timer_t4 = -#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.5.ringtone.ring_type = @@ -1801,7 +1801,7 @@ account.6.advanced.timer_t1 = account.6.advanced.timer_t2 = account.6.advanced.timer_t4 = -#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.6.ringtone.ring_type = @@ -1924,9 +1924,11 @@ forward.international.enable = #Configure Line Key {$row.device_key_id} linekey.{$row.device_key_id}.line = {$row.device_key_line} linekey.{$row.device_key_id}.value = {$row.device_key_value} +{if $row.device_key_category == "blf"} linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension} +{/if} linekey.{$row.device_key_id}.type = {$row.device_key_type} -linekey.{$row.device_key_id}.xml_phonebook = +#linekey.{$row.device_key_id}.xml_phonebook = linekey.{$row.device_key_id}.label = {$row.device_key_label} {/if} @@ -1956,10 +1958,12 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} memorykey.{$row.device_key_id}.type = {$row.device_key_type} memorykey.{$row.device_key_id}.line = {$row.device_key_line} memorykey.{$row.device_key_id}.value = {$row.device_key_value} +{if $row.device_key_category == "blf"} memorykey.{$row.device_key_id}.pickup_value = {$row.device_key_extension} +{/if} memorykey.{$row.device_key_id}.label = {$row.device_key_label} -memorykey.{$row.device_key_id}.xml_phonebook = -memorykey.{$row.device_key_id}.sub_type = +#memorykey.{$row.device_key_id}.xml_phonebook = +#memorykey.{$row.device_key_id}.sub_type = {/if} {/foreach} @@ -2009,7 +2013,9 @@ programablekey.1.label = 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} +{if $row.device_key_category == "blf"} expansion_module.1.key.{$row.device_key_id}.pickup_value = {$row.device_key_extension} +{/if} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = @@ -2024,7 +2030,9 @@ expansion_module.1.key.{$row.device_key_id}.xml_phonebook = #expansion_module.2.key.1.type = {$key_type_1} #expansion_module.2.key.1.line = {$key_id_1} #expansion_module.2.key.1.value = {$key_value_1} +{if $row.device_key_category == "blf"} #expansion_module.2.key.1.pickup_value = +{/if} #expansion_module.2.key.1.label = {$key_label_1} #expansion_module.2.key.1.xml_phonebook = #expansion_module.2.key.1.type = 37 diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg index 5ac56ff49a..d7c2e99901 100644 --- a/resources/templates/provision/yealink/t42g/y000000000029.cfg +++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg @@ -584,7 +584,7 @@ features.relog_offtime = features.ringer_device.is_use_headset = #Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; -features.factory_pwd_enable = +#features.factory_pwd_enable = 1 features.idle_talk_power_led_flash_enable = @@ -761,9 +761,6 @@ features.pickup.direct_pickup_code = features.pickup.blf_visual_enable = features.pickup.blf_audio_enable = -#Enable or disable reset by long press on OK key. 0-Disable 1-Enable(Defautl) -#features.reset_by_long_press_enable = 0 - ####################################################################################### ## Phone Setting ## ####################################################################################### @@ -837,6 +834,15 @@ phone_setting.phone_lock.lock_time_out = #Configure the keypad lock type;0-All Keys(default), 1-Function Key, 2-Menu Key phone_setting.phone_lock.lock_key_type = +#Configure the backlight time (in seconds). The valid values are: 0-Always on, 1-Always off, 15-15s, 30-30s (default), 60-60s, 120-120s. +phone_setting.backlight_time = + +####################################################################################### +## Wallpaper ## +####################################################################################### +wallpaper_upload.url = {$yealink_t42g_wallpaper} +phone_setting.backgrounds = Config:yealink_t42g_wallpaper.png + ####################################################################################### ## Multicast ## ####################################################################################### @@ -1487,15 +1493,6 @@ custom_softkey_talking.url = ####################################################################################### local_contact.data_photo_tar.url = -####################################################################################### -## Wallpaper ## -####################################################################################### -wallpaper_upload.url = {$yealink_t42g_wallpaper} - -#Configure the backlight time (in seconds). The valid values are: 0-Always on, 1-Always off, 15-15s, 30-30s (default), 60-60s, 120-120s. -phone_setting.backlight_time = -phone_setting.backgrounds = Config:yealink_t42g_wallpaper.png - ####################################################################################### ## Call List ## ####################################################################################### diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg index 87be02254a..a4b10f9041 100644 --- a/resources/templates/provision/yealink/t46g/y000000000028.cfg +++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg @@ -584,7 +584,7 @@ features.relog_offtime = features.ringer_device.is_use_headset = #Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; -features.factory_pwd_enable = +#features.factory_pwd_enable = 1 features.idle_talk_power_led_flash_enable = @@ -761,9 +761,6 @@ features.pickup.direct_pickup_code = features.pickup.blf_visual_enable = features.pickup.blf_audio_enable = -#Enable or disable reset by long press on OK key. 0-Disable 1-Enable(Defautl) -#features.reset_by_long_press_enable = 0 - ####################################################################################### ## Phone Setting ## ####################################################################################### @@ -837,6 +834,15 @@ phone_setting.phone_lock.lock_time_out = #Configure the keypad lock type;0-All Keys(default), 1-Function Key, 2-Menu Key phone_setting.phone_lock.lock_key_type = +#Configure the backlight time (in seconds). The valid values are: 0-Always on, 1-Always off, 15-15s, 30-30s (default), 60-60s, 120-120s. +phone_setting.backlight_time = + +####################################################################################### +## Wallpaper ## +####################################################################################### +wallpaper_upload.url = {$yealink_t46g_wallpaper} +phone_setting.backgrounds = Config:yealink_t46g_wallpaper.png + ####################################################################################### ## Multicast ## ####################################################################################### @@ -1487,15 +1493,6 @@ custom_softkey_talking.url = ####################################################################################### local_contact.data_photo_tar.url = -####################################################################################### -## Wallpaper ## -####################################################################################### -wallpaper_upload.url = {$yealink_t46g_wallpaper} - -#Configure the backlight time (in seconds). The valid values are: 0-Always on, 1-Always off, 15-15s, 30-30s (default), 60-60s, 120-120s. -phone_setting.backlight_time = -phone_setting.backgrounds = Config:yealink_t46g_wallpaper.png - ####################################################################################### ## Call List ## ####################################################################################### diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg index 87be02254a..125a656e43 100644 --- a/resources/templates/provision/yealink/t48g/y000000000035.cfg +++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg @@ -584,7 +584,7 @@ features.relog_offtime = features.ringer_device.is_use_headset = #Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled; -features.factory_pwd_enable = +#features.factory_pwd_enable = 1 features.idle_talk_power_led_flash_enable = @@ -761,9 +761,6 @@ features.pickup.direct_pickup_code = features.pickup.blf_visual_enable = features.pickup.blf_audio_enable = -#Enable or disable reset by long press on OK key. 0-Disable 1-Enable(Defautl) -#features.reset_by_long_press_enable = 0 - ####################################################################################### ## Phone Setting ## ####################################################################################### @@ -837,6 +834,15 @@ phone_setting.phone_lock.lock_time_out = #Configure the keypad lock type;0-All Keys(default), 1-Function Key, 2-Menu Key phone_setting.phone_lock.lock_key_type = +#Configure the backlight time (in seconds). The valid values are: 0-Always on, 1-Always off, 15-15s, 30-30s (default), 60-60s, 120-120s. +phone_setting.backlight_time = + +####################################################################################### +## Wallpaper ## +####################################################################################### +wallpaper_upload.url = {$yealink_t48g_wallpaper} +phone_setting.backgrounds = Config:yealink_t48g_wallpaper.png + ####################################################################################### ## Multicast ## ####################################################################################### @@ -1487,15 +1493,6 @@ custom_softkey_talking.url = ####################################################################################### local_contact.data_photo_tar.url = -####################################################################################### -## Wallpaper ## -####################################################################################### -wallpaper_upload.url = {$yealink_t46g_wallpaper} - -#Configure the backlight time (in seconds). The valid values are: 0-Always on, 1-Always off, 15-15s, 30-30s (default), 60-60s, 120-120s. -phone_setting.backlight_time = -phone_setting.backgrounds = Config:yealink_t46g_wallpaper.png - ####################################################################################### ## Call List ## ####################################################################################### diff --git a/resources/templates/provision/yealink/w52p/y000000000025.cfg b/resources/templates/provision/yealink/w52p/y000000000025.cfg index ccf769b9f3..23ab737315 100644 --- a/resources/templates/provision/yealink/w52p/y000000000025.cfg +++ b/resources/templates/provision/yealink/w52p/y000000000025.cfg @@ -31,8 +31,8 @@ network.vlan.dhcp_enable = #Configure the DHCP option to obtain the information of the VLAN. It ranges from 0 to 255. #Multiple options separated by a comma. It supports up to 5 options in all. #Require reboot; -network.vlan.dhcp_option = - +network.vlan.dhcp_option = + #Configure the HTTP port (80 by default) and the HTTPS port (443 by default) of the web server. Both range from 1 to 65535. #Require reboot; network.port.http =