From af881804d44e923ce185dc9cc441102f706e95d1 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Tue, 18 Mar 2014 09:04:05 +0000
Subject: [PATCH] Fix the dialplan_number so that it is more accurate.

---
 app/dialplan/resources/classes/dialplan.php                  | 5 ++++-
 app/dialplan/resources/switch/conf/dialplan/000_global.xml   | 2 +-
 .../resources/switch/conf/dialplan/110_call-direction.xml    | 2 +-
 .../resources/switch/conf/dialplan/210_user_status.xml       | 2 +-
 .../resources/switch/conf/dialplan/220_global-intercept.xml  | 2 +-
 .../resources/switch/conf/dialplan/230_group-intercept.xml   | 2 +-
 app/dialplan/resources/switch/conf/dialplan/240_redial.xml   | 2 +-
 app/dialplan/resources/switch/conf/dialplan/250_page.xml     | 2 +-
 .../resources/switch/conf/dialplan/260_eavesdrop.xml         | 2 +-
 .../resources/switch/conf/dialplan/270_call_privacy.xml      | 2 +-
 .../resources/switch/conf/dialplan/280_call_return.xml       | 4 ++--
 .../resources/switch/conf/dialplan/290_intercept-ext.xml     | 2 +-
 app/dialplan/resources/switch/conf/dialplan/300_dx.xml       | 2 +-
 .../switch/conf/dialplan/300_extension-intercom.xml          | 2 +-
 app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml | 2 +-
 .../resources/switch/conf/dialplan/310_send_to_voicemail.xml | 2 +-
 app/dialplan/resources/switch/conf/dialplan/320_vmain.xml    | 2 +-
 app/dialplan/resources/switch/conf/dialplan/320_xfer_vm.xml  | 2 +-
 .../resources/switch/conf/dialplan/330_is_transfer.xml       | 2 +-
 .../resources/switch/conf/dialplan/330_vmain_user.xml        | 2 +-
 app/dialplan/resources/switch/conf/dialplan/340_cf.xml       | 2 +-
 .../resources/switch/conf/dialplan/340_delay_echo.xml        | 2 +-
 app/dialplan/resources/switch/conf/dialplan/350_echo.xml     | 2 +-
 .../resources/switch/conf/dialplan/350_please_hold.xml       | 2 +-
 .../resources/switch/conf/dialplan/360_is_zrtp_secure.xml    | 2 +-
 .../resources/switch/conf/dialplan/360_milliwatt.xml         | 2 +-
 .../resources/switch/conf/dialplan/370_is_secure.xml         | 2 +-
 .../resources/switch/conf/dialplan/370_tone_stream.xml       | 2 +-
 .../resources/switch/conf/dialplan/380_hold_music.xml        | 2 +-
 .../resources/switch/conf/dialplan/400_recordings.xml        | 2 +-
 .../switch/conf/dialplan/410_freeswitch_conference.xml       | 2 +-
 app/dialplan/resources/switch/conf/dialplan/420_disa.xml     | 2 +-
 .../resources/switch/conf/dialplan/430_directory.xml         | 2 +-
 app/dialplan/resources/switch/conf/dialplan/440_wake-up.xml  | 2 +-
 app/dialplan/resources/switch/conf/dialplan/450_park_in.xml  | 2 +-
 app/dialplan/resources/switch/conf/dialplan/455_park_out.xml | 4 ++--
 .../resources/switch/conf/dialplan/460_park_slots.xml        | 4 ++--
 .../resources/switch/conf/dialplan/470_valet_park.xml        | 2 +-
 app/dialplan/resources/switch/conf/dialplan/480_operator.xml | 2 +-
 .../resources/switch/conf/dialplan/485_operator-forward.xml  | 2 +-
 .../resources/switch/conf/dialplan/490_do-not-disturb.xml    | 2 +-
 .../resources/switch/conf/dialplan/999_local_extension.xml   | 2 +-
 42 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/app/dialplan/resources/classes/dialplan.php b/app/dialplan/resources/classes/dialplan.php
index eb38ac4d89..0a04cae95e 100644
--- a/app/dialplan/resources/classes/dialplan.php
+++ b/app/dialplan/resources/classes/dialplan.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2010
+	Copyright (C) 2010-2014
 	All Rights Reserved.
 
 	Contributor(s):
