PM-2211: I added new column Error_mail in Email's log

workflow/engine/classes/class.case.php

@@ -5067,8 +5067,10 @@ class Cases
             }
             $aConfiguration = System::getEmailConfiguration();
 
+            $msgError = "";
             if (!isset($aConfiguration['MESS_ENABLED']) || $aConfiguration['MESS_ENABLED'] != '1') {
-                return false;
+                $msgError = "The default configuration wasn't defined";
+                $aConfiguration['MESS_ENGINE'] = '';
             }
 
             //Send derivation notification - Start
@@ -5225,13 +5227,16 @@ class Cases
                         "app_msg_bcc" => "",
                         "app_msg_attach" => "",
                         "app_msg_template" => "",
-                        "app_msg_status" => "pending"
+                        "app_msg_status" => "pending",
+                        "app_msg_error" => $msgError
                     ));
 
-                    if (($aConfiguration["MESS_BACKGROUND"] == "") ||
+                    if ($msgError == '') {
-                            ($aConfiguration["MESS_TRY_SEND_INMEDIATLY"] == "1")
+                        if (($aConfiguration["MESS_BACKGROUND"] == "") ||
-                    ) {
+                                ($aConfiguration["MESS_TRY_SEND_INMEDIATLY"] == "1")
-                        $oSpool->sendMail();
+                        ) {
+                            $oSpool->sendMail();
+                        }
                     }
                 }
             }

workflow/engine/classes/class.licensedFeatures.php

@@ -244,6 +244,7 @@ class PMLicensedFeatures
             }
         }
         
