From 78d6b30e535dda3e5206fd4f7ccd74c1bf9e13db Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Wed, 28 Oct 2015 22:07:43 -0600
Subject: [PATCH] Enable the directory for speed dial and enterprise
 categories.

---
 .../provision/cisco/7940/SIPDefault.cnf       |  2 +-
 .../cisco/7940/directory-enterprise.xml       | 27 ++++++++++++------
 .../cisco/7940/directory-personal.xml         | 27 ++++++++++++------
 .../cisco/7940/directory-speed_dial.xml       | 28 +++++++++++++------
 .../provision/cisco/7940/directory.xml        |  4 ++-
 5 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/resources/templates/provision/cisco/7940/SIPDefault.cnf b/resources/templates/provision/cisco/7940/SIPDefault.cnf
index 4cb86fc777..489f5c97ea 100644
--- a/resources/templates/provision/cisco/7940/SIPDefault.cnf
+++ b/resources/templates/provision/cisco/7940/SIPDefault.cnf
@@ -121,7 +121,7 @@ time_format_24hr: "0"
 #services_url: "http://{$domain_name}/app/provision/?file=services.php"
 
 # URL for external Directory location
-#directory_url: "http://{$domain_name}/app/provision/?file=directory.php"
+directory_url: "http://{$domain_name}/app/provision/?file=directory.php"
 
 # URL for branding logo
 #logo_url: "http://{$domain_name}/app/provision/logo.bmp"
diff --git a/resources/templates/provision/cisco/7940/directory-enterprise.xml b/resources/templates/provision/cisco/7940/directory-enterprise.xml
index 6a538e519d..7b84648f36 100644
--- a/resources/templates/provision/cisco/7940/directory-enterprise.xml
+++ b/resources/templates/provision/cisco/7940/directory-enterprise.xml
@@ -1,19 +1,28 @@
 <CiscoIPPhoneMenu>
-	<Title>Speed Dials</Title>
+	<Title>Enterprise</Title>
 	<Prompt>Please choose...</Prompt>
 	<SoftKeyItem>
 		<Name>Dial</Name>
 		<URL>SoftKey:Select</URL>
 		<Position>1</Position>
 	</SoftKeyItem>
-	<MenuItem>
-		<Name>First Last Name (Ext) Type</Name>
-		<URL>Dial:5551231234#</URL>
-	</MenuItem>
-	<MenuItem>
-		<Name>First Last Name (Ext) Type</Name>
-		<URL>Dial:5551231234#</URL>
-	</MenuItem>
+	{assign var=x value=1}
+	{foreach $contacts as $row}
+		{if $row.contact_category == "enterprise"}
+		<MenuItem>
+			{if $row.contact_name_given != ""}
+			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+			{else}
+			<Name>{$row.contact_organization}</Name>
+			{/if}
+			{if $row.phone_number != ""}
+			<URL>Dial:{$row.phone_number}#</URL>
+			{else}
+			<URL>Dial:{$row.phone_extension}#</URL>
+			{/if}
+		</MenuItem>
+		{/if}
+	{/foreach}
 	<SoftKeyItem>
 		<Name>Exit</Name>
 		<URL>SoftKey:Exit</URL>
diff --git a/resources/templates/provision/cisco/7940/directory-personal.xml b/resources/templates/provision/cisco/7940/directory-personal.xml
index 6a538e519d..9d774ab56a 100644
--- a/resources/templates/provision/cisco/7940/directory-personal.xml
+++ b/resources/templates/provision/cisco/7940/directory-personal.xml
@@ -1,19 +1,28 @@
 <CiscoIPPhoneMenu>
-	<Title>Speed Dials</Title>
+	<Title>Personal</Title>
 	<Prompt>Please choose...</Prompt>
 	<SoftKeyItem>
 		<Name>Dial</Name>
 		<URL>SoftKey:Select</URL>
 		<Position>1</Position>
 	</SoftKeyItem>
