From f814f0ed7e2cc9bbff5280c26603f6706eff1936 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@processmaker.com>
Date: Wed, 27 Jul 2016 16:41:48 -0400
Subject: [PATCH]  HOR-1322-E "Email event, FROM contiene..." SOLVED

HOR-1322-E "Email event, FROM contiene..." SOLVED
---
 workflow/engine/classes/class.processes.php              | 9 +++++++++
 .../engine/src/ProcessMaker/BusinessModel/EmailEvent.php | 8 +++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index 11b11699f..d0bc3e0ad 100755
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -4169,7 +4169,16 @@ class Processes
         try {
             $emailEvent = new \ProcessMaker\BusinessModel\EmailEvent();
 
+            $emailServer = new \ProcessMaker\BusinessModel\EmailServer();
+            $arrayEmailServerDefault = $emailServer->getEmailServerDefault();
+
             foreach ($arrayData as $value) {
+                unset($value['EMAIL_EVENT_FROM']);
+
+                if (!empty($arrayEmailServerDefault)) {
+                    $value['EMAIL_EVENT_FROM'] = $arrayEmailServerDefault['MESS_ACCOUNT'];
+                }
+
                 $emailEventData = $emailEvent->save($processUid, $value);
             }
         } catch (Exception $e) {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
index 0bb2d003f..1b36d4cd5 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
@@ -69,9 +69,9 @@ class EmailEvent
                         $aRow['EMAIL'] = $aRow['MESS_ACCOUNT'];
                     } else {
                         $aRow['EMAIL'] = $aRow['MESS_FROM_MAIL'];
-                    } 
+                    }
                     if($aRow['EMAIL'] != "") {
-                        $accountsArray[] = array_change_key_case($aRow, CASE_LOWER);    
+                        $accountsArray[] = array_change_key_case($aRow, CASE_LOWER);
                     }
                 }
                 $result->next();
@@ -445,10 +445,12 @@ class EmailEvent
                     $emailTo = $email;
                 }
             }
-            if(!empty($emailTo)) {
+            if(!empty($emailTo) && $arrayData[3] != '') {
                 $subject = $arrayData[5];
                 $subject = \G::replaceDataField($arrayData[5], $arrayApplicationData['APP_DATA']);
                 \PMFSendMessage($appUID, $arrayData[3], $emailTo, '', '', $subject, $contentFile['prf_filename'], array());
+            } else {
+                \Bootstrap::registerMonolog('EmailEventMailError', 200, \G::LoadTranslation('ID_EMAIL_EVENT_CONFIGURATION_EMAIL', array($eventUid, $prj_uid)), ['eventUid' => $eventUid, 'prj_uid' => $prj_uid], SYS_SYS, 'emailEvent.log');
             }
         }
     }