From ccf367b189d1ac2ef1a0cd28f4ae852167b54c3f Mon Sep 17 00:00:00 2001
From: agree <37550360+greenbea@users.noreply.github.com>
Date: Wed, 2 Feb 2022 14:21:35 -0500
Subject: [PATCH] [outbound route] Improve north America regex (#6283)

don't match if first digit of NPA and NXX are a 1
---
 app/dialplan_outbound/dialplan_outbound_add.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index 58f01d8df0..16d7ea14a0 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -235,9 +235,9 @@
 							$label = $text['label-11d'];
 							$abbrv = "11d";
 							break;
-						case "^(?:\+?1)?(\d{10})$":
+						case "^\+?1?([2-9]\d{2}[2-9]\d{2}\d{4})$":
 							$label = $text['label-north_america'];
-							$abbrv = "10-11d";
+							$abbrv = "10-11-NANP";
 							break;
 						case "^(011\d{9,17})$":
 							$label = $text['label-north_america_intl'];
@@ -1086,7 +1086,7 @@ function type_onchange(dialplan_detail_type) {
 	echo "	<option value='^(\\d{9})\$'>".$text['label-9d']."</option>\n";
 	echo "	<option value='^(\\d{10})\$'>".$text['label-10d']."</option>\n";
 	echo "	<option value='^\+?(\\d{11})\$'>".$text['label-11d']."</option>\n";
-	echo "	<option value='^\+?1?(\\d{10})\$'>".$text['label-north_america']."</option>\n";
+	echo "	<option value='^\+?1?([2-9]\\d{2}[2-9]\\d{2}\\d{4})\$'>".$text['label-north_america']."</option>\n";
 	echo "	<option value='^(011\\d{9,17})\$'>".$text['label-north_america_intl']."</option>\n";
 	echo "	<option value='^\+?1?((?:264|268|242|246|441|284|345|767|809|829|849|473|658|876|664|787|939|869|758|784|721|868|649|340|684|671|670|808)\d{7})\$'>".$text['label-north_america_islands']."</option>\n";
 	echo "	<option value='^(00\\d{9,17})\$'>".$text['label-europe_intl']."</option>\n";