X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=MessagePreview.php;h=f59cde177e0f2f376661919f83a9a373777494a8;hp=9ee72c2c4e846a0564debc32189a465eea0caa54;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=01800c5cff98999756d90c6ea1364e259948a7da diff --git a/MessagePreview.php b/MessagePreview.php index 9ee72c2c..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,10 +57,13 @@ class Pman_Core_MessagePreview extends Pman $cn->insert(); - $cn->sendManual(); + $sent = $cn->sendManual(); - $this->jok("SUCCESS"); + if(get_class($sent) != 'Pman_Core_NotifySend_Exception_Success'){ + $this->jerr($sent->getMessage()); + } + $this->jok("SUCCESS"); /* $mid = $_REQUEST['_id']; @@ -110,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)){