projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
looking for wrong seperator
[Pman.Core]
/
NotifySend.php
diff --git
a/NotifySend.php
b/NotifySend.php
index
ac89e6f
..
91afa5a
100644
(file)
--- a/
NotifySend.php
+++ b/
NotifySend.php
@@
-289,8
+289,8
@@
class Pman_Core_NotifySend extends Pman
$ff = HTML_FlexyFramework::get();
$ff = HTML_FlexyFramework::get();
-
- $dom = array_pop(
explode('@', $p->email)
);
+ $explode_email = explode('@', $p->email);
+ $dom = array_pop(
$explode_email
);
$mxs = $this->mxs($dom);
$ww = clone($w);
$mxs = $this->mxs($dom);
$ww = clone($w);
@@
-538,7
+538,7
@@
class Pman_Core_NotifySend extends Pman
$ev = $this->addEvent('NOTIFY', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") .
$errmsg);
$ev = $this->addEvent('NOTIFY', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") .
$errmsg);
- $w->sent =
$w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :
$w->sent; // do not update if sent.....
+ $w->sent =
(!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') :
$w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->domain_id = $core_domain->id;
$w->msgid = '';
$w->event_id = $ev->id;
$w->domain_id = $core_domain->id;
@@
-549,7
+549,7
@@
class Pman_Core_NotifySend extends Pman
// handle no host availalbe forever...
if (strtotime($w->act_start) < strtotime('NOW - 3 DAYS')) {
$ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ". $p->email);
// handle no host availalbe forever...
if (strtotime($w->act_start) < strtotime('NOW - 3 DAYS')) {
$ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ". $p->email);
- $w->sent =
$w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :
$w->sent; // do not update if sent.....
+ $w->sent =
(!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') :
$w->sent; // do not update if sent.....
$w->msgid = '';
$w->event_id = $ev->id;
$w->domain_id = $core_domain->id;
$w->msgid = '';
$w->event_id = $ev->id;
$w->domain_id = $core_domain->id;
@@
-622,7
+622,11
@@
class Pman_Core_NotifySend extends Pman
return $object->$m($rcpt, $last_sent_date, $notify, $force);
}
return $object->$m($rcpt, $last_sent_date, $notify, $force);
}
- if (!method_exists($object, 'toEmail')) {
+ if (method_exists($object, 'toMailerData')) {
+ return $object->toMailerData(array(
+ 'rcpts'=>$rcpt,
+ 'person'=>$rcpt, // added as mediaoutreach used this?
+ )); //this is core_email - i think it's only used for testing...
//var_Dump($object);
//exit;
}
//var_Dump($object);
//exit;
}