From ff36efcb49fb60a0c430c8fba9ba10c7cde84be2 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 14 Feb 2025 13:10:19 -0700 Subject: [PATCH] Add two fax variables --- app/fax/fax_send.php | 2 ++ app/fax_queue/resources/job/fax_send.php | 34 ++++++++++++------------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index 85913f1195..0ebe965af5 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -735,6 +735,8 @@ if (!function_exists('fax_split_dtmf')) { if (!empty($provider_prefix)) { $common_variables .= "provider_prefix='".$provider_prefix."',"; } + $common_variables .= "hangup_after_bridge=true,"; + $common_variables .= "continue_on_fail=true,"; if (!empty($fax_numbers)) { foreach ($fax_numbers as $fax_number) { diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php index d87fb4d59f..6663535ee8 100644 --- a/app/fax_queue/resources/job/fax_send.php +++ b/app/fax_queue/resources/job/fax_send.php @@ -279,24 +279,24 @@ } //check to see if the destination number is local - $local_destination = false; - if ($setting->get('fax_queue','prefer_local', false)) { - $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) { - $local_destination = true; - $route_array[] = 'loopback/'.$fax_number.'/public'; + $local_destination = false; + if ($setting->get('fax_queue','prefer_local', false)) { + $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) { + $local_destination = true; + $route_array[] = 'loopback/'.$fax_number.'/public'; + } } - } //define the fax file $common_variables = '';