From f7444fbc3c041fce8b72a1d7c7164b2a0888b8db Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 2 Apr 2026 12:46:47 -0600 Subject: [PATCH] Fix the link to the fax log details --- app/fax/fax_logs.php | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/app/fax/fax_logs.php b/app/fax/fax_logs.php index be1c6d4c2..cdd849c03 100644 --- a/app/fax/fax_logs.php +++ b/app/fax/fax_logs.php @@ -70,22 +70,21 @@ //add the search string $search = strtolower($_GET["search"] ?? ''); - if (!empty($search)) { - $sql_search = " and ("; - $sql_search .= " lower(fax_result_text) like :search "; - $sql_search .= " or lower(fax_file) like :search "; - $sql_search .= " or lower(fax_local_station_id) like :search "; - $sql_search .= " or fax_date::text like :search "; - $sql_search .= " or fax_uri::text like :search "; - $sql_search .= ") "; - $parameters['search'] = '%'.$search.'%'; - } //get the count $sql = "select count(fax_log_uuid) from v_fax_logs "; $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and fax_uuid = :fax_uuid "; - $sql .= $sql_search ?? ''; + if (!empty($search)) { + $sql .= " and ( "; + $sql .= " lower(fax_result_text) like :search "; + $sql .= " or lower(fax_file) like :search "; + $sql .= " or lower(fax_local_station_id) like :search "; + $sql .= " or fax_date::text like :search "; + $sql .= " or fax_uri::text like :search "; + $sql .= ") "; + $parameters['search'] = '%'.$search.'%'; + } $parameters['domain_uuid'] = $domain_uuid; $parameters['fax_uuid'] = $fax_uuid; $num_rows = $database->select($sql, $parameters, 'column'); @@ -114,6 +113,7 @@ //get the list $sql = "select "; + $sql .= " fax_log_uuid, "; $sql .= " fax_epoch, "; $sql .= " to_char(timezone(:time_zone, to_timestamp(fax_epoch)), 'DD Mon YYYY') as fax_date_formatted, \n"; $sql .= " to_char(timezone(:time_zone, to_timestamp(fax_epoch)), '".$time_format."') as fax_time_formatted, \n"; @@ -136,7 +136,16 @@ $sql .= "from v_fax_logs "; $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and fax_uuid = :fax_uuid "; - $sql .= $sql_search ?? ''; + if (!empty($search)) { + $sql .= " and ( "; + $sql .= " lower(fax_result_text) like :search "; + $sql .= " or lower(fax_file) like :search "; + $sql .= " or lower(fax_local_station_id) like :search "; + $sql .= " or fax_date::text like :search "; + $sql .= " or fax_uri::text like :search "; + $sql .= ") "; + $parameters['search'] = '%'.$search.'%'; + } $sql .= order_by($order_by, $order, 'fax_epoch', 'desc'); $sql .= limit_offset($rows_per_page, $offset ?? 0); $parameters['domain_uuid'] = $domain_uuid;