@@ -64,6 +64,7 @@ include "root.php";
 				$sql .= "app_uuid, ";
 				$sql .= "dialplan_uuid, ";
 				$sql .= "dialplan_name, ";
+				$sql .= "dialplan_number, ";
 				$sql .= "dialplan_continue, ";
 				$sql .= "dialplan_order, ";
 				$sql .= "dialplan_context, ";
@@ -76,6 +77,7 @@ include "root.php";
 				$sql .= "'".check_str($this->app_uuid)."', ";
 				$sql .= "'".check_str($this->dialplan_uuid)."', ";
 				$sql .= "'".check_str($this->dialplan_name)."', ";
+				$sql .= "'".check_str($this->dialplan_number)."', ";
 				$sql .= "'".check_str($this->dialplan_continue)."', ";
 				$sql .= "'".check_str($this->dialplan_order)."', ";
 				$sql .= "'".check_str($this->dialplan_context)."', ";
@@ -277,6 +279,7 @@ include "root.php";
 						//get the attributes
 							$this->dialplan_uuid = uuid();
 							$this->dialplan_name = $dialplan['extension']['@attributes']['name'];
+							$this->dialplan_number = $dialplan['extension']['@attributes']['number'];
 							$this->dialplan_context = $dialplan['@attributes']['name'];
 							if ($this->display_type == "text") {
 								echo "	".$this->dialplan_name.":		added\n";
diff --git a/app/dialplan/resources/switch/conf/dialplan/000_global.xml b/app/dialplan/resources/switch/conf/dialplan/000_global.xml
index 08803eba76..5da2464730 100644
--- a/app/dialplan/resources/switch/conf/dialplan/000_global.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/000_global.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="global" continue="true" app_uuid="34dd307b-fffe-4ead-990c-3d070e288126">
+	<extension name="global" number="" continue="true" app_uuid="34dd307b-fffe-4ead-990c-3d070e288126">
 		<condition>
 			<action application="export" data="origination_callee_id_name=${destination_number}"/>
 			<action application="set" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/110_call-direction.xml b/app/dialplan/resources/switch/conf/dialplan/110_call-direction.xml
index c52e845880..49174ded58 100644
--- a/app/dialplan/resources/switch/conf/dialplan/110_call-direction.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/110_call-direction.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="call-direction" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71" enabled="false">
+	<extension name="call-direction" number="" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71" enabled="false">
 		<condition field="${call_direction}" expression="^(inbound|outbound|local)$">
 			<anti-action application="set" data="call_direction=local"/>
 		</condition>
diff --git a/app/dialplan/resources/switch/conf/dialplan/210_user_status.xml b/app/dialplan/resources/switch/conf/dialplan/210_user_status.xml
index 21d514cb99..ee4d7812f6 100644
--- a/app/dialplan/resources/switch/conf/dialplan/210_user_status.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/210_user_status.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="user_status" continue="false" app_uuid="2eb032c5-c79d-4096-ac90-8a47fe40f411">
+	<extension name="user_status" number="*22" continue="false" app_uuid="2eb032c5-c79d-4096-ac90-8a47fe40f411">
 		<condition field="destination_number" expression="^\*22$">
 			<action application="lua" data="app.lua user_status"/>
 		</condition>
diff --git a/app/dialplan/resources/switch/conf/dialplan/220_global-intercept.xml b/app/dialplan/resources/switch/conf/dialplan/220_global-intercept.xml
index 443576ab7c..781c3b16f3 100644
--- a/app/dialplan/resources/switch/conf/dialplan/220_global-intercept.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/220_global-intercept.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="global-intercept" app_uuid="59aff1f2-719c-403e-9306-5eb3a0cbd16c" enabled="false">
+	<extension name="global-intercept" number="*886" app_uuid="59aff1f2-719c-403e-9306-5eb3a0cbd16c" enabled="false">
 		<condition field="destination_number" expression="^\*886$">
 			<action application="answer"/>
 			<action application="lua" data="intercept.lua"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/230_group-intercept.xml b/app/dialplan/resources/switch/conf/dialplan/230_group-intercept.xml
index e744e2c6f4..91288d5b7b 100644
--- a/app/dialplan/resources/switch/conf/dialplan/230_group-intercept.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/230_group-intercept.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="group-intercept" app_uuid="15332e83-12f5-44d3-8472-633736eb4b9b">
+	<extension name="group-intercept" number="*8" app_uuid="15332e83-12f5-44d3-8472-633736eb4b9b">
 		<condition field="destination_number" expression="^\*8$">
 			<action application="answer"/>
 			<action application="intercept" data="${hash(select/${domain_name}-last_dial/${call_group})}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/240_redial.xml b/app/dialplan/resources/switch/conf/dialplan/240_redial.xml
index edf6219ca4..811a7ae9f1 100644
--- a/app/dialplan/resources/switch/conf/dialplan/240_redial.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/240_redial.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="redial" app_uuid="459da8c1-073a-458e-ae7e-8194342f9583">
+	<extension name="redial" number="*870" app_uuid="459da8c1-073a-458e-ae7e-8194342f9583">
 		<condition field="destination_number" expression="^(redial|\*870)$">
 			<action application="transfer" data="${hash(select/${domain_name}-last_dial/${caller_id_number})}"/>
 		</condition>
diff --git a/app/dialplan/resources/switch/conf/dialplan/250_page.xml b/app/dialplan/resources/switch/conf/dialplan/250_page.xml
index e043988ff5..6d07fa27a3 100644
--- a/app/dialplan/resources/switch/conf/dialplan/250_page.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/250_page.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="page" app_uuid="2011c518-696d-4878-a9b2-b217b6311311" enabled="false">
+	<extension name="page" number="*724" app_uuid="2011c518-696d-4878-a9b2-b217b6311311" enabled="false">
 		<condition field="destination_number" expression="^\*724$" >
 			<action application="set" data="caller_id_name=Page" />
 			<action application="set" data="caller_id_number=" />
diff --git a/app/dialplan/resources/switch/conf/dialplan/260_eavesdrop.xml b/app/dialplan/resources/switch/conf/dialplan/260_eavesdrop.xml
index b28b360344..4c855aa38d 100644
--- a/app/dialplan/resources/switch/conf/dialplan/260_eavesdrop.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/260_eavesdrop.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="eavesdrop" app_uuid="e944af7e-8fcc-429b-a32f-0dcdce1585d8">
+	<extension name="eavesdrop" number="*88[ext]" app_uuid="e944af7e-8fcc-429b-a32f-0dcdce1585d8">
 		<condition field="destination_number" expression="^\*88(\d{2,7})$">
 			<action application="answer"/>
 			<action application="set" data="pin_number={v_pin_number}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/270_call_privacy.xml b/app/dialplan/resources/switch/conf/dialplan/270_call_privacy.xml
index 2dacde4d23..214a9ed73a 100644
--- a/app/dialplan/resources/switch/conf/dialplan/270_call_privacy.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/270_call_privacy.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="call_privacy" app_uuid="eb478e66-f637-4ae7-b1eb-9a7b87a1bd9e">
+	<extension name="call_privacy" number="*67[d+]" app_uuid="eb478e66-f637-4ae7-b1eb-9a7b87a1bd9e">
 		<condition field="destination_number" expression="^\*67(\d+)$">
 			<action application="privacy" data="full"/>
 			<action application="set" data="sip_h_Privacy=id"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/280_call_return.xml b/app/dialplan/resources/switch/conf/dialplan/280_call_return.xml
index 8e27746418..4468abb431 100644
--- a/app/dialplan/resources/switch/conf/dialplan/280_call_return.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/280_call_return.xml
@@ -1,6 +1,6 @@
 <context name="{v_context}">
-	<extension name="call_return" app_uuid="fa516204-920f-4802-8bb1-04c6a010bfe1">
-		<condition field="destination_number" expression="^\*69$|^lcr$">
+	<extension name="call_return" number="*69" app_uuid="fa516204-920f-4802-8bb1-04c6a010bfe1">
+		<condition field="destination_number" expression="^\*69$">
 			<action application="transfer" data="${hash(select/${domain_name}-call_return/${caller_id_number})}"/>
 		</condition>
 	</extension>
diff --git a/app/dialplan/resources/switch/conf/dialplan/290_intercept-ext.xml b/app/dialplan/resources/switch/conf/dialplan/290_intercept-ext.xml
index e1eb366b74..daf8982f93 100644
--- a/app/dialplan/resources/switch/conf/dialplan/290_intercept-ext.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/290_intercept-ext.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="intercept-ext" app_uuid="2b7b2f82-edfe-4339-8cc5-7d0cf36e1e68">
+	<extension name="intercept-ext" number="**[ext]" app_uuid="2b7b2f82-edfe-4339-8cc5-7d0cf36e1e68">
 		<condition field="destination_number" expression="^\*\*(\d+)$">
 			<action application="answer"/>
 			<action application="lua" data="intercept.lua $1"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/300_dx.xml b/app/dialplan/resources/switch/conf/dialplan/300_dx.xml
index f347aa4869..4e5a62bb0f 100644
--- a/app/dialplan/resources/switch/conf/dialplan/300_dx.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/300_dx.xml
@@ -1,6 +1,6 @@
 <!-- In call Transfer for phones without a transfer button -->
 <context name="{v_context}">
-	<extension name="dx" app_uuid="ddcf7740-78ca-4035-8c19-e2df10cebf67">
+	<extension name="dx" number="dx" app_uuid="ddcf7740-78ca-4035-8c19-e2df10cebf67">
 		<condition field="destination_number" expression="^dx$">
 			<action application="answer"/>
 			<action application="read" data="11 11 'tone_stream://%(10000,0,350,440)' digits 5000 #"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/300_extension-intercom.xml b/app/dialplan/resources/switch/conf/dialplan/300_extension-intercom.xml
index 85bb44df27..5974238d1d 100644
--- a/app/dialplan/resources/switch/conf/dialplan/300_extension-intercom.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/300_extension-intercom.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="extension-intercom" app_uuid="1b224444-de8b-448d-b2d1-19feaac3effa">
+	<extension name="extension-intercom" number="*8[ext]" app_uuid="1b224444-de8b-448d-b2d1-19feaac3effa">
 		<condition field="destination_number" expression="^\*8(\d{2,7})$">
 			<action application="set" data="extension_list=$1"/>
 			<action application="set" data="pin_number="/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml b/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml
index db5d0a118b..c03e90aa69 100644
--- a/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}"> 
-	<extension name="att_xfer" app_uuid="7bd7a113-0afc-406a-b4a7-33077c22ac39">
+	<extension name="att_xfer" number="att_xfer" app_uuid="7bd7a113-0afc-406a-b4a7-33077c22ac39">
 		<condition field="destination_number" expression="^att_xfer$">
 			<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 30000 #"/>
 			<action application="set" data="origination_cancel_key=#"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/310_send_to_voicemail.xml b/app/dialplan/resources/switch/conf/dialplan/310_send_to_voicemail.xml
