From 73f9b84fc7ba12a2f056e09be3a7ac95cc3354db Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Wed, 22 Jan 2014 10:20:51 -0400
Subject: [PATCH] BUG 12981 When using the plugin ActionByEmail. The email
 received is not very user freindly IMPROVEMENT

---
 workflow/engine/classes/class.case.php   | 54 ++++++++++++------------
 workflow/engine/classes/class.wsBase.php |  4 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 0aa369cd9..0491ab691 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -3906,12 +3906,12 @@ class Cases
         if (AppDelegationPeer::doCount($oCriteria) == 1) {
             $aFields['APP_STATUS'] = 'CANCELLED';
             $oApplication->update($aFields);
-            
-            G::LoadClass('reportTables');
-            require_once 'classes/model/AdditionalTables.php';
+
+            G::LoadClass('reportTables');
+            require_once 'classes/model/AdditionalTables.php';
             $oReportTables = new ReportTables();
-            $addtionalTables = new additionalTables();
-            $oReportTables->updateTables($aFields['PRO_UID'], $aFields['APP_UID'], $aFields['APP_NUMBER'], $aFields['APP_DATA']);
+            $addtionalTables = new additionalTables();
+            $oReportTables->updateTables($aFields['PRO_UID'], $aFields['APP_UID'], $aFields['APP_NUMBER'], $aFields['APP_DATA']);
             $addtionalTables->updateReportTables($aFields['PRO_UID'], $aFields['APP_UID'], $aFields['APP_NUMBER'], $aFields['APP_DATA'], $aFields['APP_STATUS']);
         }
         $this->CloseCurrentDelegation($sApplicationUID, $iIndex);
@@ -4932,9 +4932,9 @@ class Cases
                     throw (new Exception("Template file \"$fileTemplate\" does not exist."));
                 }
 
-                $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $aFields);
+                $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $aFields, false);
             } else {
-                $sBody = nl2br(G::replaceDataGridField($aTaskInfo["TAS_DEF_MESSAGE"], $aFields));
+                $sBody = nl2br(G::replaceDataGridField($aTaskInfo["TAS_DEF_MESSAGE"], $aFields, false));
             }
 
             G::LoadClass("tasks");
@@ -5910,7 +5910,7 @@ class Cases
             $oCriteria->add(AppMessagePeer::APP_MSG_SHOW_MESSAGE, 1);
         }
         $oCriteria->addAscendingOrderByColumn(AppMessagePeer::APP_MSG_DATE);
-        
+
         $oDataset = AppMessagePeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
@@ -6759,27 +6759,27 @@ class Cases
         }
     }
 
-    public function ordProcess ($a, $b)
+    public function ordProcess ($a, $b)
     {
     	if ($this->sort == '') {
     		$this->sort = 'APP_MSG_DATE';
-    	}
-	    if ($this->dir=='ASC') {
-		    if ($a[$this->sort] > $b[$this->sort]) {
-		        return 1;
-            } elseif ($a[$this->sort] < $b[$this->sort]) {
-                return - 1;
-            } else {
-                return 0;
-            }
-        } else {
-            if ($a[$this->sort] > $b[$this->sort]) {
-               return - 1;
-            } elseif ($a[$this->sort] < $b[$this->sort]) {
-               return 1;
-            } else {
-               return 0;
-            }
-        }
+    	}
+	    if ($this->dir=='ASC') {
+		    if ($a[$this->sort] > $b[$this->sort]) {
+		        return 1;
+            } elseif ($a[$this->sort] < $b[$this->sort]) {
+                return - 1;
+            } else {
+                return 0;
+            }
+        } else {
+            if ($a[$this->sort] > $b[$this->sort]) {
+               return - 1;
+            } elseif ($a[$this->sort] < $b[$this->sort]) {
+               return 1;
+            } else {
+               return 0;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 21499df7a..3ef625110 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -970,7 +970,7 @@ class wsBase
                 $Fields = array_merge( $oldFields['APP_DATA'], $appFields );
             }
 
-            $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields);
+            $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields, false);
             $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
 
             if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
@@ -3288,7 +3288,7 @@ class wsBase
             return $result;
         }
     }
-    
+
     /**
      * ClaimCase
      *