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
67985f9
..
91afa5a
100644
(file)
--- a/
NotifySend.php
+++ b/
NotifySend.php
@@
-26,8
+26,8
@@
require_once 'Pman.php';
* Mail[helo] << helo host name
* Mail[socket_options] << any socket option.
*/
* Mail[helo] << helo host name
* Mail[socket_options] << any socket option.
*/
-Pman_Core_NotifySend_Exception_Success extends Exception {};
-Pman_Core_NotifySend_Exception_Fail extends Exception {};
+class Pman_Core_NotifySend_Exception_Success extends Exception {}
+class Pman_Core_NotifySend_Exception_Fail extends Exception {}
class Pman_Core_NotifySend extends Pman
class Pman_Core_NotifySend extends Pman
@@
-83,7
+83,7
@@
class Pman_Core_NotifySend extends Pman
}
}
- function get($id,$opts)
+ function get($id,$opts
=array()
)
{
//print_r($opts);
{
//print_r($opts);
@@
-120,7
+120,7
@@
class Pman_Core_NotifySend extends Pman
if (!$force && (!empty($w->msgid) || $sent)) {
$ww = clone($w);
if (!$sent) {
if (!$force && (!empty($w->msgid) || $sent)) {
$ww = clone($w);
if (!$sent) {
- $w->sent = $w->s
qlValue("NOW()");
+ $w->sent = $w->s
ent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
$w->update($ww);
}
$this->errorHandler("message has been sent already.\n");
$w->update($ww);
}
$this->errorHandler("message has been sent already.\n");
@@
-133,7
+133,7
@@
class Pman_Core_NotifySend extends Pman
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (underlying object does not exist)" );;
$ww = clone($w);
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (underlying object does not exist)" );;
$ww = clone($w);
- $w->sent =
date('Y-m-d H:i:s');
+ $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->update($ww);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
@@
-150,7
+150,7
@@
class Pman_Core_NotifySend extends Pman
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (not user not active any more)" );;
$ww = clone($w);
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (not user not active any more)" );;
$ww = clone($w);
- $w->sent =
date('Y-m-d H:i:s');
+ $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->update($ww);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
@@
-204,7
+204,7
@@
class Pman_Core_NotifySend extends Pman
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (not required any more)" );;
$ww = clone($w);
$ev = $this->addEvent('NOTIFY', $w,
"Notification event cleared (not required any more)" );;
$ww = clone($w);
- $w->sent =
date('Y-m-d H:i:s');
+ $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->update($ww);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
@@
-230,7
+230,7
@@
class Pman_Core_NotifySend extends Pman
$ev = $this->addEvent('NOTIFY', $w, isset($email['error']) ?
$email['error'] : "INTERNAL ERROR - We can not handle " . $w->ontable);
$ww = clone($w);
$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->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->update($ww);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
@@
-278,7
+278,7
@@
class Pman_Core_NotifySend extends Pman
if (!Validate::email($p->email, true)) {
$ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
$ww = clone($w);
if (!Validate::email($p->email, true)) {
$ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
$ww = clone($w);
- $w->sent =
date('Y-m-d H:i:s');
+ $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->update($ww);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
@@
-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);
@@
-325,7
+325,7
@@
class Pman_Core_NotifySend extends Pman
}
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
}
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
- $w->sent =
date('Y-m-d H:i:s');
+ $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->update($ww);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
@@
-339,7
+339,7
@@
class Pman_Core_NotifySend extends Pman
if (!$force && strtotime($w->act_start) < strtotime('NOW - 14 DAY')) {
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
if (!$force && strtotime($w->act_start) < strtotime('NOW - 14 DAY')) {
$ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
- $w->sent =
date('Y-m-d H:i:s');
+ $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->update($ww);
$w->msgid = '';
$w->event_id = $ev->id;
$w->update($ww);
@@
-350,7
+350,8
@@
class Pman_Core_NotifySend extends Pman
$w->to_email = $p->email;
//$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
$w->to_email = $p->email;
//$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
- $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+ // we can only update act_when if it has not been sent already (only happens when running in force mode..)
+ $w->act_when = (!$w->act_when || $w->act_when == '0000-00-00 00:00:00') ? date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES')) : $w->act_when;
$w->update($ww);
$ww = clone($w);
$w->update($ww);
$ww = clone($w);
@@
-466,7
+467,7
@@
class Pman_Core_NotifySend extends Pman
$w->act_when = date('Y-m-d H:i:s');
}
$w->act_when = date('Y-m-d H:i:s');
}
- $w->sent =
date('Y-m-d H:i:s');
+ $w->sent =
(!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
$w->msgid = $email['headers']['Message-Id'];
$w->event_id = $ev->id; // sent ok.. - no need to record it..
$w->domain_id = $core_domain->id;
$w->msgid = $email['headers']['Message-Id'];
$w->event_id = $ev->id; // sent ok.. - no need to record it..
$w->domain_id = $core_domain->id;
@@
-537,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 =
date('Y-m-d H:i:s');
+ $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;
@@
-548,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 =
date('Y-m-d H:i:s');
+ $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;
@@
-621,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;
}
@@
-652,8
+657,11
@@
class Pman_Core_NotifySend extends Pman
function errorHandler($msg, $success = false)
{
if($this->error_handler == 'exception'){
function errorHandler($msg, $success = false)
{
if($this->error_handler == 'exception'){
- if()
- throw new Exception($msg);
+ if($success){
+ throw new Pman_Core_NotifySend_Exception_Success($msg);
+ }
+
+ throw new Pman_Core_NotifySend_Exception_Fail($msg);
}
die($msg);
}
die($msg);