Some more message log stuff. Almost done.

merge-requests/3/head
Mike Koch 9 years ago
parent eda289931f
commit 9d2fd5f4d0

@ -77,9 +77,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<th>Message</th> <th>Message</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody></tbody>
</tbody>
</table> </table>
</div> </div>
</div> </div>

@ -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/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; ?>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/core.php"></script>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/common.js"></script>
<?php <?php
if (defined('EXTRA_JS')) { if (defined('EXTRA_JS')) {
echo EXTRA_JS; echo EXTRA_JS;

@ -1,6 +1,10 @@
<?php <?php
function search_log($hesk_settings, $location, $from_date, $to_date, $severity_id) { 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 "; $sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logging` WHERE 1=1 ";
if ($location != NULL) { if ($location != NULL) {
@ -24,6 +28,7 @@ function search_log($hesk_settings, $location, $from_date, $to_date, $severity_i
$results = []; $results = [];
while ($row = hesk_dbFetchAssoc($rs)) { while ($row = hesk_dbFetchAssoc($rs)) {
$row['timestamp'] = hesk_date($row['timestamp'], true);
$results[] = $row; $results[] = $row;
} }

Loading…
Cancel
Save