Merge pull request #1 from fusionpbx/master

Merge from master
2015-10-30 16:04:26 +00:00 · 2015-10-30 16:04:26 +00:00 · 01a43f35fd
parent b5fcb26e6d 82fcbbcbce
commit 01a43f35fd
16 changed files with 158 additions and 59 deletions
--- a/app/calls/app_languages.php
+++ b/app/calls/app_languages.php
@ -101,17 +101,6 @@ $text['label-on-busy']['sv-se'] = "Vid Upptaget ";
 $text['label-on-busy']['uk'] = "Якщо зайнято";
 $text['label-on-busy']['de-at'] = "Bei Besetzt";

-$text['label-ignore-busy']['en-us'] = "Ignore Busy";
-$text['label-ignore-busy']['es-cl'] = "";
-$text['label-ignore-busy']['pt-pt'] = "";
-$text['label-ignore-busy']['fr-fr'] = "";
-$text['label-ignore-busy']['it-it'] = "";
-$text['label-ignore-busy']['pt-br'] = "";
-$text['label-ignore-busy']['pl'] = "";
-$text['label-ignore-busy']['sv-se'] = "";
-$text['label-ignore-busy']['uk'] = "";
-$text['label-ignore-busy']['de-at'] = "";
-
 $text['label-number']['en-us'] = "Number";
 $text['label-number']['es-cl'] = "Número";
 $text['label-number']['pt-pt'] = "Número";
@ -133,6 +122,17 @@ $text['label-no_answer']['sv-se'] = "Inget Svar ";
 $text['label-no_answer']['uk'] = "Без відповіді";
 $text['label-no_answer']['de-at'] = "Keine Antwort";

+$text['label-ignore-busy']['en-us'] = "Ignore Busy";
+$text['label-ignore-busy']['es-cl'] = "";
+$text['label-ignore-busy']['pt-pt'] = "";
+$text['label-ignore-busy']['fr-fr'] = "";
+$text['label-ignore-busy']['it-it'] = "";
+$text['label-ignore-busy']['pt-br'] = "";
+$text['label-ignore-busy']['pl'] = "";
+$text['label-ignore-busy']['sv-se'] = "";
+$text['label-ignore-busy']['uk'] = "";
+$text['label-ignore-busy']['de-at'] = "Ignorieren bei Besetzt";
+
 $text['label-follow-me']['en-us'] = "Follow Me";
 $text['label-follow-me']['es-cl'] = "Sígueme";
 $text['label-follow-me']['pt-pt'] = "Segue-me";
@ -141,7 +141,7 @@ $text['label-follow-me']['pt-br'] = "Siga-me";
 $text['label-follow-me']['pl'] = "Podążaj za mną";
 $text['label-follow-me']['sv-se'] = "Följ Mig ";
 $text['label-follow-me']['uk'] = "";
-$text['label-follow-me']['de-at'] = "Follow Me";
+$text['label-follow-me']['de-at'] = "Anrufweiterschaltung";

 $text['label-enabled']['en-us'] = "Enabled";
 $text['label-enabled']['es-cl'] = "Activo";
@ -311,7 +311,7 @@ $text['label-call-forward']['pt-br'] = "Encaminhamento de chamadas";
 $text['label-call-forward']['pl'] = "Przekierowanie";
 $text['label-call-forward']['sv-se'] = "Vidarekoppling ";
 $text['label-call-forward']['uk'] = "Переадресація";
-$text['label-call-forward']['de-at'] = "Ruf Weiterleitung";
+$text['label-call-forward']['de-at'] = "Rufumleitung";

 $text['description-on-busy']['en-us'] = "If enabled, it overrides the value of voicemail enabling in extension.";
 $text['description-on-busy']['es-cl'] = "Si está habilitada, anula el valor del correo de voz que permite en la extensión.";
