Import/Core_notify.php

[Pman.Core] / Import / Core_email.php

diff --git a/Import/Core_email.php b/Import/Core_email.php
index b669ad2..f887764 100644 (file)
--- a/Import/Core_email.php
+++ b/Import/Core_email.php
@@ -4,7 +4,7 @@
 
 require_once 'Pman.php';
 
-class Pman_Hydra_Import_Core_email extends Pman 
+class Pman_Core_Import_Core_email extends Pman 
 {
     static $cli_desc = "Import an email into core_email template"; 
     
@@ -32,25 +32,35 @@ class Pman_Hydra_Import_Core_email extends Pman
     function get($part='', $opts){
         
         
-        $template_name = preg_replace('/\.[a-z]+$/i',dirname($opts['file']),'');
+        $template_name = preg_replace('/\.[a-z]+$/i', '', basename($opts['file']));
         
         if (!file_exists($opts['file'])) {
             $this->jerr("file does not exist : " . $opts['file']);
         }
-        
-        
+         
         $c = DB_dataObject::factory('core_email');
         $ret = $c->get('name',$template_name);
         if($ret ) {
             $this->jerr("we do not support updating the files ... - especially if the user has changed them!!");
         }
+        
         $mailtext = file_get_contents($opts['file']);
 
-        require_once 'Mail/mimeDecode.php';  
+        require_once 'Mail/mimeDecode.php';
+        require_once 'Mail/RFC822.php';
+        
         $decoder = new Mail_mimeDecode($mailtext);
         $parts = $decoder->getSendArray();
-        $from_name = explode(" ", $parts[0])[0];
-        $from_email = explode(" ", $parts[0])[1];
+        
+        $headers = $parts[1];
+        $from = new Mail_RFC822();
+        $from_str = $from->parseAddressList($headers['From']);
+        
+        $from_name  = trim($from_str[0]->personal, '"');
+        
+        $from_email = $from_str[0]->mailbox . '@' . $from_str[0]->host;
+        
+        
         $c->setFrom(array(
             'from_name'     => $from_name,
             'from_email'    => $from_email,