From 81fc86fc01ca57c84794ba86667d747898b0bdcd Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 17 Oct 2024 13:15:26 -0600 Subject: [PATCH] Handle country code, trunk prefix and area code --- app/fax_queue/resources/job/fax_send.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php index 14e3f6cb17..46e2c54f3a 100644 --- a/app/fax_queue/resources/job/fax_send.php +++ b/app/fax_queue/resources/job/fax_send.php @@ -280,17 +280,19 @@ } //check to see if the destination number is local - $sql = "select t.*, d.domain_name "; - $sql .= "from v_destinations as t, v_domains as d "; - $sql .= "where destination_number = :destination_number "; - $sql .= "and t.domain_uuid = d.domain_uuid "; + $sql = "select count(destination_uuid) "; + $sql .= "from v_destinations "; + $sql .= "where ("; + $sql .= " destination_number = :destination_number "; + $sql .= " or concat(destination_prefix, destination_number) = :destination_number "; + $sql .= " or concat(destination_trunk_prefix, destination_number) = :destination_number "; + $sql .= " or concat(destination_area_code, destination_number) = :destination_number "; + $sql .= " or concat(destination_prefix, destination_area_code, destination_number) = :destination_number "; + $sql .= ")"; $parameters['destination_number'] = $fax_number; $destination_count = $database->select($sql, $parameters, 'column'); if ($destination_count > 0) { - //$domain_uuid = $row['domain_uuid']; - //$domain_name = $row['domain_name']; $route_array[] = 'loopback/'.$fax_number.'/public'; - //$is_local = true; } //define the fax file