X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=MessagePreview.php;h=f59cde177e0f2f376661919f83a9a373777494a8;hp=8e61cce52f52d558b00c712a275d3e86e2835bb5;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=a63ee4d1c42840fa03bdea52999403740d9a57ba diff --git a/MessagePreview.php b/MessagePreview.php index 8e61cce5..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'); @@ -57,7 +57,11 @@ class Pman_Core_MessagePreview extends Pman $cn->insert(); - $cn->sendManual(); + $sent = $cn->sendManual(); + + if(get_class($sent) != 'Pman_Core_NotifySend_Exception_Success'){ + $this->jerr($sent->getMessage()); + } $this->jok("SUCCESS"); @@ -109,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)){