PMC-40: Action by Email: Email response configuration

config/app.php

@@ -12,19 +12,20 @@ return [
     'log' => env('APP_LOG', 'single'),
     'log_level' => env('APP_LOG_LEVEL', 'debug'),
     'cache_lifetime' => env('APP_CACHE_LIFETIME', 60),
-
+    'key' => env('APP_KEY', 'base64:rU28h/tElUn/eiLY0qC24jJq1rakvAFRoRl1DWxj/kM='),
+    'cipher' => 'AES-256-CBC',
     'providers' => [
-        FilesystemServiceProvider::class,
         CacheServiceProvider::class,
-        ViewServiceProvider::class,
+        FilesystemServiceProvider::class,
         Illuminate\Database\DatabaseServiceProvider::class,
         Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
         Illuminate\Queue\QueueServiceProvider::class,
         Illuminate\Translation\TranslationServiceProvider::class,
-
+        Illuminate\Encryption\EncryptionServiceProvider::class,
+        ViewServiceProvider::class
     ],
-
     'aliases' => [
+        'Crypt' => Illuminate\Support\Facades\Crypt::class
     ],
 
 ];

workflow/engine/classes/SpoolRun.php

@@ -50,6 +50,26 @@ class SpoolRun
         $this->mailEreg = "/^([\w\-_\+\.']+@[\w\-_\.]+\.\w{2,5}+)$/";
     }
 
+    /**
+     * Set the $spool_id
+     *
+     * @param string
+     */
+    public function setSpoolId($v)
+    {
+        $this->spool_id = $v;
+    }
+
+    /**
+     * Get the $spool_id
+     *
+     * @return string
+     */
+    public function getSpoolId()
+    {
+        return $this->spool_id;
+    }
+
     /**
      * get all files into spool in a list
      *

workflow/engine/classes/WsBase.php

@@ -5,6 +5,7 @@ use ProcessMaker\BusinessModel\EmailServer;
 use ProcessMaker\ChangeLog\ChangeLog;
 /*----------------------------------********---------------------------------*/
 use ProcessMaker\Core\System;
+use ProcessMaker\Util\WsMessageResponse;
 
 class WsBase
 {
@@ -947,7 +948,8 @@ class WsBase
                 $spool->sendMail();
 
                 if ($spool->status == 'sent') {
-                    $result = new WsResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
+                    $result = new WsMessageResponse(0, G::loadTranslation('ID_MESSAGE_SENT') . ": " . $to);
+                    $result->setAppMessUid($spool->getSpoolId());
                 } else {
                     $result = new WsResponse(29, $spool->status . ' ' . $spool->error . print_r($setup, 1));
                 }

workflow/engine/classes/model/AbeConfiguration.php

@@ -26,6 +26,7 @@ class AbeConfiguration extends BaseAbeConfiguration
         'DYN_UID',
         'ABE_EMAIL_FIELD',
         'ABE_ACTION_FIELD',
+        'ABE_ACTION_BODY_FIELD',
         'ABE_CASE_NOTE_IN_RESPONSE',
         'ABE_FORCE_LOGIN',
         'ABE_CREATE_DATE',
@@ -33,7 +34,8 @@ class AbeConfiguration extends BaseAbeConfiguration
         'ABE_SUBJECT_FIELD',
         'ABE_MAILSERVER_OR_MAILCURRENT',
         'ABE_CUSTOM_GRID',
-        'ABE_EMAIL_SERVER_UID'
+        'ABE_EMAIL_SERVER_UID',
+        'ABE_EMAIL_SERVER_RECEIVER_UID'
     ];
 
     public function load($abeUid)
@@ -136,6 +138,7 @@ class AbeConfiguration extends BaseAbeConfiguration
         $criteria->addSelectColumn(AbeConfigurationPeer::DYN_UID);
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_FIELD);
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_FIELD);
+        $criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD);
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_SUBJECT_FIELD);
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT);
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_CUSTOM_GRID);

workflow/engine/classes/model/AppMessage.php

@@ -300,5 +300,24 @@ class AppMessage extends BaseAppMessage
 
         return $messages;
     }