@ -383,7 +383,7 @@ $text['description-2']['pt-br'] = "A informação contem a origem, destino, dura
 $text['description-2']['pl'] = "Za pomocą poniższych linków można skonfigurować przekierowania, usługę „Podążaj z mną” lub „Nie przeszkadzać” (DnD).";
 $text['description-2']['sv-se'] = "Använd länkarna för att konfigurera Vidarekoppling, Följ Mig och Stör Ej. ";
 $text['description-2']['uk'] = "";
-$text['description-2']['de-at'] = "Benutzen Sie die Funktionen um Weiterleitung, Follow Me oder Bitte nicht stören zu konfigurieren.";
+$text['description-2']['de-at'] = "Benutzen Sie die Funktionen um Rufumleitung, Anrufweiterschaltung oder Nicht stören zu konfigurieren.";

 $text['description']['en-us'] = "Directs incoming calls for extension:";
 $text['description']['es-cl'] = "Dirige las llamadas entrantes hacia una extensión:";
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@ -767,11 +767,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo 				$text['label-ignore-busy'];
 	echo "			</td>\n";
 	echo "			<td class='vtable' align='left'>\n";
-	echo "				<select class='formfld' name='follow_me_ignore_busy'>\n";
-	echo "					<option value='true' " . ($follow_me_ignore_busy == 'true' ? "selected='selected'" : '') . ">True</option>\n";
-	echo "					<option value='false'" . ($follow_me_ignore_busy == 'true' ? '' : "selected='selected'") . ">False</option>\n";
-	echo "				</select>\n";
-	echo "				<br> Interrupt call if one of destination are busy\n";
+	echo "				<label for='follow_me_ignore_busy'><input type='radio' name='follow_me_ignore_busy' id='follow_me_ignore_busy' value='false' onclick=\"\" ".(($follow_me_ignore_busy == "false" || $follow_me_ignore_busy == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
+	echo "				<label for='follow_me_ignore_busy'><input type='radio' name='follow_me_ignore_busy' id='follow_me_ignore_busy' value='true' onclick=\"$on_click\" ".(($follow_me_ignore_busy == "true") ? "checked='checked'" : null)." /> ".$text['label-enabled']."</label> \n";
+	echo "				<br />\n";
+	echo $text['description-ignore-busy']." \n";
+	//echo "				<br> Interrupt call if one of destination are busy\n";
 	echo "			</td>\n";
 	echo "		</tr>\n";

--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@ -118,6 +118,9 @@
 		$apps[$x]['permissions'][$y]['name'] = "extension_user_context";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "extension_absolute_codec_string";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;

 	//schema details
 		$y = 0; //table array index
@ -384,6 +387,14 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "absolute_codec_string";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+
+

 		$y = 1; //table array index
 		$z = 0; //field array index
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@ -468,6 +468,19 @@ $text['label-sip_bypass_media']['ro'] = "SIP Bypass Media";
 $text['label-sip_bypass_media']['ar-eg'] = "";
 $text['label-sip_bypass_media']['he'] = "";

+$text['label-absolute_codec_string']['en-us'] = "Absolute Codec String";
+$text['label-absolute_codec_string']['es-cl'] = "";
+$text['label-absolute_codec_string']['pt-pt'] = "";
+$text['label-absolute_codec_string']['fr-fr'] = "";
+$text['label-absolute_codec_string']['pt-br'] = "";
+$text['label-absolute_codec_string']['pl'] = "";
+$text['label-absolute_codec_string']['uk'] = "";
+$text['label-absolute_codec_string']['sv-se'] = "";
+$text['label-absolute_codec_string']['de-at'] = "";
+$text['label-absolute_codec_string']['ro'] = "";
+$text['label-absolute_codec_string']['ar-eg'] = "";
+$text['label-absolute_codec_string']['he'] = "";
+
 $text['label-rewrite_tls_contact_port']['en-us'] = "Rewrite TLS Contact Port";
 $text['label-rewrite_tls_contact_port']['es-cl'] = "Reescribir Contacto Puerto TLS";
 $text['label-rewrite_tls_contact_port']['pt-pt'] = "Reescreva Contacto Porto TLS";
@ -1339,6 +1352,19 @@ $text['description-mwi_account']['ro'] = "Contul MWI cu utilizator@domeniu al me
 $text['description-mwi_account']['ar-eg'] = "";
 $text['description-mwi_account']['he'] = "";

+$text['description-absolute_codec_string']['en-us'] = "Absolute Codec String for the extension";
+$text['description-absolute_codec_string']['es-cl'] = "";
+$text['description-absolute_codec_string']['pt-pt'] = "";
+$text['description-absolute_codec_string']['fr-fr'] = "";
+$text['description-absolute_codec_string']['pt-br'] = "";
+$text['description-absolute_codec_string']['pl'] = "";
+$text['description-absolute_codec_string']['uk'] = "";
+$text['description-absolute_codec_string']['sv-se'] = "";
+$text['description-absolute_codec_string']['de-at'] = "";
+$text['description-absolute_codec_string']['ro'] = "";
+$text['description-absolute_codec_string']['ar-eg'] = "";
+$text['description-absolute_codec_string']['he'] = "";
+
 $text['description-missed_call']['en-us'] = "Select the notification type, and enter the appropriate destination.";
 $text['description-missed_call']['es-cl'] = "Seleccione el tipo de notificación, y entrar en el destino apropiado.";
 $text['description-missed_call']['pt-pt'] = "Selecione o tipo de notificação e digite o destino apropriado.";
@ -1793,4 +1819,4 @@ $text['button-add']['ro'] = "Adaugă";
 $text['button-add']['ar-eg'] = "اضافة";
 $text['button-add']['he'] = "הוספה";

-?>
+?>
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@ -135,6 +135,7 @@ else {
 			$nibble_account = check_str($_POST["nibble_account"]);
 			$mwi_account = check_str($_POST["mwi_account"]);
 			$sip_bypass_media = check_str($_POST["sip_bypass_media"]);
+			$absolute_codec_string = check_str($_POST["absolute_codec_string"]);
 			$dial_string = check_str($_POST["dial_string"]);
 			$enabled = check_str($_POST["enabled"]);
 			$description = check_str($_POST["description"]);
@ -462,6 +463,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 								$sql .= "mwi_account, ";
 							}
 							$sql .= "sip_bypass_media, ";
+							if (permission_exists('extension_absolute_codec_string')) {
+								$sql .= "absolute_codec_string, ";
+							}
 							if (permission_exists('extension_dial_string')) {
 								$sql .= "dial_string, ";
 							}
@ -527,6 +531,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 								$sql .= "'$mwi_account', ";
 							}
 							$sql .= "'$sip_bypass_media', ";
+							if (permission_exists('extension_absolute_codec_string')) {
+								$sql .= "'$absolute_codec_string', ";
+							}
 							if (permission_exists('extension_dial_string')) {
 								$sql .= "'$dial_string', ";
 							}
@ -680,6 +687,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					}
 					$sql .= "mwi_account = '$mwi_account', ";
 					$sql .= "sip_bypass_media = '$sip_bypass_media', ";
