From 80f234355ea6acec55f4ea4d3df6daa01b420240 Mon Sep 17 00:00:00 2001 From: jakani24 Date: Sat, 27 Apr 2024 13:09:35 +0200 Subject: [PATCH] update --- .../system/secure_zone/php/export_log.php | 16 ++++++++++------ .../system/secure_zone/php/view_log.php | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/server/cyberhex-code/system/secure_zone/php/export_log.php b/src/server/cyberhex-code/system/secure_zone/php/export_log.php index 5adda2f..bfa8f44 100644 --- a/src/server/cyberhex-code/system/secure_zone/php/export_log.php +++ b/src/server/cyberhex-code/system/secure_zone/php/export_log.php @@ -24,7 +24,8 @@ $loglevel = htmlspecialchars(isset($_GET["loglevel"]) ? $_GET["loglevel"] : ""); $logtext = htmlspecialchars(isset($_GET["logtext"]) ? $_GET["logtext"] : ""); $machine_id = htmlspecialchars(isset($_GET["machine_id"]) ? $_GET["machine_id"] : ""); $time = htmlspecialchars(isset($_GET["time"]) ? $_GET["time"] : ""); -$filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&time=$time"; +$machine_location = htmlspecialchars(isset($_GET["machine_location"]) ? $_GET["machine_location"] : ""); +$filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&time=$time&machine_location=$machine_location"; ?> @@ -101,13 +102,14 @@ $filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&tim $offset = ($current_page - 1) * $page_size; // Get total number of log entries based on filters - $sql = "SELECT count(*) AS log_count FROM log WHERE loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ?"; + $sql = "SELECT count(*) AS log_count FROM machines,log WHERE machine_location LIKE ? AND loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ?"; $stmt = $conn->prepare($sql); $loglevel = "%" . $loglevel . "%"; $logtext = "%" . $logtext . "%"; $machine_id = "%" . $machine_id . "%"; + $machine_location = "%" . $machine_location . "%"; $time = "%" . $time . "%"; - $stmt->bind_param("ssss", $loglevel, $logtext, $machine_id, $time); + $stmt->bind_param("sssss",$machine_location, $loglevel, $logtext, $machine_id, $time); $stmt->execute(); $result = $stmt->get_result(); $row = $result->fetch_assoc(); @@ -117,13 +119,14 @@ $filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&tim $total_pages = ceil($total_entries / $page_size); // Query log entries for the current page with filters - $sql = "SELECT * FROM log WHERE loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ? ORDER BY id DESC LIMIT ?, ?"; + $sql = "SELECT * FROM machines,log WHERE machine_location LIKE ? AND loglevel LIKE ? AND logtext LIKE ? AND machine_id LIKE ? AND time LIKE ? AND machine_name=machine_id ORDER BY log.id DESC LIMIT ?, ?"; $stmt = $conn->prepare($sql); $loglevel = "%" . $loglevel . "%"; $logtext = "%" . $logtext . "%"; $machine_id = "%" . $machine_id . "%"; + $machine_location = "%" . $machine_location . "%"; $time = "%" . $time . "%"; - $stmt->bind_param("ssssii", $loglevel, $logtext, $machine_id, $time, $offset, $page_size); + $stmt->bind_param("sssssii", $machine_location, $loglevel, $logtext, $machine_id, $time, $offset, $page_size); $stmt->execute(); $result = $stmt->get_result(); @@ -131,7 +134,7 @@ $filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&tim echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -144,6 +147,7 @@ $filter_query = "&loglevel=$loglevel&logtext=$logtext&machine_id=$machine_id&tim echo ''; echo ''; echo ''; + echo ''; echo ''; echo ''; echo ''; diff --git a/src/server/cyberhex-code/system/secure_zone/php/view_log.php b/src/server/cyberhex-code/system/secure_zone/php/view_log.php index 3a0b981..1eae701 100644 --- a/src/server/cyberhex-code/system/secure_zone/php/view_log.php +++ b/src/server/cyberhex-code/system/secure_zone/php/view_log.php @@ -204,6 +204,7 @@ $conn->close(); $loglevel = "%" . $loglevel . "%"; $logtext = "%" . $logtext . "%"; $machine_id = "%" . $machine_id . "%"; + $machine_location = "%" . $machine_location . "%"; $time = "%" . $time . "%"; $stmt->bind_param("sssssii", $machine_location, $loglevel, $logtext, $machine_id, $time, $offset, $page_size); $stmt->execute();
Entry idLoglevelLogtextMachine idTime & dateEntry idLoglevelLogtextMachine idLocationTime & date