index d2aaf41d20..e971ca8e8d 100644
--- a/app/dialplan/resources/switch/conf/dialplan/310_send_to_voicemail.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/310_send_to_voicemail.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="send_to_voicemail" app_uuid="001d5dab-e0c6-4352-8f06-e9986ee7b0d8">
+	<extension name="send_to_voicemail" number="*99[ext]" app_uuid="001d5dab-e0c6-4352-8f06-e9986ee7b0d8">
 		<condition field="destination_number" expression="^\*99(\d{2,7})$">
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/320_vmain.xml b/app/dialplan/resources/switch/conf/dialplan/320_vmain.xml
index d4a272f079..e89d9723d9 100644
--- a/app/dialplan/resources/switch/conf/dialplan/320_vmain.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/320_vmain.xml
@@ -1,6 +1,6 @@
 <!-- voicemail main extension, used when * is pressed from an external number -->
 <context name="{v_context}">
-	<extension name="vmain" app_uuid="d085a1e3-c53a-4480-9ca6-6a362899a681">
+	<extension name="vmain" number="*98" app_uuid="d085a1e3-c53a-4480-9ca6-6a362899a681">
 		<condition field="destination_number" expression="^vmain$|^\*4000$|^\*98$">
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/320_xfer_vm.xml b/app/dialplan/resources/switch/conf/dialplan/320_xfer_vm.xml
index 60cc7fde85..e73a4ab493 100644
--- a/app/dialplan/resources/switch/conf/dialplan/320_xfer_vm.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/320_xfer_vm.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="xfer_vm" app_uuid="44a4b26d-9e13-41dc-8405-7ff2e4a215e0">
+	<extension name="xfer_vm" number="xfer_vm" app_uuid="44a4b26d-9e13-41dc-8405-7ff2e4a215e0">
 		<condition field="destination_number" expression="^xfer_vm$">
 			<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 30000 #"/>
 			<action application="set" data="origination_cancel_key=#"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/330_is_transfer.xml b/app/dialplan/resources/switch/conf/dialplan/330_is_transfer.xml