+					if (permission_exists('extension_absolute_codec_string')) {
+						$sql .= "absolute_codec_string = '$absolute_codec_string', ";
+					}
 					if (permission_exists('extension_dial_string')) {
 						$sql .= "dial_string = '$dial_string', ";
 					}
@ -841,6 +851,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			$nibble_account = $row["nibble_account"];
 			$mwi_account = $row["mwi_account"];
 			$sip_bypass_media = $row["sip_bypass_media"];
+			$absolute_codec_string = $row["absolute_codec_string"];
 			$dial_string = $row["dial_string"];
 			$enabled = $row["enabled"];
 			$description = $row["description"];
@ -1879,6 +1890,19 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";

+	if (permission_exists('extension_absolute_codec_string')) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "    ".$text['label-absolute_codec_string']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <input class='formfld' type='text' name='absolute_codec_string' maxlength='255' value=\"$absolute_codec_string\">\n";
+		echo "<br />\n";
+		echo $text['description-absolute_codec_string']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
 	if (permission_exists('extension_domain')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@ -1980,4 +2004,4 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 //include the footer
 	require_once "resources/footer.php";

-?>
+?>
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@ -65,6 +65,7 @@
 		public $nibble_account;
 		public $mwi_account;
 		public $sip_bypass_media;
+		public $absolute_codec_string;
 		public $dial_string;
 		public $enabled;
 		public $description;
@ -360,6 +361,9 @@
 										$xml .= "      <variable name=\"proxy_media\" value=\"true\"/>\n";
 										break;
 							}
