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

Account for destination_prefix larger than one character. 

Also account for trunk prefix when not using the area code.
This commit is contained in:
FusionPBX 2021-12-08 13:49:15 -07:00 committed by GitHub
parent ee29867e2b
commit 68238e9ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/destinations/resources/classes/destinations.php
View File

@ -90,6 +90,11 @@ if (!class_exists('destinations')) {
$destination_regex .= "^".$array['destination_area_code'].$array['destination_number']."\$|";
$destination_regex .= "^".$array['destination_number']."\$)";
}
elseif (isset($array['destination_prefix']) && isset($array['destination_trunk_prefix']) && isset($array['destination_number'])) {
$destination_regex = "(\+?".$array['destination_prefix'].$array['destination_number']."\$|";
$destination_regex .= "^".$array['destination_trunk_prefix'].$array['destination_number']."\$|";
$destination_regex .= "^".$array['destination_number']."\$)";
}
elseif (isset($array['destination_prefix']) && isset($array['destination_area_code']) && isset($array['destination_number'])) {
$destination_regex = "(\+?".$array['destination_prefix'].$array['destination_area_code'].$array['destination_number']."\$|";
$destination_regex .= "^".$array['destination_area_code'].$array['destination_number']."\$|";
@ -109,12 +114,13 @@ if (!class_exists('destinations')) {
//add prefix
if (strlen($destination_prefix) > 0) {
if (strlen($destination_prefix) > 0 && strlen($destination_prefix) < 4) {
$plus = (substr($destination_prefix, 0, 1) == "+") ? '' : '\+?';
$destination_prefix = str_replace("+", "", $destination_prefix);
$plus = '\+?';
if (strlen($destination_prefix) == 1) {
$destination_prefix = $plus.$destination_prefix.'?';
}
else {
$destination_prefix = '(?:'.$destination_prefix.')?';
$destination_prefix = $plus.'(?:'.$destination_prefix.')?';
}
}