From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 18 Mar 2025 13:56:20 +0000 (+0100)
Subject: IMAP: Simplify expunge
X-Git-Tag: v5.1.0~130
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=249807fc48354031dabdc1e4c14c709b4b81d59d;p=adminer.git

IMAP: Simplify expunge
---

diff --git a/plugins/drivers/imap.php b/plugins/drivers/imap.php
index 5615a594..900eb892 100644
--- a/plugins/drivers/imap.php
+++ b/plugins/drivers/imap.php
@@ -7,7 +7,7 @@
 * - editing the message shows some other information
 * - deleting marks the message for deletion but doesn't expunge the mailbox
 * - inserting or updating the message does nothing
-* @link http://adminer.org/static/plugins/imap.png
+* @link https://www.adminer.org/static/plugins/imap.png
 */
 
 namespace Adminer;
@@ -108,8 +108,8 @@ if (isset($_GET["imap"])) {
 				return imap_deletemailbox($this->imap, $this->mailbox . $name);
 			}
 
-			function expunge($name) {
-				return imap_expunge($this->imap);
+			function expunge() {
+				return imap_expunge();
 			}
 		}
 
@@ -274,11 +274,7 @@ if (isset($_GET["imap"])) {
 	}
 
 	function truncate_tables($tables) {
-		$return = true;
-		foreach ($tables as $name) {
-			$return = $return && connection()->expunge($name);
-		}
-		return $return;
+		return connection()->expunge($name);
 	}
 
 	function connect($credentials) {