Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a filter dropdown #6453

Merged
merged 2 commits into from Aug 16, 2022
Merged

Add a filter dropdown #6453

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7f20b3
Update event_guard_logs.php
alexdcrane Aug 16, 2022
8658d41
Update event_guard_logs.php
markjcrane Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 29 additions & 3 deletions app/event_guard/event_guard_logs.php
View file
Open in desktop
Expand Up @@ -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 ";
Expand All @@ -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);
Expand Down Expand Up @@ -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 ";
Expand All @@ -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;
Expand Down Expand Up @@ -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 "<form id='form_search' class='inline' method='get'>\n";
echo " <select class='formfld' name='filter'>\n";
echo " <option value='' selected='selected' disabled hidden>".$text['label-filter']."</option>";
echo " <option value=''></option>\n";
if (isset($_GET["filter"]) && $_GET["filter"] == "sip-auth-ip") {
echo " <option value='sip-auth-ip' selected='selected'>"."sip-auth-ip"."</option>\n";
}
else {
echo " <option value='sip-auth-ip'>"."sip-auth-ip"."</option>\n";
}
if (isset($_GET["filter"]) && $_GET["filter"] == "sip-auth-fail") {
echo " <option value='sip-auth-fail' selected='selected'>"."sip-auth-fail"."</option>\n";
}
else {
echo " <option value='sip-auth-fail'>"."sip-auth-fail"."</option>\n";
}
echo " </select>\n";
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'event_guard_logs.php','style'=>($search == '' ? 'display: none;' : null)]);
Expand Down