index b58a2a09e1..451c9ccc1c 100644
--- a/app/dialplan/resources/switch/conf/dialplan/330_is_transfer.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/330_is_transfer.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="is_transfer" app_uuid="da8e22c7-9e07-4ff5-a28b-faf35ba8d411">
+	<extension name="is_transfer" number="is_transfer" app_uuid="da8e22c7-9e07-4ff5-a28b-faf35ba8d411">
 		<condition field="destination_number" expression="^is_transfer$"/>
 		<condition field="${digits}" expression="^(\d+)$">
 			<action application="transfer" data="-aleg ${digits} XML ${context}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/330_vmain_user.xml b/app/dialplan/resources/switch/conf/dialplan/330_vmain_user.xml
index 45b7c97f1b..ecba084983 100644
--- a/app/dialplan/resources/switch/conf/dialplan/330_vmain_user.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/330_vmain_user.xml
@@ -1,6 +1,6 @@
 <!-- voicemail provide user extension -->
 <context name="{v_context}">
-	<extension name="vmain_user" app_uuid="5d47ab13-f25d-4f62-a68e-2a7d945d05b7">
+	<extension name="vmain_user" number="*97" app_uuid="5d47ab13-f25d-4f62-a68e-2a7d945d05b7">
 		<condition field="destination_number" expression="^\*97$">
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/340_cf.xml b/app/dialplan/resources/switch/conf/dialplan/340_cf.xml
index 8758de1855..3c85c817cb 100644
--- a/app/dialplan/resources/switch/conf/dialplan/340_cf.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/340_cf.xml
@@ -1,6 +1,6 @@
 <!-- Used to transfer both legs into a conference -->
 <context name="{v_context}">