+
+    /**
+     * Get the APP_MSG_BODY related to the key
+     *
+     * @param string $key
+     *
+     * @return string
+     * @throws Exception
+    */
+    public static function getAppMsgBodyByKey($key)
+    {
+        try {
+            $appMessage = AppMessagePeer::retrieveByPk($key);
+
+            return $appMessage->getAppMsgBody();
+        } catch (Exception $error) {
+            throw $error;
+        }
+    }
 }
 

workflow/engine/classes/model/map/AbeConfigurationMapBuilder.php

@@ -83,6 +83,8 @@ class AbeConfigurationMapBuilder
 
         $tMap->addColumn('ABE_ACTION_FIELD', 'AbeActionField', 'string', CreoleTypes::VARCHAR, false, 255);
 
+        $tMap->addColumn('ABE_ACTION_BODY_FIELD', 'AbeActionBodyField', 'string', CreoleTypes::VARCHAR, false, 255);
+
         $tMap->addColumn('ABE_CASE_NOTE_IN_RESPONSE', 'AbeCaseNoteInResponse', 'int', CreoleTypes::INTEGER, false, null);
 
         $tMap->addColumn('ABE_FORCE_LOGIN', 'AbeForceLogin', 'int', CreoleTypes::INTEGER, false, null);
@@ -99,6 +101,8 @@ class AbeConfigurationMapBuilder
 
         $tMap->addColumn('ABE_EMAIL_SERVER_UID', 'AbeEmailServerUid', 'string', CreoleTypes::VARCHAR, false, 32);
 
+        $tMap->addColumn('ABE_EMAIL_SERVER_RECEIVER_UID', 'AbeEmailServerReceiverUid', 'string', CreoleTypes::VARCHAR, false, 32);
+
     } // doBuild()
 
 } // AbeConfigurationMapBuilder

workflow/engine/classes/model/om/BaseAbeConfiguration.php

@@ -81,6 +81,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
      */
     protected $abe_action_field = '';
 
+    /**
+     * The value for the abe_action_body_field field.
+     * @var        string
+     */
+    protected $abe_action_body_field = '';
+
     /**
      * The value for the abe_case_note_in_response field.
      * @var        int
@@ -129,6 +135,12 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
      */
     protected $abe_email_server_uid = '';
 
+    /**
+     * The value for the abe_email_server_receiver_uid field.
+     * @var        string
+     */
+    protected $abe_email_server_receiver_uid = '';
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -242,6 +254,17 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
         return $this->abe_action_field;
     }
 
