X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=MessagePreview.php;h=6a7e94feeed9e5ab73e7613e066c8550ae8f649c;hb=26e81ed4f3a2bb69c887e04a62833e82a6b4e38e;hp=35f55478d4f8f90927fab436ec954a3c7c2faf33;hpb=a2093324bd084ed75d3f23cd57c800607c39feeb;p=Pman.Core

diff --git a/MessagePreview.php b/MessagePreview.php
index 35f55478..6a7e94fe 100644
--- a/MessagePreview.php
+++ b/MessagePreview.php
@@ -18,8 +18,9 @@ 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 +35,7 @@ class Pman_Core_MessagePreview extends Pman
         
     }
     
-    function post()
+    function post($v)
     {
         if(empty($_REQUEST['_id']) || empty($_REQUEST['_table'])){
             $this->jerr('Missing Options');
@@ -51,15 +52,19 @@ class Pman_Core_MessagePreview extends Pman
             'ontable'       => $_REQUEST['_table'],
             'person_id'     => $this->authUser->id,
             'person_table'  => 'Person',
-            'act_when'      => $cn->sqlValue("NOW()"),
-            'act_start'     => $cn->sqlValue("NOW()")
+            'act_when'      => $cn->sqlValue("NOW() + INTERVAL 10 MINUTE"),
+            'act_start'     => $cn->sqlValue("NOW() + INTERVAL 10 MINUTE")
         ));
         
         $cn->insert();
         
-        $cn->sendManual();
+        $sent = $cn->sendManual();
+        
+        if(get_class($sent) != 'Pman_Core_NotifySend_Exception_Success'){
+            $this->jerr($sent->getMessage());
+        }
         
-        $this->jok("OK");
+        $this->jok("SUCCESS");
         
         /*
         $mid = $_REQUEST['_id'];
@@ -106,9 +111,38 @@ class Pman_Core_MessagePreview extends Pman
         if(!method_exists($x, $method)){
             $this->jerr("{$method} does not exists in {$cls}");
         }
-
+        /*
         $content = $x->{$method}($this, $this->authUser);
         
+        $content['bcc'] = array();
+        */
+        
+        
+        $cn = DB_DataObject::factory('core_notify');
+        $cn->setFrom(array(
+            'evtype'        => 'Core_email::testData',
+            '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");
+        
+        
+        
+        
+        
         $sent = $core_email->send($content);
         
         if(is_object($sent)){