-	<MenuItem>
-		<Name>First Last Name (Ext) Type</Name>
-		<URL>Dial:5551231234#</URL>
-	</MenuItem>
-	<MenuItem>
-		<Name>First Last Name (Ext) Type</Name>
-		<URL>Dial:5551231234#</URL>
-	</MenuItem>
+	{assign var=x value=1}
+	{foreach $contacts as $row}
+		{if $row.contact_category == "personal"}
+		<MenuItem>
+			{if $row.contact_name_given != ""}
+			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+			{else}
+			<Name>{$row.contact_organization}</Name>
+			{/if}
+			{if $row.phone_number != ""}
+			<URL>Dial:{$row.phone_number}#</URL>
+			{else}
+			<URL>Dial:{$row.phone_extension}#</URL>
+			{/if}
+		</MenuItem>
+		{/if}
+	{/foreach}
 	<SoftKeyItem>
 		<Name>Exit</Name>
 		<URL>SoftKey:Exit</URL>
diff --git a/resources/templates/provision/cisco/7940/directory-speed_dial.xml b/resources/templates/provision/cisco/7940/directory-speed_dial.xml
index 6a538e519d..f100c38cd6 100644
--- a/resources/templates/provision/cisco/7940/directory-speed_dial.xml
+++ b/resources/templates/provision/cisco/7940/directory-speed_dial.xml
@@ -1,19 +1,29 @@
 <CiscoIPPhoneMenu>
-	<Title>Speed Dials</Title>
+	<Title>Speed Dial</Title>
 	<Prompt>Please choose...</Prompt>
 	<SoftKeyItem>
 		<Name>Dial</Name>
 		<URL>SoftKey:Select</URL>
 		<Position>1</Position>
 	</SoftKeyItem>
-	<MenuItem>
-		<Name>First Last Name (Ext) Type</Name>
-		<URL>Dial:5551231234#</URL>
-	</MenuItem>
-	<MenuItem>
-		<Name>First Last Name (Ext) Type</Name>
-		<URL>Dial:5551231234#</URL>
-	</MenuItem>
+	{assign var=x value=1}
+	{foreach $contacts as $row}
+		{if $row.contact_category == "speed dial"}
+		<MenuItem>
+			{if $row.contact_name_given != ""}
+			<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+			{else}
+			<Name>{$row.contact_organization}</Name>
+			{/if}
+			{if $row.phone_number != ""}
+			<URL>Dial:{$row.phone_number}#</URL>
+			{else}
+			<URL>Dial:{$row.phone_extension}#</URL>
+			{/if}
+		</MenuItem>
+		{/if}
+	{assign var=x value=$x+1}
+	{/foreach}
 	<SoftKeyItem>
 		<Name>Exit</Name>
 		<URL>SoftKey:Exit</URL>
diff --git a/resources/templates/provision/cisco/7940/directory.xml b/resources/templates/provision/cisco/7940/directory.xml
index b61f067416..9c90716c7c 100644
--- a/resources/templates/provision/cisco/7940/directory.xml
+++ b/resources/templates/provision/cisco/7940/directory.xml
@@ -1,16 +1,18 @@
 <CiscoIPPhoneMenu>
 	<Title>Contacts</Title>
 	<Prompt>Please choose...</Prompt>
+	<!--
 	<MenuItem>
 		<Name>Personal</Name>
 		<URL>http://{$domain_name}/app/provision?file=directory-personal.xml&amp;mac={$mac}</URL>
 	</MenuItem>
+	-->
 	<MenuItem>
 		<Name>Enterprise</Name>
 		<URL>http://{$domain_name}/app/provision?file=directory-enterprise&amp;mac={$mac}</URL>
 	</MenuItem>
 	<MenuItem>
-		<Name>Speed Dials</Name>
+		<Name>Speed Dial</Name>
 		<URL>http://{$domain_name}/app/provision/?file=directory-speed_dial&amp;mac={$mac}</URL>
 	</MenuItem>
 	<SoftKeyItem>