X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Import%2FCore_email.php;h=db526e76185f5e4f2a300b04aa51bccda120fe9f;hb=cd0367f0b1c72b3bf7140f594c7e54ef2ed94c9e;hp=a4023217382ff1f715f448325b998f46c4399209;hpb=074e3e3bef8ae58d1b2d22452eefbb686c437cd7;p=Pman.Core

diff --git a/Import/Core_email.php b/Import/Core_email.php
index a4023217..db526e76 100644
--- a/Import/Core_email.php
+++ b/Import/Core_email.php
@@ -28,8 +28,15 @@ class Pman_Core_Import_Core_email extends Pman
             'desc' => 'Update template (deletes old version?)',
             'short' => 'u',
             'default' => '',
-            'min' => 1,
-            'max' => 1,  
+            'min' => 0,
+            'max' => 0,  
+        ),
+         'use-file' => array(
+            'desc' => 'Force usage of file (so content is not editable in Management system)',
+            'short' => 'F',
+            'default' => '',
+            'min' => 0,
+            'max' => 0,  
         ),
     );
     
@@ -40,10 +47,13 @@ class Pman_Core_Import_Core_email extends Pman
         if (!$ff->cli) {
             die("cli only");
         }
-        
+    }
+    
+    function get($part = '', $opts=array()) {
+        $this->updateOrCreateEmail($part, $opts, false);
     }
 
-    function get($part='', $opts){
+    function updateOrCreateEmail($part='', $opts, $cm = false, $mapping = false){
         
        // DB_DataObject::debugLevel(1);
         
@@ -59,13 +69,13 @@ class Pman_Core_Import_Core_email extends Pman
         }
         
         
-         
-        $c = DB_dataObject::factory('core_email');
-        $ret = $c->get('name',$template_name);
-        if($ret && empty($opts['update'])) {
-            $this->jerr("use --update 1 to update the template..");
+        if (empty($cm)) {
+            $cm = DB_dataObject::factory('core_email');
+            $ret = $cm->get('name',$template_name);
+            if($ret && empty($opts['update'])) {
+                $this->jerr("use --update   to update the template..");
+            }
         }
-        
         $mailtext = file_get_contents($opts['file']);
         
         if (!empty($opts['master'])) {
@@ -74,6 +84,12 @@ class Pman_Core_Import_Core_email extends Pman
             $mailtext = str_replace('{outputBody():h}', $body, $mailtext);
         }
         
+        if($mapping) {
+            foreach ($mapping as $k => $v) {
+                $mailtext = str_replace($k, $v, $mailtext);
+            }
+        }
+        
         require_once 'Mail/mimeDecode.php';
         require_once 'Mail/RFC822.php';
         
@@ -83,7 +99,7 @@ class Pman_Core_Import_Core_email extends Pman
             echo $parts->toString() . "\n";
             exit;
         }
-        
+    
         $headers = $parts[1];
         $from = new Mail_RFC822();
         $from_str = $from->parseAddressList($headers['From']);
@@ -93,30 +109,39 @@ class Pman_Core_Import_Core_email extends Pman
         $from_email = $from_str[0]->mailbox . '@' . $from_str[0]->host;
         
         
+        if (!empty($opts['use-file'])) {
+            $parts[2] = '';
+        }
+        
         
-        if ($c->id) {
-            $cc =clone($c);
-            $c->setFrom(array(
-               'bodytext'      => $parts[2],
-               'updated_dt'     => date('Y-m-d H:i:s'),   
+        if ($cm->id) {
+            
+            $cc =clone($cm);
+            $cm->setFrom(array(
+               'bodytext'      => !empty($opts['use-file']) ? '' : $parts[2],
+               'updated_dt'     => date('Y-m-d H:i:s'),
+               'use_file' => !empty($opts['use-file']) ? realpath($opts['file']) : '',
             ));
             
-            $c->update($cc);
+            $cm->update($cc);
         } else {
             
-              $c->setFrom(array(
+            $cm->setFrom(array(
                 'from_name'     => $from_name,
                 'from_email'    => $from_email,
-                'subject'       => $parts[1]['Subject'],
+                'subject'       => $headers['Subject'],
                 'name'          => $template_name,
-                'bodytext'      => $parts[2],
+                'bodytext'      => !empty($opts['use-file']) ? '' : $parts[2],
                 'updated_dt'     => date('Y-m-d H:i:s'),
                 'created_dt'     => date('Y-m-d H:i:s'),
+                'use_file' => !empty($opts['use-file']) ? realpath($opts['file']) : '',
             ));
             
-            $c->insert();
+            $cm->insert();
         }
-        
+        return $cm;
+    }
+    function output() {
         die("done\n");
     }
 }
\ No newline at end of file