Changeset 1430 in subversion

Timestamp:

May 27, 2008 2:41:46 AM (5 years ago)

Author:

thomasb

Message:

Moved RoundCube functionality from lib to rcube_imap class; removed debug log

Location:

trunk/roundcubemail/program

Files:

• include/rcube_imap.php (modified) (1 diff)
• lib/imap.inc (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -1415 +1415 @@
     // send expunge command in order to have the moved message
     // really deleted from the source mailbox
-    if ($moved)
-      {
+    if ($moved) {
       $this->_expunge($from_mbox, FALSE);
       $this->_clear_messagecount($from_mbox);
       $this->_clear_messagecount($to_mbox);
-      }
+    }
+    // moving failed
+    else if (rcmail::get_instance()->config->get('delete_always', false)) {
+      return iil_C_Delete($this->conn, $from_mbox, join(',', $a_mids));
+    }
       
     // remove message ids from search set

trunk/roundcubemail/program/lib/imap.inc

@@ -1908 +1908 @@
         if (iil_C_Select($conn, $mailbox)) {
                 $c = 0;
-                $_line = "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")\r\n";
-                trigger_error($_line, E_USER_WARNING);
-                fputs($fp, $_line);
+                fputs($fp, "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")\r\n");
                 do {
                         $line=chop(iil_ReadLine($fp, 100));
@@ -2049 +2047 @@
 
 function iil_C_Move(&$conn, $messages, $from, $to) {
-    global $CONFIG;
-
     $fp = $conn->fp;
 
@@ -2058 +2054 @@
     $r = iil_C_Copy($conn, $messages, $from,$to);
     if ($r==0) {
-        return iil_C_Delete($conn, $from, $messages);
-    }
-    // Copy failed
-    if (isset($CONFIG['delete_always']) && $CONFIG['delete_always'] === true) {
         return iil_C_Delete($conn, $from, $messages);
     }