logic update (should be the last)

This commit is contained in:
Lewis Cowles 2015-05-24 12:41:39 +01:00
parent 6986ef830f
commit 743ceff0de

View File

@ -323,16 +323,17 @@ class Server
*/ */
public function numMessages($mailbox='') public function numMessages($mailbox='')
{ {
if ($mailbox===''){
return imap_num_msg( $this->getImapStream() );
}
if (!$this->hasMailbox($mailbox) && $mailbox !== ''){
return 0;
}
$oldMailbox = $this->getMailBox(); $oldMailbox = $this->getMailBox();
$mboxExists = ($this->hasMailbox($mailbox) && $oldMailbox !== $mailbox && $mailbox !== '');
if ($mboxExists){
$this->setMailbox($mailbox); $this->setMailbox($mailbox);
} $cnt = imap_num_msg($this->getImapStream());
$cnt = imap_num_msg( $this->getImapStream() );
if ($mboxExists){
$this->setMailbox($oldMailbox); $this->setMailbox($oldMailbox);
} return $cnt;
return ((!$mboxExists && $mailbox !== '') ? 0 : $cnt);
} }
/** /**