From 1f397af22298180b35dcc88d38799bbbd8f259b8 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 29 Nov 2015 22:05:07 -0500 Subject: [PATCH] Basic initial load is working --- admin/view_message_log.php | 4 +++ internal-api/admin/message-log/index.php | 24 ++++++++++++++++++ internal-api/dao/message_log_dao.php | 31 ++++++++++++++++++++++++ internal-api/js/view-message-log.js | 21 ++++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 internal-api/admin/message-log/index.php create mode 100644 internal-api/dao/message_log_dao.php create mode 100644 internal-api/js/view-message-log.js diff --git a/admin/view_message_log.php b/admin/view_message_log.php index 790677a4..3c1ad83b 100644 --- a/admin/view_message_log.php +++ b/admin/view_message_log.php @@ -13,6 +13,10 @@ hesk_load_database_functions(); hesk_session_start(); hesk_dbConnect(); hesk_isLoggedIn(); + + +define('EXTRA_JS', ''); + /* Print header */ require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); diff --git a/internal-api/admin/message-log/index.php b/internal-api/admin/message-log/index.php new file mode 100644 index 00000000..e5f5bff1 --- /dev/null +++ b/internal-api/admin/message-log/index.php @@ -0,0 +1,24 @@ += '" . hesk_dbEscape($from_date) . " 00:00:00' "; + } + $to_date_format = preg_match("/\d{4}-\d{2}-\d{2}/", $to_date); + if ($to_date != NULL + && $to_date_format === 1) { + $sql .= "AND `timestamp` <= '" . hesk_dbEscape($to_date) . " 23:59:59' "; + } + if ($severity_id != NULL) { + $sql .= "AND `severity` = " . intval($severity_id); + } + + $rs = hesk_dbQuery($sql); + + $results = []; + while ($row = hesk_dbFetchAssoc($rs)) { + $results[] = $row; + } + + return $results; +} \ No newline at end of file diff --git a/internal-api/js/view-message-log.js b/internal-api/js/view-message-log.js new file mode 100644 index 00000000..8c106be6 --- /dev/null +++ b/internal-api/js/view-message-log.js @@ -0,0 +1,21 @@ +$(document).ready(function() { + // We should show the latest 50 logs when the user first views the page. + var endpoint = getHelpdeskUrl(); + endpoint += '/internal-api/admin/message-log/'; + $.ajax({ + url: endpoint, + data: { + location: null, + fromDate: null, + toDate: null, + severityId: null + }, + method: 'POST', + success: function(data) { + console.log(data); + }, + error: function(data) { + console.error(data); + } + }) +}) \ No newline at end of file