From b37a63ed7eca9cf42e718c15315c4f269b4cd6c3 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 20 May 2015 07:31:17 +0000
Subject: [PATCH] Yealink provisioning if using Conference Meet-Me or BLF use
 the pickup value instead of the key extension.

---
 resources/templates/provision/yealink/t42g/{$mac}.cfg       | 6 +++++-
 resources/templates/provision/yealink/t46g/{$mac}.cfg       | 6 +++++-
 .../templates/provision/yealink/t48g/y000000000035.cfg      | 2 +-
 resources/templates/provision/yealink/t48g/{$mac}.cfg       | 6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 0ba1fd1cf6..f61d7bfe92 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -2923,14 +2923,18 @@ network.static_dns_enable = 0
 
 #The x of the parameter "linekey.x.line" ranges from 1 to 6.
 #The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1.
-#linekey.x.lable--Define the label for each line key.
+#linekey.x.lable--Define the label for each line key. Meet-Me Conference "1" or BLF "16" require pick_value.
 
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
 #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_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
 linekey.{$row.device_key_id}.extension = {$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}.label = {$row.device_key_label}
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 3844091f95..d5a65ef413 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -2923,14 +2923,18 @@ network.static_dns_enable = 0
 
 #The x of the parameter "linekey.x.line" ranges from 1 to 6.
 #The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1.
-#linekey.x.lable--Define the label for each line key.
+#linekey.x.lable--Define the label for each line key. Meet-Me Conference "1" or BLF "16" require pick_value.
 
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
 #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_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
 linekey.{$row.device_key_id}.extension = {$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}.label = {$row.device_key_label}
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 65c5933e4e..86c8dd6563 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -1131,7 +1131,7 @@ linekey.27.type =
 linekey.27.xml_phonebook =
 linekey.27.label = 
 #######################################################################################
-##                                   Programablekey                                  ##          
+##                                   Programmable key                                  ##          
 #######################################################################################
 #X ranges from 1 to 13.
 #programablekey.x.type--Customize the programmable key type.
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index d8871d847c..79a0eeeb3d 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -2923,14 +2923,18 @@ network.static_dns_enable = 0
 
 #The x of the parameter "linekey.x.line" ranges from 1 to 6.
 #The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1.
-#linekey.x.lable--Define the label for each line key.
+#linekey.x.lable--Define the label for each line key. Meet-Me Conference "1" or BLF "16" require pick_value.
 
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
 #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_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
 linekey.{$row.device_key_id}.extension = {$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}.label = {$row.device_key_label}