Changeset 1424 in subversion

Timestamp:

May 26, 2008 6:11:19 AM (5 years ago)

Author:

till

Message:

fix to #1485083

Location:

trunk/roundcubemail

Files:

• config/main.inc.php.dist (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)
• program/lib/imap.inc (modified) (2 diffs)

trunk/roundcubemail/config/main.inc.php.dist

@@ -329 +329 @@
 $rcmail_config['logout_expunge'] = FALSE;
 
+/**
+ * 'Delete always'
+ * This setting reflects if mail should be always marked as deleted,
+ * even if moving to "Trash" fails. This is necessary in some setups
+ * because a) people may not have a Trash folder or b) they are over
+ * quota (and Trash is included in the quota).
+ *
+ * This is a failover setting for iil_C_Move when a message is moved
+ * to the Trash, and not the same as "delete_right_away".
+ */
+$rcmail_config['delete_always'] = true;
+
 // end of config file
 ?>

trunk/roundcubemail/program/include/main.inc

@@ -280 +280 @@
     {
     $aliases['GB2312'] = 'GB18030';
-    return iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+    $_iconv = iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+    if ($_iconv !== false)
+      {
+        return $_iconv;
+      }
     }
 

trunk/roundcubemail/program/lib/imap.inc

@@ -1908 +1908 @@
         if (iil_C_Select($conn, $mailbox)) {
                 $c = 0;
-                fputs($fp, "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")\r\n");
+                $_line = "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")\r\n";
+                trigger_error($_line, E_USER_WARNING);
+                fputs($fp, $_line);
                 do {
                         $line=chop(iil_ReadLine($fp, 100));
@@ -2047 +2049 @@
 
 function iil_C_Move(&$conn, $messages, $from, $to) {
-        $fp = $conn->fp;
-        
-        if (!$from || !$to) {
-            return -1;
-        }
-    
-        $r = iil_C_Copy($conn, $messages, $from,$to);
-        if ($r==0) {
-                return iil_C_Delete($conn, $from, $messages);
-        }
+    global $CONFIG;
+
+    $fp = $conn->fp;
+
+    if (!$from || !$to) {
+        return -1;
+    }
+    $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);
+    }
     return $r;
 }