From 55a1a73c47a85456cbefce28e7cb11302e05b455 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Mon, 27 Aug 2018 12:16:11 -0400
Subject: [PATCH] HOR-4840

---
 workflow/engine/classes/Processes.php         |  2 +-
 workflow/engine/classes/model/EmailServer.php | 56 ++++++++++++-------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/workflow/engine/classes/Processes.php b/workflow/engine/classes/Processes.php
index 91b0db253..24c4ad523 100644
--- a/workflow/engine/classes/Processes.php
+++ b/workflow/engine/classes/Processes.php
@@ -4194,7 +4194,7 @@ class Processes
             foreach ($arrayData as $value) {
                 if (isset($value['__EMAIL_SERVER_UID_PRESERVED__']) && $value['__EMAIL_SERVER_UID_PRESERVED__'] === true) {
                     unset($value['__EMAIL_SERVER_UID_PRESERVED__']);
-                } else {
+                } elseif(!EmailServer::exists($value['EMAIL_SERVER_UID'])) {
                     unset($value['EMAIL_EVENT_FROM']);
                     unset($value['EMAIL_SERVER_UID']);
                 }
diff --git a/workflow/engine/classes/model/EmailServer.php b/workflow/engine/classes/model/EmailServer.php
index 1aefd8582..5243db077 100644
--- a/workflow/engine/classes/model/EmailServer.php
+++ b/workflow/engine/classes/model/EmailServer.php
@@ -1,28 +1,46 @@
 <?php
+
 class EmailServer extends BaseEmailServer
 {
-	/**
-	 * Get the evn_description column value.
-	 *
-	 * @return string
-	 */
-	public function loadDefaultAccount ()
-	{
-		$c = new Criteria( 'workflow' );
-    	$del = DBAdapter::getStringDelimiter();
+    /**
+     * Load the default account
+     *
+     * @return array
+     */
+    public function loadDefaultAccount()
+    {
+        $c = new Criteria('workflow');
+        $c->clearSelectColumns();
+        $c->addSelectColumn(EmailServerPeer::MESS_ACCOUNT);
+        $c->add(EmailServerPeer::MESS_DEFAULT, 1);
+        $rs = EmailServerPeer::doSelectRS($c, Propel::getDBConnection('workflow_ro'));
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $rs->next();
+        $response = $rs->getRow();
 
-    	$c->clearSelectColumns();
-    	$c->addSelectColumn( EmailServerPeer::MESS_ACCOUNT );
+        return $response;
+    }
 
-    	$c->add( EmailServerPeer::MESS_DEFAULT, 1 );
+    /**
+     * Check if the MESS_UID exist
+     *
+     * @param string $emailServerUid
+     *
+     * @return boolean
+     * @throws Exception
+    */
+    public static function exists($emailServerUid)
+    {
+        try {
+            $criteria = new Criteria('workflow');
+            $criteria->add(EmailServerPeer::MESS_UID, $emailServerUid, Criteria::EQUAL);
+            $dataset = EmailServerPeer::doSelectOne($criteria);
 
-    	$rs = EmailServerPeer::doSelectRS( $c, Propel::getDBConnection('workflow_ro') );
-    	$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-    	$rs->next();
-    	$row = $rs->getRow();
-    	$response=$row;
+            return !is_null($dataset);
 
-    	return $response;
-	}
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
 }