[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/functions imap_messages.php, 1.134.2.30,
From:       Tomas Kuliavas <tokul () users ! sourceforge ! net>
Date:       2006-09-30 10:15:13
Message-ID: E1GTbsH-0000HM-IB () sc8-pr-cvs8 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv675/functions

Modified Files:
      Tag: SM-1_4-STABLE
	imap_messages.php 
Log Message:
Ignore message copy errors when messages are deleted. Allows to delete
messages when quota is exceeded. (#614887) (#646386) (#1446026)


Index: imap_messages.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/imap_messages.php,v
retrieving revision 1.134.2.30
retrieving revision 1.134.2.31
diff -u -w -r1.134.2.30 -r1.134.2.31
--- imap_messages.php	21 Aug 2006 10:29:19 -0000	1.134.2.30
+++ imap_messages.php	30 Sep 2006 10:15:11 -0000	1.134.2.31
@@ -35,7 +35,11 @@
     global $move_to_trash, $trash_folder, $uid_support;
     $msgs_id = sqimap_message_list_squisher($id);
     if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, \
                $trash_folder) && ($mailbox != $trash_folder))) {
-        $read = sqimap_run_command ($imap_stream, "COPY $msgs_id \"$trash_folder\"", \
true, $response, $message, $uid_support); +        /**
+         * turn off internal error handling (third argument = false) and
+         * ignore copy to trash errors (allows to delete messages when overquota)
+         */
+        $read = sqimap_run_command ($imap_stream, "COPY $msgs_id \"$trash_folder\"", \
false, $response, $message, $uid_support);  }
     $read = sqimap_run_command ($imap_stream, "STORE $msgs_id +FLAGS (\\Deleted)", \
true, $response, $message, $uid_support);  }
@@ -899,7 +903,11 @@
     global $move_to_trash, $trash_folder, $auto_expunge, $uid_support;
 
     if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, \
                $trash_folder) && ($mailbox != $trash_folder))) {
-        sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder);
+        /**
+         * turn off internal error handling (fifth argument = false) and
+         * ignore copy to trash errors (allows to delete messages when overquota)
+         */
+        sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder, false);
     }
     sqimap_messages_flag ($imap_stream, $start, $end, "Deleted", true);
 }


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread]