projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8917318
)
NotifySend.php
author
edward
<edward@roojs.com>
Thu, 14 Jul 2016 06:49:44 +0000
(14:49 +0800)
committer
edward
<edward@roojs.com>
Thu, 14 Jul 2016 06:49:44 +0000
(14:49 +0800)
NotifySend.php
patch
|
blob
|
history
diff --git
a/NotifySend.php
b/NotifySend.php
index
a252bb7
..
f53bea6
100644
(file)
--- a/
NotifySend.php
+++ b/
NotifySend.php
@@
-356,6
+356,15
@@
class Pman_Core_NotifySend extends Pman
$fail = false;
require_once 'Mail.php';
$fail = false;
require_once 'Mail.php';
+ $core_domain = DB_DataObject::factory($core_domain);
+ if(!$core_domain->get('domain', $dom)){
+ $core_domain = DB_DataObject::factory($core_domain);
+ $core_domain->setFrom(array(
+ 'domain' => $dom
+ ));
+ $core_domain->insert();
+ }
+
foreach($mxs as $mx) {
if (!isset($ff->Mail['helo'])) {
foreach($mxs as $mx) {
if (!isset($ff->Mail['helo'])) {
@@
-387,15
+396,6
@@
class Pman_Core_NotifySend extends Pman
continue;
}
continue;
}
- $core_domain = DB_DataObject::factory($core_domain);
- if(!$core_domain->get('domain', $dom)){
- $core_domain = DB_DataObject::factory($core_domain);
- $core_domain->setFrom(array(
- 'domain' => $dom
- ));
- $core_domain->insert();
- }
-
$core_notify = DB_DataObject::factory('core_notify');
$core_notify->domain_id = $core_domain->id;
$core_notify->whereAdd("
$core_notify = DB_DataObject::factory('core_notify');
$core_notify->domain_id = $core_domain->id;
$core_notify->whereAdd("
@@
-436,6
+436,7
@@
class Pman_Core_NotifySend extends Pman
$w->sent = date('Y-m-d H:i:s');
$w->msgid = $email['headers']['Message-Id'];
$w->event_id = $ev->id; // sent ok.. - no need to record it..
$w->sent = date('Y-m-d H:i:s');
$w->msgid = $email['headers']['Message-Id'];
$w->event_id = $ev->id; // sent ok.. - no need to record it..
+ $w->domain_id =
$w->update($ww);
// enable cc in notify..
$w->update($ww);
// enable cc in notify..