diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js index c0672e7e..1d72bb95 100644 --- a/scripts/pi-hole/js/messages.js +++ b/scripts/pi-hole/js/messages.js @@ -170,7 +170,7 @@ function deleteMessage() { var id = tr.attr("data-id"); utils.disableAll(); - utils.showAlert("info", "", "Deleting message # ", id); + utils.showAlert("info", "", "Deleting message with ID " + parseInt(id, 10), "..."); $.ajax({ url: "scripts/pi-hole/php/message.php", method: "post", diff --git a/scripts/pi-hole/php/message.php b/scripts/pi-hole/php/message.php index cfbb89a6..9a653a0e 100644 --- a/scripts/pi-hole/php/message.php +++ b/scripts/pi-hole/php/message.php @@ -42,10 +42,9 @@ function JSON_error($message = null) echo json_encode($response); } -if ($_POST['action'] == 'delete_message') { +if ($_POST['action'] == 'delete_message' && isset($_POST['id'])) { // Delete message identified by ID try { - $db->query('BEGIN TRANSACTION;'); $stmt = $db->prepare('DELETE FROM message WHERE id=:id'); if (!$stmt) { @@ -60,9 +59,6 @@ if ($_POST['action'] == 'delete_message') { throw new Exception('While executing message statement: ' . $db->lastErrorMsg()); } - if(!$db->query('COMMIT;')) { - throw new Exception('While commiting changes to the database: ' . $db->lastErrorMsg()); - } $reload = true; JSON_success();