-	<extension name="cf" app_uuid="f13df3df-bfb4-4c11-bee1-6548cd983729">
+	<extension name="cf" number="cf" app_uuid="f13df3df-bfb4-4c11-bee1-6548cd983729">
 		<condition field="destination_number" expression="^cf$">
 			<action application="answer"/>
 			<action application="transfer" data="-both 30${dialed_extension:2} XML ${context}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/340_delay_echo.xml b/app/dialplan/resources/switch/conf/dialplan/340_delay_echo.xml
index 04746d41ad..846dadd9f2 100644
--- a/app/dialplan/resources/switch/conf/dialplan/340_delay_echo.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/340_delay_echo.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="delay_echo" app_uuid="fe638409-b347-46d7-9aca-489561df8b35">
+	<extension name="delay_echo" number="*9195" app_uuid="fe638409-b347-46d7-9aca-489561df8b35">
 		<condition field="destination_number" expression="^\*9195$">
 			<action application="answer"/>
 			<action application="delay_echo" data="5000"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/350_echo.xml b/app/dialplan/resources/switch/conf/dialplan/350_echo.xml
index 90620e264d..ea10e07fef 100644
--- a/app/dialplan/resources/switch/conf/dialplan/350_echo.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/350_echo.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="echo" app_uuid="1f894dfb-0567-4e20-9026-d538bbaa5261">
+	<extension name="echo" number="*9196" app_uuid="1f894dfb-0567-4e20-9026-d538bbaa5261">
 		<condition field="destination_number" expression="^\*9196$">
 			<action application="answer"/>
 			<action application="echo"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/350_please_hold.xml b/app/dialplan/resources/switch/conf/dialplan/350_please_hold.xml
index 22056cc6ff..5ec366406d 100644
--- a/app/dialplan/resources/switch/conf/dialplan/350_please_hold.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/350_please_hold.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="please_hold" app_uuid="c3ea29d1-db41-421e-91b7-b0984e50bcae" enabled="false">
+	<extension name="please_hold" number="1001-1019" app_uuid="c3ea29d1-db41-421e-91b7-b0984e50bcae" enabled="false">
 		<condition field="destination_number" expression="^(10[01][0-9])$">
 			<action application="set" data="transfer_ringback=$${hold_music}"/>
 			<action application="answer"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/360_is_zrtp_secure.xml b/app/dialplan/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