+    /**
+     * Get the [abe_action_body_field] column value.
+     * 
+     * @return     string
+     */
+    public function getAbeActionBodyField()
+    {
+
+        return $this->abe_action_body_field;
+    }
+
     /**
      * Get the [abe_case_note_in_response] column value.
      * 
@@ -372,6 +395,17 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
         return $this->abe_email_server_uid;
     }
 
+    /**
+     * Get the [abe_email_server_receiver_uid] column value.
+     * 
+     * @return     string
+     */
+    public function getAbeEmailServerReceiverUid()
+    {
+
+        return $this->abe_email_server_receiver_uid;
+    }
+
     /**
      * Set the value of [abe_uid] column.
      * 
@@ -570,6 +604,28 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
 
     } // setAbeActionField()
 
+    /**
+     * Set the value of [abe_action_body_field] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setAbeActionBodyField($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->abe_action_body_field !== $v || $v === '') {
+            $this->abe_action_body_field = $v;
+            $this->modifiedColumns[] = AbeConfigurationPeer::ABE_ACTION_BODY_FIELD;
+        }
+
+    } // setAbeActionBodyField()
+
     /**
      * Set the value of [abe_case_note_in_response] column.
      * 
@@ -760,6 +816,28 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
 
     } // setAbeEmailServerUid()
 
+    /**
+     * Set the value of [abe_email_server_receiver_uid] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setAbeEmailServerReceiverUid($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->abe_email_server_receiver_uid !== $v || $v === '') {
+            $this->abe_email_server_receiver_uid = $v;
+            $this->modifiedColumns[] = AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID;
+        }
+
+    } // setAbeEmailServerReceiverUid()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -795,28 +873,32 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
 
             $this->abe_action_field = $rs->getString($startcol + 8);
 
-            $this->abe_case_note_in_response = $rs->getInt($startcol + 9);
+            $this->abe_action_body_field = $rs->getString($startcol + 9);
 
-            $this->abe_force_login = $rs->getInt($startcol + 10);
+            $this->abe_case_note_in_response = $rs->getInt($startcol + 10);
 
-            $this->abe_create_date = $rs->getTimestamp($startcol + 11, null);
+            $this->abe_force_login = $rs->getInt($startcol + 11);
 
-            $this->abe_update_date = $rs->getTimestamp($startcol + 12, null);
+            $this->abe_create_date = $rs->getTimestamp($startcol + 12, null);
 
-            $this->abe_subject_field = $rs->getString($startcol + 13);
+            $this->abe_update_date = $rs->getTimestamp($startcol + 13, null);
 
-            $this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 14);
+            $this->abe_subject_field = $rs->getString($startcol + 14);
 
-            $this->abe_custom_grid = $rs->getString($startcol + 15);
+            $this->abe_mailserver_or_mailcurrent = $rs->getInt($startcol + 15);
 
-            $this->abe_email_server_uid = $rs->getString($startcol + 16);
+            $this->abe_custom_grid = $rs->getString($startcol + 16);
+
+            $this->abe_email_server_uid = $rs->getString($startcol + 17);
+
+            $this->abe_email_server_receiver_uid = $rs->getString($startcol + 18);
 
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 17; // 17 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 19; // 19 = AbeConfigurationPeer::NUM_COLUMNS - AbeConfigurationPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating AbeConfiguration object", $e);
@@ -1048,29 +1130,35 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
                 return $this->getAbeActionField();
                 break;
             case 9:
-                return $this->getAbeCaseNoteInResponse();
+                return $this->getAbeActionBodyField();
                 break;
             case 10:
-                return $this->getAbeForceLogin();
+                return $this->getAbeCaseNoteInResponse();
                 break;
             case 11:
-                return $this->getAbeCreateDate();
+                return $this->getAbeForceLogin();
                 break;
             case 12:
-                return $this->getAbeUpdateDate();
+                return $this->getAbeCreateDate();
                 break;
             case 13:
-                return $this->getAbeSubjectField();
+                return $this->getAbeUpdateDate();
                 break;
             case 14:
-                return $this->getAbeMailserverOrMailcurrent();
+                return $this->getAbeSubjectField();
                 break;
             case 15:
-                return $this->getAbeCustomGrid();
+                return $this->getAbeMailserverOrMailcurrent();
                 break;
             case 16:
+                return $this->getAbeCustomGrid();
+                break;
+            case 17:
                 return $this->getAbeEmailServerUid();
                 break;
+            case 18:
+                return $this->getAbeEmailServerReceiverUid();
+                break;
             default:
                 return null;
                 break;
@@ -1100,14 +1188,16 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
             $keys[6] => $this->getDynUid(),
             $keys[7] => $this->getAbeEmailField(),
             $keys[8] => $this->getAbeActionField(),
-            $keys[9] => $this->getAbeCaseNoteInResponse(),
+            $keys[9] => $this->getAbeActionBodyField(),
-            $keys[10] => $this->getAbeForceLogin(),
+            $keys[10] => $this->getAbeCaseNoteInResponse(),
-            $keys[11] => $this->getAbeCreateDate(),
+            $keys[11] => $this->getAbeForceLogin(),
-            $keys[12] => $this->getAbeUpdateDate(),
+            $keys[12] => $this->getAbeCreateDate(),
-            $keys[13] => $this->getAbeSubjectField(),
+            $keys[13] => $this->getAbeUpdateDate(),
-            $keys[14] => $this->getAbeMailserverOrMailcurrent(),
+            $keys[14] => $this->getAbeSubjectField(),
-            $keys[15] => $this->getAbeCustomGrid(),
+            $keys[15] => $this->getAbeMailserverOrMailcurrent(),
-            $keys[16] => $this->getAbeEmailServerUid(),
+            $keys[16] => $this->getAbeCustomGrid(),
+            $keys[17] => $this->getAbeEmailServerUid(),
+            $keys[18] => $this->getAbeEmailServerReceiverUid(),
         );
         return $result;
     }
@@ -1167,29 +1257,35 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
                 $this->setAbeActionField($value);
                 break;
             case 9:
-                $this->setAbeCaseNoteInResponse($value);
+                $this->setAbeActionBodyField($value);
                 break;
             case 10:
-                $this->setAbeForceLogin($value);
+                $this->setAbeCaseNoteInResponse($value);
                 break;
             case 11:
-                $this->setAbeCreateDate($value);
+                $this->setAbeForceLogin($value);
                 break;
             case 12:
-                $this->setAbeUpdateDate($value);
+                $this->setAbeCreateDate($value);
                 break;
             case 13:
-                $this->setAbeSubjectField($value);
+                $this->setAbeUpdateDate($value);
                 break;
             case 14:
-                $this->setAbeMailserverOrMailcurrent($value);
+                $this->setAbeSubjectField($value);
                 break;
             case 15:
-                $this->setAbeCustomGrid($value);
+                $this->setAbeMailserverOrMailcurrent($value);
                 break;
             case 16:
+                $this->setAbeCustomGrid($value);
+                break;
+            case 17:
                 $this->setAbeEmailServerUid($value);
                 break;
+            case 18:
+                $this->setAbeEmailServerReceiverUid($value);
+                break;
         } // switch()
     }
 
@@ -1250,35 +1346,43 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
         }
 
         if (array_key_exists($keys[9], $arr)) {
-            $this->setAbeCaseNoteInResponse($arr[$keys[9]]);
+            $this->setAbeActionBodyField($arr[$keys[9]]);
         }
 
         if (array_key_exists($keys[10], $arr)) {
-            $this->setAbeForceLogin($arr[$keys[10]]);
+            $this->setAbeCaseNoteInResponse($arr[$keys[10]]);
         }
 
         if (array_key_exists($keys[11], $arr)) {
-            $this->setAbeCreateDate($arr[$keys[11]]);
+            $this->setAbeForceLogin($arr[$keys[11]]);
         }
 
         if (array_key_exists($keys[12], $arr)) {
-            $this->setAbeUpdateDate($arr[$keys[12]]);
+            $this->setAbeCreateDate($arr[$keys[12]]);
         }
 
         if (array_key_exists($keys[13], $arr)) {
-            $this->setAbeSubjectField($arr[$keys[13]]);
+            $this->setAbeUpdateDate($arr[$keys[13]]);
         }
 
         if (array_key_exists($keys[14], $arr)) {
-            $this->setAbeMailserverOrMailcurrent($arr[$keys[14]]);
+            $this->setAbeSubjectField($arr[$keys[14]]);
         }
 
         if (array_key_exists($keys[15], $arr)) {
-            $this->setAbeCustomGrid($arr[$keys[15]]);
+            $this->setAbeMailserverOrMailcurrent($arr[$keys[15]]);
         }
 
         if (array_key_exists($keys[16], $arr)) {
-            $this->setAbeEmailServerUid($arr[$keys[16]]);
+            $this->setAbeCustomGrid($arr[$keys[16]]);
+        }
+
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setAbeEmailServerUid($arr[$keys[17]]);
+        }
+
+        if (array_key_exists($keys[18], $arr)) {
+            $this->setAbeEmailServerReceiverUid($arr[$keys[18]]);
         }
 
     }
@@ -1328,6 +1432,10 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
             $criteria->add(AbeConfigurationPeer::ABE_ACTION_FIELD, $this->abe_action_field);
         }
 
+        if ($this->isColumnModified(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD)) {
+            $criteria->add(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD, $this->abe_action_body_field);
+        }
+
         if ($this->isColumnModified(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE)) {
             $criteria->add(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, $this->abe_case_note_in_response);
         }
@@ -1360,6 +1468,10 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
             $criteria->add(AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, $this->abe_email_server_uid);
         }
 
+        if ($this->isColumnModified(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID)) {
+            $criteria->add(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID, $this->abe_email_server_receiver_uid);
+        }
+
 
         return $criteria;
     }
@@ -1430,6 +1542,8 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
 
         $copyObj->setAbeActionField($this->abe_action_field);
 
+        $copyObj->setAbeActionBodyField($this->abe_action_body_field);
+
         $copyObj->setAbeCaseNoteInResponse($this->abe_case_note_in_response);
 
         $copyObj->setAbeForceLogin($this->abe_force_login);
@@ -1446,6 +1560,8 @@ abstract class BaseAbeConfiguration extends BaseObject implements Persistent
 
         $copyObj->setAbeEmailServerUid($this->abe_email_server_uid);
 
+        $copyObj->setAbeEmailServerReceiverUid($this->abe_email_server_receiver_uid);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseAbeConfigurationPeer.php

@@ -25,7 +25,7 @@ abstract class BaseAbeConfigurationPeer
     const CLASS_DEFAULT = 'classes.model.AbeConfiguration';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 17;
+    const NUM_COLUMNS = 19;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -58,6 +58,9 @@ abstract class BaseAbeConfigurationPeer
     /** the column name for the ABE_ACTION_FIELD field */
     const ABE_ACTION_FIELD = 'ABE_CONFIGURATION.ABE_ACTION_FIELD';
 
