Changeset 93272ea in github

Timestamp:

Oct 29, 2010 8:41:11 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

9ae29c9

Parents:

c309cd8

Message:

• Use consistent results from some functions, code cleanup

Location:

program/include

Files:

• rcube_imap.php (modified) (4 diffs)
• rcube_imap_generic.php (modified) (4 diffs)

program/include/rcube_imap.php

@@ -2475 +2475 @@
 
         // 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
@@ -2537 +2536 @@
 
         // exit if no message uids are specified
-        if (empty($uids))
+        if (empty($uids)) {
             return false;
+        }
 
         // make sure mailbox exists
@@ -2549 +2549 @@
 
         // 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) {
@@ -3651 +3650 @@
             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);

program/include/rcube_imap_generic.php

@@ -1200 +1200 @@
     }
 
-    function UID2ID($folder, $uid)
+    /**
+     * Returns message sequence identifier
+     *
+     * @param string $mailbox Mailbox name
+     * @param int    $uid     Message unique identifier (UID)
+     *
+     * @return int Message sequence identifier
+     * @access public
+     */
+    function UID2ID($mailbox, $uid)
     {
             if ($uid > 0) {
-                $id_a = $this->search($folder, "UID $uid");
+                $id_a = $this->search($mailbox, "UID $uid");
                 if (is_array($id_a) && count($id_a) == 1) {
-                        return $id_a[0];
+                        return (int) $id_a[0];
                     }
             }
-            return false;
-    }
-
-    function ID2UID($folder, $id)
-    {
-            if (empty($id)) {
-                return  -1;
+            return null;
+    }
+
+    /**
+     * Returns message unique identifier (UID)
+     *
+     * @param string $mailbox Mailbox name
+     * @param int    $uid     Message sequence identifier
+     *
+     * @return int Message unique identifier
+     * @access public
+     */
+    function ID2UID($mailbox, $id)
+    {
+            if (empty($id) || $id < 0) {
+                return  null;
             }
 
         if (!$this->select($folder)) {
-            return -1;
-        }
-
-            $result  = -1;
+            return null;
+        }
+
         list($code, $response) = $this->execute('FETCH', array($id, '(UID)'));
 
         if ($code == self::ERROR_OK && preg_match("/^\* $id FETCH \(UID (.*)\)/i", $response, $m)) {
-                        $result = $m[1];
-        }
-
-        return $result;
+                        return (int) $m[1];
+        }
+
+        return null;
     }
 
@@ -1616 +1633 @@
     {
             if (empty($from) || empty($to)) {
-                return -1;
+                return false;
             }
 
             if (!$this->select($from)) {
-            return -1;
+                return false;
             }
 
@@ -1627 +1644 @@
             self::COMMAND_NORESPONSE);
 
-            return $result;
+            return ($result == self::ERROR_OK);
+    }
+
+    function move($messages, $from, $to)
+    {
+        if (!$from || !$to) {
+            return false;
+        }
+
+        $r = $this->copy($messages, $from, $to);
+
+        if ($r) {
+            return $this->delete($from, $messages);
+        }
+        return $r;
     }
 
@@ -1807 +1838 @@
     }
 
-    function move($messages, $from, $to)
-    {
-        if (!$from || !$to) {
-            return -1;
-        }
-
-        $r = $this->copy($messages, $from, $to);
-
-        if ($r==0) {
-            return $this->delete($from, $messages);
-        }
-        return $r;
-    }
-
     /**
      * Returns list of mailboxes