Import/Core_notify.php

[Pman.Core] / Import / Core_email.php

diff --git a/Import/Core_email.php b/Import/Core_email.php
index 8401763..f887764 100644 (file)
--- a/Import/Core_email.php
+++ b/Import/Core_email.php
@@ -46,18 +46,23 @@ class Pman_Core_Import_Core_email extends Pman
         
         $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();
         
         $headers = $parts[1];
-        $from = $headers['From'];
-        $from_name = explode(" ", $parts[0])[0];
-        $from_email = explode(" ", $parts[0])[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'     => trim($from_name, '"'),
+            'from_name'     => $from_name,
             'from_email'    => $from_email,
             'subject'       => $parts[1]['Subject'],
             'name'          => $template_name,