+							if (strlen($row['absolute_codec_string']) > 0) {
+								$xml .= "      <variable name=\"absolute_codec_string\" value=\"" . $row['absolute_codec_string'] . "\"/>\n";
+							}
 							if (strlen($row['forward_all_enabled']) > 0) {
 								$xml .= "      <variable name=\"forward_all_enabled\" value=\"" . $row['forward_all_enabled'] . "\"/>\n";
 							}
@ -494,4 +498,4 @@
 		}
 	}

-?>
+?>
--- a/core/user_settings/app_languages.php
+++ b/core/user_settings/app_languages.php
@ -9,7 +9,7 @@ $text['title-user_dashboard']['pl'] = "Panel użytkowników";
 $text['title-user_dashboard']['he'] = "ממשק משתמש";
 $text['title-user_dashboard']['uk'] = "Панель користувача";
 $text['title-user_dashboard']['sv-se'] = "Användarpanel";
-$text['title-user_dashboard']['de-at'] = "Benutzer-Übersichtsseite";
+$text['title-user_dashboard']['de-at'] = "Benutzerübersicht";
 $text['title-user_dashboard']['ro'] = "Panou control utilizator";
 $text['title-user_dashboard']['fa'] = "";
 $text['title-user_dashboard']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
@ -359,7 +359,7 @@ $text['label-followme']['pl'] = "Podążaj za mną";
 $text['label-followme']['he'] = "עקוב אחרי";
 $text['label-followme']['uk'] = "Follow Me";
 $text['label-followme']['sv-se'] = "Följ Mig";
-$text['label-followme']['de-at'] = "Follow Me";
+$text['label-followme']['de-at'] = "Anrufweiterschaltung";
 $text['label-followme']['ro'] = "Urmează-mă";
 $text['label-followme']['fa'] = "";
 $text['label-followme']['ar-eg'] = "خدمة اتبعني";
@ -457,7 +457,7 @@ $text['label-callforward']['pl'] = "Przekierowanie rozmowy";
 $text['label-callforward']['he'] = "עקוב אחרי";
 $text['label-callforward']['uk'] = "Переадресація дзвінків";
 $text['label-callforward']['sv-se'] = "Vidarekoppling";
-$text['label-callforward']['de-at'] = "Anrufweiterleitung";
+$text['label-callforward']['de-at'] = "Rufumleitung";
 $text['label-callforward']['ro'] = "Redirecționare apel";
 $text['label-callforward']['fa'] = "";
 $text['label-callforward']['ar-eg'] = "تحويل المكالمات";
@ -471,7 +471,7 @@ $text['header-user_dashboard']['pl'] = "Panel użytkowników";
 $text['header-user_dashboard']['he'] = "ממשק משתמש";
 $text['header-user_dashboard']['uk'] = "Панель користувача";
 $text['header-user_dashboard']['sv-se'] = "Användarpanel";
-$text['header-user_dashboard']['de-at'] = "Benutzer-Übersichtsseite";
+$text['header-user_dashboard']['de-at'] = "Benutzerübersicht";
 $text['header-user_dashboard']['ro'] = "Panou control utilizator";
 $text['header-user_dashboard']['fa'] = "";
 $text['header-user_dashboard']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