index 9d15b7cf7a..122dd7a29d 100644
--- a/app/dialplan/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="is_zrtp_secure" app_uuid="951808c2-b778-404d-bd17-50b5df4b88f4" continue="true">
+	<extension name="is_zrtp_secure" number="" app_uuid="951808c2-b778-404d-bd17-50b5df4b88f4" continue="true">
 		<condition field="${zrtp_secure_media_confirmed}" expression="^true$">
 			<action application="sleep" data="1000"/>
 			<action application="playback" data="misc/call_secured.wav"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/360_milliwatt.xml b/app/dialplan/resources/switch/conf/dialplan/360_milliwatt.xml
index 5e4f957fdb..0fe5c52e0e 100644
--- a/app/dialplan/resources/switch/conf/dialplan/360_milliwatt.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/360_milliwatt.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="milliwatt" app_uuid="296acca3-d30f-42a0-ba90-5af2208ad7f8">
+	<extension name="milliwatt" number="*9197" app_uuid="296acca3-d30f-42a0-ba90-5af2208ad7f8">
 		<condition field="destination_number" expression="^\*9197$">
 			<action application="answer"/>
 			<action application="playback" data="{loops=-1}tone_stream://%(251,0,1004)"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/370_is_secure.xml b/app/dialplan/resources/switch/conf/dialplan/370_is_secure.xml
index 7c23f2e61f..ae60c9b37a 100644
--- a/app/dialplan/resources/switch/conf/dialplan/370_is_secure.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/370_is_secure.xml
@@ -1,6 +1,6 @@
 <!-- Only Truly consider it secure if its TLS and SRTP -->
 <context name="{v_context}">
-	<extension name="is_secure" app_uuid="b57306e0-36df-4048-b182-7ad0f69d8c03" continue="true">
+	<extension name="is_secure" number="is_secure" app_uuid="b57306e0-36df-4048-b182-7ad0f69d8c03" continue="true">
 		<condition field="${sip_via_protocol}" expression="tls"/>
 		<condition field="${sip_secure_media_confirmed}" expression="^true$">
 			<action application="sleep" data="1000"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/370_tone_stream.xml b/app/dialplan/resources/switch/conf/dialplan/370_tone_stream.xml
index f37d6e0640..27f95e65af 100644
--- a/app/dialplan/resources/switch/conf/dialplan/370_tone_stream.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/370_tone_stream.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="tone_stream" app_uuid="98ccdb0b-c074-4f74-b28a-9528372faa7d">
+	<extension name="tone_stream" number="*9198" app_uuid="98ccdb0b-c074-4f74-b28a-9528372faa7d">
 		<condition field="destination_number" expression="^\*9198$">
 			<action application="answer"/>
 			<action application="playback" data="{loops=10}tone_stream://path=${base_dir}/conf/tetris.ttml"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/380_hold_music.xml b/app/dialplan/resources/switch/conf/dialplan/380_hold_music.xml
index 4e0b88ae67..ec850d8535 100644
--- a/app/dialplan/resources/switch/conf/dialplan/380_hold_music.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/380_hold_music.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="hold_music" app_uuid="b824b88a-e6da-486e-9f17-7b93cbaa318e">
+	<extension name="hold_music" number="*9664" app_uuid="b824b88a-e6da-486e-9f17-7b93cbaa318e">
 		<condition field="destination_number" expression="^\*9664$"/>
 		<condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$">
 			<action application="answer"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/400_recordings.xml b/app/dialplan/resources/switch/conf/dialplan/400_recordings.xml
index 2a7f09e429..7094f3e97a 100644
--- a/app/dialplan/resources/switch/conf/dialplan/400_recordings.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/400_recordings.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="recordings" app_uuid="430737df-5385-42d1-b933-22600d3fb79e">
+	<extension name="recordings" number="*732" app_uuid="430737df-5385-42d1-b933-22600d3fb79e">
 		<condition field="destination_number" expression="^\*(732)$">
 			<action application="answer"/>
 			<action application="set" data="pin_number={v_pin_number}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml b/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml
index a557c0bdc0..b72a9ad2d8 100644
--- a/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="freeswitch_conference" app_uuid="8e3ad78e-4b48-4d36-af7e-4920a9757043" enabled="false">
+	<extension name="freeswitch_conference" number="*9888" app_uuid="8e3ad78e-4b48-4d36-af7e-4920a9757043" enabled="false">
 		<condition field="destination_number" expression="^\*9(888|8888|1616|3232)$">
 			<action application="export" data="hold_music=silence"/>
 			<!-- 
