From 6cebe3473799d584308d742e2fc2cc52295c7e57 Mon Sep 17 00:00:00 2001 From: edward Date: Thu, 14 Jul 2016 14:49:44 +0800 Subject: [PATCH] NotifySend.php --- NotifySend.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/NotifySend.php b/NotifySend.php index a252bb77..f53bea65 100644 --- a/NotifySend.php +++ b/NotifySend.php @@ -356,6 +356,15 @@ class Pman_Core_NotifySend extends Pman $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'])) { @@ -387,15 +396,6 @@ class Pman_Core_NotifySend extends Pman 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(" @@ -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->domain_id = $w->update($ww); // enable cc in notify.. -- 2.39.2