From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 18 Mar 2025 18:46:08 +0000 (+0100)
Subject: IMAP: Use imap_num_msg()
X-Git-Tag: v5.1.0~122
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=8a64fb16cdcebb1b183ddecbbf9acd1779949066;p=adminer.git

IMAP: Use imap_num_msg()
---

diff --git a/plugins/drivers/imap.php b/plugins/drivers/imap.php
index 900eb892..5b570e82 100644
--- a/plugins/drivers/imap.php
+++ b/plugins/drivers/imap.php
@@ -21,7 +21,7 @@ if (isset($_GET["imap"])) {
 		class Db {
 			public $extension = "IMAP";
 			public $error;
-			public $server_info = "?"; // imap_mailboxmsginfo() doesn't return anything useful
+			public $server_info = "?"; // imap_mailboxmsginfo() or imap_check() don't return anything useful
 			private $mailbox;
 			private $imap;
 
@@ -51,8 +51,8 @@ if (isset($_GET["imap"])) {
 					if ($uid) {
 						$return = array((array) imap_fetchstructure($this->imap, $uid, FT_UID));
 					} else {
-						$check = imap_check($this->imap);
-						$range = ($offset + 1) . ":" . ($limit ? min($check->Nmsgs, $offset + $limit) : $check->Nmsgs);
+						$count = imap_num_msg($this->imap);
+						$range = ($offset + 1) . ":" . ($limit ? min($count, $offset + $limit) : $count);
 						$return = array();
 						$fields = fields($table);
 						$columns = ($columns == "*" ? $fields : array_flip(explode(", ", $columns)));