From bbc6a661ed0306e77b56edcb827f5a1f86ff3231 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 30 Jan 2022 14:27:08 +0100
Subject: [PATCH] Fixes #754 Be able to delete emails from control center

---
 .devilbox/www/htdocs/mail.php      | 15 ++++++++++++++-
 .devilbox/www/include/lib/Mail.php | 12 ++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.devilbox/www/htdocs/mail.php b/.devilbox/www/htdocs/mail.php
index 7e5df533..15817e2e 100644
--- a/.devilbox/www/htdocs/mail.php
+++ b/.devilbox/www/htdocs/mail.php
@@ -24,6 +24,17 @@ require $VEN_DIR . DIRECTORY_SEPARATOR . 'Mail' . DIRECTORY_SEPARATOR .'mimeDeco
 require $LIB_DIR . DIRECTORY_SEPARATOR . 'Mail.php';
 require $LIB_DIR . DIRECTORY_SEPARATOR . 'Sort.php';
 
+
+if (isset($_GET['delete']) && is_numeric($_GET['delete'])) {
+	$message = $_GET['delete'];
+	$MyMbox = new \devilbox\Mail('/var/mail/devilbox');
+	$MyMbox->delete($message);
+	header('Location: /mail.php');
+	exit();
+}
+
+
+
 //
 // Setup Sort/Order
 //
@@ -152,6 +163,7 @@ $messages = $MyMbox->get($sortOrderArr);
 								<th>From <?php echo $orderFrom;?></th>
 								<th>To <?php echo $orderTo;?></th>
 								<th>Subject <?php echo $orderSubj;?></th>
+								<th>Action</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -180,11 +192,12 @@ $messages = $MyMbox->get($sortOrderArr);
 									<td><?php echo htmlentities($structure->headers['from']);?></td>
 									<td><?php echo htmlentities($structure->headers['x-original-to']);?></td>
 									<td><?php echo htmlentities($structure->headers['subject']);?></td>
+									<td><a href="/mail.php?delete=<?php echo $data['num']-1;?>" title="Delete Email"><i class="fa fa-trash"></i></a></td>
 								</tr>
 								<tr></tr>
 								<tr id="mail-<?php echo $data['num'];?>" style="display:none">
 									<td></td>
-									<td colspan="4">
+									<td colspan="5">
 										<?php if ($body !== null): ?>
 											<template id="mail-body-<?=$data['num']?>"><?=$body?></template>
 											<html-email data-template-id="mail-body-<?=$data['num']?>"></html-email>
diff --git a/.devilbox/www/include/lib/Mail.php b/.devilbox/www/include/lib/Mail.php
index 8a1353b7..ecfecabd 100644
--- a/.devilbox/www/include/lib/Mail.php
+++ b/.devilbox/www/include/lib/Mail.php
@@ -58,6 +58,18 @@ class Mail
 	}
 
 
+	/**
+	 * Deletes an emails
+	 *
+	 * Note: messages start with 0.
+	 *
+	 * @param int $message The number of the message to remove, or array of message ids to remove
+	 */
+	public function delete($message) {
+		$this->_Mbox->remove($message);
+	}
+
+
 	/**
 	 * Retrieve emails.
 	 *