diff --git a/admin/view_message_log.php b/admin/view_message_log.php index 351d0753..e92f1bc2 100644 --- a/admin/view_message_log.php +++ b/admin/view_message_log.php @@ -97,6 +97,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); + diff --git a/api/index.php b/api/index.php index 1d2b0b91..4382f43c 100644 --- a/api/index.php +++ b/api/index.php @@ -122,7 +122,8 @@ function getLoggingLocation($exception) { // http://stackoverflow.com/a/9133897/1509431 $trace = $exception->getTrace(); $lastCall = $trace[0]; - return basename($lastCall['file'], '.php'); + $location = basename($lastCall['file'], '.php'); + return "REST API: {$location}"; } /** diff --git a/internal-api/dao/message_log_dao.php b/internal-api/dao/message_log_dao.php index cb8ddece..498acd68 100644 --- a/internal-api/dao/message_log_dao.php +++ b/internal-api/dao/message_log_dao.php @@ -23,12 +23,15 @@ function search_log($hesk_settings, $location, $from_date, $to_date, $severity_i if ($severity_id != NULL) { $sql .= "AND `severity` = " . intval($severity_id); } + $sql .= " ORDER BY `id` DESC"; $rs = hesk_dbQuery($sql); $results = array(); while ($row = hesk_dbFetchAssoc($rs)) { $row['timestamp'] = hesk_date($row['timestamp'], true); + $row['stackTrace'] = nl2br($row['stack_trace']); + unset($row['stack_trace']); $results[] = $row; } diff --git a/internal-api/js/view-message-log.js b/internal-api/js/view-message-log.js index c95f484a..6acbc741 100644 --- a/internal-api/js/view-message-log.js +++ b/internal-api/js/view-message-log.js @@ -53,7 +53,8 @@ function displayResults(data) { '' + result.timestamp + '' + '' + result.username + '' + '' + result.location + '' + - '' + result.message + ''); + '' + result.message + '' + + '' + result.stackTrace + ''); } } } diff --git a/language/en/text.php b/language/en/text.php index a30dafe3..4d171c27 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -45,6 +45,9 @@ $hesklang['_COLLATE']='utf8_unicode_ci'; // This is the email break line that will be used in email piping $hesklang['EMAIL_HR']='------ Reply above this line ------'; +// ADDED OR MODIFIED IN Mods for HESK 3.1.0 +$hesklang['stack_trace_header'] = 'Stack Trace'; + // ADDED OR MODIFIED IN Mods for HESK 3.0.0 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # $hesklang['message_lower_case'] = 'message';