X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=MessagePreview.php;h=f59cde177e0f2f376661919f83a9a373777494a8;hp=c5b34b1d196eb9c450fa491b66637b4daa3ba925;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=804ebf0b86b2f7f75a834f83aaa7091e2e5e8699 diff --git a/MessagePreview.php b/MessagePreview.php index c5b34b1d..f59cde17 100644 --- a/MessagePreview.php +++ b/MessagePreview.php @@ -18,7 +18,7 @@ class Pman_Core_MessagePreview extends Pman return true; } - function get() + function get($v, $opts=array()) { if(empty($_REQUEST['_id']) || empty($_REQUEST['_table'])){ $this->jerr('Missing Options'); @@ -34,7 +34,7 @@ class Pman_Core_MessagePreview extends Pman } - function post() + function post($v) { if(empty($_REQUEST['_id']) || empty($_REQUEST['_table'])){ $this->jerr('Missing Options'); @@ -44,14 +44,34 @@ class Pman_Core_MessagePreview extends Pman $this->coreEmailSendTest(); } + $cn = DB_DataObject::factory('core_notify'); + $cn->setFrom(array( + 'evtype' => "{$_REQUEST['_table']}::SendPreviewEmail", + 'onid' => $_REQUEST['_id'], + 'ontable' => $_REQUEST['_table'], + 'person_id' => $this->authUser->id, + 'person_table' => 'Person', + 'act_when' => $cn->sqlValue("NOW()"), + 'act_start' => $cn->sqlValue("NOW()") + )); + + $cn->insert(); + + $sent = $cn->sendManual(); + + if(get_class($sent) != 'Pman_Core_NotifySend_Exception_Success'){ + $this->jerr($sent->getMessage()); + } + + $this->jok("SUCCESS"); + + /* $mid = $_REQUEST['_id']; $mlq = DB_DataObject::factory($_REQUEST['_table']); $mlq->get($_REQUEST['_id']); - $this->authUser->email = 'edward@roojs.com'; - $content = array( 'template' => $mlq->name, 'person' => $this->authUser @@ -64,7 +84,7 @@ class Pman_Core_MessagePreview extends Pman } $this->jerr('error!!:' . $sent->toString()); - + */ } function coreEmailSendTest() @@ -93,6 +113,8 @@ class Pman_Core_MessagePreview extends Pman $content = $x->{$method}($this, $this->authUser); + $content['bcc'] = array(); + $sent = $core_email->send($content); if(is_object($sent)){