+    /** the column name for the ABE_ACTION_BODY_FIELD field */
+    const ABE_ACTION_BODY_FIELD = 'ABE_CONFIGURATION.ABE_ACTION_BODY_FIELD';
+
     /** the column name for the ABE_CASE_NOTE_IN_RESPONSE field */
     const ABE_CASE_NOTE_IN_RESPONSE = 'ABE_CONFIGURATION.ABE_CASE_NOTE_IN_RESPONSE';
 
@@ -82,6 +85,9 @@ abstract class BaseAbeConfigurationPeer
     /** the column name for the ABE_EMAIL_SERVER_UID field */
     const ABE_EMAIL_SERVER_UID = 'ABE_CONFIGURATION.ABE_EMAIL_SERVER_UID';
 
+    /** the column name for the ABE_EMAIL_SERVER_RECEIVER_UID field */
+    const ABE_EMAIL_SERVER_RECEIVER_UID = 'ABE_CONFIGURATION.ABE_EMAIL_SERVER_RECEIVER_UID';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -93,10 +99,10 @@ abstract class BaseAbeConfigurationPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeCaseNoteInResponse', 'AbeForceLogin', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', 'AbeEmailServerUid', ),
+        BasePeer::TYPE_PHPNAME => array ('AbeUid', 'ProUid', 'TasUid', 'AbeType', 'AbeTemplate', 'AbeDynType', 'DynUid', 'AbeEmailField', 'AbeActionField', 'AbeActionBodyField', 'AbeCaseNoteInResponse', 'AbeForceLogin', 'AbeCreateDate', 'AbeUpdateDate', 'AbeSubjectField', 'AbeMailserverOrMailcurrent', 'AbeCustomGrid', 'AbeEmailServerUid', 'AbeEmailServerReceiverUid', ),
-        BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_FORCE_LOGIN, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, ),
+        BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID, AbeConfigurationPeer::PRO_UID, AbeConfigurationPeer::TAS_UID, AbeConfigurationPeer::ABE_TYPE, AbeConfigurationPeer::ABE_TEMPLATE, AbeConfigurationPeer::ABE_DYN_TYPE, AbeConfigurationPeer::DYN_UID, AbeConfigurationPeer::ABE_EMAIL_FIELD, AbeConfigurationPeer::ABE_ACTION_FIELD, AbeConfigurationPeer::ABE_ACTION_BODY_FIELD, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE, AbeConfigurationPeer::ABE_FORCE_LOGIN, AbeConfigurationPeer::ABE_CREATE_DATE, AbeConfigurationPeer::ABE_UPDATE_DATE, AbeConfigurationPeer::ABE_SUBJECT_FIELD, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT, AbeConfigurationPeer::ABE_CUSTOM_GRID, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID, AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID, ),
-        BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_FORCE_LOGIN', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', 'ABE_EMAIL_SERVER_UID', ),
+        BasePeer::TYPE_FIELDNAME => array ('ABE_UID', 'PRO_UID', 'TAS_UID', 'ABE_TYPE', 'ABE_TEMPLATE', 'ABE_DYN_TYPE', 'DYN_UID', 'ABE_EMAIL_FIELD', 'ABE_ACTION_FIELD', 'ABE_ACTION_BODY_FIELD', 'ABE_CASE_NOTE_IN_RESPONSE', 'ABE_FORCE_LOGIN', 'ABE_CREATE_DATE', 'ABE_UPDATE_DATE', 'ABE_SUBJECT_FIELD', 'ABE_MAILSERVER_OR_MAILCURRENT', 'ABE_CUSTOM_GRID', 'ABE_EMAIL_SERVER_UID', 'ABE_EMAIL_SERVER_RECEIVER_UID', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
     );
 
     /**
@@ -106,10 +112,10 @@ abstract class BaseAbeConfigurationPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeCaseNoteInResponse' => 9, 'AbeForceLogin' => 10, 'AbeCreateDate' => 11, 'AbeUpdateDate' => 12, 'AbeSubjectField' => 13, 'AbeMailserverOrMailcurrent' => 14, 'AbeCustomGrid' => 15, 'AbeEmailServerUid' => 16, ),
+        BasePeer::TYPE_PHPNAME => array ('AbeUid' => 0, 'ProUid' => 1, 'TasUid' => 2, 'AbeType' => 3, 'AbeTemplate' => 4, 'AbeDynType' => 5, 'DynUid' => 6, 'AbeEmailField' => 7, 'AbeActionField' => 8, 'AbeActionBodyField' => 9, 'AbeCaseNoteInResponse' => 10, 'AbeForceLogin' => 11, 'AbeCreateDate' => 12, 'AbeUpdateDate' => 13, 'AbeSubjectField' => 14, 'AbeMailserverOrMailcurrent' => 15, 'AbeCustomGrid' => 16, 'AbeEmailServerUid' => 17, 'AbeEmailServerReceiverUid' => 18, ),
-        BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 9, AbeConfigurationPeer::ABE_FORCE_LOGIN => 10, AbeConfigurationPeer::ABE_CREATE_DATE => 11, AbeConfigurationPeer::ABE_UPDATE_DATE => 12, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 13, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 14, AbeConfigurationPeer::ABE_CUSTOM_GRID => 15, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID => 16, ),
+        BasePeer::TYPE_COLNAME => array (AbeConfigurationPeer::ABE_UID => 0, AbeConfigurationPeer::PRO_UID => 1, AbeConfigurationPeer::TAS_UID => 2, AbeConfigurationPeer::ABE_TYPE => 3, AbeConfigurationPeer::ABE_TEMPLATE => 4, AbeConfigurationPeer::ABE_DYN_TYPE => 5, AbeConfigurationPeer::DYN_UID => 6, AbeConfigurationPeer::ABE_EMAIL_FIELD => 7, AbeConfigurationPeer::ABE_ACTION_FIELD => 8, AbeConfigurationPeer::ABE_ACTION_BODY_FIELD => 9, AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE => 10, AbeConfigurationPeer::ABE_FORCE_LOGIN => 11, AbeConfigurationPeer::ABE_CREATE_DATE => 12, AbeConfigurationPeer::ABE_UPDATE_DATE => 13, AbeConfigurationPeer::ABE_SUBJECT_FIELD => 14, AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT => 15, AbeConfigurationPeer::ABE_CUSTOM_GRID => 16, AbeConfigurationPeer::ABE_EMAIL_SERVER_UID => 17, AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID => 18, ),
-        BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_CASE_NOTE_IN_RESPONSE' => 9, 'ABE_FORCE_LOGIN' => 10, 'ABE_CREATE_DATE' => 11, 'ABE_UPDATE_DATE' => 12, 'ABE_SUBJECT_FIELD' => 13, 'ABE_MAILSERVER_OR_MAILCURRENT' => 14, 'ABE_CUSTOM_GRID' => 15, 'ABE_EMAIL_SERVER_UID' => 16, ),
+        BasePeer::TYPE_FIELDNAME => array ('ABE_UID' => 0, 'PRO_UID' => 1, 'TAS_UID' => 2, 'ABE_TYPE' => 3, 'ABE_TEMPLATE' => 4, 'ABE_DYN_TYPE' => 5, 'DYN_UID' => 6, 'ABE_EMAIL_FIELD' => 7, 'ABE_ACTION_FIELD' => 8, 'ABE_ACTION_BODY_FIELD' => 9, 'ABE_CASE_NOTE_IN_RESPONSE' => 10, 'ABE_FORCE_LOGIN' => 11, 'ABE_CREATE_DATE' => 12, 'ABE_UPDATE_DATE' => 13, 'ABE_SUBJECT_FIELD' => 14, 'ABE_MAILSERVER_OR_MAILCURRENT' => 15, 'ABE_CUSTOM_GRID' => 16, 'ABE_EMAIL_SERVER_UID' => 17, 'ABE_EMAIL_SERVER_RECEIVER_UID' => 18, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
     );
 
     /**
@@ -228,6 +234,8 @@ abstract class BaseAbeConfigurationPeer
 
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_FIELD);
 
+        $criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD);
+
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_CASE_NOTE_IN_RESPONSE);
 
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_FORCE_LOGIN);
@@ -244,6 +252,8 @@ abstract class BaseAbeConfigurationPeer
 
         $criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_SERVER_UID);
 
+        $criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_SERVER_RECEIVER_UID);
+
     }
 
     const COUNT = 'COUNT(ABE_CONFIGURATION.ABE_UID)';

workflow/engine/config/schema.xml

@@ -5094,6 +5094,16 @@
                 <parameter name="Extra" value=""/>
             </vendor>
         </column>
+        <column name="ABE_ACTION_BODY_FIELD" type="VARCHAR" size="255" required="false" default="">
+            <vendor type="mysql">
+                <parameter name="Field" value="ABE_ACTION_BODY_FIELD"/>
+                <parameter name="Type" value="varchar(255)"/>
+                <parameter name="Null" value="YES"/>
+                <parameter name="Key" value=""/>
+                <parameter name="Default" value=""/>
+                <parameter name="Extra" value=""/>
+            </vendor>
+        </column>
         <column name="ABE_CASE_NOTE_IN_RESPONSE" type="INTEGER" default="0"/>
         <column name="ABE_FORCE_LOGIN" type="INTEGER" default="0"/>
         <column name="ABE_CREATE_DATE" type="TIMESTAMP" required="true">
@@ -5141,6 +5151,7 @@
             </vendor>
         </column>
         <column name="ABE_EMAIL_SERVER_UID" type="VARCHAR" size="32" required="false" default=""/>
+        <column name="ABE_EMAIL_SERVER_RECEIVER_UID" type="VARCHAR" size="32" required="false" default=""/>
         <index name="indexAbeProcess">
             <index-column name="PRO_UID"/>
         </index>
@@ -5769,7 +5780,7 @@
         <column name="PLUGIN_TASK_EXTENDED_PROPERTIES" type="LONGVARCHAR"/>
         <column name="PLUGIN_ATTRIBUTES" type="LONGVARCHAR"/>
     </table>
-    
+
     <table name="APP_DATA_CHANGE_LOG" idMethod="native">
         <vendor type="mysql">
             <parameter name="Name" value="APP_DATA_CHANGE_LOG"/>

workflow/engine/content/translations/english/processmaker.en.po

@@ -1699,6 +1699,12 @@ msgstr "3 days at least"
 msgid "The answer has been submitted. Thank you."
 msgstr "The answer has been submitted. Thank you."
 
+# TRANSLATION
+# LABEL/ID_ABE_EMAIL_RESPONSE_BODY_NOTE
+#: LABEL/ID_ABE_EMAIL_RESPONSE_BODY_NOTE
+msgid "Please add your comments above this section. Don't modify or delete this section."
+msgstr "Please add your comments above this section. Don't modify or delete this section."
+
 # TRANSLATION
 # LABEL/ID_ABE_FORM_ALREADY_FILLED
 #: LABEL/ID_ABE_FORM_ALREADY_FILLED
@@ -4235,6 +4241,12 @@ msgstr "Close Editor"
 msgid "[LABEL/ID_CODE] Code"
 msgstr "Code"
 
+# TRANSLATION
+# LABEL/ID_CODE_CRYPT
+#: LABEL/ID_CODE_CRYPT
+msgid "Code:"
+msgstr "Code:"
+
 # TRANSLATION
 # LABEL/ID_COLLAPSE_ALL
 #: LABEL/ID_COLLAPSE_ALL

workflow/engine/data/mysql/insert.sql

@@ -57081,6 +57081,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','HTML_FILES','en','You can open only files with the .html extension','2014-01-15') ,
 ( 'LABEL','ID_3DAYSMINIMUM','en','3 days at least','2014-01-15') ,
 ( 'LABEL','ID_ABE_ANSWER_SUBMITTED','en','The answer has been submitted. Thank you.','2017-06-19') ,
+( 'LABEL','ID_ABE_EMAIL_RESPONSE_BODY_NOTE','en','Please add your comments above this section. Don''t modify or delete this section.','2018-11-16') ,
 ( 'LABEL','ID_ABE_FORM_ALREADY_FILLED','en','The form has already been filled and sent.','2017-06-09') ,
 ( 'LABEL','ID_ABE_INFORMATION_SUBMITTED','en','The information was submitted. Thank you.','2017-06-19') ,
 ( 'LABEL','ID_ABE_RESPONSE_SENT','en','The response has already been sent.','2017-06-19') ,
@@ -57513,6 +57514,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_CLOSE','en','Close','2014-01-15') ,
 ( 'LABEL','ID_CLOSE_EDITOR','en','Close Editor','2014-01-15') ,
 ( 'LABEL','ID_CODE','en','Code','2014-01-15') ,
+( 'LABEL','ID_CODE_CRYPT','en','Code:','2018-11-16') ,
 ( 'LABEL','ID_COLLAPSE_ALL','en','Collapse All','2014-01-15') ,
 ( 'LABEL','ID_COLOSA_AND_CERTIFIED_PARTNERS','en','Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners.','2014-10-21') ,
 ( 'LABEL','ID_COLUMNS','en','columns','2014-01-15') ,

workflow/engine/data/mysql/schema.sql

@@ -2865,6 +2865,7 @@ CREATE TABLE `ABE_CONFIGURATION`
 	`DYN_UID` VARCHAR(32) default '' NOT NULL,
 	`ABE_EMAIL_FIELD` VARCHAR(255) default '' NOT NULL,
 	`ABE_ACTION_FIELD` VARCHAR(255) default '',
+	`ABE_ACTION_BODY_FIELD` VARCHAR(255) default '',
 	`ABE_CASE_NOTE_IN_RESPONSE` INTEGER default 0,
 	`ABE_FORCE_LOGIN` INTEGER default 0,
 	`ABE_CREATE_DATE` DATETIME  NOT NULL,
@@ -2873,6 +2874,7 @@ CREATE TABLE `ABE_CONFIGURATION`
 	`ABE_MAILSERVER_OR_MAILCURRENT` INTEGER default 0,
 	`ABE_CUSTOM_GRID` MEDIUMTEXT,
 	`ABE_EMAIL_SERVER_UID` VARCHAR(32) default '',
+	`ABE_EMAIL_SERVER_RECEIVER_UID` VARCHAR(32) default '',
 	PRIMARY KEY (`ABE_UID`),
 	KEY `indexAbeProcess`(`PRO_UID`),
 	KEY `indexAbeProcessTask`(`PRO_UID`, `TAS_UID`)

workflow/engine/src/ProcessMaker/Util/WsMessageResponse.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace ProcessMaker\Util;
+
+use WsResponse;
+
+class WsMessageResponse extends WsResponse
+{
+    private $appMessUid = null;
+
+    /**
+     * Get the appMessUid
+     *
+     * @return array
+     */
+    public function getAppMessUid()
+    {
+        return $this->appMessUid;
+    }
+
+    /**
+     * Set the appMessUid
+     *
+     * @param string $v
+     * @return void
+     */
+    public function setAppMessUid($v)
+    {
+        $this->appMessUid = $v;
+    }
+}
+