From 63741a35ca2899b2ff56e74bc7ff41c364e86fe1 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Sat, 4 Jan 2014 05:50:41 +0000
Subject: [PATCH] Fix the yealink memory keys

---
 resources/templates/provision/yealink/t20/{$mac}.cfg   | 1 -
 resources/templates/provision/yealink/t22/{$mac}.cfg   | 2 --
 resources/templates/provision/yealink/t26/{$mac}.cfg   | 3 ---
 resources/templates/provision/yealink/t28/{$mac}.cfg   | 1 -
 resources/templates/provision/yealink/t32g/{$mac}.cfg  | 4 ----
 resources/templates/provision/yealink/t38g/{$mac}.cfg  | 4 ----
 resources/templates/provision/yealink/vp530/{$mac}.cfg | 4 ----
 7 files changed, 19 deletions(-)

diff --git a/resources/templates/provision/yealink/t20/{$mac}.cfg b/resources/templates/provision/yealink/t20/{$mac}.cfg
index 83dd0362f7..cd1c26c51f 100644
--- a/resources/templates/provision/yealink/t20/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20/{$mac}.cfg
@@ -1904,7 +1904,6 @@ 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}
 
-{else}
 {/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/t22/{$mac}.cfg b/resources/templates/provision/yealink/t22/{$mac}.cfg
index 83dd0362f7..56a9d6ff6f 100644
--- a/resources/templates/provision/yealink/t22/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22/{$mac}.cfg
@@ -1904,7 +1904,5 @@ 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}
 
-{else}
-{/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/t26/{$mac}.cfg b/resources/templates/provision/yealink/t26/{$mac}.cfg
index 8341b4f341..6c230114ef 100644
--- a/resources/templates/provision/yealink/t26/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26/{$mac}.cfg
@@ -1904,7 +1904,6 @@ 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}
 
-{else}
 {/if}
 {/foreach}
 
@@ -1937,8 +1936,6 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label}
 memorykey.{$row.device_key_id}.xml_phonebook = 
 memorykey.{$row.device_key_id}.sub_type = 
 
-{else}
-memorykey.1.type =  NA
 {/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/t28/{$mac}.cfg b/resources/templates/provision/yealink/t28/{$mac}.cfg
index 8341b4f341..f10b7e2a81 100644
--- a/resources/templates/provision/yealink/t28/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28/{$mac}.cfg
@@ -1904,7 +1904,6 @@ 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}
 
-{else}
 {/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 8341b4f341..a9ecdf0005 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -1904,8 +1904,6 @@ 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}
 
-{else}
-{/if}
 {/foreach}
 
 
@@ -1937,8 +1935,6 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label}
 memorykey.{$row.device_key_id}.xml_phonebook = 
 memorykey.{$row.device_key_id}.sub_type = 
 
-{else}
-memorykey.1.type =  NA
 {/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 8341b4f341..a9ecdf0005 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -1904,8 +1904,6 @@ 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}
 
-{else}
-{/if}
 {/foreach}
 
 
@@ -1937,8 +1935,6 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label}
 memorykey.{$row.device_key_id}.xml_phonebook = 
 memorykey.{$row.device_key_id}.sub_type = 
 
-{else}
-memorykey.1.type =  NA
 {/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index 88f9f14f8c..5b35eb48d2 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -1403,8 +1403,6 @@ 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}
 
-{else}
-{/if}
 {/foreach}
 
 
@@ -1436,8 +1434,6 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label}
 memorykey.{$row.device_key_id}.xml_phonebook = 
 memorykey.{$row.device_key_id}.sub_type = 
 
-{else}
-memorykey.1.type =  NA
 {/if}
 {/foreach}