From ad47cbd334cfdd51ded4fb25ee33d2c4f38e616d Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 2 Mar 2009 21:49:13 -0700 Subject: [PATCH] Remove function that no longer exists. Reuse existing code. Add some more status flags not supported by POP. --- .../lib/Horde/Imap/Client/Cclient/Pop3.php | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Cclient/Pop3.php b/framework/Imap_Client/lib/Horde/Imap/Client/Cclient/Pop3.php index 68df4415c..81fa1e10b 100644 --- a/framework/Imap_Client/lib/Horde/Imap/Client/Cclient/Pop3.php +++ b/framework/Imap_Client/lib/Horde/Imap/Client/Cclient/Pop3.php @@ -167,18 +167,6 @@ class Horde_Imap_Client_Cclient_Pop3 extends Horde_Imap_Client_Cclient } /** - * Unsubscribe to a mailbox. - * - * @param string $mailbox The mailbox to unsubscribe to (UTF7-IMAP). - * - * @throws Horde_Imap_Client_Exception - */ - protected function _unsubscribeMailbox($mailbox) - { - throw new Horde_Imap_Client_Exception('Mailboxes other than INBOX not supported on POP3 servers.', Horde_Imap_Client_Exception::POP3_NOTSUPPORTED); - } - - /** * Obtain a list of mailboxes matching a pattern. * * @param string $pattern The mailbox search pattern. @@ -214,14 +202,14 @@ class Horde_Imap_Client_Cclient_Pop3 extends Horde_Imap_Client_Cclient */ protected function _status($mailbox, $flags) { - if (strcasecmp($mailbox, 'INBOX') !== 0) { - throw new Horde_Imap_Client_Exception('Mailboxes other than INBOX not supported on POP3 servers.', Horde_Imap_Client_Exception::POP3_NOTSUPPORTED); - } + $this->openMailbox($mailbox); // This driver only supports the base flags given by c-client. if (($flags & Horde_Imap_Client::STATUS_FIRSTUNSEEN) || ($flags & Horde_Imap_Client::STATUS_FLAGS) || - ($flags & Horde_Imap_Client::STATUS_PERMFLAGS)) { + ($flags & Horde_Imap_Client::STATUS_PERMFLAGS) || + ($flags & Horde_Imap_Client::STATUS_HIGHESTMODSEQ) || + ($flags & Horde_Imap_Client::STATUS_UIDNOTSTICKY)) { throw new Horde_Imap_Client_Exception('Improper status request on POP3 server.', Horde_Imap_Client_Exception::POP3_NOTSUPPORTED); } -- 2.11.0