--- a/core/user_settings/app_menu.php
+++ b/core/user_settings/app_menu.php
@ -29,7 +29,7 @@ $apps[$x]['menu'][1]['title']['pl'] = "Panel użytkowników";
 $apps[$x]['menu'][1]['title']['he'] = "ממשק משתמש";
 $apps[$x]['menu'][1]['title']['uk'] = "Панель користувача";
 $apps[$x]['menu'][1]['title']['sv-se'] = "Användarpanel";
-$apps[$x]['menu'][1]['title']['de-at'] = "Benutzer-Übersichtsseite";
+$apps[$x]['menu'][1]['title']['de-at'] = "Benutzerübersicht";
 $apps[$x]['menu'][1]['title']['ro'] = "Panou control utilizator";
 $apps[$x]['menu'][1]['title']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
 $apps[$x]['menu'][1]['uuid'] = "92c8ffdb-3c82-4f08-aec0-82421ec41bb5";
--- a/resources/install/scripts/app/voicemail/resources/scripts/mwi.lua
+++ b/resources/install/scripts/app/voicemail/resources/scripts/mwi.lua
@ -99,7 +99,7 @@

 				--send the message waiting event
 					local event = freeswitch.Event("message_waiting");
-					if (row["message_count"] == "0") then
+					if (new_messages == "0") then
 						event:addHeader("MWI-Messages-Waiting", "no");
 					else
 						event:addHeader("MWI-Messages-Waiting", "yes");
--- a/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
@ -244,6 +244,7 @@
 								sip_force_expires = row.sip_force_expires;
 								nibble_account = row.nibble_account;
 								sip_bypass_media = row.sip_bypass_media;
+								absolute_codec_string = row.absolute_codec_string;
 								forward_all_enabled = row.forward_all_enabled;
 								forward_all_destination = row.forward_all_destination;
 								forward_busy_enabled = row.forward_busy_enabled;
@ -445,9 +446,13 @@
 							if (string.len(nibble_account) > 0) then
 								table.insert(xml, [[								<variable name="nibble_account" value="]] .. nibble_account .. [["/>]]);
 							end
+							if (string.len(absolute_codec_string) > 0) then
+								table.insert(xml, [[								<variable name="absolute_codec_string" value="]] .. absolute_codec_string .. [["/>]]);
+							end
 							if (sip_bypass_media == "bypass-media") then
 								table.insert(xml, [[								<variable name="bypass_media" value="true"/>]]);
 							end
+							
 							if (sip_bypass_media == "bypass-media-after-bridge") then
 								table.insert(xml, [[								<variable name="bypass_media_after_bridge" value="true"/>]]);
 							end
--- a/resources/install/scripts/ivr_menu.lua
+++ b/resources/install/scripts/ivr_menu.lua
@ -358,8 +358,7 @@
 			pos = string.find(ivr_menu_greet_long, ":", 0, true);
 			if (pos ~= nil and string.sub(ivr_menu_greet_long, 0, pos-1) == 'phrase') then
 				freeswitch.consoleLog("notice", "[ivr_menu] phrase detected\n");
-				session:playAndGetDigits(min_digits, ivr_menu_digit_len, 1, ivr_menu_timeout, ivr_menu_confirm_key, ivr_menu_greet_long, "", ".*");
-				dtmf_digits = session:getVariable("dtmf_digits");
+				dtmf_digits = session:playAndGetDigits(min_digits, ivr_menu_digit_len, 1, ivr_menu_timeout, ivr_menu_confirm_key, ivr_menu_greet_long, "", ".*");
 				session:setVariable("slept", "false");
 			else 
 				dtmf_digits = session:playAndGetDigits(min_digits, ivr_menu_digit_len, 1, ivr_menu_timeout, ivr_menu_confirm_key, ivr_menu_greet_long, "", ".*");				
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>