hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add better exception handling for emails

Browse Source
This commit is contained in:
Romain Neutron
2013-01-29 12:06:02 +01:00
parent 309a0a9472
commit 8325c35f91
4 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/classes/task/period/ftp.php
View File

@@ -8,6 +8,7 @@
* file that was distributed with this source code.
*/
use Alchemy\Phrasea\Exception\InvalidArgumentException;
use Alchemy\Phrasea\Notification\Mail\MailSuccessFTP;
use Alchemy\Phrasea\Notification\Receiver;
@@ -658,17 +659,31 @@ class task_period_ftp extends task_appboxAbstract
$sender_message = $text_mail_sender . $message;
$receiver_message = $text_mail_receiver . $message;
$receiver = new Receiver(null, $sendermail);
$mail = MailSuccessFTP::create($this->dependencyContainer, $receiver, null, $sender_message);
$mail->setServer($ftp_server);
$receiver = null;
try {
$receiver = new Receiver(null, $sendermail);
} catch (InvalidArgumentException $e) {
$this->dependencyContainer['notification.deliverer']->deliver($mail);
}
$receiver = new Receiver(null, $mail);
$mail = MailSuccessFTP::create($this->dependencyContainer, $receiver, null, $receiver_message);
$mail->setServer($ftp_server);
if ($receiver) {
$mail = MailSuccessFTP::create($this->dependencyContainer, $receiver, null, $sender_message);
$mail->setServer($ftp_server);
$this->dependencyContainer['notification.deliverer']->deliver($mail);
}
$this->dependencyContainer['notification.deliverer']->deliver($mail);
$receiver = null;
try {
$receiver = new Receiver(null, $mail);
} catch (InvalidArgumentException $e) {
}
if ($receiver) {
$mail = MailSuccessFTP::create($this->dependencyContainer, $receiver, null, $receiver_message);
$mail->setServer($ftp_server);
$this->dependencyContainer['notification.deliverer']->deliver($mail);
}
}
public function logexport(record_adapter $record, $obj, $ftpLog)