From: Edward <edward@roojs.com>
Date: Thu, 20 Feb 2014 06:39:40 +0000 (+0800)
Subject: MessagePreview.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=1362d95b27bf3aab47dc8973ba1781189ebcd564

MessagePreview.php
---

diff --git a/MessagePreview.php b/MessagePreview.php
index 8b6f0229..ad784664 100644
--- a/MessagePreview.php
+++ b/MessagePreview.php
@@ -35,6 +35,8 @@ class Pman_Core_MessagePreview extends Pman
     }
     
     function post()
+    {
+        function post()
     {
         if(empty($_REQUEST['_id'])){
             $this->jerr('id got error');
@@ -42,33 +44,53 @@ class Pman_Core_MessagePreview extends Pman
         if(empty($_REQUEST['_action'])){
             $this->jerr('preview type not set');
         }
-        $mid = $_REQUEST['_id'];
         
-        $cfg = HTML_FlexyFramework::get()->Pman_Crm;
+        $msg = DB_DataObject::factory('crm_mailing_list_message');
         
-       
-       
-        $q = DB_DataObject::factory('crm_mailing_list_queue');
-        $q->id = 'test-message-'. $mid;
-        $q->message_id = $mid;
-        $q->message_id_subject = $q->message()->subject;
-        $q->message_id_from_email = $cfg['from_email'];
-        $q->message_id_from_name = "Email Test"; 
+        $msg->get($_REQUEST['_id']);
         
-        $q->cachedMailWithOutImages(true);
-        $r = $q->getMailerObject($this->authUser, false, false, true);
-        //print_r($r->toData());
-        $ret = $r->toData();
-        $images = file_get_contents(session_save_path() . '/email-cache-' . getenv('APACHE_RUN_USER') . '/mail/' . $q->id . '-images.txt');
-       // var_dump($images);exit;
+        $res = $msg->send(array(
+            'person' => $this->authUser,
+            'replace_links' => false,
+            
+        ));
+
+        if(is_object($res)){
+            return $this->jerr( "an error occured sending the email " . $res->toString() );
+        }
         
-        $ret['body'] = str_replace('%Images%', $images, $ret['body']);
+        $this->jok("success");
         
-        $sent = $r->send($ret);
-        if(!is_object($sent)){
-            $this->jok('SUCCESS');
-        }
-        $this->jerr('error!!:' . $sent->toString());
+        
+//        $mid = $_REQUEST['_id'];
+//        
+//        $cfg = HTML_FlexyFramework::get()->Pman_Crm;
+//        
+//       
+//       
+//        $q = DB_DataObject::factory('crm_mailing_list_queue');
+//        $q->id = 'test-message-'. $mid;
+//        $q->message_id = $mid;
+//        $q->message_id_subject = $q->message()->subject;
+//        $q->message_id_from_email = $cfg['from_email'];
+//        $q->message_id_from_name = "Email Test"; 
+//        
+//        $q->cachedMailWithOutImages(true);
+//        $r = $q->getMailerObject($this->authUser, false, false, true);
+//        //print_r($r->toData());
+//        $ret = $r->toData();
+//        $images = file_get_contents(session_save_path() . '/email-cache-' . getenv('APACHE_RUN_USER') . '/mail/' . $q->id . '-images.txt');
+//       // var_dump($images);exit;
+//        
+//        $ret['body'] = str_replace('%Images%', $images, $ret['body']);
+//        
+//        $sent = $r->send($ret);
+//        if(!is_object($sent)){
+//            $this->jok('SUCCESS');
+//        }
+//        $this->jerr('error!!:' . $sent->toString());
+        
+    }
         
     }