From 93272ea91b3263acd883cac77986125e9a2ad8c6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 29 Oct 2010 08:41:11 -0400
Subject: [PATCH] - Use consistent results from some functions, code cleanup
---
program/include/rcube_imap.php | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index d085542..028d998 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2474,8 +2474,7 @@
}
// move messages
- $move = $this->conn->move($uids, $from_mbox, $to_mbox);
- $moved = !($move === false || $move < 0);
+ $moved = $this->conn->move($uids, $from_mbox, $to_mbox);
// send expunge command in order to have the moved message
// really deleted from the source mailbox
@@ -2536,8 +2535,9 @@
list($uids, $all_mode) = $this->_parse_uids($uids, $from_mbox);
// exit if no message uids are specified
- if (empty($uids))
+ if (empty($uids)) {
return false;
+ }
// make sure mailbox exists
if ($to_mbox != 'INBOX' && !$this->mailbox_exists($tbox, true)) {
@@ -2548,8 +2548,7 @@
}
// copy messages
- $copy = $this->conn->copy($uids, $from_mbox, $to_mbox);
- $copied = !($copy === false || $copy < 0);
+ $copied = $this->conn->copy($uids, $from_mbox, $to_mbox);
if ($copied) {
$this->_clear_messagecount($to_mbox);
@@ -3650,7 +3649,7 @@
if (!$msg_count)
return $cache_count ? -2 : 1;
- if ($cache_count==$msg_count) {
+ if ($cache_count == $msg_count) {
if ($this->skip_deleted) {
$h_index = $this->conn->fetchHeaderIndex($mailbox, "1:*", 'UID', $this->skip_deleted);
--
Gitblit v1.9.1