From 137d604e04279a39959fdb4ff9128adf05b528bc Mon Sep 17 00:00:00 2001
From: blackc2004 <blackc2004@gmail.com>
Date: Wed, 23 Mar 2016 12:23:41 -0700
Subject: [PATCH] fix directory_extension for new contacts variable

---
 .../provision/yealink/t42g/directory_extensions.xml    | 10 +++++-----
 .../provision/yealink/t46g/directory_extensions.xml    | 10 +++++-----
 .../provision/yealink/t48g/directory_extensions.xml    | 10 +++++-----
 .../provision/yealink/t49g/directory_extensions.xml    | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/resources/templates/provision/yealink/t42g/directory_extensions.xml b/resources/templates/provision/yealink/t42g/directory_extensions.xml
index a28f60ccf4..7bd20d7513 100644
--- a/resources/templates/provision/yealink/t42g/directory_extensions.xml
+++ b/resources/templates/provision/yealink/t42g/directory_extensions.xml
@@ -1,18 +1,18 @@
 <YealinkIPPhoneDirectory>
 {assign var=x value=1}
-{foreach $extensions as $row}
+{foreach $contacts as $row}
 	<DirectoryEntry>
-{if $row.directory_full_name != ""}
-		<Name>{$row.directory_full_name}</Name>
+{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
 		<Name>{$row.effective_caller_id_name}</Name>
 {/if}
 {if $row.number_alias != ""}
 		<Telephone>{$row.number_alias}</Telephone>
 {else}
-		<Telephone>{$row.extension}</Telephone>
+		<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 	</DirectoryEntry>
 {assign var=x value=$x+1}
 {/foreach}
-</YealinkIPPhoneDirectory>
\ No newline at end of file
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t46g/directory_extensions.xml b/resources/templates/provision/yealink/t46g/directory_extensions.xml
index a28f60ccf4..7bd20d7513 100644
--- a/resources/templates/provision/yealink/t46g/directory_extensions.xml
+++ b/resources/templates/provision/yealink/t46g/directory_extensions.xml
@@ -1,18 +1,18 @@
 <YealinkIPPhoneDirectory>
 {assign var=x value=1}
-{foreach $extensions as $row}
+{foreach $contacts as $row}
 	<DirectoryEntry>
-{if $row.directory_full_name != ""}
-		<Name>{$row.directory_full_name}</Name>
+{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
 		<Name>{$row.effective_caller_id_name}</Name>
 {/if}
 {if $row.number_alias != ""}
 		<Telephone>{$row.number_alias}</Telephone>
 {else}
-		<Telephone>{$row.extension}</Telephone>
+		<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 	</DirectoryEntry>
 {assign var=x value=$x+1}
 {/foreach}
-</YealinkIPPhoneDirectory>
\ No newline at end of file
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t48g/directory_extensions.xml b/resources/templates/provision/yealink/t48g/directory_extensions.xml
index a28f60ccf4..7bd20d7513 100644
--- a/resources/templates/provision/yealink/t48g/directory_extensions.xml
+++ b/resources/templates/provision/yealink/t48g/directory_extensions.xml
@@ -1,18 +1,18 @@
 <YealinkIPPhoneDirectory>
 {assign var=x value=1}
-{foreach $extensions as $row}
+{foreach $contacts as $row}
 	<DirectoryEntry>
-{if $row.directory_full_name != ""}
-		<Name>{$row.directory_full_name}</Name>
+{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
 		<Name>{$row.effective_caller_id_name}</Name>
 {/if}
 {if $row.number_alias != ""}
 		<Telephone>{$row.number_alias}</Telephone>
 {else}
-		<Telephone>{$row.extension}</Telephone>
+		<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 	</DirectoryEntry>
 {assign var=x value=$x+1}
 {/foreach}
-</YealinkIPPhoneDirectory>
\ No newline at end of file
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t49g/directory_extensions.xml b/resources/templates/provision/yealink/t49g/directory_extensions.xml
index a28f60ccf4..7bd20d7513 100644
--- a/resources/templates/provision/yealink/t49g/directory_extensions.xml
+++ b/resources/templates/provision/yealink/t49g/directory_extensions.xml
@@ -1,18 +1,18 @@
 <YealinkIPPhoneDirectory>
 {assign var=x value=1}
-{foreach $extensions as $row}
+{foreach $contacts as $row}
 	<DirectoryEntry>
-{if $row.directory_full_name != ""}
-		<Name>{$row.directory_full_name}</Name>
+{if $row.contact_name_given != ""}
+		<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
 		<Name>{$row.effective_caller_id_name}</Name>
 {/if}
 {if $row.number_alias != ""}
 		<Telephone>{$row.number_alias}</Telephone>
 {else}
-		<Telephone>{$row.extension}</Telephone>
+		<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 	</DirectoryEntry>
 {assign var=x value=$x+1}
 {/foreach}
-</YealinkIPPhoneDirectory>
\ No newline at end of file
+</YealinkIPPhoneDirectory>