From 93c90c89690919d3f94648ea7cbab240dae12594 Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Tue, 16 Aug 2022 10:56:30 -0600 Subject: [PATCH] Add a filter dropdown (#6453) * Update event_guard_logs.php --- app/event_guard/event_guard_logs.php | 32 +++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/app/event_guard/event_guard_logs.php b/app/event_guard/event_guard_logs.php index 4604e3af11..977601a4c2 100644 --- a/app/event_guard/event_guard_logs.php +++ b/app/event_guard/event_guard_logs.php @@ -87,8 +87,9 @@ //get the count $sql = "select count(event_guard_log_uuid) "; $sql .= "from v_event_guard_logs "; + $sql .= "where true "; if (isset($search)) { - $sql .= "where ("; + $sql .= "and ("; $sql .= " hostname like :search "; $sql .= " or filter like :search "; $sql .= " or ip_address like :search "; @@ -98,6 +99,10 @@ $sql .= ") "; $parameters['search'] = '%'.$search.'%'; } + if (isset($_GET["filter"]) && $_GET["filter"] != '') { + $sql .= "and filter = :filter "; + $parameters['filter'] = $_GET["filter"]; + } $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); @@ -132,8 +137,9 @@ $sql .= "user_agent, "; $sql .= "log_status "; $sql .= "from v_event_guard_logs "; - if (isset($_GET["search"])) { - $sql .= "where ("; + $sql .= "where true "; + if (isset($_GET["search"]) && $_GET["search"] != '') { + $sql .= "and ("; $sql .= " hostname like :search "; $sql .= " or filter like :search "; $sql .= " or ip_address like :search "; @@ -143,6 +149,10 @@ $sql .= ") "; $parameters['search'] = '%'.$search.'%'; } + if (isset($_GET["filter"]) && $_GET["filter"] != '') { + $sql .= "and filter = :filter "; + $parameters['filter'] = $_GET["filter"]; + } $sql .= order_by($order_by, $order, 'log_date', 'desc'); $sql .= limit_offset($rows_per_page, $offset); $database = new database; @@ -174,6 +184,22 @@ echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]); } echo "