dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use (?:\+1|1)? instead of \+?1?

This commit is contained in:
FusionPBX 2023-11-14 16:36:04 -07:00 committed by GitHub
parent 12fb45c99f
commit d806fb1ede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/dialplan_outbound/dialplan_outbound_add.php
View File

@ -248,7 +248,7 @@
$label = $text['label-north_america_intl'];
$abbrv = "011.9-17d";
break;
case "^\+?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})$":
case "^(?:\+1|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})$":
$label = $text['label-north_america_islands'];
$abbrv = "011.9-17d";
break;
@ -300,7 +300,7 @@
$label = $text['label-9d.12-20'];
$abbrv = "9.12-20";
break;
case "^1?(8(00|33|44|55|66|77|88)[2-9]\d{6})$":
case "^(?:\+1|1)?(8(00|33|44|55|66|77|88)[2-9]\d{6})$":
$label = $text['label-800'];
$abbrv = "800";
break;
@ -1189,9 +1189,9 @@ 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?([2-9]\\d{2}[2-9]\\d{2}\\d{4})\$'>".$text['label-north_america']."</option>\n";
echo " <option value='^(?:\+1|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='^(?:\+1|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";
echo " <option value='^(\\d{12,20})\$'>".$text['label-intl']."</option>\n";
echo " <option value='^(311)\$'>".$text['label-311']."</option>\n";
@ -1199,7 +1199,7 @@ function type_onchange(dialplan_detail_type) {
echo " <option value='^(711)\$'>".$text['label-711']."</option>\n";
echo " <option value='(^911\$|^933\$)'>".$text['label-911']."</option>\n";
echo " <option value='(^988\$)'>".$text['label-988']."</option>\n";
echo " <option value='^1?(8(00|33|44|55|66|77|88)[2-9]\\d{6})\$'>".$text['label-800']."</option>\n";
echo " <option value='^(?:\+1|1)?(8(00|33|44|55|66|77|88)[2-9]\\d{6})\$'>".$text['label-800']."</option>\n";
echo " <option value='^0118835100\d{8}\$'>".$text['label-inum']."</option>\n";
echo " <option value='^9(\\d{2})\$'>".$text['label-9d2']."</option>\n";
echo " <option value='^9(\\d{3})\$'>".$text['label-9d3']."</option>\n";