From 99db46432058badac2415f285c76c0e10be82f53 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Thu, 21 Nov 2019 19:25:34 -0700
Subject: [PATCH] Update phonebook.xml

---
 .../grandstream/gxp2170/phonebook.xml         | 168 +++++++++++-------
 1 file changed, 100 insertions(+), 68 deletions(-)

diff --git a/resources/templates/provision/grandstream/gxp2170/phonebook.xml b/resources/templates/provision/grandstream/gxp2170/phonebook.xml
index 2338a27981..deb211d001 100644
--- a/resources/templates/provision/grandstream/gxp2170/phonebook.xml
+++ b/resources/templates/provision/grandstream/gxp2170/phonebook.xml
@@ -3,111 +3,143 @@
 <AddressBook>
 
 	<pbgroup>
-		<id>6</id>
+		<id>1</id>
 		<name>Users</name>
 		<ringtones>default ringtone</ringtones>
 	</pbgroup>
 	<pbgroup>
-		<id>7</id>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
 		<name>Extensions</name>
 		<ringtones>system</ringtones>
 	</pbgroup>
 
+	{$start_id=0}
 	{foreach $contacts as $row}
 		{if $row.category == "users"}
-		{$start_id=1}
 		<Contact>
-			<id>{$start_id}</id>
+			<id>{$start_id++}</id>
 			{if $row.contact_name_given != ""}
-			<FirstName>{$row.contact_name_given}</FirstName>
-
-			<LastName>{$row.contact_name_family}</LastName>
-
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
 			<JobTitle></JobTitle>
-
+			<Frequent>0</Frequent>
 			{foreach $row.numbers as $number}
 			{if $number.phone_number != ""}
-
-			<Frequent>0</Frequent>
-			<Phone type="Work">
-				<phonenumber>{$number.phone_number}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Phone type="Home">
-				<phonenumber>{$number.phone_extension}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Phone type="Cell">
-				<phonenumber>{$number.phone_mobile}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Group>6</Group>
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
 			<Primary>0</Primary>
 			<Department></Department>
 			<Job></Job>
 			<Company></Company>
 		</Contact>
 		{elseif $row.category == "groups"}
-		{$start_id=1}
 		<Contact>
-			<id>{$start_id}</id>
+			<id>{$start_id++}</id>
 			{if $row.contact_name_given != ""}
-			<FirstName>{$row.contact_name_given}</FirstName>
-
-			<LastName>{$row.contact_name_family}</LastName>
-
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
 			<JobTitle></JobTitle>
 
+			<Frequent>0</Frequent>
 			{foreach $row.numbers as $number}
 			{if $number.phone_number != ""}
-
-			<Frequent>0</Frequent>
-			<Phone type="Work">
-				<phonenumber>{$number.phone_number}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Phone type="Home">
-				<phonenumber>{$number.phone_extension}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Phone type="Cell">
-				<phonenumber>{$number.phone_mobile}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Group>6</Group>
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
 			<Primary>0</Primary>
 			<Department></Department>
 			<Job></Job>
 			<Company></Company>
 		</Contact>
 		{elseif $row.category == "extensions"}
-		{$start_id=1}
 		<Contact>
-			<id>{$start_id}</id>
+			<id>{$start_id++}</id>
 			{if $row.contact_name_given != ""}
-			<FirstName>{$row.contact_name_given}</FirstName>
-
-			<LastName>{$row.contact_name_family}</LastName>
-
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
 			<JobTitle></JobTitle>
-
-			{foreach $row.numbers as $number}
-			{if $number.phone_number != ""}
-
 			<Frequent>0</Frequent>
-			<Phone type="Work">
-				<phonenumber>{$number.phone_number}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Phone type="Home">
-				<phonenumber>{$number.phone_extension}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Phone type="Cell">
-				<phonenumber>{$number.phone_mobile}</phonenumber>
-				<accountindex>0</accountindex>
-			</Phone>
-			<Group>6</Group>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
 			<Primary>0</Primary>
 			<Department></Department>
 			<Job></Job>