diff --git a/app/dialplan/resources/switch/conf/dialplan/420_disa.xml b/app/dialplan/resources/switch/conf/dialplan/420_disa.xml
index dd6b4e3255..e09f984301 100644
--- a/app/dialplan/resources/switch/conf/dialplan/420_disa.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/420_disa.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="disa" app_uuid="3ade2d9a-f55d-4240-bb60-b4a3ab36951c" enabled="false">
+	<extension name="disa" number="*3472" app_uuid="3ade2d9a-f55d-4240-bb60-b4a3ab36951c" enabled="false">
 		<condition field="destination_number" expression="^\*(3472)$">
 			<action application="answer"/>
 			<action application="set" data="pin_number={v_pin_number}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/430_directory.xml b/app/dialplan/resources/switch/conf/dialplan/430_directory.xml
index 2ae0ec6ee3..50b89a97c8 100644
--- a/app/dialplan/resources/switch/conf/dialplan/430_directory.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/430_directory.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="directory" app_uuid="a223dc70-28a1-4979-834e-8af813cd8ea6">
+	<extension name="directory" number="*411" app_uuid="a223dc70-28a1-4979-834e-8af813cd8ea6">
 		<condition field="destination_number" expression="^\*411$">
 			<action application="lua" data="directory.lua"/> 
 		</condition>
diff --git a/app/dialplan/resources/switch/conf/dialplan/440_wake-up.xml b/app/dialplan/resources/switch/conf/dialplan/440_wake-up.xml
index d117b0c7e9..e2dcda76f3 100644
--- a/app/dialplan/resources/switch/conf/dialplan/440_wake-up.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/440_wake-up.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="wake-up" app_uuid="e27abe68-41c0-4188-bb0f-67d93de0c610">
+	<extension name="wake-up" number="*925" app_uuid="e27abe68-41c0-4188-bb0f-67d93de0c610">
 		<condition field="destination_number" expression="^\*(925)$">
 			<action application="answer"/>
 			<action application="set" data="pin_number={v_pin_number}"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/450_park_in.xml b/app/dialplan/resources/switch/conf/dialplan/450_park_in.xml
index 7407bb0511..106a9983fe 100644
--- a/app/dialplan/resources/switch/conf/dialplan/450_park_in.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/450_park_in.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="park_in" app_uuid="ffb30da6-30e4-43b8-9847-2ed40e232f89" enabled="false">
+	<extension name="park_in" number="*5900" app_uuid="ffb30da6-30e4-43b8-9847-2ed40e232f89" enabled="false">
 		<condition field="destination_number" expression="^\*5900$" >
 			<action application="set" data="park_direction=in" />
 			<action application="set" data="park_extension=\*5901" />
diff --git a/app/dialplan/resources/switch/conf/dialplan/455_park_out.xml b/app/dialplan/resources/switch/conf/dialplan/455_park_out.xml
index 6b15a3a636..fc0f573491 100644
--- a/app/dialplan/resources/switch/conf/dialplan/455_park_out.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/455_park_out.xml
@@ -1,6 +1,6 @@
 <context name="{v_context}">
-	<extension name="park_out" app_uuid="cf8234b6-a039-4ec2-87bd-3db0799a3f75" enabled="false">
-		<condition field="destination_number" expression="(^\*5901$|^\*5902$|^\*5903$)" >
+	<extension name="park_out" number="*5900-*5999" app_uuid="cf8234b6-a039-4ec2-87bd-3db0799a3f75" enabled="false">
+		<condition field="destination_number" expression="(^\*59[0-9][0-9]$)" >
 			<action application="set" data="park_direction=out" />
 			<action application="set" data="park_extension=$1" />
 			<action application="lua" data="park.lua" />
diff --git a/app/dialplan/resources/switch/conf/dialplan/460_park_slots.xml b/app/dialplan/resources/switch/conf/dialplan/460_park_slots.xml
index 762b4fcab7..aaf299c55c 100644
--- a/app/dialplan/resources/switch/conf/dialplan/460_park_slots.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/460_park_slots.xml
@@ -1,6 +1,6 @@
 <context name="{v_context}">
