projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dbdc4d2
)
NotifySend.php
author
Alan Knowles
<alan@roojs.com>
Wed, 28 Sep 2011 04:49:38 +0000
(12:49 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 28 Sep 2011 04:49:38 +0000
(12:49 +0800)
NotifySend.php
patch
|
blob
|
history
diff --git
a/NotifySend.php
b/NotifySend.php
index
12ff282
..
217250b
100644
(file)
--- a/
NotifySend.php
+++ b/
NotifySend.php
@@
-134,12
+134,12
@@
class Pman_Core_NotifySend extends Pman
if ($email === false || isset($email['error'])) {
// object returned 'false' - it does not know how to send it..
if ($email === false || isset($email['error'])) {
// object returned 'false' - it does not know how to send it..
- $
id
= $this->addEvent('NOTIFY', $w, isset($email['error']) ?
+ $
ev
= $this->addEvent('NOTIFY', $w, isset($email['error']) ?
$email['error'] : "INTERNAL ERROR - We can not handle " . $w->ontable);;
$ww = clone($w);
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$email['error'] : "INTERNAL ERROR - We can not handle " . $w->ontable);;
$ww = clone($w);
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
- $w->event_id = $id;
+ $w->event_id = $
ev->
id;
$w->update($ww);
die(date('Y-m-d h:i:s ') .
(isset($email['error']) ?
$w->update($ww);
die(date('Y-m-d h:i:s ') .
(isset($email['error']) ?
@@
-207,12
+207,12
@@
class Pman_Core_NotifySend extends Pman
}
if ($fail || $next_try_min > (2*24*60)) {
// fail.. = log and give up..
}
if ($fail || $next_try_min > (2*24*60)) {
// fail.. = log and give up..
- $
id
= $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
+ $
ev
= $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
$p->email . ' ' .
($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) : " - UNKNOWN ERROR"));
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
$p->email . ' ' .
($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) : " - UNKNOWN ERROR"));
$w->sent = date('Y-m-d H:i:s');
$w->msgid = '';
- $w->event_id = $id;
+ $w->event_id = $
ev->
id;
$w->update($ww);
die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
}
$w->update($ww);
die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
}