+        $i = 0;
         foreach($newFeaturesList as $k => $newFeature){
             $newData[] = array (
                     'db' => 'wf',

workflow/engine/classes/class.spool.php

@@ -115,6 +115,7 @@ class spoolRun
             $this->fileData['bcc'] = $rs->getString( 'APP_MSG_BCC' );
             $this->fileData['template'] = $rs->getString( 'APP_MSG_TEMPLATE' );
             $this->fileData['attachments'] = array (); //$rs->getString('APP_MSG_ATTACH');
+            $this->fileData['error'] = $rs->getString( 'APP_MSG_ERROR' );
             if ($this->config['MESS_ENGINE'] == 'OPENMAIL') {
                 if ($this->config['MESS_SERVER'] != '') {
                     if (($sAux = @gethostbyaddr( $this->config['MESS_SERVER'] ))) {
@@ -148,6 +149,7 @@ class spoolRun
         }
         $aData['app_msg_attach'] = serialize($attachment);
         $aData['app_msg_show_message'] = (isset($aData['app_msg_show_message'])) ? $aData['app_msg_show_message'] : 1;
+        $aData["app_msg_error"] = (isset($aData["app_msg_error"]))? $aData["app_msg_error"] : '';
         $sUID = $this->db_insert( $aData );
 
         $aData['app_msg_date'] = isset( $aData['app_msg_date'] ) ? $aData['app_msg_date'] : '';
@@ -158,7 +160,7 @@ class spoolRun
 
         $aData["contentTypeIsHtml"] = (isset($aData["contentTypeIsHtml"]))? $aData["contentTypeIsHtml"] : true;
 
-        $this->setData($sUID, $aData["app_msg_subject"], $aData["app_msg_from"], $aData["app_msg_to"], $aData["app_msg_body"], $aData["app_msg_date"], $aData["app_msg_cc"], $aData["app_msg_bcc"], $aData["app_msg_template"], $aData["app_msg_attach"], $aData["contentTypeIsHtml"]);
+        $this->setData($sUID, $aData["app_msg_subject"], $aData["app_msg_from"], $aData["app_msg_to"], $aData["app_msg_body"], $aData["app_msg_date"], $aData["app_msg_cc"], $aData["app_msg_bcc"], $aData["app_msg_template"], $aData["app_msg_attach"], $aData["contentTypeIsHtml"], $aData["app_msg_error"]);
     }
 
     /**
@@ -214,7 +216,7 @@ class spoolRun
      * @param string $sAppMsgUid, $sSubject, $sFrom, $sTo, $sBody, $sDate, $sCC, $sBCC, $sTemplate
      * @return none
      */
-    public function setData($sAppMsgUid, $sSubject, $sFrom, $sTo, $sBody, $sDate = "", $sCC = "", $sBCC = "", $sTemplate = "", $aAttachment = array(), $bContentTypeIsHtml = true)
+    public function setData($sAppMsgUid, $sSubject, $sFrom, $sTo, $sBody, $sDate = "", $sCC = "", $sBCC = "", $sTemplate = "", $aAttachment = array(), $bContentTypeIsHtml = true, $sError = "")
     {
         $this->spool_id = $sAppMsgUid;
         $this->fileData['subject'] = $sSubject;
@@ -228,6 +230,7 @@ class spoolRun
         $this->fileData['attachments'] = $aAttachment;
         $this->fileData['envelope_to'] = array ();
         $this->fileData["contentTypeIsHtml"] = $bContentTypeIsHtml;
+        $this->fileData["error"] = $sError;
 
         if (array_key_exists('MESS_ENGINE',$this->config)) {
             if ($this->config['MESS_ENGINE'] == 'OPENMAIL') {
@@ -685,6 +688,7 @@ class spoolRun
         $spool->setAppMsgStatus( $db_spool['app_msg_status'] );
         $spool->setAppMsgSendDate( date( 'Y-m-d H:i:s' ) ); // Add by Ankit
         $spool->setAppMsgShowMessage( $db_spool['app_msg_show_message'] ); // Add by Ankit
+        $spool->setAppMsgError( $db_spool['app_msg_error'] );
 
 
         if (! $spool->validate()) {

workflow/engine/classes/class.wsBase.php

@@ -943,6 +943,11 @@ class wsBase
             }
             /*----------------------------------********---------------------------------*/
 
+            $msgError = "";
+            if(sizeof($aSetup) == 0){
+               $msgError = "The default configuration wasn't defined";
+            }
+
             $oSpool = new spoolRun();
 
             $oSpool->setConfig($aSetup);
@@ -989,6 +994,7 @@ class wsBase
                 "app_msg_template" => "",
                 "app_msg_status"   => "pending",
                 "app_msg_show_message" => $showMessage,
+                "app_msg_error" => $msgError,
                 "contentTypeIsHtml" => (preg_match("/^.+\.html?$/i", $fileTemplate))? true : false
             );
 

workflow/engine/classes/model/AppMessage.php

@@ -84,6 +84,7 @@ class AppMessage extends BaseAppMessage
         $spool->setappMsgAttach( $data_spool['app_msg_attach'] );
         $spool->setAppMsgTemplate( $data_spool['app_msg_template'] );
         $spool->setAppMsgStatus( $data_spool['app_msg_status'] );
+        $spool->setAppMsgError( $data_spool['app_msg_error'] );
 
         if (! $spool->validate()) {
             $this->error_spool = $spool->getValidationFailures();

workflow/engine/classes/model/AppNotes.php

@@ -153,8 +153,10 @@ class AppNotes extends BaseAppNotes
             }
             $aConfiguration = System::getEmailConfiguration();
 
+            $msgError = "";
             if (! isset( $aConfiguration['MESS_ENABLED'] ) || $aConfiguration['MESS_ENABLED'] != '1') {
-                return false;
+                $msgError = "The default configuration wasn't defined";
+                $aConfiguration['MESS_ENGINE'] = '';
             }
 
             $oUser = new Users();
@@ -185,9 +187,27 @@ class AppNotes extends BaseAppNotes
                 $oSpool = new spoolRun();
 
                 $oSpool->setConfig($aConfiguration);
-                $oSpool->create( array ('msg_uid' => '','app_uid' => $appUid,'del_index' => 0,'app_msg_type' => 'DERIVATION','app_msg_subject' => $sSubject,'app_msg_from' => $sFrom,'app_msg_to' => $sTo,'app_msg_body' => $sBody,'app_msg_cc' => '','app_msg_bcc' => '','app_msg_attach' => '','app_msg_template' => '','app_msg_status' => 'pending') );
+                $oSpool->create(
-                if (($aConfiguration['MESS_BACKGROUND'] == '') || ($aConfiguration['MESS_TRY_SEND_INMEDIATLY'] == '1')) {
+                    array ('msg_uid' => '',
-                    $oSpool->sendMail();
+                           'app_uid' => $appUid,
+                           'del_index' => 0,
+                           'app_msg_type' => 'DERIVATION',
+                           'app_msg_subject' => $sSubject,
+                           'app_msg_from' => $sFrom,
+                           'app_msg_to' => $sTo,
+                           'app_msg_body' => $sBody,
+                           'app_msg_cc' => '',
+                           'app_msg_bcc' => '',
+                           'app_msg_attach' => '',
+                           'app_msg_template' => '',
+                           'app_msg_status' => 'pending',
+                           'app_msg_error' => $msgError
+                           )
+                    );
+                if ($msgError == '') {
+                    if (($aConfiguration['MESS_BACKGROUND'] == '') || ($aConfiguration['MESS_TRY_SEND_INMEDIATLY'] == '1')) {
+                        $oSpool->sendMail();
+                    }
                 }
 
             }

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

@@ -99,6 +99,8 @@ class AppMessageMapBuilder
 
         $tMap->addColumn('APP_MSG_SHOW_MESSAGE', 'AppMsgShowMessage', 'int', CreoleTypes::TINYINT, true, null);
 
+        $tMap->addColumn('APP_MSG_ERROR', 'AppMsgError', 'string', CreoleTypes::LONGVARCHAR, true, null);
+
     } // doBuild()
 
 } // AppMessageMapBuilder

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

@@ -129,6 +129,12 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
      */
     protected $app_msg_show_message = 1;
 
+/**
+     * The value for the app_msg_error field.
+     * @var        int
+     */
+    protected $app_msg_error;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -372,6 +378,17 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
         return $this->app_msg_show_message;
     }
 
+    /**
+     * Get the [app_msg_error] column value.
+     * 
+     * @return     String
+     */
+    public function getAppMsgError()
+    {
+
+        return $this->app_msg_error;
+    }
+
     /**
      * Set the value of [app_msg_uid] column.
      * 
@@ -760,6 +777,28 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
 
     } // setAppMsgShowMessage()
 
+    /**
+     * Set the value of [app_msg_error] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setAppMsgError($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->app_msg_error !== $v || $v === '') {
+            $this->app_msg_error = $v;
+            $this->modifiedColumns[] = AppMessagePeer::APP_MSG_ERROR;
+        }
+
+    } // setAppMsgFrom()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -811,12 +850,14 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
 
             $this->app_msg_show_message = $rs->getInt($startcol + 16);
 
+            $this->app_msg_error = $rs->getString($startcol + 17);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 17; // 17 = AppMessagePeer::NUM_COLUMNS - AppMessagePeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 18; // 17 = AppMessagePeer::NUM_COLUMNS - AppMessagePeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating AppMessage object", $e);
@@ -1071,6 +1112,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
             case 16:
                 return $this->getAppMsgShowMessage();
                 break;
+            case 17:
+                return $this->getAppMsgError();
+                break;
             default:
                 return null;
                 break;
@@ -1108,6 +1152,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
             $keys[14] => $this->getAppMsgAttach(),
             $keys[15] => $this->getAppMsgSendDate(),
             $keys[16] => $this->getAppMsgShowMessage(),
+            $keys[17] => $this->getAppMsgError(),
         );
         return $result;
     }
@@ -1190,6 +1235,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
             case 16:
                 $this->setAppMsgShowMessage($value);
                 break;
+            case 17:
+                $this->setAppMsgError($value);
+                break;
         } // switch()
     }
 
@@ -1281,6 +1329,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
             $this->setAppMsgShowMessage($arr[$keys[16]]);
         }
 
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setAppMsgError($arr[$keys[17]]);
+        }
     }
 
     /**
@@ -1360,6 +1411,9 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
             $criteria->add(AppMessagePeer::APP_MSG_SHOW_MESSAGE, $this->app_msg_show_message);
         }
 
+        if ($this->isColumnModified(AppMessagePeer::APP_MSG_ERROR)) {
+            $criteria->add(AppMessagePeer::APP_MSG_ERROR, $this->app_msg_error);
+        }
 
         return $criteria;
     }
@@ -1446,6 +1500,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
 
         $copyObj->setAppMsgShowMessage($this->app_msg_show_message);
 
+        $copyObj->setAppMsgError($this->app_msg_error);
 
         $copyObj->setNew(true);
 

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

@@ -25,7 +25,7 @@ abstract class BaseAppMessagePeer
     const CLASS_DEFAULT = 'classes.model.AppMessage';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 17;
+    const NUM_COLUMNS = 18;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -82,6 +82,9 @@ abstract class BaseAppMessagePeer
     /** the column name for the APP_MSG_SHOW_MESSAGE field */
     const APP_MSG_SHOW_MESSAGE = 'APP_MESSAGE.APP_MSG_SHOW_MESSAGE';
 
+    /** the column name for the APP_MSG_ERROR field */
+    const APP_MSG_ERROR = 'APP_MESSAGE.APP_MSG_ERROR';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -93,10 +96,10 @@ abstract class BaseAppMessagePeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppMsgUid', 'MsgUid', 'AppUid', 'DelIndex', 'AppMsgType', 'AppMsgSubject', 'AppMsgFrom', 'AppMsgTo', 'AppMsgBody', 'AppMsgDate', 'AppMsgCc', 'AppMsgBcc', 'AppMsgTemplate', 'AppMsgStatus', 'AppMsgAttach', 'AppMsgSendDate', 'AppMsgShowMessage', ),
+        BasePeer::TYPE_PHPNAME => array ('AppMsgUid', 'MsgUid', 'AppUid', 'DelIndex', 'AppMsgType', 'AppMsgSubject', 'AppMsgFrom', 'AppMsgTo', 'AppMsgBody', 'AppMsgDate', 'AppMsgCc', 'AppMsgBcc', 'AppMsgTemplate', 'AppMsgStatus', 'AppMsgAttach', 'AppMsgSendDate', 'AppMsgShowMessage', 'AppMsgError', ),
-        BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID, AppMessagePeer::MSG_UID, AppMessagePeer::APP_UID, AppMessagePeer::DEL_INDEX, AppMessagePeer::APP_MSG_TYPE, AppMessagePeer::APP_MSG_SUBJECT, AppMessagePeer::APP_MSG_FROM, AppMessagePeer::APP_MSG_TO, AppMessagePeer::APP_MSG_BODY, AppMessagePeer::APP_MSG_DATE, AppMessagePeer::APP_MSG_CC, AppMessagePeer::APP_MSG_BCC, AppMessagePeer::APP_MSG_TEMPLATE, AppMessagePeer::APP_MSG_STATUS, AppMessagePeer::APP_MSG_ATTACH, AppMessagePeer::APP_MSG_SEND_DATE, AppMessagePeer::APP_MSG_SHOW_MESSAGE, ),
+        BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID, AppMessagePeer::MSG_UID, AppMessagePeer::APP_UID, AppMessagePeer::DEL_INDEX, AppMessagePeer::APP_MSG_TYPE, AppMessagePeer::APP_MSG_SUBJECT, AppMessagePeer::APP_MSG_FROM, AppMessagePeer::APP_MSG_TO, AppMessagePeer::APP_MSG_BODY, AppMessagePeer::APP_MSG_DATE, AppMessagePeer::APP_MSG_CC, AppMessagePeer::APP_MSG_BCC, AppMessagePeer::APP_MSG_TEMPLATE, AppMessagePeer::APP_MSG_STATUS, AppMessagePeer::APP_MSG_ATTACH, AppMessagePeer::APP_MSG_SEND_DATE, AppMessagePeer::APP_MSG_SHOW_MESSAGE, AppMessagePeer::APP_MSG_ERROR, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID', 'MSG_UID', 'APP_UID', 'DEL_INDEX', 'APP_MSG_TYPE', 'APP_MSG_SUBJECT', 'APP_MSG_FROM', 'APP_MSG_TO', 'APP_MSG_BODY', 'APP_MSG_DATE', 'APP_MSG_CC', 'APP_MSG_BCC', 'APP_MSG_TEMPLATE', 'APP_MSG_STATUS', 'APP_MSG_ATTACH', 'APP_MSG_SEND_DATE', 'APP_MSG_SHOW_MESSAGE', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID', 'MSG_UID', 'APP_UID', 'DEL_INDEX', 'APP_MSG_TYPE', 'APP_MSG_SUBJECT', 'APP_MSG_FROM', 'APP_MSG_TO', 'APP_MSG_BODY', 'APP_MSG_DATE', 'APP_MSG_CC', 'APP_MSG_BCC', 'APP_MSG_TEMPLATE', 'APP_MSG_STATUS', 'APP_MSG_ATTACH', 'APP_MSG_SEND_DATE', 'APP_MSG_SHOW_MESSAGE', 'APP_MSG_ERROR', ),
-        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, )
     );
 
     /**
@@ -106,10 +109,10 @@ abstract class BaseAppMessagePeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppMsgUid' => 0, 'MsgUid' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'AppMsgType' => 4, 'AppMsgSubject' => 5, 'AppMsgFrom' => 6, 'AppMsgTo' => 7, 'AppMsgBody' => 8, 'AppMsgDate' => 9, 'AppMsgCc' => 10, 'AppMsgBcc' => 11, 'AppMsgTemplate' => 12, 'AppMsgStatus' => 13, 'AppMsgAttach' => 14, 'AppMsgSendDate' => 15, 'AppMsgShowMessage' => 16, ),
+        BasePeer::TYPE_PHPNAME => array ('AppMsgUid' => 0, 'MsgUid' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'AppMsgType' => 4, 'AppMsgSubject' => 5, 'AppMsgFrom' => 6, 'AppMsgTo' => 7, 'AppMsgBody' => 8, 'AppMsgDate' => 9, 'AppMsgCc' => 10, 'AppMsgBcc' => 11, 'AppMsgTemplate' => 12, 'AppMsgStatus' => 13, 'AppMsgAttach' => 14, 'AppMsgSendDate' => 15, 'AppMsgShowMessage' => 16, 'AppMsgError' => 17, ),
-        BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID => 0, AppMessagePeer::MSG_UID => 1, AppMessagePeer::APP_UID => 2, AppMessagePeer::DEL_INDEX => 3, AppMessagePeer::APP_MSG_TYPE => 4, AppMessagePeer::APP_MSG_SUBJECT => 5, AppMessagePeer::APP_MSG_FROM => 6, AppMessagePeer::APP_MSG_TO => 7, AppMessagePeer::APP_MSG_BODY => 8, AppMessagePeer::APP_MSG_DATE => 9, AppMessagePeer::APP_MSG_CC => 10, AppMessagePeer::APP_MSG_BCC => 11, AppMessagePeer::APP_MSG_TEMPLATE => 12, AppMessagePeer::APP_MSG_STATUS => 13, AppMessagePeer::APP_MSG_ATTACH => 14, AppMessagePeer::APP_MSG_SEND_DATE => 15, AppMessagePeer::APP_MSG_SHOW_MESSAGE => 16, ),
+        BasePeer::TYPE_COLNAME => array (AppMessagePeer::APP_MSG_UID => 0, AppMessagePeer::MSG_UID => 1, AppMessagePeer::APP_UID => 2, AppMessagePeer::DEL_INDEX => 3, AppMessagePeer::APP_MSG_TYPE => 4, AppMessagePeer::APP_MSG_SUBJECT => 5, AppMessagePeer::APP_MSG_FROM => 6, AppMessagePeer::APP_MSG_TO => 7, AppMessagePeer::APP_MSG_BODY => 8, AppMessagePeer::APP_MSG_DATE => 9, AppMessagePeer::APP_MSG_CC => 10, AppMessagePeer::APP_MSG_BCC => 11, AppMessagePeer::APP_MSG_TEMPLATE => 12, AppMessagePeer::APP_MSG_STATUS => 13, AppMessagePeer::APP_MSG_ATTACH => 14, AppMessagePeer::APP_MSG_SEND_DATE => 15, AppMessagePeer::APP_MSG_SHOW_MESSAGE => 16, AppMessagePeer::APP_MSG_ERROR => 17, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID' => 0, 'MSG_UID' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'APP_MSG_TYPE' => 4, 'APP_MSG_SUBJECT' => 5, 'APP_MSG_FROM' => 6, 'APP_MSG_TO' => 7, 'APP_MSG_BODY' => 8, 'APP_MSG_DATE' => 9, 'APP_MSG_CC' => 10, 'APP_MSG_BCC' => 11, 'APP_MSG_TEMPLATE' => 12, 'APP_MSG_STATUS' => 13, 'APP_MSG_ATTACH' => 14, 'APP_MSG_SEND_DATE' => 15, 'APP_MSG_SHOW_MESSAGE' => 16, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_MSG_UID' => 0, 'MSG_UID' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'APP_MSG_TYPE' => 4, 'APP_MSG_SUBJECT' => 5, 'APP_MSG_FROM' => 6, 'APP_MSG_TO' => 7, 'APP_MSG_BODY' => 8, 'APP_MSG_DATE' => 9, 'APP_MSG_CC' => 10, 'APP_MSG_BCC' => 11, 'APP_MSG_TEMPLATE' => 12, 'APP_MSG_STATUS' => 13, 'APP_MSG_ATTACH' => 14, 'APP_MSG_SEND_DATE' => 15, 'APP_MSG_SHOW_MESSAGE' => 16, 'APP_MSG_ERROR' => 17, ),
-        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, )
     );
 
     /**
@@ -244,6 +247,8 @@ abstract class BaseAppMessagePeer
 
         $criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE);
 
+        $criteria->addSelectColumn(AppMessagePeer::APP_MSG_ERROR);
+
     }
 
     const COUNT = 'COUNT(APP_MESSAGE.APP_MSG_UID)';

workflow/engine/config/schema.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <database name="workflow">
   <table name="APPLICATION">
     <vendor type="mysql">
@@ -269,6 +269,7 @@
     <column name="APP_MSG_ATTACH" type="LONGVARCHAR" required="false"/>
     <column name="APP_MSG_SEND_DATE" type="TIMESTAMP" required="true"/>
     <column name="APP_MSG_SHOW_MESSAGE" type="TINYINT" required="true" default="1"/>
+    <column name="APP_MSG_ERROR" type="LONGVARCHAR" required="false" default=""/>
   </table>
   <table name="APP_OWNER">
     <vendor type="mysql">

workflow/engine/data/mysql/schema.sql

@@ -124,6 +124,7 @@ CREATE TABLE `APP_MESSAGE`
 	`APP_MSG_ATTACH` MEDIUMTEXT,
 	`APP_MSG_SEND_DATE` DATETIME  NOT NULL,
 	`APP_MSG_SHOW_MESSAGE` TINYINT default 1 NOT NULL,
+	`APP_MSG_ERROR` MEDIUMTEXT default '' NOT NULL,
 	PRIMARY KEY (`APP_MSG_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
 #-----------------------------------------------------------------------------

workflow/engine/methods/mails/emailsAjax.php

@@ -73,6 +73,7 @@ switch($req){
         $criteria->addSelectColumn(AppMessagePeer::APP_MSG_DATE);
         $criteria->addSelectColumn(AppMessagePeer::APP_MSG_SEND_DATE);
         $criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE);
+        $criteria->addSelectColumn(AppMessagePeer::APP_MSG_ERROR);
 
         $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
         $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);

workflow/engine/templates/mails/emailList.js

@@ -172,7 +172,8 @@ Ext.onReady(function(){
             {name : 'APP_MSG_STATUS'},
             {name : 'APP_MSG_DATE'},
             {name : 'APP_MSG_SEND_DATE'},
-            {name : 'APP_MSG_BODY'}
+            {name : 'APP_MSG_BODY'},
+            {name : 'APP_MSG_ERROR'}
         ]
       })
     });
@@ -219,6 +220,7 @@ Ext.onReady(function(){
             {header: _('ID_SUBJECT'), dataIndex: 'APP_MSG_SUBJECT', width: 80,hidden:false, renderer: columnRenderer, sortable: true},
             {header: _('ID_FROM'), dataIndex: 'APP_MSG_FROM', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
             {header: _('ID_TO'), dataIndex: 'APP_MSG_TO', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
+            {header: _('ID_ERROR_EMAIL'), dataIndex: 'APP_MSG_ERROR', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
 
             {
                 header:  _('ID_STATUS'),