From 9d2fd5f4d04efe1199dc17b3cf416b59160079bf Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 8 Dec 2015 18:25:08 -0500
Subject: [PATCH] Some more message log stuff. Almost done.

---
 admin/view_message_log.php           | 4 +---
 inc/headerAdmin.inc.php              | 1 +
 internal-api/dao/message_log_dao.php | 5 +++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/view_message_log.php b/admin/view_message_log.php
index 961eaf77..3106452c 100644
--- a/admin/view_message_log.php
+++ b/admin/view_message_log.php
@@ -77,9 +77,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <th>Message</th>
                         </tr>
                         </thead>
-                        <tbody>
-
-                        </tbody>
+                        <tbody></tbody>
                     </table>
                 </div>
             </div>
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 35698c70..54521913 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -90,6 +90,7 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/platform.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/common.js"></script>
     <?php
     if (defined('EXTRA_JS')) {
         echo EXTRA_JS;
diff --git a/internal-api/dao/message_log_dao.php b/internal-api/dao/message_log_dao.php
index da145e03..281c8496 100644
--- a/internal-api/dao/message_log_dao.php
+++ b/internal-api/dao/message_log_dao.php
@@ -1,6 +1,10 @@
 <?php
 
 function search_log($hesk_settings, $location, $from_date, $to_date, $severity_id) {
+    if (!function_exists('hesk_date')) {
+        return null;
+    }
+
     $sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logging` WHERE 1=1 ";
 
     if ($location != NULL) {
@@ -24,6 +28,7 @@ function search_log($hesk_settings, $location, $from_date, $to_date, $severity_i
 
     $results = [];
     while ($row = hesk_dbFetchAssoc($rs)) {
+        $row['timestamp'] = hesk_date($row['timestamp'], true);
         $results[] = $row;
     }