extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 02:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

use exceptions to report failure on PEAR::Errors to UI for moveMessages and delteMessages

Browse Source
This commit is contained in:
Klaus Leithoff 2010-11-11 16:25:45 +00:00
parent 7ec27c700a
commit 15612076fb
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
felamimail/inc/class.bofelamimail.inc.php
View File

@ -604,13 +604,17 @@
if (self::$debug) error_log(implode(' : ', $_messageUID)); if (self::$debug) error_log(implode(' : ', $_messageUID));
if (self::$debug) error_log("$trashFolder <= ". $this->sessionData['mailbox']); if (self::$debug) error_log("$trashFolder <= ". $this->sessionData['mailbox']);
// copy messages // copy messages
if ( PEAR::isError($this->icServer->copyMessages($trashFolder, $_messageUID, $_folder, true)) ) { $retValue = $this->icServer->copyMessages($trashFolder, $_messageUID, $_folder, true);
if ( PEAR::isError($retValue) ) {
if (self::$debug) error_log(__METHOD__." failed to copy Message(s) to $trashFolder: ".implode(',',$_messageUID)); if (self::$debug) error_log(__METHOD__." failed to copy Message(s) to $trashFolder: ".implode(',',$_messageUID));
throw new egw_exception("failed to copy Message(s) to $trashFolder: ".implode(',',$_messageUID).' due to:'.array2string($retValue->message));
return false; return false;
} }
// mark messages as deleted // mark messages as deleted
if ( PEAR::isError($this->icServer->deleteMessages($_messageUID, true))) { $retValue = $this->icServer->deleteMessages($_messageUID, true);
if (self::$debug) error_log(__METHOD__." failed to delete Message(s): ".implode(',',$_messageUID)); if ( PEAR::isError($retValue)) {
if (self::$debug) error_log(__METHOD__." failed to delete Message(s): ".implode(',',$_messageUID).' due to:'.$retValue->message);
throw new egw_exception("failed to delete Message(s): ".implode(',',$_messageUID).' due to:'.array2string($retValue->message));
return false; return false;
} }
// delete the messages finaly // delete the messages finaly
@ -620,16 +624,20 @@
case "mark_as_deleted": case "mark_as_deleted":
// mark messages as deleted // mark messages as deleted
if ( PEAR::isError($this->icServer->deleteMessages($_messageUID, true))) { $retValue = PEAR::isError($this->icServer->deleteMessages($_messageUID, true));
if ( PEAR::isError($retValue)) {
if (self::$debug) error_log(__METHOD__." failed to mark as deleted for Message(s): ".implode(',',$_messageUID)); if (self::$debug) error_log(__METHOD__." failed to mark as deleted for Message(s): ".implode(',',$_messageUID));
throw new egw_exception("failed to mark as deleted for Message(s): ".implode(',',$_messageUID).' due to:'.array2string($retValue->message));
return false; return false;
} }
break; break;
case "remove_immediately": case "remove_immediately":
// mark messages as deleted // mark messages as deleted
if ( PEAR::isError($this->icServer->deleteMessages($_messageUID, true))) { $retValue = $this->icServer->deleteMessages($_messageUID, true);
if ( PEAR::isError($retValue)) {
if (self::$debug) error_log(__METHOD__." failed to remove immediately Message(s): ".implode(',',$_messageUID)); if (self::$debug) error_log(__METHOD__." failed to remove immediately Message(s): ".implode(',',$_messageUID));
throw new egw_exception("failed to remove immediately Message(s): ".implode(',',$_messageUID).' due to:'.array2string($retValue->message));
return false; return false;
} }
// delete the messages finaly // delete the messages finaly
@ -2728,14 +2736,19 @@
$msglist = ''; $msglist = '';
$deleteOptions = $GLOBALS['egw_info']["user"]["preferences"]["felamimail"]["deleteOptions"]; $deleteOptions = $GLOBALS['egw_info']["user"]["preferences"]["felamimail"]["deleteOptions"];
$retValue = $this->icServer->copyMessages($_foldername, $_messageUID, $this->sessionData['mailbox'], true);
if ( PEAR::isError($this->icServer->copyMessages($_foldername, $_messageUID, $this->sessionData['mailbox'], true)) ) { if ( PEAR::isError($retValue) ) {
error_log(__METHOD__.__LINE__."Copying to Folder $_foldername failed! PEAR::Error:".array2string($retValue->message));
throw new egw_exception("Copying to Folder $_foldername failed! PEAR::Error:".array2string($retValue->message));
return false; return false;
} }
if ($deleteAfterMove === true) if ($deleteAfterMove === true)
{ {
if ( PEAR::isError($this->icServer->deleteMessages($_messageUID, true))) $retValue = $this->icServer->deleteMessages($_messageUID, true);
if ( PEAR::isError($retValue))
{ {
error_log(__METHOD__.__LINE__."Delete After Move PEAR::Error:".array2string($retValue->message));
throw new egw_exception("Delete After Move PEAR::Error:".array2string($retValue->message));
return false; return false;
} }