-	<extension name="park_slots" app_uuid="f096f899-c78e-409c-8290-00f6d423b31c" enabled="false">
-		<condition field="destination_number" expression="(^\*5901$|^\*5902$|^\*5903$)" >
+	<extension name="park_slots" number="*5900-*5999" app_uuid="f096f899-c78e-409c-8290-00f6d423b31c" enabled="false">
+		<condition field="destination_number" expression="(^\*59[0-9][0-9]$|^\*5902$|^\*5903$)" >
 			<action application="set" data="park_extension=$1" />
 			<action application="set" data="park_direction=both" />
 			<action application="set" data="park_announce=true" />
diff --git a/app/dialplan/resources/switch/conf/dialplan/470_valet_park.xml b/app/dialplan/resources/switch/conf/dialplan/470_valet_park.xml
index 60a459d68a..40433c0478 100644
--- a/app/dialplan/resources/switch/conf/dialplan/470_valet_park.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/470_valet_park.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="valet_park" continue="true" app_uuid="3cc8363d-5ce3-48aa-8ac1-143cf297c4f7" enabled="true">
+	<extension name="valet_park" continue="true" number="park+*5901-*5999" app_uuid="3cc8363d-5ce3-48aa-8ac1-143cf297c4f7" enabled="true">
 		<condition field="destination_number" expression="^(park\+)?(\*59[0-9][0-9])$" break="never"/>
 		<condition field="${sip_h_Referred-By}" expression="sip:(.*)@.*" break="never">
 			<action application="set" data="referred_by_user=$1"/>
diff --git a/app/dialplan/resources/switch/conf/dialplan/480_operator.xml b/app/dialplan/resources/switch/conf/dialplan/480_operator.xml
index cb5801be11..b054038f43 100644
--- a/app/dialplan/resources/switch/conf/dialplan/480_operator.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/480_operator.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="operator" app_uuid="0e1cd2d7-9d84-4959-8b6c-0cb23de4de59" continue="false">
+	<extension name="operator" number="0" app_uuid="0e1cd2d7-9d84-4959-8b6c-0cb23de4de59" continue="false">
 		<condition field="destination_number" expression="^0$|^operator$">
 			<action application="export" data="transfer_context={v_context}" />
 			<action application="bind_meta_app" data="4 ab s execute_extension::att_xfer XML features" />
diff --git a/app/dialplan/resources/switch/conf/dialplan/485_operator-forward.xml b/app/dialplan/resources/switch/conf/dialplan/485_operator-forward.xml
index 73d1fad52d..c363855a05 100644
--- a/app/dialplan/resources/switch/conf/dialplan/485_operator-forward.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/485_operator-forward.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="operator-forward" app_uuid="a90d3639-3b82-4905-a65d-85f58b6c4a19" enabled="true">
+	<extension name="operator-forward" number="*000" app_uuid="a90d3639-3b82-4905-a65d-85f58b6c4a19" enabled="true">
 		<condition field="destination_number" expression="^\*000$" >
 			<action application="set" data="dial_string=loopback/operator/{v_context}/XML" />
 			<action application="set" data="direction=both" />
diff --git a/app/dialplan/resources/switch/conf/dialplan/490_do-not-disturb.xml b/app/dialplan/resources/switch/conf/dialplan/490_do-not-disturb.xml
index 7e967d911d..be8162cf5a 100644
--- a/app/dialplan/resources/switch/conf/dialplan/490_do-not-disturb.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/490_do-not-disturb.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="do-not-disturb" app_uuid="df32d982-e39e-4ae5-a46d-aed1893873f2" enabled="true">
+	<extension name="do-not-disturb" number="*363" app_uuid="df32d982-e39e-4ae5-a46d-aed1893873f2" enabled="true">
 		<condition field="destination_number" expression="^\*363$" >
 			<action application="set" data="dial_string=loopback/*99{v_unique_id)/{v_context}/XML" />
 			<action application="set" data="direction=both" />
diff --git a/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml b/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml
index fb18108207..0c1fe51dd3 100644
--- a/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/999_local_extension.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="local_extension" app_uuid="71cf1310-b6e3-415b-8745-3cbdc8e15212">
+	<extension name="local_extension" number="[ext]" app_uuid="71cf1310-b6e3-415b-8745-3cbdc8e15212">
 		<condition field="destination_number" expression="(^\d{2,7}$)">
 			<!--<action application="pre_answer"/>-->
 			<action application="set" data="dialed_extension=$1"/>