From 14ca5aaf341c39e62b82ac4e19c65528e7582609 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Fri, 28 Feb 2014 23:37:53 +0000
Subject: [PATCH] Fix Yealink T42 and T46 account enable.

---
 .../provision/yealink/t42g/{$mac}.cfg         | 36 +++++++++++++++----
 .../provision/yealink/t46g/{$mac}.cfg         | 36 +++++++++++++++----
 2 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 5264d4e085..ce3b44bed0 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -7,7 +7,11 @@
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.1.enable = 
+{if isset($user_password_1) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
 account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 account.1.auth_name = {$auth_id_1}
@@ -459,7 +463,11 @@ account.1.xsi.port =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.2.enable = 
+{if isset($user_password_2) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
 account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 account.2.auth_name = {$auth_id_2}
@@ -947,7 +955,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.3.enable = 
+{if isset($user_password_3) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
 account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 account.3.auth_name = {$auth_id_3}
@@ -1435,7 +1447,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.4.enable = 
+{if isset($user_password_4) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
 account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 account.4.auth_name = {$auth_id_4}
@@ -1922,7 +1938,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.5.enable = 
+{if isset($user_password_5) }
+account.5.enable = 1
+{else}
+account.5.enable = 0
+{/if}
 account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 account.5.auth_name = {$auth_id_5}
@@ -2409,7 +2429,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.6.enable = 
+{if isset($user_password_6) }
+account.6.enable = 1
+{else}
+account.6.enable = 0
+{/if}
 account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 account.6.auth_name = {$auth_id_6}
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 5264d4e085..ce3b44bed0 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -7,7 +7,11 @@
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.1.enable = 
+{if isset($user_password_1) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
 account.1.label = {$display_name_1}
 account.1.display_name = {$display_name_1}
 account.1.auth_name = {$auth_id_1}
@@ -459,7 +463,11 @@ account.1.xsi.port =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.2.enable = 
+{if isset($user_password_2) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
 account.2.label = {$display_name_2}
 account.2.display_name = {$display_name_2}
 account.2.auth_name = {$auth_id_2}
@@ -947,7 +955,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.3.enable = 
+{if isset($user_password_3) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
 account.3.label = {$display_name_3}
 account.3.display_name = {$display_name_3}
 account.3.auth_name = {$auth_id_3}
@@ -1435,7 +1447,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.4.enable = 
+{if isset($user_password_4) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
 account.4.label = {$display_name_4}
 account.4.display_name = {$display_name_4}
 account.4.auth_name = {$auth_id_4}
@@ -1922,7 +1938,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.5.enable = 
+{if isset($user_password_5) }
+account.5.enable = 1
+{else}
+account.5.enable = 0
+{/if}
 account.5.label = {$display_name_5}
 account.5.display_name = {$display_name_5}
 account.5.auth_name = {$auth_id_5}
@@ -2409,7 +2429,11 @@ network.secondary_dns =
 #######################################################################################
 ## ¡°X¡± ranges from 1 to 6;
 ##account.X.enable = 
-account.6.enable = 
+{if isset($user_password_6) }
+account.6.enable = 1
+{else}
+account.6.enable = 0
+{/if}
 account.6.label = {$display_name_6}
 account.6.display_name = {$display_name_6}
 account.6.auth_name = {$auth_id_6}