From 3fdee27e3aca1ede68dba6c7c4d5e2b473bb130d Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Fri, 29 Jan 2016 13:45:25 -0700
Subject: [PATCH] Mitel provisioning ensure the user_id is set for all keys.

---
 resources/templates/provision/mitel/5324/MN_{$mac}.cfg | 4 ++--
 resources/templates/provision/mitel/5330/MN_{$mac}.cfg | 4 ++--
 resources/templates/provision/mitel/5340/MN_{$mac}.cfg | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
index d6a28f2e81..1d568b2548 100644
--- a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
@@ -268,7 +268,6 @@
 	<srtp>0</srtp>
 <pkDescription>
 {foreach $keys as $row}
-{if $row.device_key_type == "6"}
 {if $row.device_key_line == "1"}{$feature = "6"}{$user_id = $user_id_1}{/if}
 {if $row.device_key_line == "2"}{$feature = "7"}{$user_id = $user_id_2}{/if}
 {if $row.device_key_line == "3"}{$feature = "8"}{$user_id = $user_id_3}{/if}
@@ -277,8 +276,9 @@
 {if $row.device_key_line == "6"}{$feature = "11"}{$user_id = $user_id_6}{/if}
 {if $row.device_key_line == "7"}{$feature = "12"}{$user_id = $user_id_7}{/if}
 {if $row.device_key_line == "8"}{$feature = "13"}{$user_id = $user_id_8}{/if}
+{if $row.device_key_type == "6"}
 <Key Line="{$row.device_key_id}" Fea="{$feature}" Des="{$row.device_key_label}" Addr="{$row.device_key_value}" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
-{/if}{if $row.device_key_type != "6"}
+{else}
 <Key Line="{$row.device_key_id}" Fea="{$row.device_key_type}" Des="{$row.device_key_label}" Addr="{$row.device_key_value}" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
 {/if}
 {/foreach}
diff --git a/resources/templates/provision/mitel/5330/MN_{$mac}.cfg b/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
index 0c585c1d81..bd9647783d 100644
--- a/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
@@ -268,7 +268,6 @@
 	<srtp>0</srtp>
 <pkDescription>
 {foreach $keys as $row}
-{if $row.device_key_type == "6"}
 {if $row.device_key_line == "1"}{$feature = "6"}{$user_id = $user_id_1}{/if}
 {if $row.device_key_line == "2"}{$feature = "7"}{$user_id = $user_id_2}{/if}
 {if $row.device_key_line == "3"}{$feature = "8"}{$user_id = $user_id_3}{/if}
@@ -277,8 +276,9 @@
 {if $row.device_key_line == "6"}{$feature = "11"}{$user_id = $user_id_6}{/if}
 {if $row.device_key_line == "7"}{$feature = "12"}{$user_id = $user_id_7}{/if}
 {if $row.device_key_line == "8"}{$feature = "13"}{$user_id = $user_id_8}{/if}
+{if $row.device_key_type == "6"}
 <Key Line="{$row.device_key_id}" Fea="{$feature}" Des="{$row.device_key_label}" Addr="{$row.device_key_value}" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
-{/if}{if $row.device_key_type != "6"}
+{else}
 <Key Line="{$row.device_key_id}" Fea="{$row.device_key_type}" Des="{$row.device_key_label}" Addr="{$row.device_key_value}" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
 {/if}
 {/foreach}
diff --git a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
index 0c585c1d81..1d568b2548 100644
--- a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
@@ -1,4 +1,4 @@
-<Parameter Model="5340">
+<Parameter Model="5324">
 	<dhcpenable>1</dhcpenable>
 	{if isset($mitel_tftp_config)}<tftp_config>{$mitel_tftp_config}</tftp_config>{else}<tftp_config>2</tftp_config>
 	{/if}<pppoe_enable>0</pppoe_enable>
@@ -268,7 +268,6 @@
 	<srtp>0</srtp>
 <pkDescription>
 {foreach $keys as $row}
-{if $row.device_key_type == "6"}
 {if $row.device_key_line == "1"}{$feature = "6"}{$user_id = $user_id_1}{/if}
 {if $row.device_key_line == "2"}{$feature = "7"}{$user_id = $user_id_2}{/if}
 {if $row.device_key_line == "3"}{$feature = "8"}{$user_id = $user_id_3}{/if}
@@ -277,8 +276,9 @@
 {if $row.device_key_line == "6"}{$feature = "11"}{$user_id = $user_id_6}{/if}
 {if $row.device_key_line == "7"}{$feature = "12"}{$user_id = $user_id_7}{/if}
 {if $row.device_key_line == "8"}{$feature = "13"}{$user_id = $user_id_8}{/if}
+{if $row.device_key_type == "6"}
 <Key Line="{$row.device_key_id}" Fea="{$feature}" Des="{$row.device_key_label}" Addr="{$row.device_key_value}" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
-{/if}{if $row.device_key_type != "6"}
+{else}
 <Key Line="{$row.device_key_id}" Fea="{$row.device_key_type}" Des="{$row.device_key_label}" Addr="{$row.device_key_value}" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
 {/if}
 {/foreach}