diff --git a/workflow/engine/methods/cases/casesDemo.php b/workflow/engine/methods/cases/casesDemo.php
index 6ac60175b..644ddff14 100755
--- a/workflow/engine/methods/cases/casesDemo.php
+++ b/workflow/engine/methods/cases/casesDemo.php
@@ -167,3 +167,4 @@ catch ( Exception $e ){
   $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
   G::RenderPage('publish');
 }
+
diff --git a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php
index 2d303dc40..58db609e5 100644
--- a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php
@@ -12,138 +12,128 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
-  $actionAjax = isset($_REQUEST['actionAjax'])?$_REQUEST['actionAjax']: null;
-  
-  
-  function casesShowOuputDocumentExist($url){
-  
-    $urlArray = explode("?",$url);
+$actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;
+
+function casesShowOuputDocumentExist ($url)
+{
+    $urlArray = explode( "?", $url );
     $urlParametroString = $urlArray[1];
-    
-    parse_str($urlParametroString, $_GET);
 
+    parse_str( $urlParametroString, $_GET );
+
+    require_once ("classes/model/AppDocumentPeer.php");
 
-    require_once ( "classes/model/AppDocumentPeer.php" );
-    
     $oAppDocument = new AppDocument();
-    $oAppDocument->Fields = $oAppDocument->load($_GET['a'],(isset($_GET['v']) )? $_GET['v'] : NULL );
-    
+    $oAppDocument->Fields = $oAppDocument->load( $_GET['a'], (isset( $_GET['v'] )) ? $_GET['v'] : NULL );
+
     $sAppDocUid = $oAppDocument->getAppDocUid();
     $info = pathinfo( $oAppDocument->getAppDocFilename() );
-    if (!isset($_GET['ext'])) {
+    if (! isset( $_GET['ext'] )) {
         $ext = $info['extension'];
-    }
-    else {
+    } else {
         if ($_GET['ext'] != '') {
             $ext = $_GET['ext'];
-        }
-        else {
+        } else {
             $ext = $info['extension'];
         }
     }
-    $ver= (isset($_GET['v']) && $_GET['v']!='') ? '_'.$_GET['v'] : '';
-    
-    if(!$ver)   //This code is in the case the outputdocument won't be versioned
-      $ver='_1';
-      
-     $realPath = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $sAppDocUid .$ver. '.' . $ext ;
-    $realPath1 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename'] .$ver. '.' . $ext ;
-    $realPath2 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename']. '.' . $ext ;
-    $sw_file_exists=false;
-    if(file_exists($realPath)){
-        $sw_file_exists=true;
-    }elseif(file_exists($realPath1)){
-        $sw_file_exists=true;
-        $realPath=$realPath1;
-    }elseif(file_exists($realPath2)){
-        $sw_file_exists=true;
-        $realPath=$realPath2;
+    $ver = (isset( $_GET['v'] ) && $_GET['v'] != '') ? '_' . $_GET['v'] : '';
+
+    if (! $ver) //This code is in the case the outputdocument won't be versioned
+        $ver = '_1';
+
+    $realPath = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $sAppDocUid . $ver . '.' . $ext;
+    $realPath1 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename'] . $ver . '.' . $ext;
+    $realPath2 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename'] . '.' . $ext;
+    $sw_file_exists = false;
+    if (file_exists( $realPath )) {
+        $sw_file_exists = true;
+    } elseif (file_exists( $realPath1 )) {
+        $sw_file_exists = true;
+        $realPath = $realPath1;
+    } elseif (file_exists( $realPath2 )) {
+        $sw_file_exists = true;
+        $realPath = $realPath2;
     }
-    
+
     $swFileExist = 0;
-      if($sw_file_exists){      
+    if ($sw_file_exists) {
         $swFileExist = 1;
-      }
-    return $swFileExist;    
-  }
-  
-    if($actionAjax=='casesGenerateDocumentPage'){    
-      global $G_PUBLISH;
-      
-      $oHeadPublisher =& headPublisher::getSingleton(); 
-      G::loadClass('configuration');
-      $conf = new Configurations;
-      $oHeadPublisher->addExtJsScript('cases/casesGenerateDocumentPage', true );    //adding a javascript file .js
-      $oHeadPublisher->addContent    ('cases/casesGenerateDocumentPage'); //adding a html file  .html.      
-      $oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));    
-      G::RenderPage('publish', 'extJs');
-    }                     
-    if($actionAjax=='generateDocumentGrid_Ajax'){
-      G::LoadClass('case');
-      G::LoadClass("BasePeer" );
-      
-      global $G_PUBLISH;    
-      $oCase = new Cases();
-      
-      $aProcesses = Array();
+    }
+    return $swFileExist;
+}
 
-      $G_PUBLISH = new Publisher();
-      $c = $oCase->getAllGeneratedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']);
-        if ( $c->getDbName() == 'dbarray' ){
-          $rs = ArrayBasePeer::doSelectRs ($c);
-        }
-        else{
-          $rs = GulliverBasePeer::doSelectRs ($c);
-        }
-        
-      $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
-      $rs->next();
-      
-      $totalCount = 0;
-        for($j=0;$j< $rs->getRecordCount() ;$j++) {
-          $result = $rs->getRow();
-          
-          $result["FILEDOCEXIST"] = casesShowOuputDocumentExist($result["FILEDOC"]);
-          $result["FILEPDFEXIST"] = casesShowOuputDocumentExist($result["FILEPDF"]);
-          
-          $aProcesses[] = $result;
-          
+if ($actionAjax == 'casesGenerateDocumentPage') {
+    global $G_PUBLISH;
 
-          $rs->next();
-          $totalCount++;
-        }
-        
-      //!dateFormat
-      G::LoadClass ( 'configuration' );
-      $conf = new Configurations();
-      try {
-        $generalConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '' );
-      }
-      catch (Exception $e){
-        $generalConfCasesList = array();
-      }
-      $dateFormat = "";
-      if (isset($generalConfCasesList['casesListDateFormat'])&&!empty($generalConfCasesList['casesListDateFormat'])) {
+    $oHeadPublisher = & headPublisher::getSingleton();
+    G::loadClass( 'configuration' );
+    $conf = new Configurations();
+    $oHeadPublisher->addExtJsScript( 'cases/casesGenerateDocumentPage', true ); //adding a javascript file .js
+    $oHeadPublisher->addContent( 'cases/casesGenerateDocumentPage' ); //adding a html file  .html.
+    $oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
+    G::RenderPage( 'publish', 'extJs' );
+}
+if ($actionAjax == 'generateDocumentGrid_Ajax') {
+    G::LoadClass( 'case' );
+    G::LoadClass( "BasePeer" );
+
+    global $G_PUBLISH;
+    $oCase = new Cases();
+
+    $aProcesses = Array ();
+
+    $G_PUBLISH = new Publisher();
+    $c = $oCase->getAllGeneratedDocumentsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] );
+    if ($c->getDbName() == 'dbarray') {
+        $rs = ArrayBasePeer::doSelectRs( $c );
+    } else {
+        $rs = GulliverBasePeer::doSelectRs( $c );
+    }
+
+    $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $rs->next();
+
+    $totalCount = 0;
+    for ($j = 0; $j < $rs->getRecordCount(); $j ++) {
+        $result = $rs->getRow();
+
+        $result["FILEDOCEXIST"] = casesShowOuputDocumentExist( $result["FILEDOC"] );
+        $result["FILEPDFEXIST"] = casesShowOuputDocumentExist( $result["FILEPDF"] );
+
+        $aProcesses[] = $result;
+
+        $rs->next();
+        $totalCount ++;
+    }
+
+    //!dateFormat
+    G::LoadClass( 'configuration' );
+    $conf = new Configurations();
+    try {
+        $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+    } catch (Exception $e) {
+        $generalConfCasesList = array ();
+    }
+    $dateFormat = "";
+    if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
         $dateFormat = $generalConfCasesList['casesListDateFormat'];
-      }
+    }
+
+    $newDir = '/tmp/test/directory';
+    $r = G::verifyPath( $newDir );
+    $r->data = $aProcesses;
+    $r->totalCount = $totalCount;
+    $r->dataFormat = $dateFormat;
+    echo G::json_encode( $r );
+}
 
-        
-            
-      $newDir = '/tmp/test/directory';
-      $r = G::verifyPath ( $newDir );
-      $r->data = $aProcesses;
-      $r->totalCount = $totalCount;
-      $r->dataFormat = $dateFormat;
-      echo G::json_encode($r);
-    }    
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
index 3342848a5..b89da3608 100644
--- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
@@ -12,78 +12,75 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
-  $actionAjax = isset($_REQUEST['actionAjax'])?$_REQUEST['actionAjax']: null;
+$actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;
 
+if ($actionAjax == "historyDynaformPage") {
+    global $G_PUBLISH;
+    $oHeadPublisher = & headPublisher::getSingleton();
+    G::loadClass( 'configuration' );
+    $conf = new Configurations();
+    $oHeadPublisher->addExtJsScript( 'cases/caseHistoryDynaformPage', true ); //adding a javascript file .js
+    $oHeadPublisher->addContent( 'cases/caseHistoryDynaformPage' ); //adding a html file  .html.
+    $oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
+    G::RenderPage( 'publish', 'extJs' );
+}
+if ($actionAjax == 'historyDynaformGrid_Ajax') {
+    G::LoadClass( 'case' );
+    G::LoadClass( "BasePeer" );
 
-    if($actionAjax=="historyDynaformPage"){
-      global $G_PUBLISH;
-      $oHeadPublisher =& headPublisher::getSingleton();
-      G::loadClass('configuration');
-      $conf = new Configurations;
-      $oHeadPublisher->addExtJsScript('cases/caseHistoryDynaformPage', true );    //adding a javascript file .js
-      $oHeadPublisher->addContent    ('cases/caseHistoryDynaformPage'); //adding a html file  .html.
-      $oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));
-      G::RenderPage('publish', 'extJs');
-    }
-    if($actionAjax=='historyDynaformGrid_Ajax'){
-      G::LoadClass('case');
-      G::LoadClass("BasePeer" );
+    global $G_PUBLISH;
+    $oCase = new Cases();
 
-      global $G_PUBLISH;
-      $oCase = new Cases();
+    $aProcesses = Array ();
+    $c = $oCase->getallDynaformsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] );
 
-      $aProcesses = Array();
-      $c = $oCase->getallDynaformsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']);
-
-        if ( $c->getDbName() == 'dbarray' ){
-          $rs = ArrayBasePeer::doSelectRs ($c);
-        }
-        else{
-          $rs = GulliverBasePeer::doSelectRs ($c);
-        }
-
-      $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
-      $rs->next();
-
-        for($j=0;$j< $rs->getRecordCount() ;$j++) {
-          $result = $rs->getRow();
-          //$result["ID_HISTORY"] = $result["PRO_UID"].'_'.$result["APP_UID"].'_'.$result["TAS_UID"];
-          $aProcesses[] = $result;
-          $rs->next();
-        }
-
-      $newDir = '/tmp/test/directory';
-      $r = G::verifyPath ( $newDir );
-      $r->data = $aProcesses;
-      $r->totalCount = 2;
-
-      echo G::json_encode($r);
+    if ($c->getDbName() == 'dbarray') {
+        $rs = ArrayBasePeer::doSelectRs( $c );
+    } else {
+        $rs = GulliverBasePeer::doSelectRs( $c );
     }
 
+    $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $rs->next();
 
-    if($actionAjax=='showHistoryMessage'){
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important;
-        }
-         body{
-          color:black !important;
-        }
-      </style>
-      <script language="Javascript">
+    for ($j = 0; $j < $rs->getRecordCount(); $j ++) {
+        $result = $rs->getRow();
+        //$result["ID_HISTORY"] = $result["PRO_UID"].'_'.$result["APP_UID"].'_'.$result["TAS_UID"];
+        $aProcesses[] = $result;
+        $rs->next();
+    }
+
+    $newDir = '/tmp/test/directory';
+    $r = G::verifyPath( $newDir );
+    $r->data = $aProcesses;
+    $r->totalCount = 2;
+
+    echo G::json_encode( $r );
+}
+
+if ($actionAjax == 'showHistoryMessage') {
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
         //!Code that simulated reload library javascript maborak
         var leimnud = {};
         leimnud.exec = "";
@@ -99,50 +96,50 @@
       </script>
 <?php
 
-      G::LoadClass('case');
-      $oCase = new Cases();
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
 
-      $_POST["APP_UID"] = $_REQUEST["APP_UID"];
-      $_POST['APP_MSG_UID'] = $_REQUEST["APP_MSG_UID"];
+    $_POST["APP_UID"] = $_REQUEST["APP_UID"];
+    $_POST['APP_MSG_UID'] = $_REQUEST["APP_MSG_UID"];
 
-      $G_PUBLISH = new Publisher();
-      $oCase = new Cases();
+    $G_PUBLISH = new Publisher();
+    $oCase = new Cases();
 
-      $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView($_POST['APP_UID'], $_POST['APP_MSG_UID']));
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ) );
 
-
-?>
-        <script language="javascript">
+    ?>
+<script language="javascript">
 <?php
-      global $G_FORM;
-?>
+    global $G_FORM;
+    ?>
           function loadForm_<?php echo $G_FORM->id;?>(parametro1){
           }
         </script>
 <?php
 
-      G::RenderPage('publish', 'raw');
-    }
+    G::RenderPage( 'publish', 'raw' );
+}
 
-    if($actionAjax=='showDynaformListHistory'){
+if ($actionAjax == 'showDynaformListHistory') {
 
-      //!dataIndex
-      $_POST["APP_UID"] = $_REQUEST["APP_UID"];
-      $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
-      $_POST["PRO_UID"] = $_REQUEST["PRO_UID"];
-      $_POST["TAS_UID"] = $_REQUEST["TAS_UID"];
+    //!dataIndex
+    $_POST["APP_UID"] = $_REQUEST["APP_UID"];
+    $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
+    $_POST["PRO_UID"] = $_REQUEST["PRO_UID"];
+    $_POST["TAS_UID"] = $_REQUEST["TAS_UID"];
 
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important;
-        }
-         body{
-          color:black !important;
-        }
-      </style>
-      <script language="Javascript">
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
         globalMd5Return=function(s,raw,hexcase,chrsz){raw=raw||false;hexcase=hexcase||false;chrsz=chrsz||8;function safe_add(x,y){var lsw=(x&0xFFFF)+(y&0xFFFF);var msw=(x>>16)+(y>>16)+(lsw>>16);return(msw<<16)|(lsw&0xFFFF)}function bit_rol(num,cnt){return(num<<cnt)|(num>>>(32-cnt))}function md5_cmn(q,a,b,x,s,t){return safe_add(bit_rol(safe_add(safe_add(a,q),safe_add(x,t)),s),b)}function md5_ff(a,b,c,d,x,s,t){return md5_cmn((b&c)|((~b)&d),a,b,x,s,t)}function md5_gg(a,b,c,d,x,s,t){return md5_cmn((b&d)|(c&(~d)),a,b,x,s,t)}function md5_hh(a,b,c,d,x,s,t){return md5_cmn(b^c^d,a,b,x,s,t)}function md5_ii(a,b,c,d,x,s,t){return md5_cmn(c^(b|(~d)),a,b,x,s,t)}function core_md5(x,len){x[len>>5]|=0x80<<((len)%32);x[(((len+64)>>>9)<<4)+14]=len;var a=1732584193;var b=-271733879;var c=-1732584194;var d=271733878;for(var i=0;i<x.length;i+=16){var olda=a;var oldb=b;var oldc=c;var oldd=d;a=md5_ff(a,b,c,d,x[i+0],7,-680876936);d=md5_ff(d,a,b,c,x[i+1],12,-389564586);c=md5_ff(c,d,a,b,x[i+2],17,606105819);b=md5_ff(b,c,d,a,x[i+3],22,-1044525330);a=md5_ff(a,b,c,d,x[i+4],7,-176418897);d=md5_ff(d,a,b,c,x[i+5],12,1200080426);c=md5_ff(c,d,a,b,x[i+6],17,-1473231341);b=md5_ff(b,c,d,a,x[i+7],22,-45705983);a=md5_ff(a,b,c,d,x[i+8],7,1770035416);d=md5_ff(d,a,b,c,x[i+9],12,-1958414417);c=md5_ff(c,d,a,b,x[i+10],17,-42063);b=md5_ff(b,c,d,a,x[i+11],22,-1990404162);a=md5_ff(a,b,c,d,x[i+12],7,1804603682);d=md5_ff(d,a,b,c,x[i+13],12,-40341101);c=md5_ff(c,d,a,b,x[i+14],17,-1502002290);b=md5_ff(b,c,d,a,x[i+15],22,1236535329);a=md5_gg(a,b,c,d,x[i+1],5,-165796510);d=md5_gg(d,a,b,c,x[i+6],9,-1069501632);c=md5_gg(c,d,a,b,x[i+11],14,643717713);b=md5_gg(b,c,d,a,x[i+0],20,-373897302);a=md5_gg(a,b,c,d,x[i+5],5,-701558691);d=md5_gg(d,a,b,c,x[i+10],9,38016083);c=md5_gg(c,d,a,b,x[i+15],14,-660478335);b=md5_gg(b,c,d,a,x[i+4],20,-405537848);a=md5_gg(a,b,c,d,x[i+9],5,568446438);d=md5_gg(d,a,b,c,x[i+14],9,-1019803690);c=md5_gg(c,d,a,b,x[i+3],14,-187363961);b=md5_gg(b,c,d,a,x[i+8],20,1163531501);a=md5_gg(a,b,c,d,x[i+13],5,-1444681467);d=md5_gg(d,a,b,c,x[i+2],9,-51403784);c=md5_gg(c,d,a,b,x[i+7],14,1735328473);b=md5_gg(b,c,d,a,x[i+12],20,-1926607734);a=md5_hh(a,b,c,d,x[i+5],4,-378558);d=md5_hh(d,a,b,c,x[i+8],11,-2022574463);c=md5_hh(c,d,a,b,x[i+11],16,1839030562);b=md5_hh(b,c,d,a,x[i+14],23,-35309556);a=md5_hh(a,b,c,d,x[i+1],4,-1530992060);d=md5_hh(d,a,b,c,x[i+4],11,1272893353);c=md5_hh(c,d,a,b,x[i+7],16,-155497632);b=md5_hh(b,c,d,a,x[i+10],23,-1094730640);a=md5_hh(a,b,c,d,x[i+13],4,681279174);d=md5_hh(d,a,b,c,x[i+0],11,-358537222);c=md5_hh(c,d,a,b,x[i+3],16,-722521979);b=md5_hh(b,c,d,a,x[i+6],23,76029189);a=md5_hh(a,b,c,d,x[i+9],4,-640364487);d=md5_hh(d,a,b,c,x[i+12],11,-421815835);c=md5_hh(c,d,a,b,x[i+15],16,530742520);b=md5_hh(b,c,d,a,x[i+2],23,-995338651);a=md5_ii(a,b,c,d,x[i+0],6,-198630844);d=md5_ii(d,a,b,c,x[i+7],10,1126891415);c=md5_ii(c,d,a,b,x[i+14],15,-1416354905);b=md5_ii(b,c,d,a,x[i+5],21,-57434055);a=md5_ii(a,b,c,d,x[i+12],6,1700485571);d=md5_ii(d,a,b,c,x[i+3],10,-1894986606);c=md5_ii(c,d,a,b,x[i+10],15,-1051523);b=md5_ii(b,c,d,a,x[i+1],21,-2054922799);a=md5_ii(a,b,c,d,x[i+8],6,1873313359);d=md5_ii(d,a,b,c,x[i+15],10,-30611744);c=md5_ii(c,d,a,b,x[i+6],15,-1560198380);b=md5_ii(b,c,d,a,x[i+13],21,1309151649);a=md5_ii(a,b,c,d,x[i+4],6,-145523070);d=md5_ii(d,a,b,c,x[i+11],10,-1120210379);c=md5_ii(c,d,a,b,x[i+2],15,718787259);b=md5_ii(b,c,d,a,x[i+9],21,-343485551);a=safe_add(a,olda);b=safe_add(b,oldb);c=safe_add(c,oldc);d=safe_add(d,oldd)}return[a,b,c,d]}function str2binl(str){var bin=[];var mask=(1<<chrsz)-1;for(var i=0;i<str.length*chrsz;i+=chrsz){bin[i>>5]|=(str.charCodeAt(i/chrsz)&mask)<<(i%32)}return bin}function binl2str(bin){var str="";var mask=(1<<chrsz)-1;for(var i=0;i<bin.length*32;i+=chrsz){str+=String.fromCharCode((bin[i>>5]>>>(i%32))&mask)}return str}function binl2hex(binarray){var hex_tab=hexcase?"0123456789ABCDEF":"0123456789abcdef";var str="";for(var i=0;i<binarray.length*4;i++){str+=hex_tab.charAt((binarray[i>>2]>>((i%4)*8+4))&0xF)+hex_tab.charAt((binarray[i>>2]>>((i%4)*8))&0xF)}return str}return(raw?binl2str(core_md5(str2binl(s),s.length*chrsz)):binl2hex(core_md5(str2binl(s),s.length*chrsz)))};
 
         //!Code that simulated reload library javascript maborak
@@ -209,26 +206,27 @@
       </script>
 <?php
 
-	    require_once 'classes/model/AppHistory.php';
-	    $G_PUBLISH = new Publisher();
-	    $G_PUBLISH->AddContent('view', 'cases/cases_DynaformHistory');
+    require_once 'classes/model/AppHistory.php';
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'view', 'cases/cases_DynaformHistory' );
 
-	    G::RenderPage('publish', 'raw');
-    }
+    G::RenderPage( 'publish', 'raw' );
+}
 
-    if($actionAjax=='dynaformChangeLogViewHistory'){
+if ($actionAjax == 'dynaformChangeLogViewHistory') {
 
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important;
-        }
-         body{
-          color:black !important;
-        }
-      </style>
-      <script language="Javascript">
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
 
 
 
@@ -247,47 +245,46 @@
       </script>
 <?php
 
-      $_POST['DYN_UID']= $_REQUEST['DYN_UID'];
-      $_POST['HISTORY_ID']= $_REQUEST['HISTORY_ID'];
+    $_POST['DYN_UID'] = $_REQUEST['DYN_UID'];
+    $_POST['HISTORY_ID'] = $_REQUEST['HISTORY_ID'];
 
+    global $G_PUBLISH;
+    $G_PUBLISH = new Publisher();
+    $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] );
+    $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
+    $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
 
-      global $G_PUBLISH;
-      $G_PUBLISH = new Publisher();
-      $FieldsHistory=unserialize($_SESSION['HISTORY_DATA']);
-      $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
-      $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
-
-
-?>
-        <script language="javascript">
+    ?>
+<script language="javascript">
 <?php
-      global $G_FORM;
-?>
+    global $G_FORM;
+    ?>
           function loadForm_<?php echo $G_FORM->id;?>(parametro1){
 
           }
         </script>
 <?php
 
-      G::RenderPage('publish', 'raw');
+    G::RenderPage( 'publish', 'raw' );
 
-    }
-    if($actionAjax== 'historyDynaformGridPreview'){
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important;
-        }
-         body{
-          color:black !important;
-        }
-      </style>
-      <script language="Javascript">
+}
+if ($actionAjax == 'historyDynaformGridPreview') {
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
 
 
 
@@ -306,36 +303,36 @@
       </script>
 <?php
 
-      //!dataIndex
-      $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
+    //!dataIndex
+    $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
 
-      G::LoadClass('case');
+    G::LoadClass( 'case' );
 
-      $G_PUBLISH = new Publisher();
-      $oCase = new Cases();
-      $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_POST['DYN_UID'];
+    $G_PUBLISH = new Publisher();
+    $oCase = new Cases();
+    $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_POST['DYN_UID'];
 
-      $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID'];
-      $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
+    $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID'];
+    $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
 
-?>
+    ?>
 <script language="javascript">
 function popUp(URL, width, height, left, top, resizable) {
     window.open(URL, '', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=1,resizable='+resizable+',width='+width+',height='+height+',left = '+left+',top = '+top+'');
 }
 <?php
-      global $G_FORM;
-?>
+    global $G_FORM;
+    ?>
 function loadForm_<?php echo $G_FORM->id;?>(parametro1) {
 }
 </script>
 <?php
 
-      G::RenderPage('publish', 'raw');
+    G::RenderPage( 'publish', 'raw' );
+}
 
-    }
diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php
index d55f18f98..d272fa659 100755
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -1,673 +1,994 @@
-<?php
-  //get the action from GET or POST, default is todo
-  $action   = isset($_GET['action']) ? $_GET['action'] : (isset($_POST['action']) ? $_POST['action'] : 'todo');
-  //fix a previous inconsistency
-  if ( $action == 'selfservice' ) $action = 'unassigned';
-  //if ( $action == 'sent' ) $action = 'participated';
-
-  G::LoadClass ( "BasePeer" );
-  G::LoadClass ( 'configuration' );
-  require_once ( "classes/model/Fields.php" );
-  require_once ( "classes/model/AppCacheView.php" );
-  require_once ( "classes/model/Process.php" );
-  require_once ( "classes/model/Users.php" );
-
-  $oHeadPublisher   =& headPublisher::getSingleton();
-  // oHeadPublisher->setExtSkin( 'xtheme-blue');
-
-  //get the configuration for this action
-  $conf = new Configurations();
-  try {
-  	// the setup for search is the same as the Sent (participated)
-    $confCasesList        = $conf->getConfiguration('casesList', ($action=='search'||$action=='simple_search') ? 'search': $action );
-    $generalConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '' );
-  }
-  catch (Exception $e){
-    $confCasesList = array();
-    $generalConfCasesList = array();
-  }
-
-  // reassign header configuration
-  $confReassignList = getReassignList();
-
-  // evaluates an action and the configuration for the list that will be rendered
-  $config       = getAdditionalFields($action, (class_exists('enterprisePlugin') ? $confCasesList : array()));
-  $columns      = $config['caseColumns'];
-  $readerFields = $config['caseReaderFields'];
-  $reassignColumns      = $confReassignList['caseColumns'];
-  $reassignReaderFields = $confReassignList['caseReaderFields'];
-
-  // if the general settings has been set the pagesize values are extracted from that record
-  if (isset($generalConfCasesList['casesListRowNumber'])&&!empty($generalConfCasesList['casesListRowNumber'])){
-    $pageSize = intval($generalConfCasesList['casesListRowNumber']);
-  }
-  else {
-    $pageSize = intval($config['rowsperpage']);
-  }
-
-  // if the general settings has been set the dateFormat values are extracted from that record
-  if (isset($generalConfCasesList['casesListDateFormat']) && !empty($generalConfCasesList['casesListDateFormat'])){
-    $dateFormat = $generalConfCasesList['casesListDateFormat'];
-  }
-  else {
-    $dateFormat = $config['dateformat'];
-  }
-
-
-
-  if ( $action == 'draft' /* &&  $action == 'cancelled' */) {
+<?php
+//get the action from GET or POST, default is todo
+$action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
+//fix a previous inconsistency
+if ($action == 'selfservice')
+    $action = 'unassigned';
+    //if ( $action == 'sent' ) $action = 'participated';
+
+
+G::LoadClass( "BasePeer" );
+G::LoadClass( 'configuration' );
+require_once ("classes/model/Fields.php");
+require_once ("classes/model/AppCacheView.php");
+require_once ("classes/model/Process.php");
+require_once ("classes/model/Users.php");
+
+$oHeadPublisher = & headPublisher::getSingleton();
+// oHeadPublisher->setExtSkin( 'xtheme-blue');
+
+
+//get the configuration for this action
+$conf = new Configurations();
+try {
+    // the setup for search is the same as the Sent (participated)
+    $confCasesList = $conf->getConfiguration( 'casesList', ($action == 'search' || $action == 'simple_search') ? 'search' : $action );
+    $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+} catch (Exception $e) {
+    $confCasesList = array ();
+    $generalConfCasesList = array ();
+}
+
+// reassign header configuration
+$confReassignList = getReassignList();
+
+// evaluates an action and the configuration for the list that will be rendered
+$config = getAdditionalFields( $action, (class_exists( 'enterprisePlugin' ) ? $confCasesList : array ()) );
+$columns = $config['caseColumns'];
+$readerFields = $config['caseReaderFields'];
+$reassignColumns = $confReassignList['caseColumns'];
+$reassignReaderFields = $confReassignList['caseReaderFields'];
+
+// if the general settings has been set the pagesize values are extracted from that record
+if (isset( $generalConfCasesList['casesListRowNumber'] ) && ! empty( $generalConfCasesList['casesListRowNumber'] )) {
+    $pageSize = intval( $generalConfCasesList['casesListRowNumber'] );
+} else {
+    $pageSize = intval( $config['rowsperpage'] );
+}
+
+// if the general settings has been set the dateFormat values are extracted from that record
+if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
+    $dateFormat = $generalConfCasesList['casesListDateFormat'];
+} else {
+    $dateFormat = $config['dateformat'];
+}
+
+if ($action == 'draft' /* &&  $action == 'cancelled' */) {
     //array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'deleteLink' ) );
-  }
-  if ( $action == 'selfservice' ) {
-    array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'viewLink' ) );
-  }
-
-  if ( $action == 'paused' ) {
+}
+if ($action == 'selfservice') {
+    array_unshift( $columns, array ('header' => '','width' => 50,'sortable' => false,'id' => 'viewLink'
+    ) );
+}
+
+if ($action == 'paused') {
     //array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'unpauseLink' ) );
-  }
+}
 /*
   if ( $action == 'to_reassign' ) {
     array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'reassignLink' ) );
   }
-*/
+*/
 //  if ( $action == 'cancelled' ) {
 //    array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'reactivateLink' ) );
 //  }
-
-  $userUid = ( isset($_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '' ) ? $_SESSION['USER_LOGGED'] : null;
-  $oAppCache = new AppCacheView();
-  $oAppCache->confCasesList = $confCasesList;
-
-  //get values for the comboBoxes
-  $processes[] = array ( '', G::LoadTranslation('ID_ALL_PROCESS'));
-  $status    = getStatusArray($action, $userUid );
-  $category  = getCategoryArray();
-  $users     = getUserArray($action, $userUid );
-  $allUsers  = getAllUsersArray($action);
-
-  $oHeadPublisher->assign('reassignReaderFields',  $reassignReaderFields ); //sending the fields to get from proxy
-  $oHeadPublisher->addExtJsScript('cases/reassignList', false);
-  $oHeadPublisher->assign('pageSize',      $pageSize);                      //sending the page size
-  $oHeadPublisher->assign('columns',       $columns);                       //sending the columns to display in grid
-  $oHeadPublisher->assign('readerFields',  $readerFields);                  //sending the fields to get from proxy
-  $oHeadPublisher->assign('reassignColumns',       $reassignColumns);       //sending the columns to display in grid
-  $oHeadPublisher->assign('action',        $action);                        //sending the action to make
-  $oHeadPublisher->assign('PMDateFormat',  $dateFormat);                    //sending the fields to get from proxy
-  $oHeadPublisher->assign('statusValues',  $status);                        //Sending the listing of status
-  $oHeadPublisher->assign('processValues', $processes);                     //Sending the listing of processes
-  $oHeadPublisher->assign('categoryValues', $category);                     //Sending the listing of categories
-  $oHeadPublisher->assign('userValues',    $users);                         //Sending the listing of users
-  $oHeadPublisher->assign('allUsersValues',$allUsers);                      //Sending the listing of all users
-  $oHeadPublisher->assign("solrEnabled", (($aux = System::solrEnv()) !== false)? 1 : 0); //Sending the status of solar
-
-  //menu permissions
-  /*$c = new Criteria('workflow');
+
+
+$userUid = (isset( $_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '') ? $_SESSION['USER_LOGGED'] : null;
+$oAppCache = new AppCacheView();
+$oAppCache->confCasesList = $confCasesList;
+
+//get values for the comboBoxes
+$processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' )
+);
+$status = getStatusArray( $action, $userUid );
+$category = getCategoryArray();
+$users = getUserArray( $action, $userUid );
+$allUsers = getAllUsersArray( $action );
+
+$oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy
+$oHeadPublisher->addExtJsScript( 'cases/reassignList', false );
+$oHeadPublisher->assign( 'pageSize', $pageSize ); //sending the page size
+$oHeadPublisher->assign( 'columns', $columns ); //sending the columns to display in grid
+$oHeadPublisher->assign( 'readerFields', $readerFields ); //sending the fields to get from proxy
+$oHeadPublisher->assign( 'reassignColumns', $reassignColumns ); //sending the columns to display in grid
+$oHeadPublisher->assign( 'action', $action ); //sending the action to make
+$oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to get from proxy
+$oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status
+$oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes
+$oHeadPublisher->assign( 'categoryValues', $category ); //Sending the listing of categories
+$oHeadPublisher->assign( 'userValues', $users ); //Sending the listing of users
+$oHeadPublisher->assign( 'allUsersValues', $allUsers ); //Sending the listing of all users
+$oHeadPublisher->assign( "solrEnabled", (($aux = System::solrEnv()) !== false) ? 1 : 0 ); //Sending the status of solar
+
+
+//menu permissions
+/*$c = new Criteria('workflow');
   $c->clearSelectColumns();
   $c->addSelectColumn( AppThreadPeer::APP_THREAD_PARENT );
   $c->add(AppThreadPeer::APP_UID, $APP_UID );
   $c->add(AppThreadPeer::APP_THREAD_STATUS , 'OPEN' );
-  $cnt = AppThreadPeer::doCount($c);*/
-  $cnt = '';
-  $menuPerms = '';
-  $menuPerms = $menuPerms . ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) ? 'R': ''; //can reassign case
-
-  $oHeadPublisher->assign( '___p34315105',   $menuPerms); // user menu permissions
-
-  G::LoadClass('configuration');
-  $c = new Configurations();
-
-  //$oHeadPublisher->addExtJsScript('cases/caseUtils', true);
-  $oHeadPublisher->addExtJsScript('app/main', true);
-  $oHeadPublisher->addExtJsScript('cases/casesList', false );    //adding a javascript file .js
-  $oHeadPublisher->addContent( 'cases/casesListExtJs'); //adding a html file  .html.
-  $oHeadPublisher->assign('FORMATS',$c->getFormats());
-  G::RenderPage('publish', 'extJs');
-
-  function getUserArray ( $action, $userUid ) {
-  	global $oAppCache;
-    $status = array();
-    $users[] = array("CURRENT_USER", G::LoadTranslation("ID_CURRENT_USER"));
-    $users[] = array("", G::LoadTranslation("ID_ALL_USERS"));
-
+  $cnt = AppThreadPeer::doCount($c);*/
+$cnt = '';
+$menuPerms = '';
+$menuPerms = $menuPerms . ($RBAC->userCanAccess( 'PM_REASSIGNCASE' ) == 1) ? 'R' : ''; //can reassign case
+
+
+$oHeadPublisher->assign( '___p34315105', $menuPerms ); // user menu permissions
+
+
+G::LoadClass( 'configuration' );
+$c = new Configurations();
+
+//$oHeadPublisher->addExtJsScript('cases/caseUtils', true);
+$oHeadPublisher->addExtJsScript( 'app/main', true );
+$oHeadPublisher->addExtJsScript( 'cases/casesList', false ); //adding a javascript file .js
+$oHeadPublisher->addContent( 'cases/casesListExtJs' ); //adding a html file  .html.
+$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+G::RenderPage( 'publish', 'extJs' );
+
+function getUserArray ($action, $userUid)
+{
+    global $oAppCache;
+    $status = array ();
+    $users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" )
+    );
+    $users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" )
+    );
+
     //now get users, just for the Search action
-    switch ( $action ) {
-      case 'search_simple':
-      case 'search' :
-           $cUsers = new Criteria('workflow');
-           $cUsers->clearSelectColumns ( );
-           $cUsers->addSelectColumn ( UsersPeer::USR_UID );
-           $cUsers->addSelectColumn ( UsersPeer::USR_FIRSTNAME );
-           $cUsers->addSelectColumn ( UsersPeer::USR_LASTNAME );
-           $oDataset = UsersPeer::doSelectRS($cUsers);
-           $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-           $oDataset->next();
-           while($aRow = $oDataset->getRow()){
-             $users[] = array( $aRow['USR_UID'], $aRow['USR_LASTNAME'] . ' ' . $aRow['USR_FIRSTNAME'] );
-             $oDataset->next();
-           }
-           break;
-      default:
-           return $users;
-      break;
-    }
-    return $users;
-  }
-
-    function getCategoryArray () {
-        global $oAppCache;
-        require_once 'classes/model/ProcessCategory.php';
-        $category[] = array("", G::LoadTranslation("ID_ALL_CATEGORIES"));
-
-        $criteria = new Criteria('workflow');
-        $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_UID);
-        $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_NAME);
-        $dataset = ProcessCategoryPeer::doSelectRS($criteria);
-        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $dataset->next();
-
-        while ($row = $dataset->getRow()) {
-            $category[] = array( $row['CATEGORY_UID'], $row['CATEGORY_NAME']);
-            $dataset->next();
-        }
-        return $category;
-    }
-
-  function getAllUsersArray ( $action ) {
-    global $oAppCache;
-    $status = array();
-    $users[] = array("CURRENT_USER", G::LoadTranslation("ID_CURRENT_USER"));
-    $users[] = array("", G::LoadTranslation("ID_ALL_USERS"));
-
-    if ($action=='to_reassign') {
-      //now get users, just for the Search action
-      $cUsers = $oAppCache->getToReassignListCriteria();
-      $cUsers->addSelectColumn(AppCacheViewPeer::USR_UID);
-
-			if(g::MySQLSintaxis())
-				$cUsers->addGroupByColumn(AppCacheViewPeer::USR_UID);
-
-      $cUsers->addAscendingOrderByColumn ( AppCacheViewPeer::APP_CURRENT_USER );
-      $oDataset = AppCacheViewPeer::doSelectRS($cUsers);
-      $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-      $oDataset->next();
-      while($aRow = $oDataset->getRow()){
-        $users[] = array( $aRow['USR_UID'], $aRow['APP_CURRENT_USER'] );
-        $oDataset->next();
-      }
-    }
-    return $users;
-  }
-
-  function getStatusArray ( $action, $userUid ) {
-  	global $oAppCache;
-    $status = array();
-    $status[] = array( '',  G::LoadTranslation('ID_ALL_STATUS') );
-//get the list based in the action provided
-    switch ( $action ) {
-      case 'sent' :
-           $cStatus       = $oAppCache->getSentListProcessCriteria ($userUid); // a little slow
-           break;
-      case 'simple_search':
-      case 'search' :
-           $cStatus = new Criteria('workflow');
-           $cStatus->clearSelectColumns ( );
-           $cStatus->setDistinct();
-           $cStatus->addSelectColumn ( ApplicationPeer::APP_STATUS );
-           $oDataset = ApplicationPeer::doSelectRS($cStatus);
-           $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-           $oDataset->next();
-           while($aRow = $oDataset->getRow()){
-             $status[] = array( $aRow['APP_STATUS'], G::LoadTranslation('ID_CASES_STATUS_'.$aRow['APP_STATUS'])  ); //here we can have a translation for the status ( the second param)
-             $oDataset->next();
-           }
-           return $status;
-           break;
-
-      case 'selfservice' :
-           $cStatus       = $oAppCache->getUnassignedListCriteria($userUid);
-           break;
-      case 'paused' :
-           $cStatus       = $oAppCache->getPausedListCriteria($userUid);
-           break;
-      case 'to_revise' :
-           $cStatus       = $oAppCache->getToReviseListCriteria($userUid);
-//           $cStatus       = $oAppCache->getPausedListCriteria($userUid);
-           break;
-      case 'to_reassign' :
-           $cStatus       = $oAppCache->getToReassignListCriteria();
-           break;
-      case 'todo'  :
-      case 'draft' :
-      case 'gral'  :
-//      case 'to_revise' :
-      default:
-           return $status;
-      break;
-    }
-
+    switch ($action) {
+        case 'search_simple':
+        case 'search':
+            $cUsers = new Criteria( 'workflow' );
+            $cUsers->clearSelectColumns();
+            $cUsers->addSelectColumn( UsersPeer::USR_UID );
+            $cUsers->addSelectColumn( UsersPeer::USR_FIRSTNAME );
+            $cUsers->addSelectColumn( UsersPeer::USR_LASTNAME );
+            $oDataset = UsersPeer::doSelectRS( $cUsers );
+            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $users[] = array ($aRow['USR_UID'],$aRow['USR_LASTNAME'] . ' ' . $aRow['USR_FIRSTNAME']
+                );
+                $oDataset->next();
+            }
+            break;
+        default:
+            return $users;
+            break;
+    }
+    return $users;
+}
+
+function getCategoryArray ()
+{
+    global $oAppCache;
+    require_once 'classes/model/ProcessCategory.php';
+    $category[] = array ("",G::LoadTranslation( "ID_ALL_CATEGORIES" )
+    );
+
+    $criteria = new Criteria( 'workflow' );
+    $criteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_UID );
+    $criteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_NAME );
+    $dataset = ProcessCategoryPeer::doSelectRS( $criteria );
+    $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $dataset->next();
+
+    while ($row = $dataset->getRow()) {
+        $category[] = array ($row['CATEGORY_UID'],$row['CATEGORY_NAME']
+        );
+        $dataset->next();
+    }
+    return $category;
+}
+
+function getAllUsersArray ($action)
+{
+    global $oAppCache;
+    $status = array ();
+    $users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" )
+    );
+    $users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" )
+    );
+
+    if ($action == 'to_reassign') {
+        //now get users, just for the Search action
+        $cUsers = $oAppCache->getToReassignListCriteria();
+        $cUsers->addSelectColumn( AppCacheViewPeer::USR_UID );
+
+        if (g::MySQLSintaxis())
+            $cUsers->addGroupByColumn( AppCacheViewPeer::USR_UID );
+
+        $cUsers->addAscendingOrderByColumn( AppCacheViewPeer::APP_CURRENT_USER );
+        $oDataset = AppCacheViewPeer::doSelectRS( $cUsers );
+        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset->next();
+        while ($aRow = $oDataset->getRow()) {
+            $users[] = array ($aRow['USR_UID'],$aRow['APP_CURRENT_USER']
+            );
+            $oDataset->next();
+        }
+    }
+    return $users;
+}
+
+function getStatusArray ($action, $userUid)
+{
+    global $oAppCache;
+    $status = array ();
+    $status[] = array ('',G::LoadTranslation( 'ID_ALL_STATUS' )
+    );
+    //get the list based in the action provided
+    switch ($action) {
+        case 'sent':
+            $cStatus = $oAppCache->getSentListProcessCriteria( $userUid ); // a little slow
+            break;
+        case 'simple_search':
+        case 'search':
+            $cStatus = new Criteria( 'workflow' );
+            $cStatus->clearSelectColumns();
+            $cStatus->setDistinct();
+            $cStatus->addSelectColumn( ApplicationPeer::APP_STATUS );
+            $oDataset = ApplicationPeer::doSelectRS( $cStatus );
+            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oDataset->next();
+            while ($aRow = $oDataset->getRow()) {
+                $status[] = array ($aRow['APP_STATUS'],G::LoadTranslation( 'ID_CASES_STATUS_' . $aRow['APP_STATUS'] )
+                ); //here we can have a translation for the status ( the second param)
+                $oDataset->next();
+            }
+            return $status;
+            break;
+
+        case 'selfservice':
+            $cStatus = $oAppCache->getUnassignedListCriteria( $userUid );
+            break;
+        case 'paused':
+            $cStatus = $oAppCache->getPausedListCriteria( $userUid );
+            break;
+        case 'to_revise':
+            $cStatus = $oAppCache->getToReviseListCriteria( $userUid );
+            //           $cStatus       = $oAppCache->getPausedListCriteria($userUid);
+            break;
+        case 'to_reassign':
+            $cStatus = $oAppCache->getToReassignListCriteria();
+            break;
+        case 'todo':
+        case 'draft':
+        case 'gral':
+        //      case 'to_revise' :
+        default:
+            return $status;
+            break;
+    }
+
     //get the status for this user in this action only for participated, unassigned, paused
-//    if ( $action != 'todo' && $action != 'draft' && $action != 'to_revise') {
-    if ( $action != 'todo' && $action != 'draft' ) {
-      //$cStatus = new Criteria('workflow');
-      $cStatus->clearSelectColumns ( );
-      $cStatus->setDistinct();
-      $cStatus->addSelectColumn ( AppCacheViewPeer::APP_STATUS );
-      $oDataset = AppCacheViewPeer::doSelectRS($cStatus);
-      $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-      $oDataset->next();
-      while($aRow = $oDataset->getRow()){
-        $status[] = array( $aRow['APP_STATUS'], G::LoadTranslation('ID_CASES_STATUS_'.$aRow['APP_STATUS'])  ); //here we can have a translation for the status ( the second param)
-        $oDataset->next();
-      }
-    }
-    return $status;
-  }
-
-  //these getXX function gets the default fields in casesListSetup
-  function getToDo() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',       'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),     'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',        'width' => 150 );
-    $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',          'width' => 50 , 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),     'dataIndex' => 'APP_PRO_TITLE',    'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),        'dataIndex' => 'APP_TAS_TITLE',    'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_DUE_DATE'),    'dataIndex' => 'DEL_TASK_DUE_DATE', 'width' => 110);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 	'width' => 110 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PRIORITY'),    'dataIndex' => 'DEL_PRIORITY',      'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_TASK_DUE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
-    $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
-
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y' );
-  }
-
-  function getDraft() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                 'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),    'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),       'dataIndex' => 'APP_TITLE',         'width' => 150 );
-    $caseColumns[] = array( 'header' => 'UserUid',                           'dataIndex' => 'USR_UID',           'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => 'PreUsrUid',                         'dataIndex' => 'PREVIOUS_USR_UID',  'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),    'dataIndex' => 'APP_PRO_TITLE',     'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),       'dataIndex' => 'APP_TAS_TITLE',     'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_DUE_DATE'),   'dataIndex' => 'DEL_TASK_DUE_DATE', 'width' => 110);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'),'dataIndex' => 'APP_UPDATE_DATE',   'width' => 110 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PRIORITY'),   'dataIndex' => 'DEL_PRIORITY',      'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_TASK_DUE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
-  function getParticipated() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),     'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',         'width' => 150 );
-    $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',           'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID',  'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),     'dataIndex' => 'APP_PRO_TITLE',     'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),        'dataIndex' => 'APP_TAS_TITLE',     'width' => 120 );
+    //    if ( $action != 'todo' && $action != 'draft' && $action != 'to_revise') {
+    if ($action != 'todo' && $action != 'draft') {
+        //$cStatus = new Criteria('workflow');
+        $cStatus->clearSelectColumns();
+        $cStatus->setDistinct();
+        $cStatus->addSelectColumn( AppCacheViewPeer::APP_STATUS );
+        $oDataset = AppCacheViewPeer::doSelectRS( $cStatus );
+        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset->next();
+        while ($aRow = $oDataset->getRow()) {
+            $status[] = array ($aRow['APP_STATUS'],G::LoadTranslation( 'ID_CASES_STATUS_' . $aRow['APP_STATUS'] )
+            ); //here we can have a translation for the status ( the second param)
+            $oDataset->next();
+        }
+    }
+    return $status;
+}
+
+//these getXX function gets the default fields in casesListSetup
+function getToDo ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SENT_BY' ),'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_DUE_DATE' ),'dataIndex' => 'DEL_TASK_DUE_DATE','width' => 110
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 110
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PRIORITY' ),'dataIndex' => 'DEL_PRIORITY','width' => 50
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_FIRSTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_LASTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_USERNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_TASK_DUE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_PRIORITY'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_FINISH_DATE'
+    );
+
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getDraft ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'PreUsrUid','dataIndex' => 'PREVIOUS_USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_DUE_DATE' ),'dataIndex' => 'DEL_TASK_DUE_DATE','width' => 110
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 110
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PRIORITY' ),'dataIndex' => 'DEL_PRIORITY','width' => 50
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_TASK_DUE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_PRIORITY'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_FINISH_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getParticipated ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'PreUsrUid','dataIndex' => 'PREVIOUS_USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
     //$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'),'dataIndex' => 'APP_CURRENT_USER',  'width' => 120, 'sortable'=>false );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE',   'width' => 80 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'),      'dataIndex' => 'APP_STATUS',        'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_TASK_DUE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-   }
-
-   function getSearch() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                     'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),     'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),           'dataIndex' => 'APP_TITLE',         'width' => 100 );
-    $caseColumns[] = array( 'header' => 'UserUid',                               'dataIndex' => 'USR_UID',           'width' => 50 , 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => 'PreUsrUid',                             'dataIndex' => 'PREVIOUS_USR_UID',  'width' => 50 , 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),           'dataIndex' => 'APP_TAS_TITLE',     'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),        'dataIndex' => 'APP_PRO_TITLE',     'width' => 120 );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CURRENT_USER' ),'dataIndex' => 'APP_CURRENT_USER','width' => 120,'sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 80
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_STATUS' ),'dataIndex' => 'APP_STATUS','width' => 50
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_FIRSTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_LASTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_USERNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_TASK_DUE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_PRIORITY'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_FINISH_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getSearch ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 100
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'PreUsrUid','dataIndex' => 'PREVIOUS_USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
     //$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),        'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'),   'dataIndex' => 'APP_CURRENT_USER',  'width' => 120, 'sortable'=>false );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'),    'dataIndex' => 'APP_UPDATE_DATE',   'width' => 80 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_DELEGATION_DATE'),'dataIndex' => 'DEL_DELEGATE_DATE', 'width' => 80 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_DUE_DATE'),       'dataIndex' => 'DEL_TASK_DUE_DATE', 'width' => 80);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'),         'dataIndex' => 'APP_STATUS',        'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_TASK_DUE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_DELEGATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-   }
-
-  function getUnassigned() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',      'width' => 40, 'align' => 'left');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),     'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',       'width' => 150 );
-    $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',         'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),     'dataIndex' => 'APP_PRO_TITLE',   'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),        'dataIndex' => 'APP_TAS_TITLE',   'width' => 120 );
-
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_DUE_DATE'),    'dataIndex' => 'DEL_TASK_DUE_DATE', 'width' => 110);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE',   'width' => 80 );
-
-//    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_COMPLETED_BY_USER'),'dataIndex' => 'APP_CURRENT_USER','width' => 110 );
-//    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_FINISH_DATE'),      'dataIndex' => 'APP_FINISH_DATE', 'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_TASK_DUE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
-  function getPaused() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',           'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),    'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',            'width' => 150 );
-    $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',              'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),     'dataIndex' => 'APP_PRO_TITLE',        'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),        'dataIndex' => 'APP_TAS_TITLE',        'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE',   'width' => 80 );
-
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_THREAD_INDEX'),'dataIndex' => 'APP_THREAD_INDEX',   'width' => 80 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_DEL_INDEX'),   'dataIndex' => 'DEL_INDEX',   'width' => 80 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_TASK_DUE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_THREAD_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
-  function getToRevise() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',      'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),    'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',       'width' => 150 );
-    $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',         'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID','width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),     'dataIndex' => 'APP_PRO_TITLE',   'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),        'dataIndex' => 'APP_TAS_TITLE',   'width' => 120 );
-
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'),'dataIndex' => 'APP_CURRENT_USER','width' => 90, 'sortable'=>false );
-//    $caseColumns[] = array( 'header' =>'Sent By',      'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
-///--    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 110 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PRIORITY'),    'dataIndex' => 'DEL_PRIORITY',    'width' => 50 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'),      'dataIndex' => 'APP_STATUS',      'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-//    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'DEL_TASK_DUE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
-  function getToReassign() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),     'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',         'width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID','width' => 50, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',      'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',       'width' => 150 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),     'dataIndex' => 'APP_PRO_TITLE',   'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),        'dataIndex' => 'APP_TAS_TITLE',   'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'),'dataIndex' => 'APP_CURRENT_USER','width' => 90, 'sortable'=>false );
-//    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 110 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'),      'dataIndex' => 'APP_STATUS',      'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'TAS_UID' );
-    $caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-//    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
-  function getGeneral() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                  'dataIndex' => 'APP_NUMBER',        'width' => 45, 'align' => 'center');
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),     'dataIndex' => 'CASE_SUMMARY',     'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center',  'sortable'=>false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),        'dataIndex' => 'APP_TITLE',         'width' => 150 );
-    $caseColumns[] = array( 'header' => 'UserUid',                            'dataIndex' => 'USR_UID',           'width' => 50 , 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => 'PreUsrUid',                          'dataIndex' => 'PREVIOUS_USR_UID',  'width' => 50 , 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),        'dataIndex' => 'APP_TAS_TITLE',     'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),     'dataIndex' => 'APP_PRO_TITLE',     'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'),'dataIndex' => 'APP_CURRENT_USER',  'width' => 90, 'sortable'=>false );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE',   'width' => 110 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'),      'dataIndex' => 'APP_STATUS',        'width' => 50 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_CURRENT_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
-    $caseReaderFields[] = array( 'name' => 'APP_UPDATE_DATE' );
-    $caseReaderFields[] = array( 'name' => 'APP_STATUS' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
-  /**
-   * get the list configuration headers of the cases checked for reassign, for the
-   * reassign cases list.
-   */
-  function getReassignList() {
-    $caseColumns = array ();
-    $caseColumns[] = array( 'header' => '#',                                 'dataIndex' => 'APP_NUMBER',           'width' => 40 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'),    'dataIndex' => 'CASE_SUMMARY',         'width' => 45,'hidden'=> true);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'),'dataIndex' => 'CASE_NOTES_COUNT',     'width' => 45,'hidden'=> true);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'),       'dataIndex' => 'APP_TITLE',            'width' => 100, 'hidden'=> true);
-    $caseColumns[] = array( 'header' => 'CaseId',                            'dataIndex' => 'APP_UID'  ,            'width' => 200, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => 'User',                              'dataIndex' => 'USR_UID'  ,            'width' => 200, 'hidden'=> true, 'hideable'=> false);
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'),       'dataIndex' => 'APP_TAS_TITLE',        'width' => 120 );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'),    'dataIndex' => 'APP_PRO_TITLE',        'width' => 120 );
-    $caseColumns[] = array( 'header' => 'Reassigned Uid',                    'dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120, 'hidden'=> true, 'hideable'=> false );
-    $caseColumns[] = array( 'header' => 'Reassigned Uid',                    'dataIndex' => 'TAS_UID',              'width' => 120, 'hidden'=> true, 'hideable'=> false );
-    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_REASSIGN_TO'),'dataIndex' => 'APP_REASSIGN_USER',    'width' => 170 );
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
-    $caseReaderFields[] = array( 'name' => 'APP_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_UID' );
-    $caseReaderFields[] = array( 'name' => 'USR_UID' );
-    $caseReaderFields[] = array( 'name' => 'APP_TAS_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_PRO_TITLE' );
-    $caseReaderFields[] = array( 'name' => 'APP_REASSIGN_USER_UID' );
-    $caseReaderFields[] = array( 'name' => 'TAS_UID' );
-    $caseReaderFields[] = array( 'name' => 'APP_REASSIGN_USER' );
-    $caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
-    $caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
-  function getReassignUsersList() {
-    $caseColumns = array ();
-
-    $caseReaderFields = array();
-    $caseReaderFields[] = array( 'name' => 'userUid' );
-    $caseReaderFields[] = array( 'name' => 'userFullname' );
-
-    return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => 20, 'dateformat' => 'M d, Y'  );
-  }
-
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CURRENT_USER' ),'dataIndex' => 'APP_CURRENT_USER','width' => 120,'sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 80
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_DELEGATION_DATE' ),'dataIndex' => 'DEL_DELEGATE_DATE','width' => 80
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_DUE_DATE' ),'dataIndex' => 'DEL_TASK_DUE_DATE','width' => 80
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_STATUS' ),'dataIndex' => 'APP_STATUS','width' => 50
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_TASK_DUE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_DELEGATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_PRIORITY'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_FINISH_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getUnassigned ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 40,'align' => 'left'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SENT_BY' ),'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_DUE_DATE' ),'dataIndex' => 'DEL_TASK_DUE_DATE','width' => 110
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 80
+    );
+
+    //    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_COMPLETED_BY_USER'),'dataIndex' => 'APP_CURRENT_USER','width' => 110 );
+    //    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_FINISH_DATE'),      'dataIndex' => 'APP_FINISH_DATE', 'width' => 50 );
+
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_FIRSTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_LASTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_USERNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_TASK_DUE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_PRIORITY'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_FINISH_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getPaused ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SENT_BY' ),'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 80
+    );
+
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_THREAD_INDEX' ),'dataIndex' => 'APP_THREAD_INDEX','width' => 80
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_DEL_INDEX' ),'dataIndex' => 'DEL_INDEX','width' => 80
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_FIRSTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_LASTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_USERNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_TASK_DUE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_PRIORITY'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_FINISH_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_THREAD_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getToRevise ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'PreUsrUid','dataIndex' => 'PREVIOUS_USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SENT_BY' ),'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CURRENT_USER' ),'dataIndex' => 'APP_CURRENT_USER','width' => 90,'sortable' => false
+    );
+    //    $caseColumns[] = array( 'header' =>'Sent By',      'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
+    ///--    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 110 );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PRIORITY' ),'dataIndex' => 'DEL_PRIORITY','width' => 50
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_STATUS' ),'dataIndex' => 'APP_STATUS','width' => 50
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_FIRSTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_LASTNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_USERNAME'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    //    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_TASK_DUE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_PRIORITY'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_FINISH_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getToReassign ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'PreUsrUid','dataIndex' => 'PREVIOUS_USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CURRENT_USER' ),'dataIndex' => 'APP_CURRENT_USER','width' => 90,'sortable' => false
+    );
+    //    $caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'),     'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 110
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_STATUS' ),'dataIndex' => 'APP_STATUS','width' => 50
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'TAS_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'DEL_INDEX'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    //    $caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getGeneral ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 45,'align' => 'center'
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'align' => 'center','sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 150
+    );
+    $caseColumns[] = array ('header' => 'UserUid','dataIndex' => 'USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'PreUsrUid','dataIndex' => 'PREVIOUS_USR_UID','width' => 50,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CURRENT_USER' ),'dataIndex' => 'APP_CURRENT_USER','width' => 90,'sortable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SENT_BY' ),'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_LAST_MODIFY' ),'dataIndex' => 'APP_UPDATE_DATE','width' => 110
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_STATUS' ),'dataIndex' => 'APP_STATUS','width' => 50
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'PREVIOUS_USR_UID'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_DEL_PREVIOUS_USER'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_UPDATE_DATE'
+    );
+    $caseReaderFields[] = array ('name' => 'APP_STATUS'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY'
+    );
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+/**
+ * get the list configuration headers of the cases checked for reassign, for the
+ * reassign cases list.
+ */
+function getReassignList ()
+{
+    $caseColumns = array ();
+    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 40);
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'hidden' => true
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'hidden' => true
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 100,'hidden' => true
+    );
+    $caseColumns[] = array ('header' => 'CaseId','dataIndex' => 'APP_UID','width' => 200,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'User','dataIndex' => 'USR_UID','width' => 200,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    );
+    $caseColumns[] = array ('header' => 'Reassigned Uid','dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => 'Reassigned Uid','dataIndex' => 'TAS_UID','width' => 120,'hidden' => true,'hideable' => false
+    );
+    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_REASSIGN_TO' ),'dataIndex' => 'APP_REASSIGN_USER','width' => 170
+    );
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'APP_NUMBER');
+    $caseReaderFields[] = array ('name' => 'APP_TITLE');
+    $caseReaderFields[] = array ('name' => 'APP_UID');
+    $caseReaderFields[] = array ('name' => 'USR_UID');
+    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE');
+    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE');
+    $caseReaderFields[] = array ('name' => 'APP_REASSIGN_USER_UID');
+    $caseReaderFields[] = array ('name' => 'TAS_UID');
+    $caseReaderFields[] = array ('name' => 'APP_REASSIGN_USER');
+    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY');
+    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT');
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
+function getReassignUsersList ()
+{
+    $caseColumns = array ();
+
+    $caseReaderFields = array ();
+    $caseReaderFields[] = array ('name' => 'userUid'
+    );
+    $caseReaderFields[] = array ('name' => 'userFullname'
+    );
+
+    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    );
+}
+
 //  Ext.namespace("Ext.ux");
 //  Ext.ux.comboBoxRenderer = function(combo) {
 //    return function(value) {
@@ -676,61 +997,66 @@
 //      return rec.get(combo.displayField);
 //    }
 //  }
-  /**
-   * loads the PM Table field list from the database based in an action parameter
-   * then assemble the List of fields with these data, for the configuration in cases list.
-   * @param  String $action
-   * @return Array $config
-   */
-
-function getAdditionalFields($action, $confCasesList=array()) {
-  if (!empty($confCasesList) && !empty($confCasesList['second']['data'])) {// For the case list builder in the enterprise plugin
-    $caseColumns = array();
-    $caseReaderFields = array();
-
-    foreach($confCasesList['second']['data'] as $fieldData) {
-      if ($fieldData['fieldType'] != 'key') {
-        $label = $fieldData['label'];
-        $caseColumns[] = array('header' => $label, 'dataIndex' => $fieldData['name'], 'width' => $fieldData['width'], 'align' => $fieldData['align']);
-        $caseReaderFields[] = array('name' => $fieldData['name']);
-      }
-    }
-    return array('caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => $confCasesList['rowsperpage'], 'dateformat' => $confCasesList['dateformat']);
-  } else {
-    switch ($action) {
-      case 'draft' :
-        $config = getDraft();
-        break;
-      case 'simple_search':
-      case 'search' :
-        $config = getSearch();
-        break;
-      case 'participated' :
-      case 'sent' :
-        $config = getParticipated();
-        break;
-      case 'unassigned' :
-        $config = getUnassigned();
-        break;
-      case 'paused' :
-        $config = getPaused();
-        break;
-      case 'to_revise' :
-        $config = getToRevise();
-        break;
-      case 'to_reassign' :
-        $config = getToReassign();
-        break;
-      case 'gral' :
-        $config = getGeneral();
-        break;
-      case 'todo' :
-      default :
-        $action = 'todo';
-        $config = getToDo();
-        break;
-    }
-    return $config;
-  }
+/**
+ * loads the PM Table field list from the database based in an action parameter
+ * then assemble the List of fields with these data, for the configuration in cases list.
+ *
+ * @param String $action
+ * @return Array $config
+ */
+
+function getAdditionalFields ($action, $confCasesList = array())
+{
+    if (! empty( $confCasesList ) && ! empty( $confCasesList['second']['data'] )) { // For the case list builder in the enterprise plugin
+        $caseColumns = array ();
+        $caseReaderFields = array ();
+
+        foreach ($confCasesList['second']['data'] as $fieldData) {
+            if ($fieldData['fieldType'] != 'key') {
+                $label = $fieldData['label'];
+                $caseColumns[] = array ('header' => $label,'dataIndex' => $fieldData['name'],'width' => $fieldData['width'],'align' => $fieldData['align']
+                );
+                $caseReaderFields[] = array ('name' => $fieldData['name']
+                );
+            }
+        }
+        return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => $confCasesList['rowsperpage'],'dateformat' => $confCasesList['dateformat']
+        );
+    } else {
+        switch ($action) {
+            case 'draft':
+                $config = getDraft();
+                break;
+            case 'simple_search':
+            case 'search':
+                $config = getSearch();
+                break;
+            case 'participated':
+            case 'sent':
+                $config = getParticipated();
+                break;
+            case 'unassigned':
+                $config = getUnassigned();
+                break;
+            case 'paused':
+                $config = getPaused();
+                break;
+            case 'to_revise':
+                $config = getToRevise();
+                break;
+            case 'to_reassign':
+                $config = getToReassign();
+                break;
+            case 'gral':
+                $config = getGeneral();
+                break;
+            case 'todo':
+            default:
+                $action = 'todo';
+                $config = getToDo();
+                break;
+        }
+        return $config;
+    }
 }
 
diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php
index 56967121e..96bd50551 100755
--- a/workflow/engine/methods/cases/casesListExtJsRedirector.php
+++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php
@@ -1,31 +1,31 @@
 <script>
 if (typeof window.parent != 'undefined') {
-<?php 
-if (isset($_GET['ux'])) {
-  switch ($_GET['ux']) {
-    case 'SIMPLIFIED':
-    case 'SWITCHABLE':
-    case 'SINGLE':
-      $url = '../home';
-      break;
-    default:
-      $url = 'casesListExtJs';
-  }
-} 
-else {
-  $url = 'casesListExtJs';
-}
-
-if (isset($_GET['ux'])) {
-  echo 'if (typeof window.parent.ux_env != \'undefined\') {';
-}
-
-echo "  window.parent.location.href = '$url';";
-
-if (isset($_GET['ux'])) {
-  echo '} else { window.parent.location.href = \'casesListExtJs\'; }';
-}
-
+<?php
+if (isset( $_GET['ux'] )) {
+    switch ($_GET['ux']) {
+        case 'SIMPLIFIED':
+        case 'SWITCHABLE':
+        case 'SINGLE':
+            $url = '../home';
+            break;
+        default:
+            $url = 'casesListExtJs';
+    }
+} else {
+    $url = 'casesListExtJs';
+}
+
+if (isset( $_GET['ux'] )) {
+    echo 'if (typeof window.parent.ux_env != \'undefined\') {';
+}
+
+echo "  window.parent.location.href = '$url';";
+
+if (isset( $_GET['ux'] )) {
+    echo '} else { window.parent.location.href = \'casesListExtJs\'; }';
+}
+
 ?>
 }
-</script>
\ No newline at end of file
+</script>
+
diff --git a/workflow/engine/methods/cases/casesList_Ajax.php b/workflow/engine/methods/cases/casesList_Ajax.php
index 6dc041f8e..8b454572e 100755
--- a/workflow/engine/methods/cases/casesList_Ajax.php
+++ b/workflow/engine/methods/cases/casesList_Ajax.php
@@ -12,253 +12,256 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
-    require_once 'classes/model/Application.php';
-    require_once 'classes/model/Users.php';
-    require_once 'classes/model/AppThread.php';
-    require_once 'classes/model/AppDelay.php';
-    require_once 'classes/model/Process.php';
-    require_once 'classes/model/Task.php';
-    
-    require_once ( "classes/model/AppCacheView.php" );
-    require_once ( "classes/model/AppDelegation.php" );
-    require_once ( "classes/model/AdditionalTables.php" );
-    require_once ( "classes/model/AppDelay.php" );
-    G::LoadClass('case');
+require_once 'classes/model/Application.php';
+require_once 'classes/model/Users.php';
+require_once 'classes/model/AppThread.php';
+require_once 'classes/model/AppDelay.php';
+require_once 'classes/model/Process.php';
+require_once 'classes/model/Task.php';
 
-  $actionAjax = isset($_REQUEST['actionAjax'])?$_REQUEST['actionAjax']: null;
-  
-    if ($actionAjax == "processListExtJs") {
-        $action = isset($_REQUEST['action']) ? $_REQUEST['action']: null;
-        $categoryUid = isset($_REQUEST['CATEGORY_UID']) ? $_REQUEST['CATEGORY_UID'] : null;
-        $userUid = ( isset($_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '' ) ? $_SESSION['USER_LOGGED'] : null;
+require_once ("classes/model/AppCacheView.php");
+require_once ("classes/model/AppDelegation.php");
+require_once ("classes/model/AdditionalTables.php");
+require_once ("classes/model/AppDelay.php");
+G::LoadClass( 'case' );
 
-        global $oAppCache;
-        $oAppCache = new AppCacheView();
-        $processes = Array();
-        $processes[] = array ( '', G::LoadTranslation('ID_ALL_PROCESS') );
+$actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;
 
-        //get the list based in the action provided
-        switch ( $action ) {
-            case 'draft':
-                $cProcess = $oAppCache->getDraftListCriteria($userUid); //fast enough
-                break;
-            case 'sent':
-                $cProcess = $oAppCache->getSentListProcessCriteria ($userUid); // fast enough
-                break;
-            case 'simple_search':
-            case 'search':
-                //in search action, the query to obtain all process is too slow, so we need to query directly to
-                //process and content tables, and for that reason we need the current language in AppCacheView.
-                G::loadClass('configuration');
-                $oConf = new Configurations;
-                $oConf->loadConfig($x, 'APP_CACHE_VIEW_ENGINE','','','','');
-                $appCacheViewEngine = $oConf->aConfig;
-                $lang   = isset($appCacheViewEngine['LANG']) ? $appCacheViewEngine['LANG'] : 'en';
+if ($actionAjax == "processListExtJs") {
+    $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : null;
+    $categoryUid = isset( $_REQUEST['CATEGORY_UID'] ) ? $_REQUEST['CATEGORY_UID'] : null;
+    $userUid = (isset( $_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '') ? $_SESSION['USER_LOGGED'] : null;
 
-                $cProcess = new Criteria('workflow');
-                $cProcess->clearSelectColumns ( );
-                $cProcess->addSelectColumn ( ProcessPeer::PRO_UID );
-                $cProcess->addSelectColumn ( ContentPeer::CON_VALUE );
-                if ($categoryUid) {
-                    $cProcess->add (ProcessPeer::PRO_CATEGORY, $categoryUid);
-                }
-                $del = DBAdapter::getStringDelimiter();
-                $conds = array();
-                $conds[] = array(ProcessPeer::PRO_UID, ContentPeer::CON_ID );
-                $conds[] = array(ContentPeer::CON_CATEGORY, $del . 'PRO_TITLE' . $del);
-                $conds[] = array(ContentPeer::CON_LANG, $del . $lang . $del);
-                $cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
-                $cProcess->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
-                $oDataset = ProcessPeer::doSelectRS($cProcess);
-                $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                $oDataset->next();
+    global $oAppCache;
+    $oAppCache = new AppCacheView();
+    $processes = Array ();
+    $processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' )
+    );
 
-                while ($aRow = $oDataset->getRow()) {
-                    $processes[] = array ( $aRow['PRO_UID'], $aRow['CON_VALUE'] );
-                    $oDataset->next();
-                }
-                return print G::json_encode($processes);
-                break;
-            case 'unassigned':
-                $cProcess = $oAppCache->getUnassignedListCriteria($userUid);
-                break;
-            case 'paused':
-                $cProcess = $oAppCache->getPausedListCriteria($userUid);
-                break;
-            case 'to_revise':
-                $cProcess = $oAppCache->getToReviseListCriteria($userUid);
-                break;
-            case 'to_reassign':
-                $cProcess = $oAppCache->getToReassignListCriteria();
-                $cProcess->addAscendingOrderByColumn(AppCacheViewPeer::APP_PRO_TITLE);
-                break;
-            case 'gral':
-                $cProcess = $oAppCache->getGeneralListCriteria();
-                $cProcess->addAscendingOrderByColumn(AppCacheViewPeer::APP_PRO_TITLE);
-                break;
-            case 'todo':
-            default:
-                $cProcess = $oAppCache->getToDoListCriteria($userUid); //fast enough
-                break;
-        }
-        //get the processes for this user in this action
-        $cProcess->clearSelectColumns();
-        $cProcess->addSelectColumn(AppCacheViewPeer::PRO_UID);
-        $cProcess->addSelectColumn(AppCacheViewPeer::APP_PRO_TITLE);
-        $cProcess->setDistinct(AppCacheViewPeer::PRO_UID);
-        if ($categoryUid) {
-            $cProcess->addAlias('CP', 'PROCESS');
-            $cProcess->add('CP.PRO_CATEGORY', $categoryUid, Criteria::EQUAL );
-            $cProcess->addJoin(AppCacheViewPeer::PRO_UID, 'CP.PRO_UID', Criteria::LEFT_JOIN);
-            $cProcess->addAsColumn('CATEGORY_UID', 'CP.PRO_CATEGORY');
-        }
-        $oDataset = AppCacheViewPeer::doSelectRS($cProcess);
-        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $oDataset->next();
+    //get the list based in the action provided
+    switch ($action) {
+        case 'draft':
+            $cProcess = $oAppCache->getDraftListCriteria( $userUid ); //fast enough
+            break;
+        case 'sent':
+            $cProcess = $oAppCache->getSentListProcessCriteria( $userUid ); // fast enough
+            break;
+        case 'simple_search':
+        case 'search':
+            //in search action, the query to obtain all process is too slow, so we need to query directly to
+            //process and content tables, and for that reason we need the current language in AppCacheView.
+            G::loadClass( 'configuration' );
+            $oConf = new Configurations();
+            $oConf->loadConfig( $x, 'APP_CACHE_VIEW_ENGINE', '', '', '', '' );
+            $appCacheViewEngine = $oConf->aConfig;
+            $lang = isset( $appCacheViewEngine['LANG'] ) ? $appCacheViewEngine['LANG'] : 'en';
 
-        while ($aRow = $oDataset->getRow()) {
-            $processes[] = array ( $aRow['PRO_UID'], $aRow['APP_PRO_TITLE'] );
+            $cProcess = new Criteria( 'workflow' );
+            $cProcess->clearSelectColumns();
+            $cProcess->addSelectColumn( ProcessPeer::PRO_UID );
+            $cProcess->addSelectColumn( ContentPeer::CON_VALUE );
+            if ($categoryUid) {
+                $cProcess->add( ProcessPeer::PRO_CATEGORY, $categoryUid );
+            }
+            $del = DBAdapter::getStringDelimiter();
+            $conds = array ();
+            $conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID
+            );
+            $conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del
+            );
+            $conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del
+            );
+            $cProcess->addJoinMC( $conds, Criteria::LEFT_JOIN );
+            $cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' );
+            $oDataset = ProcessPeer::doSelectRS( $cProcess );
+            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
             $oDataset->next();
-        }
-        return print G::json_encode($processes);
+
+            while ($aRow = $oDataset->getRow()) {
+                $processes[] = array ($aRow['PRO_UID'],$aRow['CON_VALUE']
+                );
+                $oDataset->next();
+            }
+            return print G::json_encode( $processes );
+            break;
+        case 'unassigned':
+            $cProcess = $oAppCache->getUnassignedListCriteria( $userUid );
+            break;
+        case 'paused':
+            $cProcess = $oAppCache->getPausedListCriteria( $userUid );
+            break;
+        case 'to_revise':
+            $cProcess = $oAppCache->getToReviseListCriteria( $userUid );
+            break;
+        case 'to_reassign':
+            $cProcess = $oAppCache->getToReassignListCriteria();
+            $cProcess->addAscendingOrderByColumn( AppCacheViewPeer::APP_PRO_TITLE );
+            break;
+        case 'gral':
+            $cProcess = $oAppCache->getGeneralListCriteria();
+            $cProcess->addAscendingOrderByColumn( AppCacheViewPeer::APP_PRO_TITLE );
+            break;
+        case 'todo':
+        default:
+            $cProcess = $oAppCache->getToDoListCriteria( $userUid ); //fast enough
+            break;
     }
-
-    if ($actionAjax=="getUsersToReassign") {
-        $_SESSION['TASK'] = $_REQUEST['TAS_UID'];
-        $case = new Cases();
-        $result->data = $case->getUsersToReassign($_SESSION['TASK'], $_SESSION['USER_LOGGED']);
-        print G::json_encode($result);
+    //get the processes for this user in this action
+    $cProcess->clearSelectColumns();
+    $cProcess->addSelectColumn( AppCacheViewPeer::PRO_UID );
+    $cProcess->addSelectColumn( AppCacheViewPeer::APP_PRO_TITLE );
+    $cProcess->setDistinct( AppCacheViewPeer::PRO_UID );
+    if ($categoryUid) {
+        $cProcess->addAlias( 'CP', 'PROCESS' );
+        $cProcess->add( 'CP.PRO_CATEGORY', $categoryUid, Criteria::EQUAL );
+        $cProcess->addJoin( AppCacheViewPeer::PRO_UID, 'CP.PRO_UID', Criteria::LEFT_JOIN );
+        $cProcess->addAsColumn( 'CATEGORY_UID', 'CP.PRO_CATEGORY' );
     }
-    if ($actionAjax=='reassignCase') {
-    
-      $APP_UID = $_REQUEST["APP_UID"];
-      $DEL_INDEX = $_REQUEST["DEL_INDEX"];
+    $oDataset = AppCacheViewPeer::doSelectRS( $cProcess );
+    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $oDataset->next();
 
-      $_SESSION['APPLICATION'] = $APP_UID;
-      $_SESSION['INDEX'] = $DEL_INDEX;
+    while ($aRow = $oDataset->getRow()) {
+        $processes[] = array ($aRow['PRO_UID'],$aRow['APP_PRO_TITLE']
+        );
+        $oDataset->next();
+    }
+    return print G::json_encode( $processes );
+}
 
+if ($actionAjax == "getUsersToReassign") {
+    $_SESSION['TASK'] = $_REQUEST['TAS_UID'];
+    $case = new Cases();
+    $result->data = $case->getUsersToReassign( $_SESSION['TASK'], $_SESSION['USER_LOGGED'] );
+    print G::json_encode( $result );
+}
+if ($actionAjax == 'reassignCase') {
 
-      $cases = new Cases();
-      $user = new Users();
-      $app = new Application();
-      
-      $TO_USR_UID = $_POST['USR_UID'];     
+    $APP_UID = $_REQUEST["APP_UID"];
+    $DEL_INDEX = $_REQUEST["DEL_INDEX"];
 
-      try{
-        $cases->reassignCase($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $TO_USR_UID);
-        $caseData = $app->load($_SESSION['APPLICATION']);
-        $userData = $user->load($TO_USR_UID);
+    $_SESSION['APPLICATION'] = $APP_UID;
+    $_SESSION['INDEX'] = $DEL_INDEX;
+
+    $cases = new Cases();
+    $user = new Users();
+    $app = new Application();
+
+    $TO_USR_UID = $_POST['USR_UID'];
+
+    try {
+        $cases->reassignCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $TO_USR_UID );
+        $caseData = $app->load( $_SESSION['APPLICATION'] );
+        $userData = $user->load( $TO_USR_UID );
         //print_r($caseData);
         $data['APP_NUMBER'] = $caseData['APP_NUMBER'];
-        $data['USER'] = $userData['USR_LASTNAME'].' '. $userData['USR_FIRSTNAME']; //TODO change with the farmated username from environment conf
+        $data['USER'] = $userData['USR_LASTNAME'] . ' ' . $userData['USR_FIRSTNAME']; //TODO change with the farmated username from environment conf
         $result->status = 0;
-        $result->msg = G::LoadTranslation('ID_REASSIGNMENT_SUCCESS', SYS_LANG, $data);
-      } catch(Exception $e){
+        $result->msg = G::LoadTranslation( 'ID_REASSIGNMENT_SUCCESS', SYS_LANG, $data );
+    } catch (Exception $e) {
         $result->status = 1;
         $result->msg = $e->getMessage();
-      }
-      
-      print G::json_encode($result);
-  
-
     }
-    
-    
-    if($actionAjax=='showHistoryMessage'){    
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important; 
-        }
-         body{
-          color:black !important; 
-        }
-      </style>
-      <script language="Javascript">
+
+    print G::json_encode( $result );
+
+}
+
+if ($actionAjax == 'showHistoryMessage') {
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
         //!Code that simulated reload library javascript maborak
-        var leimnud = {};        
+        var leimnud = {};
         leimnud.exec = "";
         leimnud.fix = {};
         leimnud.fix.memoryLeak  = "";
         leimnud.browser = {};
         leimnud.browser.isIphone  = "";
         leimnud.iphone = {};
-        leimnud.iphone.make = function(){};      
-        function ajax_function(ajax_server, funcion, parameters, method){          
+        leimnud.iphone.make = function(){};
+        function ajax_function(ajax_server, funcion, parameters, method){
         }
         //!
       </script>
 <?php
-    
-      G::LoadClass('case');
-      $oCase = new Cases();
 
-      $_POST["APP_UID"] = $_REQUEST["APP_UID"];
-      $_POST['APP_MSG_UID'] = $_REQUEST["APP_MSG_UID"];
-     
-      $G_PUBLISH = new Publisher();
-      $oCase = new Cases();
-  
-      $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView($_POST['APP_UID'], $_POST['APP_MSG_UID']));
-      
-      
-?>      
-        <script language="javascript">
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
+
+    $_POST["APP_UID"] = $_REQUEST["APP_UID"];
+    $_POST['APP_MSG_UID'] = $_REQUEST["APP_MSG_UID"];
+
+    $G_PUBLISH = new Publisher();
+    $oCase = new Cases();
+
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ) );
+
+    ?>
+<script language="javascript">
 <?php
-      global $G_FORM;
-?>
-          function loadForm_<?php echo $G_FORM->id;?>(parametro1){          
+    global $G_FORM;
+    ?>
+          function loadForm_<?php echo $G_FORM->id;?>(parametro1){
           }
         </script>
 <?php
 
-      G::RenderPage('publish', 'raw');    
-    }
-    
-    if($actionAjax=='showDynaformListHistory'){
-    
-      //!dataIndex
-      $_POST["APP_UID"] = $_REQUEST["APP_UID"];
-      $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
-      $_POST["PRO_UID"] = $_REQUEST["PRO_UID"];
-      $_POST["TAS_UID"] = $_REQUEST["TAS_UID"];
-      
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important; 
-        }
-         body{
-          color:black !important; 
-        }
-      </style>
-      <script language="Javascript">
+    G::RenderPage( 'publish', 'raw' );
+}
+
+if ($actionAjax == 'showDynaformListHistory') {
+
+    //!dataIndex
+    $_POST["APP_UID"] = $_REQUEST["APP_UID"];
+    $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
+    $_POST["PRO_UID"] = $_REQUEST["PRO_UID"];
+    $_POST["TAS_UID"] = $_REQUEST["TAS_UID"];
+
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
         globalMd5Return=function(s,raw,hexcase,chrsz){raw=raw||false;hexcase=hexcase||false;chrsz=chrsz||8;function safe_add(x,y){var lsw=(x&0xFFFF)+(y&0xFFFF);var msw=(x>>16)+(y>>16)+(lsw>>16);return(msw<<16)|(lsw&0xFFFF)}function bit_rol(num,cnt){return(num<<cnt)|(num>>>(32-cnt))}function md5_cmn(q,a,b,x,s,t){return safe_add(bit_rol(safe_add(safe_add(a,q),safe_add(x,t)),s),b)}function md5_ff(a,b,c,d,x,s,t){return md5_cmn((b&c)|((~b)&d),a,b,x,s,t)}function md5_gg(a,b,c,d,x,s,t){return md5_cmn((b&d)|(c&(~d)),a,b,x,s,t)}function md5_hh(a,b,c,d,x,s,t){return md5_cmn(b^c^d,a,b,x,s,t)}function md5_ii(a,b,c,d,x,s,t){return md5_cmn(c^(b|(~d)),a,b,x,s,t)}function core_md5(x,len){x[len>>5]|=0x80<<((len)%32);x[(((len+64)>>>9)<<4)+14]=len;var a=1732584193;var b=-271733879;var c=-1732584194;var d=271733878;for(var i=0;i<x.length;i+=16){var olda=a;var oldb=b;var oldc=c;var oldd=d;a=md5_ff(a,b,c,d,x[i+0],7,-680876936);d=md5_ff(d,a,b,c,x[i+1],12,-389564586);c=md5_ff(c,d,a,b,x[i+2],17,606105819);b=md5_ff(b,c,d,a,x[i+3],22,-1044525330);a=md5_ff(a,b,c,d,x[i+4],7,-176418897);d=md5_ff(d,a,b,c,x[i+5],12,1200080426);c=md5_ff(c,d,a,b,x[i+6],17,-1473231341);b=md5_ff(b,c,d,a,x[i+7],22,-45705983);a=md5_ff(a,b,c,d,x[i+8],7,1770035416);d=md5_ff(d,a,b,c,x[i+9],12,-1958414417);c=md5_ff(c,d,a,b,x[i+10],17,-42063);b=md5_ff(b,c,d,a,x[i+11],22,-1990404162);a=md5_ff(a,b,c,d,x[i+12],7,1804603682);d=md5_ff(d,a,b,c,x[i+13],12,-40341101);c=md5_ff(c,d,a,b,x[i+14],17,-1502002290);b=md5_ff(b,c,d,a,x[i+15],22,1236535329);a=md5_gg(a,b,c,d,x[i+1],5,-165796510);d=md5_gg(d,a,b,c,x[i+6],9,-1069501632);c=md5_gg(c,d,a,b,x[i+11],14,643717713);b=md5_gg(b,c,d,a,x[i+0],20,-373897302);a=md5_gg(a,b,c,d,x[i+5],5,-701558691);d=md5_gg(d,a,b,c,x[i+10],9,38016083);c=md5_gg(c,d,a,b,x[i+15],14,-660478335);b=md5_gg(b,c,d,a,x[i+4],20,-405537848);a=md5_gg(a,b,c,d,x[i+9],5,568446438);d=md5_gg(d,a,b,c,x[i+14],9,-1019803690);c=md5_gg(c,d,a,b,x[i+3],14,-187363961);b=md5_gg(b,c,d,a,x[i+8],20,1163531501);a=md5_gg(a,b,c,d,x[i+13],5,-1444681467);d=md5_gg(d,a,b,c,x[i+2],9,-51403784);c=md5_gg(c,d,a,b,x[i+7],14,1735328473);b=md5_gg(b,c,d,a,x[i+12],20,-1926607734);a=md5_hh(a,b,c,d,x[i+5],4,-378558);d=md5_hh(d,a,b,c,x[i+8],11,-2022574463);c=md5_hh(c,d,a,b,x[i+11],16,1839030562);b=md5_hh(b,c,d,a,x[i+14],23,-35309556);a=md5_hh(a,b,c,d,x[i+1],4,-1530992060);d=md5_hh(d,a,b,c,x[i+4],11,1272893353);c=md5_hh(c,d,a,b,x[i+7],16,-155497632);b=md5_hh(b,c,d,a,x[i+10],23,-1094730640);a=md5_hh(a,b,c,d,x[i+13],4,681279174);d=md5_hh(d,a,b,c,x[i+0],11,-358537222);c=md5_hh(c,d,a,b,x[i+3],16,-722521979);b=md5_hh(b,c,d,a,x[i+6],23,76029189);a=md5_hh(a,b,c,d,x[i+9],4,-640364487);d=md5_hh(d,a,b,c,x[i+12],11,-421815835);c=md5_hh(c,d,a,b,x[i+15],16,530742520);b=md5_hh(b,c,d,a,x[i+2],23,-995338651);a=md5_ii(a,b,c,d,x[i+0],6,-198630844);d=md5_ii(d,a,b,c,x[i+7],10,1126891415);c=md5_ii(c,d,a,b,x[i+14],15,-1416354905);b=md5_ii(b,c,d,a,x[i+5],21,-57434055);a=md5_ii(a,b,c,d,x[i+12],6,1700485571);d=md5_ii(d,a,b,c,x[i+3],10,-1894986606);c=md5_ii(c,d,a,b,x[i+10],15,-1051523);b=md5_ii(b,c,d,a,x[i+1],21,-2054922799);a=md5_ii(a,b,c,d,x[i+8],6,1873313359);d=md5_ii(d,a,b,c,x[i+15],10,-30611744);c=md5_ii(c,d,a,b,x[i+6],15,-1560198380);b=md5_ii(b,c,d,a,x[i+13],21,1309151649);a=md5_ii(a,b,c,d,x[i+4],6,-145523070);d=md5_ii(d,a,b,c,x[i+11],10,-1120210379);c=md5_ii(c,d,a,b,x[i+2],15,718787259);b=md5_ii(b,c,d,a,x[i+9],21,-343485551);a=safe_add(a,olda);b=safe_add(b,oldb);c=safe_add(c,oldc);d=safe_add(d,oldd)}return[a,b,c,d]}function str2binl(str){var bin=[];var mask=(1<<chrsz)-1;for(var i=0;i<str.length*chrsz;i+=chrsz){bin[i>>5]|=(str.charCodeAt(i/chrsz)&mask)<<(i%32)}return bin}function binl2str(bin){var str="";var mask=(1<<chrsz)-1;for(var i=0;i<bin.length*32;i+=chrsz){str+=String.fromCharCode((bin[i>>5]>>>(i%32))&mask)}return str}function binl2hex(binarray){var hex_tab=hexcase?"0123456789ABCDEF":"0123456789abcdef";var str="";for(var i=0;i<binarray.length*4;i++){str+=hex_tab.charAt((binarray[i>>2]>>((i%4)*8+4))&0xF)+hex_tab.charAt((binarray[i>>2]>>((i%4)*8))&0xF)}return str}return(raw?binl2str(core_md5(str2binl(s),s.length*chrsz)):binl2hex(core_md5(str2binl(s),s.length*chrsz)))};
-        
+
         //!Code that simulated reload library javascript maborak
-        var leimnud = {};        
+        var leimnud = {};
         leimnud.exec = "";
         leimnud.fix = {};
         leimnud.fix.memoryLeak  = "";
         leimnud.browser = {};
         leimnud.browser.isIphone  = "";
         leimnud.iphone = {};
-        leimnud.iphone.make = function(){};      
-          function ajax_function(ajax_server, funcion, parameters, method){          
-          }       
-        
+        leimnud.iphone.make = function(){};
+          function ajax_function(ajax_server, funcion, parameters, method){
+          }
+
           function toggleTable(tablename){
             //table= document.getElementByName(tablename);
             table= document.getElementById(tablename);
@@ -268,172 +271,170 @@
               table.style.display = '';
             }
           }
-          
+
           function noesFuncion(idIframe) {
             window.parent.tabIframeWidthFix2(idIframe);
           }
-        
+
           function onResizeIframe(idIframe){
-          
-            
+
+
             window.onresize = noesFuncion(idIframe);
-          
+
           }
-          
+
         var showDynaformHistoryGlobal = {};
         showDynaformHistoryGlobal.dynUID = '';
         showDynaformHistoryGlobal.tablename = '';
         showDynaformHistoryGlobal.dynDate = '';
-        showDynaformHistoryGlobal.dynTitle = '';          
-          function showDynaformHistory(dynUID,tablename,dynDate,dynTitle){            
+        showDynaformHistoryGlobal.dynTitle = '';
+          function showDynaformHistory(dynUID,tablename,dynDate,dynTitle){
             showDynaformHistoryGlobal.dynUID = dynUID;
             showDynaformHistoryGlobal.tablename = tablename;
             showDynaformHistoryGlobal.dynDate = dynDate;
             showDynaformHistoryGlobal.dynTitle = dynTitle;
-            
+
             var dynUID = showDynaformHistoryGlobal.dynUID;
             var tablename = showDynaformHistoryGlobal.tablename;
             var dynDate = showDynaformHistoryGlobal.dynDate;
             var dynTitle = showDynaformHistoryGlobal.dynTitle;
-            
+
             var idUnique = globalMd5Return(dynUID+tablename+dynDate+dynTitle);
-            
+
             var tabData =  window.parent.Ext.util.JSON.encode(showDynaformHistoryGlobal);
             var tabName = 'dynaformChangeLogViewHistory'+idUnique;
             var tabTitle = 'View('+dynTitle+' '+dynDate+')';
-            
-            window.parent.ActionTabFrameGlobal.tabData = tabData;    
+
+            window.parent.ActionTabFrameGlobal.tabData = tabData;
             window.parent.ActionTabFrameGlobal.tabName = tabName;
-            window.parent.ActionTabFrameGlobal.tabTitle = tabTitle;                       
-          
+            window.parent.ActionTabFrameGlobal.tabTitle = tabTitle;
+
             window.parent.Actions.tabFrame(tabName);
           }
       </script>
 <?php
-    
-	    require_once 'classes/model/AppHistory.php';
-	    $G_PUBLISH = new Publisher();
-	    $G_PUBLISH->AddContent('view', 'cases/cases_DynaformHistory');
-      
-	    G::RenderPage('publish', 'raw');    
-    }
-    
-    if($actionAjax=='dynaformChangeLogViewHistory'){
-    
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important; 
-        }
-         body{
-          color:black !important; 
-        }
-      </style>
-      <script language="Javascript">
-      
-      
-      
+
+    require_once 'classes/model/AppHistory.php';
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'view', 'cases/cases_DynaformHistory' );
+
+    G::RenderPage( 'publish', 'raw' );
+}
+
+if ($actionAjax == 'dynaformChangeLogViewHistory') {
+
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
+
+
+
         //!Code that simulated reload library javascript maborak
-        var leimnud = {};        
+        var leimnud = {};
         leimnud.exec = "";
         leimnud.fix = {};
         leimnud.fix.memoryLeak  = "";
         leimnud.browser = {};
         leimnud.browser.isIphone  = "";
         leimnud.iphone = {};
-        leimnud.iphone.make = function(){};      
-        function ajax_function(ajax_server, funcion, parameters, method){          
+        leimnud.iphone.make = function(){};
+        function ajax_function(ajax_server, funcion, parameters, method){
         }
         //!
       </script>
 <?php
-    
-      $_POST['DYN_UID']= $_REQUEST['DYN_UID'];
-      $_POST['HISTORY_ID']= $_REQUEST['HISTORY_ID'];       
-    
-    
-      global $G_PUBLISH;
-      $G_PUBLISH = new Publisher();
-      $FieldsHistory=unserialize($_SESSION['HISTORY_DATA']);
-      $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
-      $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
-      
-      
-?>      
-        <script language="javascript">
+
+    $_POST['DYN_UID'] = $_REQUEST['DYN_UID'];
+    $_POST['HISTORY_ID'] = $_REQUEST['HISTORY_ID'];
+
+    global $G_PUBLISH;
+    $G_PUBLISH = new Publisher();
+    $FieldsHistory = unserialize( $_SESSION['HISTORY_DATA'] );
+    $Fields['APP_DATA'] = $FieldsHistory[$_POST['HISTORY_ID']];
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
+    $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
+
+    ?>
+<script language="javascript">
 <?php
-      global $G_FORM;
-?>
+    global $G_FORM;
+    ?>
           function loadForm_<?php echo $G_FORM->id;?>(parametro1){
-          
+
           }
         </script>
 <?php
 
-      G::RenderPage('publish', 'raw');
-    
-    }
-    if($actionAjax== 'historyDynaformGridPreview'){
-?>
-      <link rel="stylesheet" type="text/css" href="/css/classic.css" />
-      <style type="text/css">
-        html{
-          color:black !important; 
-        }
-         body{
-          color:black !important; 
-        }
-      </style>
-      <script language="Javascript">
-      
-      
-      
-        //!Code that simulated reload library javascript maborak
-        var leimnud = {};        
+    G::RenderPage( 'publish', 'raw' );
+
+}
+if ($actionAjax == 'historyDynaformGridPreview') {
+    ?>
+<link rel="stylesheet" type="text/css" href="/css/classic.css" />
+<style type="text/css">
+html {
+	color: black !important;
+}
+
+body {
+	color: black !important;
+}
+</style>
+<script language="Javascript">
+
+    //!Code that simulated reload library javascript maborak
+        var leimnud = {};
         leimnud.exec = "";
         leimnud.fix = {};
         leimnud.fix.memoryLeak  = "";
         leimnud.browser = {};
         leimnud.browser.isIphone  = "";
         leimnud.iphone = {};
-        leimnud.iphone.make = function(){};      
-        function ajax_function(ajax_server, funcion, parameters, method){          
+        leimnud.iphone.make = function(){};
+        function ajax_function(ajax_server, funcion, parameters, method){
         }
         //!
       </script>
 <?php
-    
-      //!dataIndex
-      $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
-      
-      G::LoadClass('case');
-      
-      $G_PUBLISH = new Publisher();
-      $oCase = new Cases();
-      $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
-      $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID'];
-      $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
-      
-?>      
-        <script language="javascript">
+
+    //!dataIndex
+    $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
+
+    G::LoadClass( 'case' );
+
+    $G_PUBLISH = new Publisher();
+    $oCase = new Cases();
+    $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
+    $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID'];
+    $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
+
+    ?>
+<script language="javascript">
 <?php
-      global $G_FORM;
-?>
+    global $G_FORM;
+    ?>
           function loadForm_<?php echo $G_FORM->id;?>(parametro1){
-          
+
           }
         </script>
 <?php
-      
-      G::RenderPage('publish', 'raw');
-    
-    }
\ No newline at end of file
+
+    G::RenderPage( 'publish', 'raw' );
+}
+
diff --git a/workflow/engine/methods/cases/casesMenuLoader.php b/workflow/engine/methods/cases/casesMenuLoader.php
index 45caaa112..6641b6cb9 100755
--- a/workflow/engine/methods/cases/casesMenuLoader.php
+++ b/workflow/engine/methods/cases/casesMenuLoader.php
@@ -1,162 +1,147 @@
-<?php
-
-  $action = isset($_GET['action']) ? $_GET['action']: 'default';
-  G::LoadClass('case');
-  G::LoadClass('configuration');
-
-  $userId = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '00000000000000000000000000000000';
-  switch($action) {
-    case 'getAllCounters': 
-      getAllCounters();  
-      break;
-    case 'getProcess'    : 
-      getProcess();      
-      break;  
+<?php
+
+$action = isset( $_GET['action'] ) ? $_GET['action'] : 'default';
+G::LoadClass( 'case' );
+G::LoadClass( 'configuration' );
+
+$userId = isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : '00000000000000000000000000000000';
+switch ($action) {
+    case 'getAllCounters':
+        getAllCounters();
+        break;
+    case 'getProcess':
+        getProcess();
+        break;
     default: //this is the starting call
-      getLoadTreeMenuData();
-      break;
-  }
-  
-  
-  function getLoadTreeMenuData () {
-    header ("content-type: text/xml");
-
-    global $G_TMP_MENU;
-    $oMenu = new Menu();
-    $oMenu->load('cases');
-
-    $oCases = new Cases();
-    $aTypes = Array(
-      'to_do',
-      'draft',
-      'cancelled',
-      'sent',
-      'paused',
-      'completed',
-      'selfservice',
-      //'to_revise',
-      //'to_reassign'
-    );
-    $aTypesID = Array(
-      'CASES_INBOX'=>'to_do',
-      'CASES_DRAFT'=>'draft',
-      'CASES_CANCELLED'=>'cancelled',
-      'CASES_SENT'=>'sent',
-      'CASES_PAUSED'=>'paused',
-      'CASES_COMPLETED'=>'completed',
-      'CASES_SELFSERVICE'=>'selfservice',
-      //'CASES_TO_REVISE'=>'to_revise',
-      //'CASES_TO_REASSIGN'=>'to_reassign'
-    );
-    
-    $list = array();
-    $list['count']  = ' ';
-     
-    $empty = array();
-    foreach ( $aTypes as $key => $val ) {
-      $empty[$val] = $list;
-    }
-
+        getLoadTreeMenuData();
+        break;
+}
+
+function getLoadTreeMenuData ()
+{
+    header( "content-type: text/xml" );
+
+    global $G_TMP_MENU;
+    $oMenu = new Menu();
+    $oMenu->load( 'cases' );
+
+    $oCases = new Cases();
+    $aTypes = Array ('to_do','draft','cancelled','sent','paused','completed','selfservice'
+    //'to_revise',
+    //'to_reassign'
+    ;
+    $aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice'
+    //'CASES_TO_REVISE'=>'to_revise',
+    //'CASES_TO_REASSIGN'=>'to_reassign'
+    ;
+
+    $list = array ();
+    $list['count'] = ' ';
+
+    $empty = array ();
+    foreach ($aTypes as $key => $val) {
+        $empty[$val] = $list;
+    }
+
     $aCount = $empty; //$oCases->getAllConditionCasesCount($aTypes, true);
-    $processNameMaxSize = 20;
-
+    $processNameMaxSize = 20;
+
     //now drawing the treeview using the menu options from menu/cases.php
-    $menuCases = array();
-    foreach( $oMenu->Options as $i => $option ) {
-      if( $oMenu->Types[$i] == 'blockHeader' ) {
-        $CurrentBlockID = $oMenu->Id[$i];
-        $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i];
-        if($oMenu->Options[$i]!=""){
-            $menuCases[$CurrentBlockID]['link']  = $oMenu->Options[$i];
-        }
-      }elseif( $oMenu->Types[$i] == 'blockNestedTree' ){
-        $CurrentBlockID = $oMenu->Id[$i];
-        $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i];
-        $menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i];
-        $menuCases[$CurrentBlockID]['loaderurl'] = $oMenu->Options[$i];
-      }elseif( $oMenu->Types[$i] == 'blockHeaderNoChild' ){
-        $CurrentBlockID = $oMenu->Id[$i];
-        $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i];
-        $menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i];
-        $menuCases[$CurrentBlockID]['link'] = $oMenu->Options[$i];       
-      }else {
-        $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = Array (
-          'label' => $oMenu->Labels[$i],
-          'link'  => $oMenu->Options[$i],
-          'icon'  => (isset($oMenu->Icons[$i]) && $oMenu->Icons[$i] != '') ? $oMenu->Icons[$i] : 'kcmdf.png'
-        );
-
-        if( isset($aTypesID[$oMenu->Id[$i]]) ) {
-          $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]]['cases_count'] = $aCount[$aTypesID[$oMenu->Id[$i]]]['count'];
-        }
-      }
-    }
+    $menuCases = array ();
+    foreach ($oMenu->Options as $i => $option) {
+        if ($oMenu->Types[$i] == 'blockHeader') {
+            $CurrentBlockID = $oMenu->Id[$i];
+            $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i];
+            if ($oMenu->Options[$i] != "") {
+                $menuCases[$CurrentBlockID]['link'] = $oMenu->Options[$i];
+            }
+        } elseif ($oMenu->Types[$i] == 'blockNestedTree') {
+            $CurrentBlockID = $oMenu->Id[$i];
+            $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i];
+            $menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i];
+            $menuCases[$CurrentBlockID]['loaderurl'] = $oMenu->Options[$i];
+        } elseif ($oMenu->Types[$i] == 'blockHeaderNoChild') {
+            $CurrentBlockID = $oMenu->Id[$i];
+            $menuCases[$CurrentBlockID]['blockTitle'] = $oMenu->Labels[$i];
+            $menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i];
+            $menuCases[$CurrentBlockID]['link'] = $oMenu->Options[$i];
+        } else {
+            $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = Array ('label' => $oMenu->Labels[$i],'link' => $oMenu->Options[$i],'icon' => (isset( $oMenu->Icons[$i] ) && $oMenu->Icons[$i] != '') ? $oMenu->Icons[$i] : 'kcmdf.png'
+            );
+
+            if (isset( $aTypesID[$oMenu->Id[$i]] )) {
+                $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]]['cases_count'] = $aCount[$aTypesID[$oMenu->Id[$i]]]['count'];
+            }
+        }
+    }
     //now build the menu in xml format
-    $xml = '<menu_cases>';
-    $i = 0;
-    foreach( $menuCases as $menu => $aMenuBlock ) {
-      if( isset($aMenuBlock['blockItems']) && sizeof($aMenuBlock['blockItems']) > 0 ) {
-        $urlProperty="";
-        if((isset($aMenuBlock['link']))&&($aMenuBlock['link']!="")){
-          $urlProperty="url='".$aMenuBlock['link']."'";
-        }
-        $xml .= '<menu_block blockTitle="'.$aMenuBlock['blockTitle'].'" id="'.$menu.'" '.$urlProperty.'>';
-        foreach( $aMenuBlock['blockItems'] as $id => $aMenu ) {
-          $i++;
-          if( isset($aMenu['cases_count']) && $aMenu['cases_count'] !== '') {
-            $nofifier = "cases_count=\"{$aMenu['cases_count']}\" ";
-          } 
-          else {
-            $nofifier = '';
-          }
-          $xml .= '<option title="'.$aMenu['label'].'" id="'.$id.'" '.$nofifier.' url="'.$aMenu['link'].'">';
-          $xml .= '</option>';
-        }
-        $xml .= '</menu_block>';
-      }elseif( isset($aMenuBlock['blockType']) && $aMenuBlock['blockType']=="blockNestedTree" ) {
-        $xml .= '<menu_block blockTitle="'.$aMenuBlock['blockTitle'].'" blockNestedTree = "'.$aMenuBlock['loaderurl'].'" id="'.$menu.'" folderId="0">';
-        $xml .= '</menu_block>';
-      }elseif( isset($aMenuBlock['blockType']) && $aMenuBlock['blockType']=="blockHeaderNoChild" ) {
-        $xml .= '<menu_block blockTitle="'.$aMenuBlock['blockTitle'].'" blockHeaderNoChild="blockHeaderNoChild" url = "'.$aMenuBlock['link'].'" id="'.$menu.'">';
-        //$xml .= '<option title="" id="" ></option>';
-        $xml .= '</menu_block>';
-      }
-    }
-    $xml .= '</menu_cases>';
-
-    print $xml; 
-  }
-  
-  // get the process summary of specific case list type,
-  function getProcess () {
-  	global $G_TMP_MENU;
-  	global $userId;
-    if ( !isset($_GET['item']) ) {
-      die;
-    }
-
-    $oMenu = new Menu();
-    $oMenu->load('cases');
-    $type = $_GET['item'];
-    $oCases = new AppCacheView();
-      
-    $aTypesID = array();
-    $aTypesID['CASES_INBOX']       = 'to_do';
-    $aTypesID['CASES_DRAFT']       = 'draft'; 
-    $aTypesID['CASES_CANCELLED']   = 'cancelled';
-    $aTypesID['CASES_SENT']        = 'sent';
-    $aTypesID['CASES_PAUSED']      = 'paused';
-    $aTypesID['CASES_COMPLETED']   = 'completed';
-    $aTypesID['CASES_SELFSERVICE'] = 'selfservice';
+    $xml = '<menu_cases>';
+    $i = 0;
+    foreach ($menuCases as $menu => $aMenuBlock) {
+        if (isset( $aMenuBlock['blockItems'] ) && sizeof( $aMenuBlock['blockItems'] ) > 0) {
+            $urlProperty = "";
+            if ((isset( $aMenuBlock['link'] )) && ($aMenuBlock['link'] != "")) {
+                $urlProperty = "url='" . $aMenuBlock['link'] . "'";
+            }
+            $xml .= '<menu_block blockTitle="' . $aMenuBlock['blockTitle'] . '" id="' . $menu . '" ' . $urlProperty . '>';
+            foreach ($aMenuBlock['blockItems'] as $id => $aMenu) {
+                $i ++;
+                if (isset( $aMenu['cases_count'] ) && $aMenu['cases_count'] !== '') {
+                    $nofifier = "cases_count=\"{$aMenu['cases_count']}\" ";
+                } else {
+                    $nofifier = '';
+                }
+                $xml .= '<option title="' . $aMenu['label'] . '" id="' . $id . '" ' . $nofifier . ' url="' . $aMenu['link'] . '">';
+                $xml .= '</option>';
+            }
+            $xml .= '</menu_block>';
+        } elseif (isset( $aMenuBlock['blockType'] ) && $aMenuBlock['blockType'] == "blockNestedTree") {
+            $xml .= '<menu_block blockTitle="' . $aMenuBlock['blockTitle'] . '" blockNestedTree = "' . $aMenuBlock['loaderurl'] . '" id="' . $menu . '" folderId="0">';
+            $xml .= '</menu_block>';
+        } elseif (isset( $aMenuBlock['blockType'] ) && $aMenuBlock['blockType'] == "blockHeaderNoChild") {
+            $xml .= '<menu_block blockTitle="' . $aMenuBlock['blockTitle'] . '" blockHeaderNoChild="blockHeaderNoChild" url = "' . $aMenuBlock['link'] . '" id="' . $menu . '">';
+            //$xml .= '<option title="" id="" ></option>';
+            $xml .= '</menu_block>';
+        }
+    }
+    $xml .= '</menu_cases>';
+
+    print $xml;
+}
+
+// get the process summary of specific case list type,
+function getProcess ()
+{
+    global $G_TMP_MENU;
+    global $userId;
+    if (! isset( $_GET['item'] )) {
+        die();
+    }
+
+    $oMenu = new Menu();
+    $oMenu->load( 'cases' );
+    $type = $_GET['item'];
+    $oCases = new AppCacheView();
+
+    $aTypesID = array ();
+    $aTypesID['CASES_INBOX'] = 'to_do';
+    $aTypesID['CASES_DRAFT'] = 'draft';
+    $aTypesID['CASES_CANCELLED'] = 'cancelled';
+    $aTypesID['CASES_SENT'] = 'sent';
+    $aTypesID['CASES_PAUSED'] = 'paused';
+    $aTypesID['CASES_COMPLETED'] = 'completed';
+    $aTypesID['CASES_SELFSERVICE'] = 'selfservice';
     //$aTypesID['CASES_TO_REVISE']   = 'to_revise';
     //$aTypesID['CASES_TO_REASSIGN'] = 'to_reassign';
-    $aTypesID = Array('CASES_INBOX'=>'to_do', 'CASES_DRAFT'=>'draft', 'CASES_CANCELLED'=>'cancelled', 'CASES_SENT'=>'sent', 'CASES_PAUSED'=>'paused', 'CASES_COMPLETED'=>'completed','CASES_SELFSERVICE'=>'selfservice','CASES_TO_REVISE'=>'to_revise','CASES_TO_REASSIGN'=>'to_reassign');
-
-    $aCount = $oCases->getAllCounters(Array($aTypesID[$type]), $userId, true);
-
-    $response = Array();
-//disabling the summary...
-/*    
+    $aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice','CASES_TO_REVISE' => 'to_revise','CASES_TO_REASSIGN' => 'to_reassign'
+    );
+
+    $aCount = $oCases->getAllCounters( Array ($aTypesID[$type]
+    ), $userId, true );
+
+    $response = Array ();
+    //disabling the summary...
+    /*
     $i=0;
     foreach($aCount[$aTypesID[$type]]['sumary'] as $PRO_UID=>$process){
       //{"text":"state","id":"src\/state","cls":"folder", loaded:true},
@@ -167,7 +152,7 @@
       $response[$i]->loaded = true;
       $i++;
     }
-*/
+*/
     //ordering
     /*for($i=0; $i<=count($response)-1; $i++){
       for($j=$i+1; $j<=count($response); $j++){
@@ -179,48 +164,50 @@
           $response[$j] = $x;
         }
       }
-    }*/
-    echo G::json_encode($response);
-  }
-  
-  function getAllCounters() {
-    $userUid = ( isset($_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '' ) ? $_SESSION['USER_LOGGED'] : null;
-    $oAppCache = new AppCacheView();
-    $aTypes = Array();
-    $aTypes['to_do']       = 'CASES_INBOX';
-    $aTypes['draft']       = 'CASES_DRAFT';
-    $aTypes['cancelled']   = 'CASES_CANCELLED';
-    $aTypes['sent']        = 'CASES_SENT';
-    $aTypes['paused']      = 'CASES_PAUSED';
-    $aTypes['completed']   = 'CASES_COMPLETED';
-    $aTypes['selfservice'] = 'CASES_SELFSERVICE';
+    }*/
+    echo G::json_encode( $response );
+}
+
+function getAllCounters ()
+{
+    $userUid = (isset( $_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '') ? $_SESSION['USER_LOGGED'] : null;
+    $oAppCache = new AppCacheView();
+    $aTypes = Array ();
+    $aTypes['to_do'] = 'CASES_INBOX';
+    $aTypes['draft'] = 'CASES_DRAFT';
+    $aTypes['cancelled'] = 'CASES_CANCELLED';
+    $aTypes['sent'] = 'CASES_SENT';
+    $aTypes['paused'] = 'CASES_PAUSED';
+    $aTypes['completed'] = 'CASES_COMPLETED';
+    $aTypes['selfservice'] = 'CASES_SELFSERVICE';
     //$aTypes['to_revise']   = 'CASES_TO_REVISE';
     //$aTypes['to_reassign'] = 'CASES_TO_REASSIGN';
-    
-    if ((($solrConf = System::solrEnv()) !== false)) {
-      G::LoadClass ( 'AppSolr' );
-      $ApplicationSolrIndex = new AppSolr ($solrConf['solr_enabled'], $solrConf['solr_host'], $solrConf['solr_instance']);
-      
-      $aCount = $ApplicationSolrIndex->getCasesCount ( $userUid );
-      
-      //get paused count
-      $aCountMissing = $oAppCache->getAllCounters( array('paused', 'completed', 'cancelled'), $userUid );
-      
-      $aCount = array_merge($aCount, $aCountMissing);
-    }
-    else {
-      
-      $aCount = $oAppCache->getAllCounters( array_keys($aTypes), $userUid );
-      
-    }
-
-    $response = Array();
-    $i = 0;
-    foreach ($aCount as $type=>$count) {
-      $response[$i]->item = $aTypes[$type];
-      $response[$i]->count = $count;
-      $i++;
-    }
-    echo G::json_encode($response);
-  }    
-  
\ No newline at end of file
+
+
+    if ((($solrConf = System::solrEnv()) !== false)) {
+        G::LoadClass( 'AppSolr' );
+        $ApplicationSolrIndex = new AppSolr( $solrConf['solr_enabled'], $solrConf['solr_host'], $solrConf['solr_instance'] );
+
+        $aCount = $ApplicationSolrIndex->getCasesCount( $userUid );
+
+        //get paused count
+        $aCountMissing = $oAppCache->getAllCounters( array ('paused','completed','cancelled'
+        ), $userUid );
+
+        $aCount = array_merge( $aCount, $aCountMissing );
+    } else {
+
+        $aCount = $oAppCache->getAllCounters( array_keys( $aTypes ), $userUid );
+
+    }
+
+    $response = Array ();
+    $i = 0;
+    foreach ($aCount as $type => $count) {
+        $response[$i]->item = $aTypes[$type];
+        $response[$i]->count = $count;
+        $i ++;
+    }
+    echo G::json_encode( $response );
+}
+
diff --git a/workflow/engine/methods/cases/casesSaveDataView.php b/workflow/engine/methods/cases/casesSaveDataView.php
index 94de05242..2d40d3c83 100755
--- a/workflow/engine/methods/cases/casesSaveDataView.php
+++ b/workflow/engine/methods/cases/casesSaveDataView.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /**
  * cases_SaveData.php
  *
@@ -12,73 +12,72 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 //validate the data post
 //$oForm = new Form ( $_SESSION ['PROCESS'] . '/' . $_GET ['UID'], PATH_DYNAFORM );
 //$oForm->validatePost ();
 
+
 /* @author Alvaro Campos Sanchez */
 /* Includes */
-G::LoadClass ( 'case' );
+G::LoadClass( 'case' );
 
 //load the variables
-$oCase = new Cases ( );
-$oCase->thisIsTheCurrentUser ( $_SESSION ['APPLICATION'], $_SESSION ['INDEX'], $_SESSION ['USER_LOGGED'], 'REDIRECT', 'cases_List' );
-$Fields = $oCase->loadCase ( $_SESSION ['APPLICATION'] );
-$Fields ['APP_DATA'] = array_merge ( $Fields ['APP_DATA'], G::getSystemConstants () );
-$Fields ['APP_DATA'] = array_merge ( $Fields ['APP_DATA'], ( array ) $_POST ['form'] );
+$oCase = new Cases();
+$oCase->thisIsTheCurrentUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'REDIRECT', 'cases_List' );
+$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+$Fields['APP_DATA'] = array_merge( $Fields['APP_DATA'], G::getSystemConstants() );
+$Fields['APP_DATA'] = array_merge( $Fields['APP_DATA'], (array) $_POST['form'] );
 
 #here we must verify if is a debug session
-$trigger_debug_session = $_SESSION ['TRIGGER_DEBUG'] ['ISSET']; #here we must verify if is a debugg session
+$trigger_debug_session = $_SESSION['TRIGGER_DEBUG']['ISSET']; #here we must verify if is a debugg session
 
 
 #trigger debug routines...
 
 
 //cleaning debug variables
-$_SESSION ['TRIGGER_DEBUG'] ['ERRORS'] = Array ();
-$_SESSION ['TRIGGER_DEBUG'] ['DATA'] = Array ();
-$_SESSION ['TRIGGER_DEBUG'] ['TRIGGERS_NAMES'] = Array ();
-$_SESSION ['TRIGGER_DEBUG'] ['TRIGGERS_VALUES'] = Array (); 
-$triggers = $oCase->loadTriggers ( $_SESSION ['TASK'], 'DYNAFORM', $_GET ['UID'], 'AFTER' );
-$_SESSION ['TRIGGER_DEBUG'] ['NUM_TRIGGERS'] = count ( $triggers );
-$_SESSION ['TRIGGER_DEBUG'] ['TIME'] = 'AFTER';
-  
-if ($_SESSION ['TRIGGER_DEBUG'] ['NUM_TRIGGERS'] != 0) {
-	$_SESSION ['TRIGGER_DEBUG'] ['TRIGGERS_NAMES'] = $oCase->getTriggerNames ( $triggers );
-	$_SESSION ['TRIGGER_DEBUG'] ['TRIGGERS_VALUES'] = $triggers;
-}
- 
-if ($_SESSION ['TRIGGER_DEBUG'] ['NUM_TRIGGERS'] != 0) {
-	//Execute after triggers - Start
-	$Fields ['APP_DATA'] = $oCase->ExecuteTriggers ( $_SESSION ['TASK'], 'DYNAFORM', $_GET ['UID'], 'AFTER', $Fields ['APP_DATA'] );
-	//Execute after triggers - End
+$_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array ();
+$_SESSION['TRIGGER_DEBUG']['DATA'] = Array ();
+$_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = Array ();
+$_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = Array ();
+$triggers = $oCase->loadTriggers( $_SESSION['TASK'], 'DYNAFORM', $_GET['UID'], 'AFTER' );
+$_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count( $triggers );
+$_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
+
+if ($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
+    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
+    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = $triggers;
 }
 
+if ($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
+    //Execute after triggers - Start
+    $Fields['APP_DATA'] = $oCase->ExecuteTriggers( $_SESSION['TASK'], 'DYNAFORM', $_GET['UID'], 'AFTER', $Fields['APP_DATA'] );
+    //Execute after triggers - End
+}
 
 //go to the next step
-$aNextStep = $oCase->getNextStep ( $_SESSION ['PROCESS'], $_SESSION ['APPLICATION'], $_SESSION ['INDEX'], $_SESSION ['STEP_POSITION'] );
-if (isset ( $_GET ['_REFRESH_'] )) {
-	G::header ( 'location: ' . $_SERVER ['HTTP_REFERER'] );
-	die ();
+$aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
+if (isset( $_GET['_REFRESH_'] )) {
+    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+    die();
 }
-$_SESSION ['STEP_POSITION'] = $aNextStep ['POSITION'];
+$_SESSION['STEP_POSITION'] = $aNextStep['POSITION'];
 
-$_SESSION['BREAKSTEP']['NEXT_STEP'] = $aNextStep ['PAGE'];
+$_SESSION['BREAKSTEP']['NEXT_STEP'] = $aNextStep['PAGE'];
 
 if ($trigger_debug_session) {
-	$_SESSION ['TRIGGER_DEBUG'] ['BREAKPAGE'] = $aNextStep ['PAGE'];
-	$aNextStep ['PAGE'] = $aNextStep ['PAGE'] . '&breakpoint=triggerdebug';
+    $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
+    $aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug';
 }
 
-G::header ( 'location: ' . $aNextStep ['PAGE'] );
+G::header( 'location: ' . $aNextStep['PAGE'] );
 
diff --git a/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php b/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php
index 9b632c9d9..8b879cd01 100755
--- a/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php
+++ b/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php
@@ -1,44 +1,42 @@
-<?php
-/**
- * casesSchedulerLog_Ajax.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
+<?php
+/**
+ * casesSchedulerLog_Ajax.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
 //if (($RBAC_Response=$RBAC->userCanAccess("PM_USERS"))!=1) return $RBAC_Response;
-G::LoadInclude('ajax');
-$_POST['action'] = get_ajax_value('action');
-
-switch ($_POST['action'])
-{
-  case 'updatePageSize':
-    G::LoadClass('configuration');
-    $c = new Configurations();
-    $arr['pageSize'] = $_REQUEST['size'];
-    $arr['dateSave'] = date('Y-m-d H:i:s');
-    $config = Array();
-    $config[] = $arr;
-    $c->aConfig = $config;
-    $c->saveConfig('casesSchedulerLogList', 'pageSize','',$_SESSION['USER_LOGGED']);
-    echo '{success: true}';
-    break;
-break;
-}
-?>
+G::LoadInclude( 'ajax' );
+$_POST['action'] = get_ajax_value( 'action' );
+
+switch ($_POST['action']) {
+    case 'updatePageSize':
+        G::LoadClass( 'configuration' );
+        $c = new Configurations();
+        $arr['pageSize'] = $_REQUEST['size'];
+        $arr['dateSave'] = date( 'Y-m-d H:i:s' );
+        $config = Array ();
+        $config[] = $arr;
+        $c->aConfig = $config;
+        $c->saveConfig( 'casesSchedulerLogList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+        echo '{success: true}';
+        break;
+        break;
+}
+
diff --git a/workflow/engine/methods/cases/casesStartPage.php b/workflow/engine/methods/cases/casesStartPage.php
index 760d016ef..7b8529e05 100755
--- a/workflow/engine/methods/cases/casesStartPage.php
+++ b/workflow/engine/methods/cases/casesStartPage.php
@@ -1,47 +1,48 @@
-<?php
-unset($_SESSION['__currentTabDashboard']);
-if(isset($_GET['action'])){
-    $_SESSION['__currentTabDashboard']=$_GET['action'];
-}
-$page="";
-if(isset($_GET['action'])){
-    $page=$_GET['action'];
-}
-
-$oHeadPublisher =& headPublisher::getSingleton();
-global $RBAC;
-switch($page){
-    case "startCase":
-        $oHeadPublisher->addExtJsScript('cases/casesStartCase', true);    //adding a javascript file .js
-
-        $oHeadPublisher->addContent( 'cases/casesStartCase'); //adding a html file  .html.
-        G::LoadClass('configuration');
-        $c = new Configurations();
-        $oHeadPublisher->assign('FORMATS',$c->getFormats());
-        break;
-    case "documents":
-        
-        G::LoadClass('configuration');
-        $c = new Configurations();
-        $configPage = $c->getConfiguration('documentsModule', 'pageSize','',$_SESSION['USER_LOGGED']);
-        $configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
-        $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
-        $oHeadPublisher->assign('CONFIG', $Config);
-        $oHeadPublisher->assign('FORMATS',$c->getFormats());
-
-        $oHeadPublisher->assign('permitodelete'   ,$RBAC->userCanAccess('PM_FOLDER_DELETE')    );
-        $oHeadPublisher->assign('permitoaddfile'  ,$RBAC->userCanAccess('PM_FOLDERS_ADD_FILE')  );
-        $oHeadPublisher->assign('permitoaddfolder',$RBAC->userCanAccess('PM_FOLDERS_ADD_FOLDER'));
-
-        $oHeadPublisher->addExtJsScript('cases/casesDocuments', false);    //adding a javascript file .js
-        $oHeadPublisher->addContent( 'cases/casesDocuments'); //adding a html file  .html.
-        break;
-    default:
-        $oHeadPublisher->addExtJsScript('cases/casesStartPage', false);    //adding a javascript file .js
-        $oHeadPublisher->addContent( 'cases/casesStartPage'); //adding a html file  .html.
-        break;
-
-}
-
-
-G::RenderPage('publish', 'extJs');
+<?php
+unset( $_SESSION['__currentTabDashboard'] );
+if (isset( $_GET['action'] )) {
+    $_SESSION['__currentTabDashboard'] = $_GET['action'];
+}
+$page = "";
+if (isset( $_GET['action'] )) {
+    $page = $_GET['action'];
+}
+
+$oHeadPublisher = & headPublisher::getSingleton();
+global $RBAC;
+switch ($page) {
+    case "startCase":
+        $oHeadPublisher->addExtJsScript( 'cases/casesStartCase', true ); //adding a javascript file .js
+
+
+        $oHeadPublisher->addContent( 'cases/casesStartCase' ); //adding a html file  .html.
+        G::LoadClass( 'configuration' );
+        $c = new Configurations();
+        $oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+        break;
+    case "documents":
+
+        G::LoadClass( 'configuration' );
+        $c = new Configurations();
+        $configPage = $c->getConfiguration( 'documentsModule', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+        $configEnv = $c->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+        $oHeadPublisher->assign( 'CONFIG', $Config );
+        $oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+
+        $oHeadPublisher->assign( 'permitodelete', $RBAC->userCanAccess( 'PM_FOLDER_DELETE' ) );
+        $oHeadPublisher->assign( 'permitoaddfile', $RBAC->userCanAccess( 'PM_FOLDERS_ADD_FILE' ) );
+        $oHeadPublisher->assign( 'permitoaddfolder', $RBAC->userCanAccess( 'PM_FOLDERS_ADD_FOLDER' ) );
+
+        $oHeadPublisher->addExtJsScript( 'cases/casesDocuments', false ); //adding a javascript file .js
+        $oHeadPublisher->addContent( 'cases/casesDocuments' ); //adding a html file  .html.
+        break;
+    default:
+        $oHeadPublisher->addExtJsScript( 'cases/casesStartPage', false ); //adding a javascript file .js
+        $oHeadPublisher->addContent( 'cases/casesStartPage' ); //adding a html file  .html.
+        break;
+
+}
+
+G::RenderPage( 'publish', 'extJs' );
+
diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php
index 531c9fff3..37eefa9fb 100755
--- a/workflow/engine/methods/cases/casesStartPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php
@@ -1,349 +1,366 @@
-<?php
-
-if (! isset ( $_REQUEST ['action'] )) {
-  $res ['success'] = 'failure';
-  $res ['message'] = 'You may request an action';
-  print G::json_encode ( $res);
-  die ();
-}
-if (! function_exists ( $_REQUEST ['action'] )) {
-  $res ['success'] = 'failure';
-  $res ['message'] = 'The requested action does not exist';
-  print G::json_encode ( $res );
-  die ();
-}
-
-$functionName = $_REQUEST ['action'];
-$functionParams = isset ( $_REQUEST ['params'] ) ? $_REQUEST ['params'] : array ();
-
-$functionName ( $functionParams );
-
-function getProcessList() {
-  G::LoadClass ( 'case' );
-  G::LoadClass ( 'process' );
-  G::LoadClass ( 'calendar' );
-  $calendar    = new Calendar ( );
-  $oProcess = new Process ( );
-  $oCase = new Cases ( );
-
-  //Get ProcessStatistics Info
-  $start = 0;
-  $limit = '';
-  $proData = $oProcess->getAllProcesses($start, $limit, null, null, false, true);
-
-  $bCanStart = $oCase->canStartCase ( $_SESSION ['USER_LOGGED'] );
-  if ($bCanStart) {
-    $processListInitial = $oCase->getStartCasesPerType ( $_SESSION ['USER_LOGGED'], 'category' );
-    $processList = array ();
-    foreach ( $processListInitial as $key => $procInfo ) {
-      if (isset ( $procInfo ['pro_uid'] )) {
-        if (trim ( $procInfo ['cat'] ) == "")
-          $procInfo ['cat'] = "_OTHER_";
-        $processList [$procInfo ['catname']] [$procInfo ['value']] = $procInfo;
-      }
-    }
-    ksort ( $processList );
-    foreach ( $processList as $key => $processInfo ) {
-      ksort ( $processList [$key] );
-    }
-
-    if (! isset ( $_REQUEST ['node'] )) {
-      $node = 'root';
-    } else {
-      $node = $_REQUEST ['node'];
-    }
-
-
-    foreach($proData as $key => $proInfo){
-      $proData[$proInfo['PRO_UID']]=$proInfo;
-    }
-
-    $processListTree = array ();
-    if (1) {
-      foreach ( $processList as $key => $processInfo ) {
-        $tempTree ['text'] = $key;
-        $tempTree ['id'] = $key;
-        $tempTree ['cls'] = 'folder';
-        $tempTree ['draggable'] = true;
-        $tempTree ['optionType'] = "category";
-        //$tempTree['allowDrop']=false;
-        $tempTree ['singleClickExpand'] = true;
-        if ($key != "No Category") {
-          $tempTree ['expanded'] = true;
-        } else {
-          //$tempTree ['expanded'] = false;
-          $tempTree ['expanded'] = true;
-        }
-        $tempTreeChildren=array();
-      foreach ( $processList [$key] as $keyChild => $processInfoChild ) {
-        //print_r($processInfo);
-        $tempTreeChild ['text'] = $keyChild; //ellipsis ( $keyChild, 50 );
-        //$tempTree['text']=$key;
-        $tempTreeChild ['id'] = $keyChild;
-        $tempTreeChild ['draggable'] = true;
-        $tempTreeChild ['leaf'] = true;
-        $tempTreeChild ['icon'] = '/images/icon.trigger.png';
-        $tempTreeChild ['allowChildren'] = false;
-        $tempTreeChild ['optionType'] = "startProcess";
-        $tempTreeChild ['pro_uid'] = $processInfoChild ['pro_uid'];
-        $tempTreeChild ['tas_uid'] = $processInfoChild ['uid'];
-        $processInfoChild ['myInbox']=0;
-        $processInfoChild ['totalInbox']=0;
-        if(isset($proData[ $processInfoChild ['pro_uid'] ])){
-        $tempTreeChild ['otherAttributes'] = array_merge($processInfoChild,$proData[ $processInfoChild ['pro_uid'] ],$calendar->getCalendarFor ( $processInfoChild ['uid'], $processInfoChild ['uid'], $processInfoChild ['uid'] ));
-        $tempTreeChild ['otherAttributes']['PRO_TAS_TITLE']=str_replace(")","",str_replace("(","",trim(str_replace($tempTreeChild ['otherAttributes']['PRO_TITLE'],"",$tempTreeChild ['otherAttributes']["value"]))));
-        $tempTreeChild ['qtip']=$tempTreeChild ['otherAttributes']['PRO_DESCRIPTION'];
-
-        //$tempTree['cls']='file';
-
-        $tempTreeChildren [] = $tempTreeChild;
-        }
-      }
-
-        $tempTree['children']=$tempTreeChildren;
-
-        $processListTree [] = $tempTree;
-      }
-    } else {
-      foreach ( $processList [$node] as $key => $processInfo ) {
-        //print_r($processInfo);
-        $tempTree ['text'] = $key; //ellipsis ( $key, 50 );
-        //$tempTree['text']=$key;
-        $tempTree ['id'] = $key;
-        $tempTree ['draggable'] = true;
-        $tempTree ['leaf'] = true;
-        $tempTree ['icon'] = '/images/icon.trigger.png';
-        $tempTree ['allowChildren'] = false;
-        $tempTree ['optionType'] = "startProcess";
-        $tempTree ['pro_uid'] = $processInfo ['pro_uid'];
-        $tempTree ['tas_uid'] = $processInfo ['uid'];
-        $processInfo ['myInbox']=0;
-        $processInfo ['totalInbox']=0;
-        $tempTree ['otherAttributes'] = array_merge($processInfo,$proData[ $processInfo ['pro_uid'] ],$calendar->getCalendarFor ( $processInfo ['uid'], $processInfo ['uid'], $processInfo ['uid'] ));
-        $tempTree ['otherAttributes']['PRO_TAS_TITLE']=str_replace(")","",str_replace("(","",trim(str_replace($tempTree ['otherAttributes']['PRO_TITLE'],"",$tempTree ['otherAttributes']["value"]))));
-        $tempTree ['qtip']=$tempTree ['otherAttributes']['PRO_DESCRIPTION'];
-        //$tempTree['cls']='file';
-        $processListTree [] = $tempTree;
-      }
-
-    }
-    $processList = $processListTree;
-  } else {
-    $processList ['success'] = 'failure';
-    $processList ['message'] = 'User can\'t start process';
-  }
-  print G::json_encode ( $processList );
-  die ();
-}
-
-function ellipsis($text, $numb) {
-  $text = html_entity_decode ( $text, ENT_QUOTES );
-  if (strlen ( $text ) > $numb) {
-    $text = substr ( $text, 0, $numb );
-    $text = substr ( $text, 0, strrpos ( $text, " " ) );
-    //This strips the full stop:
-    if ((substr ( $text, - 1 )) == ".") {
-      $text = substr ( $text, 0, (strrpos ( $text, "." )) );
-    }
-    $etc = "...";
-    $text = $text . $etc;
-  }
-
-  return $text;
-}
-
-  function lookinginforContentProcess($sproUid){
-    require_once 'classes/model/Content.php';
-    require_once 'classes/model/Task.php';
-    require_once 'classes/model/Content.php';
-
-    $oContent = new Content();
+<?php
+if (! isset( $_REQUEST['action'] )) {
+    $res['success'] = 'failure';
+    $res['message'] = 'You may request an action';
+    print G::json_encode( $res );
+    die();
+}
+if (! function_exists( $_REQUEST['action'] )) {
+    $res['success'] = 'failure';
+    $res['message'] = 'The requested action does not exist';
+    print G::json_encode( $res );
+    die();
+}
+
+$functionName = $_REQUEST['action'];
+$functionParams = isset( $_REQUEST['params'] ) ? $_REQUEST['params'] : array ();
+
+$functionName( $functionParams );
+
+function getProcessList ()
+{
+    G::LoadClass( 'case' );
+    G::LoadClass( 'process' );
+    G::LoadClass( 'calendar' );
+    $calendar = new Calendar();
+    $oProcess = new Process();
+    $oCase = new Cases();
+
+    //Get ProcessStatistics Info
+    $start = 0;
+    $limit = '';
+    $proData = $oProcess->getAllProcesses( $start, $limit, null, null, false, true );
+
+    $bCanStart = $oCase->canStartCase( $_SESSION['USER_LOGGED'] );
+    if ($bCanStart) {
+        $processListInitial = $oCase->getStartCasesPerType( $_SESSION['USER_LOGGED'], 'category' );
+        $processList = array ();
+        foreach ($processListInitial as $key => $procInfo) {
+            if (isset( $procInfo['pro_uid'] )) {
+                if (trim( $procInfo['cat'] ) == "")
+                    $procInfo['cat'] = "_OTHER_";
+                $processList[$procInfo['catname']][$procInfo['value']] = $procInfo;
+            }
+        }
+        ksort( $processList );
+        foreach ($processList as $key => $processInfo) {
+            ksort( $processList[$key] );
+        }
+
+        if (! isset( $_REQUEST['node'] )) {
+            $node = 'root';
+        } else {
+            $node = $_REQUEST['node'];
+        }
+
+        foreach ($proData as $key => $proInfo) {
+            $proData[$proInfo['PRO_UID']] = $proInfo;
+        }
+
+        $processListTree = array ();
+        if (1) {
+            foreach ($processList as $key => $processInfo) {
+                $tempTree['text'] = $key;
+                $tempTree['id'] = $key;
+                $tempTree['cls'] = 'folder';
+                $tempTree['draggable'] = true;
+                $tempTree['optionType'] = "category";
+                //$tempTree['allowDrop']=false;
+                $tempTree['singleClickExpand'] = true;
+                if ($key != "No Category") {
+                    $tempTree['expanded'] = true;
+                } else {
+                    //$tempTree ['expanded'] = false;
+                    $tempTree['expanded'] = true;
+                }
+                $tempTreeChildren = array ();
+                foreach ($processList[$key] as $keyChild => $processInfoChild) {
+                    //print_r($processInfo);
+                    $tempTreeChild['text'] = $keyChild; //ellipsis ( $keyChild, 50 );
+                    //$tempTree['text']=$key;
+                    $tempTreeChild['id'] = $keyChild;
+                    $tempTreeChild['draggable'] = true;
+                    $tempTreeChild['leaf'] = true;
+                    $tempTreeChild['icon'] = '/images/icon.trigger.png';
+                    $tempTreeChild['allowChildren'] = false;
+                    $tempTreeChild['optionType'] = "startProcess";
+                    $tempTreeChild['pro_uid'] = $processInfoChild['pro_uid'];
+                    $tempTreeChild['tas_uid'] = $processInfoChild['uid'];
+                    $processInfoChild['myInbox'] = 0;
+                    $processInfoChild['totalInbox'] = 0;
+                    if (isset( $proData[$processInfoChild['pro_uid']] )) {
+                        $tempTreeChild['otherAttributes'] = array_merge( $processInfoChild, $proData[$processInfoChild['pro_uid']], $calendar->getCalendarFor( $processInfoChild['uid'], $processInfoChild['uid'], $processInfoChild['uid'] ) );
+                        $tempTreeChild['otherAttributes']['PRO_TAS_TITLE'] = str_replace( ")", "", str_replace( "(", "", trim( str_replace( $tempTreeChild['otherAttributes']['PRO_TITLE'], "", $tempTreeChild['otherAttributes']["value"] ) ) ) );
+                        $tempTreeChild['qtip'] = $tempTreeChild['otherAttributes']['PRO_DESCRIPTION'];
+
+                        //$tempTree['cls']='file';
+
+
+                        $tempTreeChildren[] = $tempTreeChild;
+                    }
+                }
+
+                $tempTree['children'] = $tempTreeChildren;
+
+                $processListTree[] = $tempTree;
+            }
+        } else {
+            foreach ($processList[$node] as $key => $processInfo) {
+                //print_r($processInfo);
+                $tempTree['text'] = $key; //ellipsis ( $key, 50 );
+                //$tempTree['text']=$key;
+                $tempTree['id'] = $key;
+                $tempTree['draggable'] = true;
+                $tempTree['leaf'] = true;
+                $tempTree['icon'] = '/images/icon.trigger.png';
+                $tempTree['allowChildren'] = false;
+                $tempTree['optionType'] = "startProcess";
+                $tempTree['pro_uid'] = $processInfo['pro_uid'];
+                $tempTree['tas_uid'] = $processInfo['uid'];
+                $processInfo['myInbox'] = 0;
+                $processInfo['totalInbox'] = 0;
+                $tempTree['otherAttributes'] = array_merge( $processInfo, $proData[$processInfo['pro_uid']], $calendar->getCalendarFor( $processInfo['uid'], $processInfo['uid'], $processInfo['uid'] ) );
+                $tempTree['otherAttributes']['PRO_TAS_TITLE'] = str_replace( ")", "", str_replace( "(", "", trim( str_replace( $tempTree['otherAttributes']['PRO_TITLE'], "", $tempTree['otherAttributes']["value"] ) ) ) );
+                $tempTree['qtip'] = $tempTree['otherAttributes']['PRO_DESCRIPTION'];
+                //$tempTree['cls']='file';
+                $processListTree[] = $tempTree;
+            }
+
+        }
+        $processList = $processListTree;
+    } else {
+        $processList['success'] = 'failure';
+        $processList['message'] = 'User can\'t start process';
+    }
+    print G::json_encode( $processList );
+    die();
+}
+
+function ellipsis ($text, $numb)
+{
+    $text = html_entity_decode( $text, ENT_QUOTES );
+    if (strlen( $text ) > $numb) {
+        $text = substr( $text, 0, $numb );
+        $text = substr( $text, 0, strrpos( $text, " " ) );
+        //This strips the full stop:
+        if ((substr( $text, - 1 )) == ".") {
+            $text = substr( $text, 0, (strrpos( $text, "." )) );
+        }
+        $etc = "...";
+        $text = $text . $etc;
+    }
+
+    return $text;
+}
+
+function lookinginforContentProcess ($sproUid)
+{
+    require_once 'classes/model/Content.php';
+    require_once 'classes/model/Task.php';
+    require_once 'classes/model/Content.php';
+
+    $oContent = new Content();
     ///we are looking for a pro title for this process $sproUid
-    $oCriteria = new Criteria('workflow');
-    $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE');
-    $oCriteria->add( ContentPeer::CON_LANG, 'en');
-    $oCriteria->add( ContentPeer::CON_ID, $sproUid);
-    $oDataset = ContentPeer::doSelectRS($oCriteria);
-    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset->next();
-    $aRow = $oDataset->getRow();
-    if(!is_array($aRow)){
-
-    $oC = new Criteria('workflow');
-    $oC->addSelectColumn(TaskPeer::TAS_UID);
-    $oC->add( TaskPeer::PRO_UID, $sproUid);
-    $oDataset1 = TaskPeer::doSelectRS($oC);
-    $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
-      while($oDataset1->next()){
-        $aRow1 = $oDataset1->getRow();
-
-        $oCriteria1 = new Criteria('workflow');
-        $oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE');
-        $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG);
-        $oCriteria1->add( ContentPeer::CON_ID, $aRow1['TAS_UID']);
-        $oDataset2 = ContentPeer::doSelectRS($oCriteria1);
-        $oDataset2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $oDataset2->next();
-        $aRow2 = $oDataset2->getRow();
-
-        Content::insertContent( 'TAS_TITLE', '', $aRow2['CON_ID'], 'en', $aRow2['CON_VALUE']  );
-      }
-    $oC2 = new Criteria('workflow');
-    $oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE');
-    $oC2->add( ContentPeer::CON_LANG, SYS_LANG);
-    $oC2->add( ContentPeer::CON_ID, $sproUid);
-    $oDataset3 = ContentPeer::doSelectRS($oC2);
-    $oDataset3->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $oDataset3->next();
-    $aRow3 = $oDataset3->getRow();
-
-    Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE']  );
-
-    }
-    return 1;
-
-  }
-
-
-function startCase() {
-  G::LoadClass ( 'case' );
-
-  /* GET , POST & $_SESSION Vars */
+    $oCriteria = new Criteria( 'workflow' );
+    $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
+    $oCriteria->add( ContentPeer::CON_LANG, 'en' );
+    $oCriteria->add( ContentPeer::CON_ID, $sproUid );
+    $oDataset = ContentPeer::doSelectRS( $oCriteria );
+    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $oDataset->next();
+    $aRow = $oDataset->getRow();
+    if (! is_array( $aRow )) {
+
+        $oC = new Criteria( 'workflow' );
+        $oC->addSelectColumn( TaskPeer::TAS_UID );
+        $oC->add( TaskPeer::PRO_UID, $sproUid );
+        $oDataset1 = TaskPeer::doSelectRS( $oC );
+        $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+
+        while ($oDataset1->next()) {
+            $aRow1 = $oDataset1->getRow();
+
+            $oCriteria1 = new Criteria( 'workflow' );
+            $oCriteria1->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE' );
+            $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
+            $oCriteria1->add( ContentPeer::CON_ID, $aRow1['TAS_UID'] );
+            $oDataset2 = ContentPeer::doSelectRS( $oCriteria1 );
+            $oDataset2->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oDataset2->next();
+            $aRow2 = $oDataset2->getRow();
+
+            Content::insertContent( 'TAS_TITLE', '', $aRow2['CON_ID'], 'en', $aRow2['CON_VALUE'] );
+        }
+        $oC2 = new Criteria( 'workflow' );
+        $oC2->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
+        $oC2->add( ContentPeer::CON_LANG, SYS_LANG );
+        $oC2->add( ContentPeer::CON_ID, $sproUid );
+        $oDataset3 = ContentPeer::doSelectRS( $oC2 );
+        $oDataset3->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset3->next();
+        $aRow3 = $oDataset3->getRow();
+
+        Content::insertContent( 'PRO_TITLE', '', $aRow3['CON_ID'], 'en', $aRow3['CON_VALUE'] );
+
+    }
+    return 1;
+
+}
+
+function startCase ()
+{
+    G::LoadClass( 'case' );
+
+    /* GET , POST & $_SESSION Vars */
   /* unset any variable, because we are starting a new case */
-  if (isset ( $_SESSION ['APPLICATION'] ))    unset ( $_SESSION ['APPLICATION'] );
-  if (isset ( $_SESSION ['PROCESS'] ))        unset ( $_SESSION ['PROCESS'] );
-  if (isset ( $_SESSION ['TASK'] ))           unset ( $_SESSION ['TASK'] );
-  if (isset ( $_SESSION ['INDEX'] ))          unset ( $_SESSION ['INDEX'] );
-  if (isset ( $_SESSION ['STEP_POSITION'] ))  unset ( $_SESSION ['STEP_POSITION'] );
-
-  /* Process */
-  try {
-    $oCase = new Cases ( );
-
-    lookinginforContentProcess($_POST['processId']);
-
-    $aData = $oCase->startCase ( $_REQUEST ['taskId'], $_SESSION ['USER_LOGGED'] );
-
-    $_SESSION ['APPLICATION'] = $aData ['APPLICATION'];
-    $_SESSION ['INDEX']   = $aData ['INDEX'];
-    $_SESSION ['PROCESS'] = $aData ['PROCESS'];
-    $_SESSION ['TASK'] = $_REQUEST ['taskId'];
-    $_SESSION ['STEP_POSITION'] = 0;
-
-    $_SESSION ['CASES_REFRESH'] = true;
-
-    // Execute Events
-    require_once 'classes/model/Event.php';
-    $event = new Event();
-    $event->createAppEvents($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK']);
-
-    $oCase = new Cases ( );
-    $aNextStep = $oCase->getNextStep ( $_SESSION ['PROCESS'], $_SESSION ['APPLICATION'], $_SESSION ['INDEX'], $_SESSION ['STEP_POSITION'] );
-
-    $aNextStep['PAGE'] = 'open?APP_UID='.$aData ['APPLICATION'].'&DEL_INDEX='.$aData ['INDEX'].'&action=draft';
-
-    $_SESSION ['BREAKSTEP'] ['NEXT_STEP'] = $aNextStep;
-    $aData ['openCase'] = $aNextStep;
-
-    $aData ['status'] = 'success';
-    print (G::json_encode ( $aData )) ;
-  }
-  catch ( Exception $e ) {
-    $aData ['status'] = 'failure';
-    $aData ['message'] = $e->getMessage ();
-    print_r ( G::json_encode ( $aData ) );
-  }
-}
-
-function getSimpleDashboardData() {
-  G::LoadClass ( "BasePeer" );
-  require_once ("classes/model/AppCacheView.php");
-  require_once 'classes/model/Process.php';
-  $sUIDUserLogged = $_SESSION ['USER_LOGGED'];
-
-  $Criteria = new Criteria ( 'workflow' );
-
-  $Criteria->clearSelectColumns ();
-
-  $Criteria->addSelectColumn ( AppCacheViewPeer::PRO_UID );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_UID );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_NUMBER );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_STATUS );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::DEL_INDEX );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_TITLE );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_PRO_TITLE );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_TAS_TITLE );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_DEL_PREVIOUS_USER );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::DEL_TASK_DUE_DATE );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_UPDATE_DATE );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::DEL_PRIORITY );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::DEL_DELAYED );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::USR_UID );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_THREAD_STATUS );
-
-  $Criteria->add ( AppCacheViewPeer::APP_STATUS, array ("TO_DO", "DRAFT" ), CRITERIA::IN );
-  $Criteria->add ( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged, "" ), CRITERIA::IN );
-
-  $Criteria->add ( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
-
-  //$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' );
-
-
-  $Criteria->add ( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' );
-
-  //execute the query
-  $oDataset = AppCacheViewPeer::doSelectRS ( $Criteria );
-  $oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-  $oDataset->next ();
-
-  $oProcess = new Process ( );
-
-  $rows = array ();
-  $processNames = array ();
-  while ( $aRow = $oDataset->getRow () ) {
-    // G::pr($aRow);
-    if (! isset ( $processNames [$aRow ['PRO_UID']] )) {
-      $aProcess = $oProcess->load ( $aRow ['PRO_UID'] );
-      $processNames [$aRow ['PRO_UID']] = $aProcess ['PRO_TITLE'];
-    }
-
-    if ($aRow ['USR_UID'] == "")
-      $aRow ['APP_STATUS'] = "UNASSIGNED";
-    if (((in_array ( $aRow ['APP_STATUS'], array ("TO_DO", "UNASSIGNED" ) )) && ($aRow ['APP_THREAD_STATUS'] == "OPEN")) || ($aRow ['APP_STATUS'] == "DRAFT")) {
-      $rows [$processNames [$aRow ['PRO_UID']]] [$aRow ['APP_STATUS']] [$aRow ['DEL_DELAYED']] [] = $aRow ['APP_UID'];
-      if(!isset($rows [$processNames [$aRow ['PRO_UID']]] [$aRow ['APP_STATUS']]['count'])) $rows [$processNames [$aRow ['PRO_UID']]] [$aRow ['APP_STATUS']]['count']=0;
-      $rows [$processNames [$aRow ['PRO_UID']]][$aRow ['APP_STATUS']]['count']++;
-    }
-
-    $oDataset->next ();
-  }
-  //Generate different groups of data for graphs
-  $rowsResponse=array();
-  $i=0;
-  foreach($rows as $processID => $processInfo){
-  	$i++;
-  	if($i<=10){
-     $rowsResponse['caseStatusByProcess'][]=array('process'=>$processID,'inbox'=>isset($processInfo['TO_DO']['count'])?$processInfo['TO_DO']['count']:0,'draft'=>isset($processInfo['DRAFT']['count'])?$processInfo['DRAFT']['count']:0,'unassigned'=>isset($processInfo['UNASSIGNED']['count'])?$processInfo['UNASSIGNED']['count']:0);
-
-  	}
-  }
-  $rowsResponse['caseDelayed'][]=array('delayed'=>'On Time','total'=>100);
-  $rowsResponse['caseDelayed'][]=array('delayed'=>'Delayed','total'=>50);
-
-  print_r ( G::json_encode ( $rowsResponse ) );
-}
-
-function getRegisteredDashboards() {
-  $oPluginRegistry = & PMPluginRegistry::getSingleton ();
-  $dashBoardPages = $oPluginRegistry->getDashboardPages ();
-  print_r ( G::json_encode ( $dashBoardPages ) );
-}
-
-function getDefaultDashboard(){
-	$defaultDashboard['defaultTab']="mainDashboard";
-	if(isset($_SESSION['__currentTabDashboard'])){
-		$defaultDashboard['defaultTab']=$_SESSION['__currentTabDashboard'];
-	}
-	print_r ( G::json_encode ( $defaultDashboard ) );
-}
+  if (isset( $_SESSION['APPLICATION'] ))
+        unset( $_SESSION['APPLICATION'] );
+    if (isset( $_SESSION['PROCESS'] ))
+        unset( $_SESSION['PROCESS'] );
+    if (isset( $_SESSION['TASK'] ))
+        unset( $_SESSION['TASK'] );
+    if (isset( $_SESSION['INDEX'] ))
+        unset( $_SESSION['INDEX'] );
+    if (isset( $_SESSION['STEP_POSITION'] ))
+        unset( $_SESSION['STEP_POSITION'] );
+
+        /* Process */
+    try {
+        $oCase = new Cases();
+
+        lookinginforContentProcess( $_POST['processId'] );
+
+        $aData = $oCase->startCase( $_REQUEST['taskId'], $_SESSION['USER_LOGGED'] );
+
+        $_SESSION['APPLICATION'] = $aData['APPLICATION'];
+        $_SESSION['INDEX'] = $aData['INDEX'];
+        $_SESSION['PROCESS'] = $aData['PROCESS'];
+        $_SESSION['TASK'] = $_REQUEST['taskId'];
+        $_SESSION['STEP_POSITION'] = 0;
+
+        $_SESSION['CASES_REFRESH'] = true;
+
+        // Execute Events
+        require_once 'classes/model/Event.php';
+        $event = new Event();
+        $event->createAppEvents( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK'] );
+
+        $oCase = new Cases();
+        $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
+
+        $aNextStep['PAGE'] = 'open?APP_UID=' . $aData['APPLICATION'] . '&DEL_INDEX=' . $aData['INDEX'] . '&action=draft';
+
+        $_SESSION['BREAKSTEP']['NEXT_STEP'] = $aNextStep;
+        $aData['openCase'] = $aNextStep;
+
+        $aData['status'] = 'success';
+        print (G::json_encode( $aData )) ;
+    } catch (Exception $e) {
+        $aData['status'] = 'failure';
+        $aData['message'] = $e->getMessage();
+        print_r( G::json_encode( $aData ) );
+    }
+}
+
+function getSimpleDashboardData ()
+{
+    G::LoadClass( "BasePeer" );
+    require_once ("classes/model/AppCacheView.php");
+    require_once 'classes/model/Process.php';
+    $sUIDUserLogged = $_SESSION['USER_LOGGED'];
+
+    $Criteria = new Criteria( 'workflow' );
+
+    $Criteria->clearSelectColumns();
+
+    $Criteria->addSelectColumn( AppCacheViewPeer::PRO_UID );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_UID );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_NUMBER );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_STATUS );
+    $Criteria->addSelectColumn( AppCacheViewPeer::DEL_INDEX );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_TITLE );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_PRO_TITLE );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_TAS_TITLE );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_DEL_PREVIOUS_USER );
+    $Criteria->addSelectColumn( AppCacheViewPeer::DEL_TASK_DUE_DATE );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_UPDATE_DATE );
+    $Criteria->addSelectColumn( AppCacheViewPeer::DEL_PRIORITY );
+    $Criteria->addSelectColumn( AppCacheViewPeer::DEL_DELAYED );
+    $Criteria->addSelectColumn( AppCacheViewPeer::USR_UID );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_THREAD_STATUS );
+
+    $Criteria->add( AppCacheViewPeer::APP_STATUS, array ("TO_DO","DRAFT"
+    ), CRITERIA::IN );
+    $Criteria->add( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged,""
+    ), CRITERIA::IN );
+
+    $Criteria->add( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
+
+    //$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' );
+
+
+    $Criteria->add( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' );
+
+    //execute the query
+    $oDataset = AppCacheViewPeer::doSelectRS( $Criteria );
+    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $oDataset->next();
+
+    $oProcess = new Process();
+
+    $rows = array ();
+    $processNames = array ();
+    while ($aRow = $oDataset->getRow()) {
+        // G::pr($aRow);
+        if (! isset( $processNames[$aRow['PRO_UID']] )) {
+            $aProcess = $oProcess->load( $aRow['PRO_UID'] );
+            $processNames[$aRow['PRO_UID']] = $aProcess['PRO_TITLE'];
+        }
+
+        if ($aRow['USR_UID'] == "")
+            $aRow['APP_STATUS'] = "UNASSIGNED";
+        if (((in_array( $aRow['APP_STATUS'], array ("TO_DO","UNASSIGNED"
+        ) )) && ($aRow['APP_THREAD_STATUS'] == "OPEN")) || ($aRow['APP_STATUS'] == "DRAFT")) {
+            $rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']][$aRow['DEL_DELAYED']][] = $aRow['APP_UID'];
+            if (! isset( $rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']]['count'] ))
+                $rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']]['count'] = 0;
+            $rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']]['count'] ++;
+        }
+
+        $oDataset->next();
+    }
+    //Generate different groups of data for graphs
+    $rowsResponse = array ();
+    $i = 0;
+    foreach ($rows as $processID => $processInfo) {
+        $i ++;
+        if ($i <= 10) {
+            $rowsResponse['caseStatusByProcess'][] = array ('process' => $processID,'inbox' => isset( $processInfo['TO_DO']['count'] ) ? $processInfo['TO_DO']['count'] : 0,'draft' => isset( $processInfo['DRAFT']['count'] ) ? $processInfo['DRAFT']['count'] : 0,'unassigned' => isset( $processInfo['UNASSIGNED']['count'] ) ? $processInfo['UNASSIGNED']['count'] : 0
+            );
+
+        }
+    }
+    $rowsResponse['caseDelayed'][] = array ('delayed' => 'On Time','total' => 100
+    );
+    $rowsResponse['caseDelayed'][] = array ('delayed' => 'Delayed','total' => 50
+    );
+
+    print_r( G::json_encode( $rowsResponse ) );
+}
+
+function getRegisteredDashboards ()
+{
+    $oPluginRegistry = & PMPluginRegistry::getSingleton();
+    $dashBoardPages = $oPluginRegistry->getDashboardPages();
+    print_r( G::json_encode( $dashBoardPages ) );
+}
+
+function getDefaultDashboard ()
+{
+    $defaultDashboard['defaultTab'] = "mainDashboard";
+    if (isset( $_SESSION['__currentTabDashboard'] )) {
+        $defaultDashboard['defaultTab'] = $_SESSION['__currentTabDashboard'];
+    }
+    print_r( G::json_encode( $defaultDashboard ) );
+}
+
diff --git a/workflow/engine/methods/cases/casesToRevisePanelExtJs.php b/workflow/engine/methods/cases/casesToRevisePanelExtJs.php
index 24cd2f79c..8a7514daa 100755
--- a/workflow/engine/methods/cases/casesToRevisePanelExtJs.php
+++ b/workflow/engine/methods/cases/casesToRevisePanelExtJs.php
@@ -1,15 +1,14 @@
-<?php
+<?php
 //  $oHeadPublisher =& headPublisher::getSingleton();
-
 //  $TRANSLATIONS = array_merge($TRANSLATIONS, $TRANSLATIONS2);
-  $delIndex = $_GET['DEL_INDEX'];
-  $appUid   = $_GET['APP_UID'];
+$delIndex = $_GET['DEL_INDEX'];
+$appUid = $_GET['APP_UID'];
 //  $oHeadPublisher->assign( 'TRANSLATIONS',   $TRANSLATIONS); //translations
-  $casesPanelUrl = 'casesToReviseTreeContent?APP_UID='.$appUid.'&DEL_INDEX='.$delIndex;
-  $oHeadPublisher->assign( 'casesPanelUrl',   $casesPanelUrl); //translations
-  $oHeadPublisher->assign( 'treeTitle',   G::loadtranslation('ID_STEP_LIST')); //translations
-  $oHeadPublisher->addExtJsScript('cases/casesToRevisePanel', false );    //adding a javascript file .js
-  $oHeadPublisher->addContent( 'cases/casesToRevisePanel'); //adding a html file  .html.
-
-  G::RenderPage('publish', 'extJs');
- 
\ No newline at end of file
+$casesPanelUrl = 'casesToReviseTreeContent?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex;
+$oHeadPublisher->assign( 'casesPanelUrl', $casesPanelUrl ); //translations
+$oHeadPublisher->assign( 'treeTitle', G::loadtranslation( 'ID_STEP_LIST' ) ); //translations
+$oHeadPublisher->addExtJsScript( 'cases/casesToRevisePanel', false ); //adding a javascript file .js
+$oHeadPublisher->addContent( 'cases/casesToRevisePanel' ); //adding a html file  .html.
+
+G::RenderPage( 'publish', 'extJs' );
+
diff --git a/workflow/engine/methods/cases/casesToReviseTreeContent.php b/workflow/engine/methods/cases/casesToReviseTreeContent.php
index b84fc5f9d..ea7631550 100755
--- a/workflow/engine/methods/cases/casesToReviseTreeContent.php
+++ b/workflow/engine/methods/cases/casesToReviseTreeContent.php
@@ -1,93 +1,99 @@
-<?php
-
-class TreeNode {
-
-    public $text = "";
-    public $id = "";
-    public $iconCls = "";
-    public $leaf = true;
-    public $draggable = false;
-    public $href = "#";
-    public $hrefTarget = "";
-
-    function  __construct($id,$text,$iconCls,$leaf,$draggable,$href,$hrefTarget) {
-
-        $this->id = $id;
-        $this->text = $text;
-        $this->iconCls = $iconCls;
-        $this->leaf = $leaf;
-        $this->draggable = $draggable;
-        $this->href = $href;
-        $this->hrefTarget = $hrefTarget;
-    }
-
-    function toJson() {
-      return G::json_encode($this);
-    }
-}
-
-class ExtJsTreeNode extends TreeNode {
-    public $children = array();
-    function add($object) {
-        $this->children[] = $object;
-    }
-
-    function toJson() {
-        return G::json_encode($this);
-    }
-}
-
-G::LoadClass('case');
-
-$o = new Cases();
-
-$PRO_UID = $_SESSION['PROCESS'];
-
-$treeArray = array();
+<?php
+
+class TreeNode
+{
+    public $text = "";
+    public $id = "";
+    public $iconCls = "";
+    public $leaf = true;
+    public $draggable = false;
+    public $href = "#";
+    public $hrefTarget = "";
+
+    function __construct ($id, $text, $iconCls, $leaf, $draggable, $href, $hrefTarget)
+    {
+        $this->id = $id;
+        $this->text = $text;
+        $this->iconCls = $iconCls;
+        $this->leaf = $leaf;
+        $this->draggable = $draggable;
+        $this->href = $href;
+        $this->hrefTarget = $hrefTarget;
+    }
+
+    function toJson ()
+    {
+        return G::json_encode( $this );
+    }
+}
+
+class ExtJsTreeNode extends TreeNode
+{
+    public $children = array ();
+
+    function add ($object)
+    {
+        $this->children[] = $object;
+    }
+
+    function toJson ()
+    {
+        return G::json_encode( $this );
+    }
+}
+
+G::LoadClass( 'case' );
+
+$o = new Cases();
+
+$PRO_UID = $_SESSION['PROCESS'];
+
+$treeArray = array ();
 //if (isset($_GET['action'])&&$_GET['action']=='test'){
-  echo "[";
-  // dynaforms assemble
-  $extTreeDynaforms = new ExtJsTreeNode("node-dynaforms", G::loadtranslation('ID_DYNAFORMS'), "", false, false, "", "");
-  $i = 0;
-  $APP_UID = $_GET['APP_UID'];
-  $DEL_INDEX = $_GET['DEL_INDEX'];
-  $steps = $o->getAllDynaformsStepsToRevise($_GET['APP_UID']);
-  $steps->next();
-    while ($step = $steps->getRow()) {
-      require_once 'classes/model/Dynaform.php';
-      $od = new Dynaform();
-      $dynaformF = $od->Load($step['STEP_UID_OBJ']);
-
-      $n = $step['STEP_POSITION'];
-      $TITLE   = " - ".$dynaformF['DYN_TITLE'];
-      $DYN_UID = $dynaformF['DYN_UID'];
-      $href = "cases_StepToRevise?type=DYNAFORM&ex=$i&PRO_UID=$PRO_UID&DYN_UID=$DYN_UID&APP_UID=$APP_UID&position=".$step['STEP_POSITION']."&DEL_INDEX=$DEL_INDEX";
-      $extTreeDynaforms->add(new TreeNode($DYN_UID,$TITLE,"datasource",true,false,$href,"openCaseFrame"));
-      $i++;
-      $steps->next();
-    }
-  echo $extTreeDynaforms->toJson();
-  // end the dynaforms tree menu
-  echo ",";
-  // assembling the input documents tree menu
-  $extTreeInputDocs = new ExtJsTreeNode("node-input-documents", G::loadtranslation('ID_REQUEST_DOCUMENTS'), "", false, false, "", "");
-  $i = 0;
-  $APP_UID = $_GET['APP_UID'];
-  $DEL_INDEX = $_GET['DEL_INDEX'];
-  $steps = $o->getAllInputsStepsToRevise($_GET['APP_UID']);
-  $steps->next();
-  while ($step = $steps->getRow()) {
-    require_once 'classes/model/InputDocument.php';
-    $od = new InputDocument();
-    $IDF = $od->Load($step['STEP_UID_OBJ']);
-
-    $n = $step['STEP_POSITION'];
-    $TITLE = " - ".$IDF['INP_DOC_TITLE'];
-    $INP_DOC_UID = $IDF['INP_DOC_UID'];
-    $href = "cases_StepToReviseInputs?type=INPUT_DOCUMENT&ex=$i&PRO_UID=$PRO_UID&INP_DOC_UID=$INP_DOC_UID&APP_UID=$APP_UID&position=".$step['STEP_POSITION']."&DEL_INDEX=$DEL_INDEX";
-    $extTreeInputDocs->add(new TreeNode($INP_DOC_UID,$TITLE,"datasource",true,false,$href,"openCaseFrame"));
-    $i++;
-    $steps->next();
-  }
-  echo $extTreeInputDocs->toJson();
-  echo "]";
\ No newline at end of file
+echo "[";
+// dynaforms assemble
+$extTreeDynaforms = new ExtJsTreeNode( "node-dynaforms", G::loadtranslation( 'ID_DYNAFORMS' ), "", false, false, "", "" );
+$i = 0;
+$APP_UID = $_GET['APP_UID'];
+$DEL_INDEX = $_GET['DEL_INDEX'];
+$steps = $o->getAllDynaformsStepsToRevise( $_GET['APP_UID'] );
+$steps->next();
+while ($step = $steps->getRow()) {
+    require_once 'classes/model/Dynaform.php';
+    $od = new Dynaform();
+    $dynaformF = $od->Load( $step['STEP_UID_OBJ'] );
+
+    $n = $step['STEP_POSITION'];
+    $TITLE = " - " . $dynaformF['DYN_TITLE'];
+    $DYN_UID = $dynaformF['DYN_UID'];
+    $href = "cases_StepToRevise?type=DYNAFORM&ex=$i&PRO_UID=$PRO_UID&DYN_UID=$DYN_UID&APP_UID=$APP_UID&position=" . $step['STEP_POSITION'] . "&DEL_INDEX=$DEL_INDEX";
+    $extTreeDynaforms->add( new TreeNode( $DYN_UID, $TITLE, "datasource", true, false, $href, "openCaseFrame" ) );
+    $i ++;
+    $steps->next();
+}
+echo $extTreeDynaforms->toJson();
+// end the dynaforms tree menu
+echo ",";
+// assembling the input documents tree menu
+$extTreeInputDocs = new ExtJsTreeNode( "node-input-documents", G::loadtranslation( 'ID_REQUEST_DOCUMENTS' ), "", false, false, "", "" );
+$i = 0;
+$APP_UID = $_GET['APP_UID'];
+$DEL_INDEX = $_GET['DEL_INDEX'];
+$steps = $o->getAllInputsStepsToRevise( $_GET['APP_UID'] );
+$steps->next();
+while ($step = $steps->getRow()) {
+    require_once 'classes/model/InputDocument.php';
+    $od = new InputDocument();
+    $IDF = $od->Load( $step['STEP_UID_OBJ'] );
+
+    $n = $step['STEP_POSITION'];
+    $TITLE = " - " . $IDF['INP_DOC_TITLE'];
+    $INP_DOC_UID = $IDF['INP_DOC_UID'];
+    $href = "cases_StepToReviseInputs?type=INPUT_DOCUMENT&ex=$i&PRO_UID=$PRO_UID&INP_DOC_UID=$INP_DOC_UID&APP_UID=$APP_UID&position=" . $step['STEP_POSITION'] . "&DEL_INDEX=$DEL_INDEX";
+    $extTreeInputDocs->add( new TreeNode( $INP_DOC_UID, $TITLE, "datasource", true, false, $href, "openCaseFrame" ) );
+    $i ++;
+    $steps->next();
+}
+echo $extTreeInputDocs->toJson();
+echo "]";
+
diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index fd71d43fd..e5fd70af5 100755
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -1,90 +1,87 @@
-<?php
-/**
- * cases_ShowOutputDocument.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
+<?php
+/**
+ * cases_ShowOutputDocument.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
 /*
  * Created on 13-02-2008
  *
  * @author David Callizaya <davidsantos@colosa.com>
- */
-
-require_once ( "classes/model/AppDocumentPeer.php" );
-
-$oAppDocument = new AppDocument();
-$oAppDocument->Fields = $oAppDocument->load($_GET['a'],(isset($_GET['v']) )? $_GET['v'] : NULL );
-
-$sAppDocUid = $oAppDocument->getAppDocUid();
-$info = pathinfo( $oAppDocument->getAppDocFilename() );
-if (!isset($_GET['ext'])) {
-    $ext = $info['extension'];
-}
-else {
-    if ($_GET['ext'] != '') {
-        $ext = $_GET['ext'];
-    }
-    else {
-        $ext = $info['extension'];
-    }
-}
-$ver= (isset($_GET['v']) && $_GET['v']!='') ? '_'.$_GET['v'] : '';
-
-if(!$ver)   //This code is in the case the outputdocument won't be versioned
-  $ver='_1';
-  
-$realPath = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $sAppDocUid .$ver. '.' . $ext ;
-$realPath1 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename'] .$ver. '.' . $ext ;
-$realPath2 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename']. '.' . $ext ;
-$sw_file_exists=false;
-if(file_exists($realPath)){
-    $sw_file_exists=true;
-}elseif(file_exists($realPath1)){
-    $sw_file_exists=true;
-    $realPath=$realPath1;
-}elseif(file_exists($realPath2)){
-    $sw_file_exists=true;
-    $realPath=$realPath2;
-}
-if(!$sw_file_exists){
-    $error_message="'".$info['basename'] .$ver. '.' . $ext."' ".G::LoadTranslation('ID_ERROR_STREAMING_FILE');
-    if((isset($_POST['request']))&&($_POST['request']==true)){
-        $res ['success'] = 'failure';
-        $res ['message'] = $error_message;
-        print G::json_encode ( $res );
-    }else{
-        G::SendMessageText($error_message, "ERROR");
-        $backUrlObj=explode("sys".SYS_SYS,$_SERVER['HTTP_REFERER']);
-        G::header("location: "."/sys".SYS_SYS.$backUrlObj[1]);
-        die;
-    }
-
-}else{
-    if((isset($_POST['request']))&&($_POST['request']==true)){
-        $res ['success'] = 'success';
-        $res ['message'] = $info['basename'] .$ver. '.' . $ext;
-        print G::json_encode ( $res );
-    }else{
-        G::streamFile ( $realPath, true ,$info['basename'] .$ver. '.' . $ext );
-    }
-}
-//G::streamFile ( $realPath, true);
-?>
\ No newline at end of file
+ */
+
+require_once ("classes/model/AppDocumentPeer.php");
+
+$oAppDocument = new AppDocument();
+$oAppDocument->Fields = $oAppDocument->load( $_GET['a'], (isset( $_GET['v'] )) ? $_GET['v'] : NULL );
+
+$sAppDocUid = $oAppDocument->getAppDocUid();
+$info = pathinfo( $oAppDocument->getAppDocFilename() );
+if (! isset( $_GET['ext'] )) {
+    $ext = $info['extension'];
+} else {
+    if ($_GET['ext'] != '') {
+        $ext = $_GET['ext'];
+    } else {
+        $ext = $info['extension'];
+    }
+}
+$ver = (isset( $_GET['v'] ) && $_GET['v'] != '') ? '_' . $_GET['v'] : '';
+
+if (! $ver) //This code is in the case the outputdocument won't be versioned
+    $ver = '_1';
+
+$realPath = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $sAppDocUid . $ver . '.' . $ext;
+$realPath1 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename'] . $ver . '.' . $ext;
+$realPath2 = PATH_DOCUMENT . $oAppDocument->Fields['APP_UID'] . '/outdocs/' . $info['basename'] . '.' . $ext;
+$sw_file_exists = false;
+if (file_exists( $realPath )) {
+    $sw_file_exists = true;
+} elseif (file_exists( $realPath1 )) {
+    $sw_file_exists = true;
+    $realPath = $realPath1;
+} elseif (file_exists( $realPath2 )) {
+    $sw_file_exists = true;
+    $realPath = $realPath2;
+}
+if (! $sw_file_exists) {
+    $error_message = "'" . $info['basename'] . $ver . '.' . $ext . "' " . G::LoadTranslation( 'ID_ERROR_STREAMING_FILE' );
+    if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
+        $res['success'] = 'failure';
+        $res['message'] = $error_message;
+        print G::json_encode( $res );
+    } else {
+        G::SendMessageText( $error_message, "ERROR" );
+        $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
+        G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
+        die();
+    }
+
+} else {
+    if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
+        $res['success'] = 'success';
+        $res['message'] = $info['basename'] . $ver . '.' . $ext;
+        print G::json_encode( $res );
+    } else {
+        G::streamFile( $realPath, true, $info['basename'] . $ver . '.' . $ext );
+    }
+}
+//G::streamFile ( $realPath, true);
+
diff --git a/workflow/engine/methods/cases/cases_ShowToReviseOutputDocument.php b/workflow/engine/methods/cases/cases_ShowToReviseOutputDocument.php
index b1a0036c6..3146dfade 100755
--- a/workflow/engine/methods/cases/cases_ShowToReviseOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowToReviseOutputDocument.php
@@ -1,66 +1,62 @@
-<?php
-/**
- * cases_ShowOutputDocument.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
+<?php
+/**
+ * cases_ShowOutputDocument.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
 /*
  * Created on 13-02-2008
  *
  * @author David Callizaya <davidsantos@colosa.com>
- */
-
-  switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
-	    case - 2:
-	        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-	        G::header('location: ../login/login');
-	        die;
-	        break;
-	    case - 1:
-	        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-	        G::header('location: ../login/login');
-	        die;
-	        break;
-	}
-
-  require_once ( "classes/model/AppDocumentPeer.php" );
-
-  $oAppDocument = new AppDocument();
-  $oAppDocument->Fields = $oAppDocument->load($_GET['a']);
-
-  $sAppDocUid = $oAppDocument->getAppDocUid();
-  $info = pathinfo( $oAppDocument->getAppDocFilename() );
-  if (!isset($_GET['ext'])) {
-    $ext = $info['extension'];
-  }
-  else {
-  	if ($_GET['ext'] != '') {
-  		$ext = $_GET['ext'];
-  	}
-  	else {
-  		$ext = $info['extension'];
-  	}
-  }
-
-  $realPath = PATH_DOCUMENT . $_SESSION['APPLICATION'] . '/outdocs/' . $info['basename'] . '.' . $ext ;
-  G::streamFile ( $realPath, true );
-
-?>
\ No newline at end of file
+ */
+
+switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+require_once ("classes/model/AppDocumentPeer.php");
+
+$oAppDocument = new AppDocument();
+$oAppDocument->Fields = $oAppDocument->load( $_GET['a'] );
+
+$sAppDocUid = $oAppDocument->getAppDocUid();
+$info = pathinfo( $oAppDocument->getAppDocFilename() );
+if (! isset( $_GET['ext'] )) {
+    $ext = $info['extension'];
+} else {
+    if ($_GET['ext'] != '') {
+        $ext = $_GET['ext'];
+    } else {
+        $ext = $info['extension'];
+    }
+}
+
+$realPath = PATH_DOCUMENT . $_SESSION['APPLICATION'] . '/outdocs/' . $info['basename'] . '.' . $ext;
+G::streamFile( $realPath, true );
+
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 9967c0e22..ed8139087 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -1,81 +1,77 @@
-<?php
-/**
- * cases_Step.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-  /* Permissions */
-  switch ($RBAC->userCanAccess('PM_CASES'))
-  {
-    case -2:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-    break;
-    case -1:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-    break;
-  }
-
-  if ( (int)$_SESSION['INDEX'] < 1 )
-  {
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ' . $_SERVER['HTTP_REFERER']);
-    die;
-  }
-  global $_DBArray;
-  if (!isset($_DBArray)) {
-    $_DBArray = array();
-  }
-
-  /* Includes */
-  G::LoadClass('case');
-  G::LoadClass('derivation');
-
-
-  /* GET , POST & $_SESSION Vars */
-  if (isset($_GET['POSITION'])) {
-    $_SESSION['STEP_POSITION'] = (int)$_GET['POSITION'];
-  }
-
-  if (isset($_SESSION['CASES_REFRESH'])) {
-    unset($_SESSION['CASES_REFRESH']);
-    G::evalJScript("if(typeof parent != 'undefined' && parent.refreshCountFolders) parent.refreshCountFolders();");
-  }
-
-  /* Menues */
-  $G_MAIN_MENU            = 'processmaker';
-  $G_ID_MENU_SELECTED     = 'CASES';
-  $G_SUB_MENU             = 'caseOptions';
-  $G_ID_SUB_MENU_SELECTED = '_';
-
-  /* Prepare page before to show */
-  $oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
-  $oTemplatePower->prepare();
-  $G_PUBLISH = new Publisher;
-  $oHeadPublisher =& headPublisher::getSingleton();
-  $oHeadPublisher->addScriptCode('
+<?php
+/**
+ * cases_Step.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+/* Permissions */
+switch ($RBAC->userCanAccess( 'PM_CASES' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+if ((int) $_SESSION['INDEX'] < 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+    die();
+}
+global $_DBArray;
+if (! isset( $_DBArray )) {
+    $_DBArray = array ();
+}
+
+/* Includes */
+G::LoadClass( 'case' );
+G::LoadClass( 'derivation' );
+
+/* GET , POST & $_SESSION Vars */
+if (isset( $_GET['POSITION'] )) {
+    $_SESSION['STEP_POSITION'] = (int) $_GET['POSITION'];
+}
+
+if (isset( $_SESSION['CASES_REFRESH'] )) {
+    unset( $_SESSION['CASES_REFRESH'] );
+    G::evalJScript( "if(typeof parent != 'undefined' && parent.refreshCountFolders) parent.refreshCountFolders();" );
+}
+
+/* Menues */
+$G_MAIN_MENU = 'processmaker';
+$G_ID_MENU_SELECTED = 'CASES';
+$G_SUB_MENU = 'caseOptions';
+$G_ID_SUB_MENU_SELECTED = '_';
+
+/* Prepare page before to show */
+$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower->prepare();
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addScriptCode( '
   var Cse = {};
   Cse.panels = {};
   var leimnud = new maborak();
@@ -83,887 +79,814 @@
   leimnud.Package.Load("rpc,drag,drop,panel,app,validator,fx,dom,abbr",{Instance:leimnud,Type:"module"});
   leimnud.exec(leimnud.fix.memoryLeak);
   leimnud.event.add(window,"load",function(){
-    '.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').'
+    ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
   });
-  ');
-  $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-
-  $oCase = new Cases();
-
-  $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
-  $Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants());
-  $sStatus = $Fields['APP_STATUS'];
-
-  $APP_NUMBER = $Fields['APP_NUMBER'];
-  $APP_TITLE = $Fields['TITLE'];
-
-  $oProcess = new Process();
-  $oProcessFieds = $oProcess->Load($_SESSION['PROCESS']);
-
-  #trigger debug routines...
-
-  if( isset($oProcessFieds['PRO_DEBUG']) && $oProcessFieds['PRO_DEBUG'] ) { #here we must verify if is a debugg session
-    $_SESSION['TRIGGER_DEBUG']['ISSET'] = 1;
-    $_SESSION['PMDEBUGGER']= true;
-  }
-  else {
-    $_SESSION['TRIGGER_DEBUG']['ISSET'] = 0;
-    $_SESSION['PMDEBUGGER']= false;
-  }
-
-  //cleaning debug variables
-  if( !isset($_GET['breakpoint']) ) {
-    if( isset($_SESSION['TRIGGER_DEBUG']['info']) ) unset($_SESSION['TRIGGER_DEBUG']['info']);
-
-    if (!isset($_SESSION['_NO_EXECUTE_TRIGGERS_'])) {
-      $_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array();
-    }
-    $_SESSION['TRIGGER_DEBUG']['DATA'] = Array();
-    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = Array();
-    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = Array();
-
-    $triggers = $oCase->loadTriggers( $_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE');
-
-    $_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count($triggers);
-    $_SESSION['TRIGGER_DEBUG']['TIME'] = 'BEFORE';
-    if($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
-      $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = $oCase->getTriggerNames($triggers);
-      $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = $triggers;
-    }
-
-    if (!isset($_SESSION['_NO_EXECUTE_TRIGGERS_'])) {
-      //Execute before triggers - Start
-      $Fields['APP_DATA'] = $oCase->ExecuteTriggers ( $_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE', $Fields['APP_DATA'] );
-      $Fields['DEL_INDEX']= $_SESSION['INDEX'];
-      $Fields['TAS_UID']  = $_SESSION['TASK'];
-      //Execute before triggers - End
-    }
-    else {
-      unset($_SESSION['_NO_EXECUTE_TRIGGERS_']);
-      $Fields['DEL_INDEX']= $_SESSION['INDEX'];
-      $Fields['TAS_UID']  = $_SESSION['TASK'];
-    }
-  }
-
-  if( isset($_GET['breakpoint']) ) {
-    $_POST['NextStep'] = $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'];
-  }
-
-  /**
-   * Here we throw the debug view
-   */
-  if ( isset($_GET['breakpoint']) ) {
-
-    $G_PUBLISH->AddContent('view', 'cases/showDebugFrameLoader');
-    $G_PUBLISH->AddContent('view', 'cases/showDebugFrameBreaker');
-    G::RenderPage('publish', 'blank');
-    exit();
-  }
-  #end trigger debug session.......
-
-  //$oCase->thisIsTheCurrentUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'REDIRECT', 'cases_List');
-
-  //Save data - Start
-  $oCase->updateCase ( $_SESSION['APPLICATION'], $Fields );
-  //Save data - End
-
-  //Obtain previous and next step - Start
-  try {
-    $oCase         = new Cases();
-    $aNextStep     = $oCase->getNextStep(    $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']);
-    $aPreviousStep = $oCase->getPreviousStep($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']);
-  }
-  catch ( Exception $e ) {
-  }
-  //Obtain previous and next step - End
-
-  try {
-  //Add content content step - Start
-  $oApp = ApplicationPeer::retrieveByPK( $_SESSION['APPLICATION'] );
-  $array['APP_NUMBER'] = $APP_NUMBER;
-  $sTitleCase = $oApp->getAppTitle();
-  $array['APP_TITLE'] = $sTitleCase;
-  $array['CASE'] = G::LoadTranslation('ID_CASE');
-  $array['TITLE'] = G::LoadTranslation('ID_TITLE');
-
-  $noShowTitle = 0;
-  if(isset($oProcessFieds['PRO_SHOW_MESSAGE'])) {
-      $noShowTitle = $oProcessFieds['PRO_SHOW_MESSAGE'];
-  }
-
-  switch ($_GET['TYPE'])
-  {
-    case 'DYNAFORM':
-      if($noShowTitle == 0) {
-        $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
-      }
-      if (!$aPreviousStep) {
-        $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-      }
-      else {
-        $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-        $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
-      }
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation('ID_NEXT_STEP');
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PHPSESSID'] = @session_id();
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_GET['UID'];
-
-      $oHeadPublisher =& headPublisher::getSingleton();
-      $oHeadPublisher->addScriptCode("
+  ' );
+$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+
+$oCase = new Cases();
+
+$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+$Fields['APP_DATA'] = array_merge( $Fields['APP_DATA'], G::getSystemConstants() );
+$sStatus = $Fields['APP_STATUS'];
+
+$APP_NUMBER = $Fields['APP_NUMBER'];
+$APP_TITLE = $Fields['TITLE'];
+
+$oProcess = new Process();
+$oProcessFieds = $oProcess->Load( $_SESSION['PROCESS'] );
+
+#trigger debug routines...
+
+
+if (isset( $oProcessFieds['PRO_DEBUG'] ) && $oProcessFieds['PRO_DEBUG']) { #here we must verify if is a debugg session
+    $_SESSION['TRIGGER_DEBUG']['ISSET'] = 1;
+    $_SESSION['PMDEBUGGER'] = true;
+} else {
+    $_SESSION['TRIGGER_DEBUG']['ISSET'] = 0;
+    $_SESSION['PMDEBUGGER'] = false;
+}
+
+//cleaning debug variables
+if (! isset( $_GET['breakpoint'] )) {
+    if (isset( $_SESSION['TRIGGER_DEBUG']['info'] ))
+        unset( $_SESSION['TRIGGER_DEBUG']['info'] );
+
+    if (! isset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] )) {
+        $_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array ();
+    }
+    $_SESSION['TRIGGER_DEBUG']['DATA'] = Array ();
+    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = Array ();
+    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = Array ();
+
+    $triggers = $oCase->loadTriggers( $_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE' );
+
+    $_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count( $triggers );
+    $_SESSION['TRIGGER_DEBUG']['TIME'] = 'BEFORE';
+    if ($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
+        $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers );
+        $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = $triggers;
+    }
+
+    if (! isset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] )) {
+        //Execute before triggers - Start
+        $Fields['APP_DATA'] = $oCase->ExecuteTriggers( $_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE', $Fields['APP_DATA'] );
+        $Fields['DEL_INDEX'] = $_SESSION['INDEX'];
+        $Fields['TAS_UID'] = $_SESSION['TASK'];
+        //Execute before triggers - End
+    } else {
+        unset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] );
+        $Fields['DEL_INDEX'] = $_SESSION['INDEX'];
+        $Fields['TAS_UID'] = $_SESSION['TASK'];
+    }
+}
+
+if (isset( $_GET['breakpoint'] )) {
+    $_POST['NextStep'] = $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'];
+}
+
+/**
+ * Here we throw the debug view
+ */
+if (isset( $_GET['breakpoint'] )) {
+
+    $G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameLoader' );
+    $G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameBreaker' );
+    G::RenderPage( 'publish', 'blank' );
+    exit();
+}
+#end trigger debug session.......
+
+
+//$oCase->thisIsTheCurrentUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'REDIRECT', 'cases_List');
+
+
+//Save data - Start
+$oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
+//Save data - End
+
+
+//Obtain previous and next step - Start
+try {
+    $oCase = new Cases();
+    $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
+    $aPreviousStep = $oCase->getPreviousStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
+} catch (Exception $e) {
+}
+//Obtain previous and next step - End
+
+
+try {
+    //Add content content step - Start
+    $oApp = ApplicationPeer::retrieveByPK( $_SESSION['APPLICATION'] );
+    $array['APP_NUMBER'] = $APP_NUMBER;
+    $sTitleCase = $oApp->getAppTitle();
+    $array['APP_TITLE'] = $sTitleCase;
+    $array['CASE'] = G::LoadTranslation( 'ID_CASE' );
+    $array['TITLE'] = G::LoadTranslation( 'ID_TITLE' );
+
+    $noShowTitle = 0;
+    if (isset( $oProcessFieds['PRO_SHOW_MESSAGE'] )) {
+        $noShowTitle = $oProcessFieds['PRO_SHOW_MESSAGE'];
+    }
+
+    switch ($_GET['TYPE']) {
+        case 'DYNAFORM':
+            if ($noShowTitle == 0) {
+                $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+            }
+            if (! $aPreviousStep) {
+                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+            } else {
+                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
+                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+            }
+            $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
+            $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation( 'ID_NEXT_STEP' );
+            $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PHPSESSID'] = @session_id();
+            $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_GET['UID'];
+
+            $oHeadPublisher = & headPublisher::getSingleton();
+            $oHeadPublisher->addScriptCode( "
       if (typeof parent != 'undefined') {
         if (parent.setNode) {
-          parent.setNode('".$_GET['UID']."');
+          parent.setNode('" . $_GET['UID'] . "');
         }
-      }");
-
-      $oStep = new Step();
-      $oStep = $oStep->loadByProcessTaskPosition($_SESSION['PROCESS'], $_SESSION['TASK'], $_GET['POSITION']);
-
-      /** Added By erik  16-05-08
-      * Description: this was added for the additional database connections */
-      G::LoadClass ('dbConnections');
-      $oDbConnections = new dbConnections($_SESSION['PROCESS']);
-      $oDbConnections->loadAdditionalConnections();
-      $_SESSION['CURRENT_DYN_UID'] = $_GET['UID'];
-
-      $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS']. '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
-      break;
-
-    case 'INPUT_DOCUMENT':
-      if($noShowTitle == 0) {
-        $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
-      }
-      $oInputDocument = new InputDocument();
-      $Fields = $oInputDocument->load($_GET['UID']);
-      if (!$aPreviousStep) {
-        $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-        $Fields['PREVIOUS_STEP_LABEL'] = '';
-      }
-      else {
-        $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-        $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
-
-        $Fields['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-        $Fields['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
-      }
-      $Fields['NEXT_STEP'] = $aNextStep['PAGE'];
-      $Fields['NEXT_STEP_LABEL'] = G::loadTranslation("ID_NEXT_STEP");
-      switch ($_GET['ACTION'])
-      {
-        case 'ATTACH':
-          switch ($Fields['INP_DOC_FORM_NEEDED']) {
-            case 'REAL':
-              $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_NEW');
-              $sXmlForm = 'cases/cases_AttachInputDocument2';
-              break;
-            case 'VIRTUAL':
-              $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
-              $sXmlForm = 'cases/cases_AttachInputDocument1';
-              break;
-            case 'VREAL':
-              $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
-              $sXmlForm = 'cases/cases_AttachInputDocument3';
-              break;
-          }
-          $Fields['MESSAGE1'] = G::LoadTranslation('ID_PLEASE_ENTER_COMMENTS');
-          $Fields['MESSAGE2'] = G::LoadTranslation('ID_PLEASE_SELECT_FILE');
-        //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
-        $oPluginRegistry =& PMPluginRegistry::getSingleton();
-        if ( $oPluginRegistry->existsTrigger ( PM_UPLOAD_DOCUMENT_BEFORE ) ) {//If a Plugin has registered a Break Page Evaluator
-          $oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT_BEFORE , array('USR_UID'=>$_SESSION['USER_LOGGED']) );
-        }
-        //END: If there is a Break Step registered from Plugin
-          $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID']), array_merge(array('DOC_UID'=>$_GET['UID']),$Fields));//$aFields
-
-          //call plugin
-          //if ( $oPluginRegistry->existsTrigger ( PM_CASE_DOCUMENT_LIST ) ) {
-          //  $folderData = new folderData (null, null, $_SESSION['APPLICATION'], null, $_SESSION['USER_LOGGED'] );
-          //  $oPluginRegistry =& PMPluginRegistry::getSingleton();
-          //  $oPluginRegistry->executeTriggers ( PM_CASE_DOCUMENT_LIST , $folderData );
-          //  //end plugin
-          //}
-          //else
-          //  $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID']), array_merge(array('DOC_UID'=>$_GET['UID']),$Fields));//$aFields
-
-          $oHeadPublisher =& headPublisher::getSingleton();
-          $titleDocument="<h3>".$Fields['INP_DOC_TITLE']."<br><small>".G::LoadTranslation('ID_INPUT_DOCUMENT')."</small></h3>";
-          if($Fields['INP_DOC_DESCRIPTION']) $titleDocument.= " ".str_replace("\n","",str_replace("'","\'",nl2br(htmlentities(utf8_decode($Fields['INP_DOC_DESCRIPTION'])))))."";
-
-          $oHeadPublisher->addScriptCode("documentName='{$titleDocument}';");
-          break;
-
-        case 'VIEW':
-          require_once 'classes/model/AppDocument.php';
-          require_once 'classes/model/Users.php';
-          $oAppDocument = new AppDocument();
-          $oAppDocument->Fields = $oAppDocument->load($_GET['DOC'],$_GET['VERSION']);
-          $Fields['POSITION']   = $_SESSION['STEP_POSITION'];
-          $oUser = new Users();
-          $aUser = $oUser->load($oAppDocument->Fields['USR_UID']);
-          $Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-          switch ($Fields['INP_DOC_FORM_NEEDED'])
-          {
-            case 'REAL':
-              $sXmlForm = 'cases/cases_ViewInputDocument2';
-            break;
-            case 'VIRTUAL':
-              $sXmlForm = 'cases/cases_ViewInputDocument1';
-            break;
-            case 'VREAL':
-              $sXmlForm = 'cases/cases_ViewInputDocument3';
-            break;
-          }
-          $oAppDocument->Fields['VIEW'] = G::LoadTranslation('ID_OPEN');
-          $oAppDocument->Fields['FILE'] = 'cases_ShowDocument?a=' . $_GET['DOC'] . '&r=' . rand();
-          $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', G::array_merges($Fields, $oAppDocument->Fields), '');
-        break;
-      }
-    break;
-
-    case 'OUTPUT_DOCUMENT':
-      //$G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
-
-      require_once 'classes/model/OutputDocument.php';
-      $oOutputDocument = new OutputDocument();
-      $aOD = $oOutputDocument->load( $_GET['UID'] );
-      if (!$aPreviousStep) {
-        $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-      }
-      else {
-        $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-        $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
-      }
-      $aOD['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
-      $aOD['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation("ID_NEXT_STEP");
-      switch ($_GET['ACTION'])
-      {
-        case 'GENERATE':
-          //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
-          $oPluginRegistry =& PMPluginRegistry::getSingleton();
-          if ( $oPluginRegistry->existsTrigger ( PM_UPLOAD_DOCUMENT_BEFORE ) ) {//If a Plugin has registered a Break Page Evaluator
-            $oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT_BEFORE , array('USR_UID'=>$_SESSION['USER_LOGGED']) );
-          }
-          //END: If there is a Break Step registered from Plugin
-
-
-          $sFilenameOriginal=$sFilename = preg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
-          require_once 'classes/model/AppFolder.php';
-          require_once 'classes/model/AppDocument.php';
-
-          //Get the Custom Folder ID (create if necessary)
-          $oFolder=new AppFolder();
-          $folderId=$oFolder->createFromPath($aOD['OUT_DOC_DESTINATION_PATH']);
-
-          //Tags
-          $fileTags=$oFolder->parseTags($aOD['OUT_DOC_TAGS']);
-
-          //Get last Document Version and apply versioning if is enabled
-
-          $oAppDocument= new AppDocument();
-          $lastDocVersion=$oAppDocument->getLastDocVersion($_GET['UID'],$_SESSION['APPLICATION']);
-
-          //if(($aOD['OUT_DOC_VERSIONING'])||($lastDocVersion==0)){
-          //  $lastDocVersion++;
-          //}
-
-          $oCriteria = new Criteria('workflow');
-          $oCriteria->add(AppDocumentPeer::APP_UID,      $_SESSION['APPLICATION']);
-          //$oCriteria->add(AppDocumentPeer::DEL_INDEX,    $_SESSION['INDEX']);
-          $oCriteria->add(AppDocumentPeer::DOC_UID,      $_GET['UID']);
-          $oCriteria->add(AppDocumentPeer::DOC_VERSION,      $lastDocVersion);
-          $oCriteria->add(AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT');
-          $oDataset = AppDocumentPeer::doSelectRS($oCriteria);
-          $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-          $oDataset->next();
-          if(($aOD['OUT_DOC_VERSIONING'])&&($lastDocVersion!=0)){//Create new Version of current output
-            $lastDocVersion++;
-            if ($aRow = $oDataset->getRow()) {
-                $aFields = array('APP_DOC_UID'         => $aRow['APP_DOC_UID'],
-                                 'APP_UID'             => $_SESSION['APPLICATION'],
-                                 'DEL_INDEX'           => $_SESSION['INDEX'],
-                                 'DOC_UID'             => $_GET['UID'],
-                                 'DOC_VERSION'         => $lastDocVersion+1,
-                                 'USR_UID'             => $_SESSION['USER_LOGGED'],
-                                 'APP_DOC_TYPE'        => 'OUTPUT',
-                                 'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),
-                                 'APP_DOC_FILENAME'    => $sFilename,
-                                 'FOLDER_UID'          => $folderId,
-                                 'APP_DOC_TAGS'        => $fileTags);
-                $oAppDocument = new AppDocument();
-                $oAppDocument->create($aFields);
-                $sDocUID = $aRow['APP_DOC_UID'];
-            }
-          }else{//No versioning so Update a current Output or Create new if no exist
-            if ($aRow = $oDataset->getRow()) { //Update
-                $aFields = array('APP_DOC_UID'         => $aRow['APP_DOC_UID'],
-                                 'APP_UID'             => $_SESSION['APPLICATION'],
-                                 'DEL_INDEX'           => $_SESSION['INDEX'],
-                                 'DOC_UID'             => $_GET['UID'],
-                                 'DOC_VERSION'         => $lastDocVersion,
-                                 'USR_UID'             => $_SESSION['USER_LOGGED'],
-                                 'APP_DOC_TYPE'        => 'OUTPUT',
-                                 'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),
-                                 'APP_DOC_FILENAME'    => $sFilename,
-                                 'FOLDER_UID'          => $folderId,
-                                 'APP_DOC_TAGS'        => $fileTags);
-                $oAppDocument = new AppDocument();
-                $oAppDocument->update($aFields);
-                $sDocUID = $aRow['APP_DOC_UID'];
-             }else{ //create
-                if($lastDocVersion==0) $lastDocVersion++;
-                $aFields = array('APP_UID'             => $_SESSION['APPLICATION'],
-                             'DEL_INDEX'           => $_SESSION['INDEX'],
-                             'DOC_UID'             => $_GET['UID'],
-                             'DOC_VERSION'         => $lastDocVersion,
-                             'USR_UID'             => $_SESSION['USER_LOGGED'],
-                             'APP_DOC_TYPE'        => 'OUTPUT',
-                             'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),
-                             'APP_DOC_FILENAME'    => $sFilename,
-                             'FOLDER_UID'          => $folderId,
-                             'APP_DOC_TAGS'        => $fileTags);
-                $oAppDocument = new AppDocument();
-                $aFields['APP_DOC_UID']=$sDocUID = $oAppDocument->create($aFields);
-
-            }
-          }
-
-          //$sFilename = ereg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
-          //if ( $sFilename == '' ) $sFilename='_';
-
-          $sFilename = $aFields['APP_DOC_UID']. "_".$lastDocVersion;
-
-          $pathOutput = PATH_DOCUMENT . $_SESSION['APPLICATION'] . PATH_SEP . 'outdocs'. PATH_SEP ;
-          G::mk_dir ( $pathOutput );
-          switch ( $aOD['OUT_DOC_TYPE'] ) {
-            case 'HTML' :
-
-                $aProperties = array();                //maui
-
-                if(!isset($aOD['OUT_DOC_MEDIA']))
-                  $aOD['OUT_DOC_MEDIA'] = 'Letter';
-                if(!isset($aOD['OUT_DOC_LEFT_MARGIN']))
-                  $aOD['OUT_DOC_LEFT_MARGIN'] = '15';
-                if(!isset($aOD['OUT_DOC_RIGHT_MARGIN']))
-                  $aOD['OUT_DOC_RIGHT_MARGIN'] = '15';
-                if(!isset($aOD['OUT_DOC_TOP_MARGIN']))
-                  $aOD['OUT_DOC_TOP_MARGIN'] = '15';
-                if(!isset($aOD['OUT_DOC_BOTTOM_MARGIN']))
-                  $aOD['OUT_DOC_BOTTOM_MARGIN'] = '15';
-
-                $aProperties['media']=$aOD['OUT_DOC_MEDIA'];
-                $aProperties['margins']=array('left' => $aOD['OUT_DOC_LEFT_MARGIN'], 'right' => $aOD['OUT_DOC_RIGHT_MARGIN'], 'top' => $aOD['OUT_DOC_TOP_MARGIN'], 'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN']);
-                if($aOD['OUT_DOC_PDF_SECURITY_ENABLED']=='1'){
-                  $aProperties['pdfSecurity']=array('openPassword'=>$aOD['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],'ownerPassword'=>$aOD['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],'permissions'=>$aOD['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
-                }
-                $oOutputDocument->generate( $_GET['UID'], $Fields['APP_DATA'], $pathOutput,
-                   $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'],$aProperties );
-                   //$sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'] );
-                break;
-            case 'JRXML' :
-                //creating the xml with the application data;
-                $xmlData = "<dynaform>\n";
-                foreach ( $Fields['APP_DATA'] as $key => $val ) {
-                  $xmlData .= "  <$key>$val</$key>\n";
-                }
-                $xmlData .= "</dynaform>\n";
-                $iSize = file_put_contents ( $javaOutput .  'addressBook.xml' , $xmlData );
-
-                G::LoadClass ('javaBridgePM');
-                $JBPM = new JavaBridgePM();
-                $JBPM->checkJavaExtension();
-
-                $util = new Java("com.processmaker.util.pmutils");
-                $util->setInputPath( $javaInput );
-                $util->setOutputPath( $javaOutput );
-
-                //$content = file_get_contents ( PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.jrxml' );
-                //$iSize = file_put_contents ( $javaInput .  $aOD['OUT_DOC_UID'] . '.jrxml', $content );
-                copy ( PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.jrxml', $javaInput .  $aOD['OUT_DOC_UID'] . '.jrxml' );
-
-               $outputFile = $javaOutput . $sFilename . '.pdf' ;
-                print $util->jrxml2pdf( $aOD['OUT_DOC_UID'] . '.jrxml' , basename($outputFile) );
-
-                //$content = file_get_contents ( $outputFile );
-                //$iSize = file_put_contents ( $pathOutput .  $sFilename . '.pdf' , $content );
-                copy ( $outputFile, $pathOutput .  $sFilename . '.pdf' );
-                //die;
-                break;
-              case 'ACROFORM' :
-                  //creating the xml with the application data;
-                  $xmlData = "<dynaform>\n";
-                  foreach ( $Fields['APP_DATA'] as $key => $val ) {
-                    $xmlData .= "  <$key>$val</$key>\n";
-                  }
-                  $xmlData .= "</dynaform>\n";
-                  //$iSize = file_put_contents ( $javaOutput .  'addressBook.xml' , $xmlData );
-
-                  G::LoadClass ('javaBridgePM');
-                  $JBPM = new JavaBridgePM();
-                  $JBPM->checkJavaExtension();
-
-                  $util = new Java("com.processmaker.util.pmutils");
-                  $util->setInputPath( $javaInput );
-                  $util->setOutputPath( $javaOutput );
-
-                  copy ( PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.pdf', $javaInput .  $aOD['OUT_DOC_UID'] . '.pdf' );
-
-                  $outputFile = $javaOutput . $sFilename . '.pdf' ;
-                  print $util->writeVarsToAcroFields( $aOD['OUT_DOC_UID'] . '.pdf' , $xmlData );
-
-                  copy ( $javaOutput. $aOD['OUT_DOC_UID'] . '.pdf', $pathOutput .  $sFilename . '.pdf' );
-
-                break;
-              default :
-                throw ( new Exception ('invalid output document' ));
-          }
-
-
-          //Execute after triggers - Start
-          $Fields['APP_DATA'] = $oCase->ExecuteTriggers ( $_SESSION['TASK'], 'OUTPUT_DOCUMENT', $_GET['UID'], 'AFTER', $Fields['APP_DATA'] );
-          $Fields['DEL_INDEX']= $_SESSION['INDEX'];
-          $Fields['TAS_UID']  = $_SESSION['TASK'];
-          //Execute after triggers - End
-
-          //Save data - Start
-          $oCase->updateCase ( $_SESSION['APPLICATION'], $Fields );
-          //Save data - End
-
-          //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
-          $oPluginRegistry =& PMPluginRegistry::getSingleton();
-          if ( $oPluginRegistry->existsTrigger ( PM_UPLOAD_DOCUMENT ) && class_exists ('uploadDocumentData' ) ) {
-            $triggerDetail=$oPluginRegistry->getTriggerInfo( PM_UPLOAD_DOCUMENT );
-
-
-            $sPathName = PATH_DOCUMENT . $_SESSION['APPLICATION'] . PATH_SEP;
-
-            $oData['APP_UID']   = $_SESSION['APPLICATION'];
-            $oData['ATTACHMENT_FOLDER'] = true;
-            switch($aOD['OUT_DOC_GENERATE']){
-                case "BOTH":
-                    $documentData = new uploadDocumentData (
-                                  $_SESSION['APPLICATION'],
-                                  $_SESSION['USER_LOGGED'],
-                                  $pathOutput . $sFilename . '.pdf',
-                                  $sFilenameOriginal. '.pdf',
-                                  $sDocUID,
-                                  $oAppDocument->getDocVersion()
-                                  );
-
-                    $documentData->sFileType = "PDF";
-                    $documentData->bUseOutputFolder = true;
-                    $uploadReturn=$oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT , $documentData );
-                    if($uploadReturn){//Only delete if the file was saved correctly
-                        $aFields['APP_DOC_PLUGIN']=$triggerDetail->sNamespace;
-                        //$oAppDocument = new AppDocument();
-                        //$oAppDocument->update($aFields);
-                      unlink ( $pathOutput . $sFilename. '.pdf' );
-                    }
-
-
-
-                    $documentData = new uploadDocumentData (
-                                  $_SESSION['APPLICATION'],
-                                  $_SESSION['USER_LOGGED'],
-                                  $pathOutput . $sFilename . '.doc',
-                                  $sFilenameOriginal. '.doc',
-                                  $sDocUID,
-                                  $oAppDocument->getDocVersion()
-                                  );
-
-                    $documentData->sFileType = "DOC";
-                    $documentData->bUseOutputFolder = true;
-                    $uploadReturn=$oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT , $documentData );
-                    if($uploadReturn){//Only delete if the file was saved correctly
-                      unlink ( $pathOutput . $sFilename. '.doc' );
-                    }
-
-                break;
-                case "PDF":
-                    $documentData = new uploadDocumentData (
-                                  $_SESSION['APPLICATION'],
-                                  $_SESSION['USER_LOGGED'],
-                                  $pathOutput . $sFilename . '.pdf',
-                                  $sFilenameOriginal. '.pdf',
-                                  $sDocUID,
-                                  $oAppDocument->getDocVersion()
-                                  );
-
-
-                    $documentData->sFileType = "PDF";
-                    $documentData->bUseOutputFolder = true;
-                    $uploadReturn=$oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT , $documentData );
-                    if($uploadReturn){//Only delete if the file was saved correctly
-                      unlink ( $pathOutput . $sFilename. '.pdf' );
-                    }
-                break;
-                case "DOC":
-                    $documentData = new uploadDocumentData (
-                                  $_SESSION['APPLICATION'],
-                                  $_SESSION['USER_LOGGED'],
-                                  $pathOutput . $sFilename . '.doc',
-                                  $sFilenameOriginal. '.doc',
-                                  $sDocUID,
-                                  $oAppDocument->getDocVersion()
-                                  );
-
-                    $documentData->sFileType = "DOC";
-                    $documentData->bUseOutputFolder = true;
-                    $uploadReturn=$oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT , $documentData );
-                    if($uploadReturn){//Only delete if the file was saved correctly
-                      unlink ( $pathOutput . $sFilename. '.doc' );
-                    }
-                break;
-            }
-
-          }
-
-          $outputNextStep = 'cases_Step?TYPE=OUTPUT_DOCUMENT&UID=' . $_GET['UID'] . '&POSITION=' . $_SESSION['STEP_POSITION'] . '&ACTION=VIEW&DOC=' . $sDocUID;
-          G::header('location: '.$outputNextStep);
-          die;
-          break;
-       case 'VIEW':
-          if($noShowTitle == 0) {
-            $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
-          }
-          require_once 'classes/model/AppDocument.php';
-          $oAppDocument = new AppDocument();
-          $lastVersion=$oAppDocument->getLastAppDocVersion($_GET['DOC'],$_SESSION['APPLICATION']);
-          $aFields = $oAppDocument->load($_GET['DOC'],$lastVersion);
-          $listing=false;
-          $oPluginRegistry = & PMPluginRegistry::getSingleton();
-          if($oPluginRegistry->existsTrigger(PM_CASE_DOCUMENT_LIST)) {
-            $folderData = new folderData(null, null, $_SESSION['APPLICATION'], null, $_SESSION['USER_LOGGED']);
-            $folderData->PMType = "OUTPUT";
-            $folderData->returnList = true;
-            $listing=$oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData);
-          }
-
-          require_once 'classes/model/OutputDocument.php';
-          $oOutputDocument = new OutputDocument();
-          $aGields = $oOutputDocument->load($aFields['DOC_UID']);
-
-          if(isset($aGields['OUT_DOC_VERSIONING']) && $aGields['OUT_DOC_VERSIONING']!=0){
-            $oAppDocument= new AppDocument();
-            $lastDocVersion=$oAppDocument->getLastDocVersion($_GET['UID'],$_SESSION['APPLICATION']);
-          }else {
-            $lastDocVersion='';
-          }
-          $aFields['VIEW1'] = G::LoadTranslation('ID_OPEN');
-
-          $aFields['VIEW2'] = G::LoadTranslation('ID_OPEN');
-
-          $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v='.$lastDocVersion . '&ext=doc&random=' . rand() . '&PHPSESSID=' . @session_id();
-
-          $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v='.$lastDocVersion . '&ext=pdf&random=' . rand() . '&PHPSESSID=' . @session_id();
-
-
-          if ( is_array ($listing) ){//If exist in Plugin Document List
-            foreach($listing as $folderitem) {
-                if(($folderitem->filename==$aFields['APP_DOC_UID'])&&($folderitem->type=='DOC')){
-                    $aFields['VIEW1'] = G::LoadTranslation('ID_GET_EXTERNAL_FILE');
-                    $aFields['FILE1'] = $folderitem->downloadScript;
-                    continue;
-                }
-                if(($folderitem->filename==$aFields['APP_DOC_UID'])&&($folderitem->type=='PDF')){
-                    $aFields['VIEW2'] = G::LoadTranslation('ID_GET_EXTERNAL_FILE');
-                    $aFields['FILE2'] = $folderitem->downloadScript;
-                    continue;
-                }
-            }
-          }
-
-          if(($aGields['OUT_DOC_GENERATE']=='BOTH')||($aGields['OUT_DOC_GENERATE']==''))
-              $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocument1', '', G::array_merges($aOD, $aFields), '');
-
-          if($aGields['OUT_DOC_GENERATE']=='DOC')
-              $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocument2', '', G::array_merges($aOD, $aFields), '');
-
-          if($aGields['OUT_DOC_GENERATE']=='PDF')
-              $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocument3', '', G::array_merges($aOD, $aFields), '');
-
-
-          break;
-        }
-      break;
-
-    case 'ASSIGN_TASK':
-      $oDerivation = new Derivation();
-      $oProcess    = new Process();
-      $aData       = $oCase->loadCase($_SESSION['APPLICATION']);
-
-      $aFields['PROCESS']              = $oProcess->load($_SESSION['PROCESS']);
-      $aFields['PREVIOUS_PAGE']        = $aPreviousStep['PAGE'];
-      $aFields['PREVIOUS_PAGE_LABEL']  = G::LoadTranslation('ID_PREVIOUS_STEP');
-      $aFields['ASSIGN_TASK']          = G::LoadTranslation('ID_ASSIGN_TASK');
-      $aFields['END_OF_PROCESS']       = G::LoadTranslation('ID_END_OF_PROCESS');
-      $aFields['NEXT_TASK_LABEL']      = G::LoadTranslation('ID_NEXT_TASK');
-      $aFields['EMPLOYEE']             = G::LoadTranslation('ID_EMPLOYEE');
-      $aFields['LAST_EMPLOYEE']        = G::LoadTranslation('ID_LAST_EMPLOYEE');
-      $aFields['OPTION_LABEL']         = G::LoadTranslation('ID_OPTION');
-      $aFields['CONTINUE']             = G::LoadTranslation('ID_CONTINUE');
-      $aFields['FINISH']               = G::LoadTranslation('ID_FINISH');
-      $aFields['CONTINUE_WITH_OPTION'] = G::LoadTranslation('ID_CONTINUE_WITH_OPTION');
-      $aFields['FINISH_WITH_OPTION']   = G::LoadTranslation('ID_FINISH_WITH_OPTION');
-      $aFields['TAS_TIMING_TITLE']     = G::LoadTranslation('ID_TIMING_CONTROL');
-      $aFields['TAS_DURATION']         = G::LoadTranslation('ID_TASK_DURATION');
-      $aFields['TAS_TIMEUNIT']         = G::LoadTranslation('ID_TIME_UNIT');
-      $aFields['TAS_TYPE_DAY']         = G::LoadTranslation('ID_COUNT_DAYS');
-      $aFields['TAS_CALENDAR']         = G::LoadTranslation('ID_CALENDAR');
-
-      $aFields['TASK'] = $oDerivation->prepareInformation(array(
-        'USER_UID'  => $_SESSION['USER_LOGGED'],
-        'APP_UID'   => $_SESSION['APPLICATION'],
-        'DEL_INDEX' => $_SESSION['INDEX']
-      ));
-
-      if ( empty($aFields['TASK']) )  {
-        throw ( new Exception ( G::LoadTranslation( 'ID_NO_DERIVATION_RULE')  ) );
-      }
-
-      //take the first derivation rule as the task derivation rule type.
-      $aFields['PROCESS']['ROU_TYPE'] = $aFields['TASK'][1]['ROU_TYPE'];
-      $aFields['PROCESS']['ROU_FINISH_FLAG'] = false;
-
-      foreach ( $aFields['TASK'] as $sKey => &$aValues)
-      {
-        $sPriority = '';//set priority value
-        if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] != '') {
-          //TO DO: review this type of assignment
-          if (isset($aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'])]))
-          {
-            $sPriority = $aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'])];
-          }
-        }//set priority value
-
-        $sTask = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_UID'];
-
-        //TAS_UID has a hidden field to store the TAS_UID
-        $hiddenName = "form[TASKS][" . $sKey . "][TAS_UID]";
-        $hiddenField = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aValues['NEXT_TASK']['TAS_UID'] . '">';
-        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_HIDDEN_FIELD'] = $hiddenField;
-        //print "<hr>".$aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']."<hr>";
-        switch ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']) {
-          case 'EVALUATE':
-          case 'REPORT_TO':
-          case 'BALANCED':
-          case 'SELF_SERVICE':
-              $hiddenName = "form[TASKS][" . $sKey . "][USR_UID]";
-              $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_FULLNAME'];
-              $aFields['TASK'][$sKey]['NEXT_TASK']['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aValues['NEXT_TASK']['USER_ASSIGNED']['USR_UID'] . '">';
-              //var_dump($aFields);
-              //there is a error with reportsTo, when the USR_UID is empty means there are no manager for this user, so we are disabling buttons
-              //but this validation is not for SELF_SERVICE
-              if ( $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != 'SELF_SERVICE' )
-                if ( $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_UID'] == '' )
-                  $aFields['PROCESS']['ERROR'] = $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_FULLNAME'];
-              break;
-          case 'MANUAL':
-              $Aux = array();
-              foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $aUser)
-              {
-                $Aux[$aUser['USR_UID']] = $aUser['USR_FULLNAME'];
-              }
-              asort($Aux);
-              $sAux      = '<select name="form[TASKS][' . $sKey . '][USR_UID]" id="form[TASKS][' . $sKey . '][USR_UID]">';
-              $sAux .= '<option value="" enabled>'.G::LoadTranslation('ID_SELECT').'</option>';
-              foreach ($Aux as $key => $value)
-              {
-                $sAux .= '<option value="' . $key . '">' . $value . '</option>';
-              }
-              $sAux .= '</select>';
-
-              $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $sAux;
-              break;
-          case 'CANCEL_MI':
-          case 'STATIC_MI':
-              //count the Users in the group
-              $cntInstanceUsers = count($aValues['NEXT_TASK']['USER_ASSIGNED']);
-
-               //set TAS_MI_INSTANCE_VARIABLE value
-               $sMIinstanceVar = '';
-               if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] != '') {
-                   if (isset($aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'])]))
-                    {
-                        $sMIinstanceVar = $aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'])];
-                        if($sMIinstanceVar > $cntInstanceUsers)
-                            throw (new Exception("Total Multiple Instance Task cannot be greater than number of users in the group."));
-                        else if($sMIinstanceVar == 0)
-                            throw (new Exception("Total Multiple Instance Task cannot be zero."));
-                    }
-                    else if(is_int((int)$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE']))
-                    {
-                        $sMIinstanceVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'];
-                        if($sMIinstanceVar > $cntInstanceUsers)
-                            throw (new Exception("Total Multiple Instance Task cannot be greater than number of users in the group."));
-                    }
-                    else
-                       throw (new Exception("Total Multiple Instance Task variable doesn't have valid value."));
-               }
-                 else
-                    throw (new Exception("Total Multiple Instance Task variable doesn't have valid value."));
-               ////set TAS_MI_INSTANCE_VARIABLE value
-
-               //set TAS_MI_COMPLETE_VARIABLE value
-               $sMIcompleteVar = '';
-               if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] != '') {
-                   if (isset($aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'])]))
-                    {
-                        $sMIcompleteVar = $aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'])];
-                        //
-                        if($sMIcompleteVar > $sMIinstanceVar)
-                            throw (new Exception("Total Multiple Instance Task to complete cannot be greater than Total number of Instances."));
-                    }
-                    else if(is_int((int)$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE']))
-                    {
-                        $sMIcompleteVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'];
-                        if($sMIcompleteVar > $sMIinstanceVar)
-                            throw (new Exception("Total Multiple Instance Task to complete cannot be greater than Total number of Instances."));
-                    }
-                    else
-                        throw ( new Exception("Total Multiple Instance Task to complete variable doesn't have valid value.") ) ;
-
-               }
-                 else
-                    throw ( new Exception("Total Multiple Instance Task to complete variable doesn't have valid value.") ) ;
-               //set TAS_MI_COMPLETE_VARIABLE value
-                $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_NEXT'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];
-
-               //If the Users in the group is equal to the MI Instance variable then Show all the users without Dropdown
-               if($sMIinstanceVar == $cntInstanceUsers)
-               {
-                  foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $key=>$aUser)
-                  {
-                    $hiddenName = "form[TASKS][" . $sKey . "][NEXT_TASK][USER_ASSIGNED][".$key."][USR_UID]";
-                    $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_UID'] = $aUser['USR_FULLNAME'];
-                    $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aUser['USR_UID'] . '">';
-                  }
-              }
-              //If the Users in the group is not equal to the MI Instance variable then Show Only count users in dropdown
-              else
-              {
-                    $Aux = array();
-                    foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $aUser)
-                    {
-                          $Aux[$aUser['USR_UID']] = $aUser['USR_FULLNAME'];
-                    }
-                    asort($Aux);
-                    $aAux = '<option value="" enabled>'.G::LoadTranslation('ID_SELECT').'</option>';
-                    foreach ($Aux as $akey => $value)
-                    {
-                        $aAux .= '<option value="' . $akey . '">' . $value . '</option>';
-                    }
-
-                    for($key=0; $key < $sMIinstanceVar; $key++)
-                    {
-                        $hiddenName = "form[TASKS][" . $sKey . "][NEXT_TASK][USER_ASSIGNED][".$key."][USR_UID]";
-                        $sAux      = "<select name=$hiddenName id=$hiddenName";
-                        $sAux .= $aAux;
-                        $sAux .= '</select>';
-                        $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_HIDDEN_FIELD'] = "<input type='hidden' name='hidden' id='hidden' value=''>";
-                        $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_UID'] = $sAux;
-                    }
-              }
-              break;
-          case '':  //when this task is the Finish process
-              $userFields = $oDerivation->getUsersFullNameFromArray ( $aFields['TASK'][$sKey]['USER_UID'] );
-              $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $userFields['USR_FULLNAME'];
-              $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] = true;
-              $aFields['PROCESS']['ROU_FINISH_FLAG'] = true;
-              break;
-        }
-        $hiddenName = 'form[TASKS][' . $sKey . ']';
-
-        /* Allow user defined Timing Control
+      }" );
+
+            $oStep = new Step();
+            $oStep = $oStep->loadByProcessTaskPosition( $_SESSION['PROCESS'], $_SESSION['TASK'], $_GET['POSITION'] );
+
+            /**
+             * Added By erik 16-05-08
+             * Description: this was added for the additional database connections
+             */
+            G::LoadClass( 'dbConnections' );
+            $oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
+            $oDbConnections->loadAdditionalConnections();
+            $_SESSION['CURRENT_DYN_UID'] = $_GET['UID'];
+
+            $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower( $oStep->getStepMode() ) != 'edit' ? strtolower( $oStep->getStepMode() ) : '') );
+            break;
+
+        case 'INPUT_DOCUMENT':
+            if ($noShowTitle == 0) {
+                $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+            }
+            $oInputDocument = new InputDocument();
+            $Fields = $oInputDocument->load( $_GET['UID'] );
+            if (! $aPreviousStep) {
+                $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+                $Fields['PREVIOUS_STEP_LABEL'] = '';
+            } else {
+                $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
+                $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+
+                $Fields['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
+                $Fields['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+            }
+            $Fields['NEXT_STEP'] = $aNextStep['PAGE'];
+            $Fields['NEXT_STEP_LABEL'] = G::loadTranslation( "ID_NEXT_STEP" );
+            switch ($_GET['ACTION']) {
+                case 'ATTACH':
+                    switch ($Fields['INP_DOC_FORM_NEEDED']) {
+                        case 'REAL':
+                            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_NEW' );
+                            $sXmlForm = 'cases/cases_AttachInputDocument2';
+                            break;
+                        case 'VIRTUAL':
+                            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+                            $sXmlForm = 'cases/cases_AttachInputDocument1';
+                            break;
+                        case 'VREAL':
+                            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+                            $sXmlForm = 'cases/cases_AttachInputDocument3';
+                            break;
+                    }
+                    $Fields['MESSAGE1'] = G::LoadTranslation( 'ID_PLEASE_ENTER_COMMENTS' );
+                    $Fields['MESSAGE2'] = G::LoadTranslation( 'ID_PLEASE_SELECT_FILE' );
+                    //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
+                    $oPluginRegistry = & PMPluginRegistry::getSingleton();
+                    if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) { //If a Plugin has registered a Break Page Evaluator
+                        $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED']
+                        ) );
+                    }
+                    //END: If there is a Break Step registered from Plugin
+                    $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID'] ), array_merge( array ('DOC_UID' => $_GET['UID']
+                    ), $Fields ) ); //$aFields
+
+
+                    //call plugin
+                    //if ( $oPluginRegistry->existsTrigger ( PM_CASE_DOCUMENT_LIST ) ) {
+                    //  $folderData = new folderData (null, null, $_SESSION['APPLICATION'], null, $_SESSION['USER_LOGGED'] );
+                    //  $oPluginRegistry =& PMPluginRegistry::getSingleton();
+                    //  $oPluginRegistry->executeTriggers ( PM_CASE_DOCUMENT_LIST , $folderData );
+                    //  //end plugin
+                    //}
+                    //else
+                    //  $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID']), array_merge(array('DOC_UID'=>$_GET['UID']),$Fields));//$aFields
+
+
+                    $oHeadPublisher = & headPublisher::getSingleton();
+                    $titleDocument = "<h3>" . $Fields['INP_DOC_TITLE'] . "<br><small>" . G::LoadTranslation( 'ID_INPUT_DOCUMENT' ) . "</small></h3>";
+                    if ($Fields['INP_DOC_DESCRIPTION'])
+                        $titleDocument .= " " . str_replace( "\n", "", str_replace( "'", "\'", nl2br( htmlentities( utf8_decode( $Fields['INP_DOC_DESCRIPTION'] ) ) ) ) ) . "";
+
+                    $oHeadPublisher->addScriptCode( "documentName='{$titleDocument}';" );
+                    break;
+
+                case 'VIEW':
+                    require_once 'classes/model/AppDocument.php';
+                    require_once 'classes/model/Users.php';
+                    $oAppDocument = new AppDocument();
+                    $oAppDocument->Fields = $oAppDocument->load( $_GET['DOC'], $_GET['VERSION'] );
+                    $Fields['POSITION'] = $_SESSION['STEP_POSITION'];
+                    $oUser = new Users();
+                    $aUser = $oUser->load( $oAppDocument->Fields['USR_UID'] );
+                    $Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
+                    switch ($Fields['INP_DOC_FORM_NEEDED']) {
+                        case 'REAL':
+                            $sXmlForm = 'cases/cases_ViewInputDocument2';
+                            break;
+                        case 'VIRTUAL':
+                            $sXmlForm = 'cases/cases_ViewInputDocument1';
+                            break;
+                        case 'VREAL':
+                            $sXmlForm = 'cases/cases_ViewInputDocument3';
+                            break;
+                    }
+                    $oAppDocument->Fields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
+                    $oAppDocument->Fields['FILE'] = 'cases_ShowDocument?a=' . $_GET['DOC'] . '&r=' . rand();
+                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $sXmlForm, '', G::array_merges( $Fields, $oAppDocument->Fields ), '' );
+                    break;
+            }
+            break;
+
+        case 'OUTPUT_DOCUMENT':
+            //$G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
+
+
+            require_once 'classes/model/OutputDocument.php';
+            $oOutputDocument = new OutputDocument();
+            $aOD = $oOutputDocument->load( $_GET['UID'] );
+            if (! $aPreviousStep) {
+                $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+            } else {
+                $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
+                $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+            }
+            $aOD['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
+            $aOD['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation( "ID_NEXT_STEP" );
+            switch ($_GET['ACTION']) {
+                case 'GENERATE':
+                    //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
+                    $oPluginRegistry = & PMPluginRegistry::getSingleton();
+                    if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) { //If a Plugin has registered a Break Page Evaluator
+                        $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED']
+                        ) );
+                    }
+                    //END: If there is a Break Step registered from Plugin
+
+
+                    $sFilenameOriginal = $sFilename = preg_replace( '[^A-Za-z0-9_]', '_', G::replaceDataField( $aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA'] ) );
+                    require_once 'classes/model/AppFolder.php';
+                    require_once 'classes/model/AppDocument.php';
+
+                    //Get the Custom Folder ID (create if necessary)
+                    $oFolder = new AppFolder();
+                    $folderId = $oFolder->createFromPath( $aOD['OUT_DOC_DESTINATION_PATH'] );
+
+                    //Tags
+                    $fileTags = $oFolder->parseTags( $aOD['OUT_DOC_TAGS'] );
+
+                    //Get last Document Version and apply versioning if is enabled
+
+
+                    $oAppDocument = new AppDocument();
+                    $lastDocVersion = $oAppDocument->getLastDocVersion( $_GET['UID'], $_SESSION['APPLICATION'] );
+
+                    //if(($aOD['OUT_DOC_VERSIONING'])||($lastDocVersion==0)){
+                    //  $lastDocVersion++;
+                    //}
+
+
+                    $oCriteria = new Criteria( 'workflow' );
+                    $oCriteria->add( AppDocumentPeer::APP_UID, $_SESSION['APPLICATION'] );
+                    //$oCriteria->add(AppDocumentPeer::DEL_INDEX,    $_SESSION['INDEX']);
+                    $oCriteria->add( AppDocumentPeer::DOC_UID, $_GET['UID'] );
+                    $oCriteria->add( AppDocumentPeer::DOC_VERSION, $lastDocVersion );
+                    $oCriteria->add( AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT' );
+                    $oDataset = AppDocumentPeer::doSelectRS( $oCriteria );
+                    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                    $oDataset->next();
+                    if (($aOD['OUT_DOC_VERSIONING']) && ($lastDocVersion != 0)) { //Create new Version of current output
+                        $lastDocVersion ++;
+                        if ($aRow = $oDataset->getRow()) {
+                            $aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion + 1,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
+                            );
+                            $oAppDocument = new AppDocument();
+                            $oAppDocument->create( $aFields );
+                            $sDocUID = $aRow['APP_DOC_UID'];
+                        }
+                    } else { //No versioning so Update a current Output or Create new if no exist
+                        if ($aRow = $oDataset->getRow()) { //Update
+                            $aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
+                            );
+                            $oAppDocument = new AppDocument();
+                            $oAppDocument->update( $aFields );
+                            $sDocUID = $aRow['APP_DOC_UID'];
+                        } else { //create
+                            if ($lastDocVersion == 0)
+                                $lastDocVersion ++;
+                            $aFields = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
+                            );
+                            $oAppDocument = new AppDocument();
+                            $aFields['APP_DOC_UID'] = $sDocUID = $oAppDocument->create( $aFields );
+
+                        }
+                    }
+
+                    //$sFilename = ereg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
+                    //if ( $sFilename == '' ) $sFilename='_';
+
+
+                    $sFilename = $aFields['APP_DOC_UID'] . "_" . $lastDocVersion;
+
+                    $pathOutput = PATH_DOCUMENT . $_SESSION['APPLICATION'] . PATH_SEP . 'outdocs' . PATH_SEP;
+                    G::mk_dir( $pathOutput );
+                    switch ($aOD['OUT_DOC_TYPE']) {
+                        case 'HTML':
+
+                            $aProperties = array (); //maui
+
+
+                            if (! isset( $aOD['OUT_DOC_MEDIA'] ))
+                                $aOD['OUT_DOC_MEDIA'] = 'Letter';
+                            if (! isset( $aOD['OUT_DOC_LEFT_MARGIN'] ))
+                                $aOD['OUT_DOC_LEFT_MARGIN'] = '15';
+                            if (! isset( $aOD['OUT_DOC_RIGHT_MARGIN'] ))
+                                $aOD['OUT_DOC_RIGHT_MARGIN'] = '15';
+                            if (! isset( $aOD['OUT_DOC_TOP_MARGIN'] ))
+                                $aOD['OUT_DOC_TOP_MARGIN'] = '15';
+                            if (! isset( $aOD['OUT_DOC_BOTTOM_MARGIN'] ))
+                                $aOD['OUT_DOC_BOTTOM_MARGIN'] = '15';
+
+                            $aProperties['media'] = $aOD['OUT_DOC_MEDIA'];
+                            $aProperties['margins'] = array ('left' => $aOD['OUT_DOC_LEFT_MARGIN'],'right' => $aOD['OUT_DOC_RIGHT_MARGIN'],'top' => $aOD['OUT_DOC_TOP_MARGIN'],'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN']
+                            );
+                            if ($aOD['OUT_DOC_PDF_SECURITY_ENABLED'] == '1') {
+                                $aProperties['pdfSecurity'] = array ('openPassword' => $aOD['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],'ownerPassword' => $aOD['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],'permissions' => $aOD['OUT_DOC_PDF_SECURITY_PERMISSIONS']
+                                );
+                            }
+                            $oOutputDocument->generate( $_GET['UID'], $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties );
+                            //$sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'] );
+                            break;
+                        case 'JRXML':
+                            //creating the xml with the application data;
+                            $xmlData = "<dynaform>\n";
+                            foreach ($Fields['APP_DATA'] as $key => $val) {
+                                $xmlData .= "  <$key>$val</$key>\n";
+                            }
+                            $xmlData .= "</dynaform>\n";
+                            $iSize = file_put_contents( $javaOutput . 'addressBook.xml', $xmlData );
+
+                            G::LoadClass( 'javaBridgePM' );
+                            $JBPM = new JavaBridgePM();
+                            $JBPM->checkJavaExtension();
+
+                            $util = new Java( "com.processmaker.util.pmutils" );
+                            $util->setInputPath( $javaInput );
+                            $util->setOutputPath( $javaOutput );
+
+                            //$content = file_get_contents ( PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.jrxml' );
+                            //$iSize = file_put_contents ( $javaInput .  $aOD['OUT_DOC_UID'] . '.jrxml', $content );
+                            copy( PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.jrxml', $javaInput . $aOD['OUT_DOC_UID'] . '.jrxml' );
+
+                            $outputFile = $javaOutput . $sFilename . '.pdf';
+                            print $util->jrxml2pdf( $aOD['OUT_DOC_UID'] . '.jrxml', basename( $outputFile ) );
+
+                            //$content = file_get_contents ( $outputFile );
+                            //$iSize = file_put_contents ( $pathOutput .  $sFilename . '.pdf' , $content );
+                            copy( $outputFile, $pathOutput . $sFilename . '.pdf' );
+                            //die;
+                            break;
+                        case 'ACROFORM':
+                            //creating the xml with the application data;
+                            $xmlData = "<dynaform>\n";
+                            foreach ($Fields['APP_DATA'] as $key => $val) {
+                                $xmlData .= "  <$key>$val</$key>\n";
+                            }
+                            $xmlData .= "</dynaform>\n";
+                            //$iSize = file_put_contents ( $javaOutput .  'addressBook.xml' , $xmlData );
+
+
+                            G::LoadClass( 'javaBridgePM' );
+                            $JBPM = new JavaBridgePM();
+                            $JBPM->checkJavaExtension();
+
+                            $util = new Java( "com.processmaker.util.pmutils" );
+                            $util->setInputPath( $javaInput );
+                            $util->setOutputPath( $javaOutput );
+
+                            copy( PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.pdf', $javaInput . $aOD['OUT_DOC_UID'] . '.pdf' );
+
+                            $outputFile = $javaOutput . $sFilename . '.pdf';
+                            print $util->writeVarsToAcroFields( $aOD['OUT_DOC_UID'] . '.pdf', $xmlData );
+
+                            copy( $javaOutput . $aOD['OUT_DOC_UID'] . '.pdf', $pathOutput . $sFilename . '.pdf' );
+
+                            break;
+                        default:
+                            throw (new Exception( 'invalid output document' ));
+                    }
+
+                    //Execute after triggers - Start
+                    $Fields['APP_DATA'] = $oCase->ExecuteTriggers( $_SESSION['TASK'], 'OUTPUT_DOCUMENT', $_GET['UID'], 'AFTER', $Fields['APP_DATA'] );
+                    $Fields['DEL_INDEX'] = $_SESSION['INDEX'];
+                    $Fields['TAS_UID'] = $_SESSION['TASK'];
+                    //Execute after triggers - End
+
+
+                    //Save data - Start
+                    $oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
+                    //Save data - End
+
+
+                    //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
+                    $oPluginRegistry = & PMPluginRegistry::getSingleton();
+                    if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) {
+                        $triggerDetail = $oPluginRegistry->getTriggerInfo( PM_UPLOAD_DOCUMENT );
+
+                        $sPathName = PATH_DOCUMENT . $_SESSION['APPLICATION'] . PATH_SEP;
+
+                        $oData['APP_UID'] = $_SESSION['APPLICATION'];
+                        $oData['ATTACHMENT_FOLDER'] = true;
+                        switch ($aOD['OUT_DOC_GENERATE']) {
+                            case "BOTH":
+                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion() );
+
+                                $documentData->sFileType = "PDF";
+                                $documentData->bUseOutputFolder = true;
+                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                if ($uploadReturn) { //Only delete if the file was saved correctly
+                                    $aFields['APP_DOC_PLUGIN'] = $triggerDetail->sNamespace;
+                                    //$oAppDocument = new AppDocument();
+                                    //$oAppDocument->update($aFields);
+                                    unlink( $pathOutput . $sFilename . '.pdf' );
+                                }
+
+                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.doc', $sFilenameOriginal . '.doc', $sDocUID, $oAppDocument->getDocVersion() );
+
+                                $documentData->sFileType = "DOC";
+                                $documentData->bUseOutputFolder = true;
+                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                if ($uploadReturn) { //Only delete if the file was saved correctly
+                                    unlink( $pathOutput . $sFilename . '.doc' );
+                                }
+
+                                break;
+                            case "PDF":
+                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion() );
+
+                                $documentData->sFileType = "PDF";
+                                $documentData->bUseOutputFolder = true;
+                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                if ($uploadReturn) { //Only delete if the file was saved correctly
+                                    unlink( $pathOutput . $sFilename . '.pdf' );
+                                }
+                                break;
+                            case "DOC":
+                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.doc', $sFilenameOriginal . '.doc', $sDocUID, $oAppDocument->getDocVersion() );
+
+                                $documentData->sFileType = "DOC";
+                                $documentData->bUseOutputFolder = true;
+                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                if ($uploadReturn) { //Only delete if the file was saved correctly
+                                    unlink( $pathOutput . $sFilename . '.doc' );
+                                }
+                                break;
+                        }
+
+                    }
+
+                    $outputNextStep = 'cases_Step?TYPE=OUTPUT_DOCUMENT&UID=' . $_GET['UID'] . '&POSITION=' . $_SESSION['STEP_POSITION'] . '&ACTION=VIEW&DOC=' . $sDocUID;
+                    G::header( 'location: ' . $outputNextStep );
+                    die();
+                    break;
+                case 'VIEW':
+                    if ($noShowTitle == 0) {
+                        $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+                    }
+                    require_once 'classes/model/AppDocument.php';
+                    $oAppDocument = new AppDocument();
+                    $lastVersion = $oAppDocument->getLastAppDocVersion( $_GET['DOC'], $_SESSION['APPLICATION'] );
+                    $aFields = $oAppDocument->load( $_GET['DOC'], $lastVersion );
+                    $listing = false;
+                    $oPluginRegistry = & PMPluginRegistry::getSingleton();
+                    if ($oPluginRegistry->existsTrigger( PM_CASE_DOCUMENT_LIST )) {
+                        $folderData = new folderData( null, null, $_SESSION['APPLICATION'], null, $_SESSION['USER_LOGGED'] );
+                        $folderData->PMType = "OUTPUT";
+                        $folderData->returnList = true;
+                        $listing = $oPluginRegistry->executeTriggers( PM_CASE_DOCUMENT_LIST, $folderData );
+                    }
+
+                    require_once 'classes/model/OutputDocument.php';
+                    $oOutputDocument = new OutputDocument();
+                    $aGields = $oOutputDocument->load( $aFields['DOC_UID'] );
+
+                    if (isset( $aGields['OUT_DOC_VERSIONING'] ) && $aGields['OUT_DOC_VERSIONING'] != 0) {
+                        $oAppDocument = new AppDocument();
+                        $lastDocVersion = $oAppDocument->getLastDocVersion( $_GET['UID'], $_SESSION['APPLICATION'] );
+                    } else {
+                        $lastDocVersion = '';
+                    }
+                    $aFields['VIEW1'] = G::LoadTranslation( 'ID_OPEN' );
+
+                    $aFields['VIEW2'] = G::LoadTranslation( 'ID_OPEN' );
+
+                    $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v=' . $lastDocVersion . '&ext=doc&random=' . rand() . '&PHPSESSID=' . @session_id();
+
+                    $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v=' . $lastDocVersion . '&ext=pdf&random=' . rand() . '&PHPSESSID=' . @session_id();
+
+                    if (is_array( $listing )) { //If exist in Plugin Document List
+                        foreach ($listing as $folderitem) {
+                            if (($folderitem->filename == $aFields['APP_DOC_UID']) && ($folderitem->type == 'DOC')) {
+                                $aFields['VIEW1'] = G::LoadTranslation( 'ID_GET_EXTERNAL_FILE' );
+                                $aFields['FILE1'] = $folderitem->downloadScript;
+                                continue;
+                            }
+                            if (($folderitem->filename == $aFields['APP_DOC_UID']) && ($folderitem->type == 'PDF')) {
+                                $aFields['VIEW2'] = G::LoadTranslation( 'ID_GET_EXTERNAL_FILE' );
+                                $aFields['FILE2'] = $folderitem->downloadScript;
+                                continue;
+                            }
+                        }
+                    }
+
+                    if (($aGields['OUT_DOC_GENERATE'] == 'BOTH') || ($aGields['OUT_DOC_GENERATE'] == ''))
+                        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument1', '', G::array_merges( $aOD, $aFields ), '' );
+
+                    if ($aGields['OUT_DOC_GENERATE'] == 'DOC')
+                        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument2', '', G::array_merges( $aOD, $aFields ), '' );
+
+                    if ($aGields['OUT_DOC_GENERATE'] == 'PDF')
+                        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument3', '', G::array_merges( $aOD, $aFields ), '' );
+
+                    break;
+            }
+            break;
+
+        case 'ASSIGN_TASK':
+            $oDerivation = new Derivation();
+            $oProcess = new Process();
+            $aData = $oCase->loadCase( $_SESSION['APPLICATION'] );
+
+            $aFields['PROCESS'] = $oProcess->load( $_SESSION['PROCESS'] );
+            $aFields['PREVIOUS_PAGE'] = $aPreviousStep['PAGE'];
+            $aFields['PREVIOUS_PAGE_LABEL'] = G::LoadTranslation( 'ID_PREVIOUS_STEP' );
+            $aFields['ASSIGN_TASK'] = G::LoadTranslation( 'ID_ASSIGN_TASK' );
+            $aFields['END_OF_PROCESS'] = G::LoadTranslation( 'ID_END_OF_PROCESS' );
+            $aFields['NEXT_TASK_LABEL'] = G::LoadTranslation( 'ID_NEXT_TASK' );
+            $aFields['EMPLOYEE'] = G::LoadTranslation( 'ID_EMPLOYEE' );
+            $aFields['LAST_EMPLOYEE'] = G::LoadTranslation( 'ID_LAST_EMPLOYEE' );
+            $aFields['OPTION_LABEL'] = G::LoadTranslation( 'ID_OPTION' );
+            $aFields['CONTINUE'] = G::LoadTranslation( 'ID_CONTINUE' );
+            $aFields['FINISH'] = G::LoadTranslation( 'ID_FINISH' );
+            $aFields['CONTINUE_WITH_OPTION'] = G::LoadTranslation( 'ID_CONTINUE_WITH_OPTION' );
+            $aFields['FINISH_WITH_OPTION'] = G::LoadTranslation( 'ID_FINISH_WITH_OPTION' );
+            $aFields['TAS_TIMING_TITLE'] = G::LoadTranslation( 'ID_TIMING_CONTROL' );
+            $aFields['TAS_DURATION'] = G::LoadTranslation( 'ID_TASK_DURATION' );
+            $aFields['TAS_TIMEUNIT'] = G::LoadTranslation( 'ID_TIME_UNIT' );
+            $aFields['TAS_TYPE_DAY'] = G::LoadTranslation( 'ID_COUNT_DAYS' );
+            $aFields['TAS_CALENDAR'] = G::LoadTranslation( 'ID_CALENDAR' );
+
+            $aFields['TASK'] = $oDerivation->prepareInformation( array ('USER_UID' => $_SESSION['USER_LOGGED'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX']
+            ) );
+
+            if (empty( $aFields['TASK'] )) {
+                throw (new Exception( G::LoadTranslation( 'ID_NO_DERIVATION_RULE' ) ));
+            }
+
+            //take the first derivation rule as the task derivation rule type.
+            $aFields['PROCESS']['ROU_TYPE'] = $aFields['TASK'][1]['ROU_TYPE'];
+            $aFields['PROCESS']['ROU_FINISH_FLAG'] = false;
+
+            foreach ($aFields['TASK'] as $sKey => &$aValues) {
+                $sPriority = ''; //set priority value
+                if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] != '') {
+                    //TO DO: review this type of assignment
+                    if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] )] )) {
+                        $sPriority = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] )];
+                    }
+                } //set priority value
+
+
+                $sTask = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_UID'];
+
+                //TAS_UID has a hidden field to store the TAS_UID
+                $hiddenName = "form[TASKS][" . $sKey . "][TAS_UID]";
+                $hiddenField = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aValues['NEXT_TASK']['TAS_UID'] . '">';
+                $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_HIDDEN_FIELD'] = $hiddenField;
+                //print "<hr>".$aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']."<hr>";
+                switch ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']) {
+                    case 'EVALUATE':
+                    case 'REPORT_TO':
+                    case 'BALANCED':
+                    case 'SELF_SERVICE':
+                        $hiddenName = "form[TASKS][" . $sKey . "][USR_UID]";
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_FULLNAME'];
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aValues['NEXT_TASK']['USER_ASSIGNED']['USR_UID'] . '">';
+                        //var_dump($aFields);
+                        //there is a error with reportsTo, when the USR_UID is empty means there are no manager for this user, so we are disabling buttons
+                        //but this validation is not for SELF_SERVICE
+                        if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != 'SELF_SERVICE')
+                            if ($aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_UID'] == '')
+                                $aFields['PROCESS']['ERROR'] = $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_FULLNAME'];
+                        break;
+                    case 'MANUAL':
+                        $Aux = array ();
+                        foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $aUser) {
+                            $Aux[$aUser['USR_UID']] = $aUser['USR_FULLNAME'];
+                        }
+                        asort( $Aux );
+                        $sAux = '<select name="form[TASKS][' . $sKey . '][USR_UID]" id="form[TASKS][' . $sKey . '][USR_UID]">';
+                        $sAux .= '<option value="" enabled>' . G::LoadTranslation( 'ID_SELECT' ) . '</option>';
+                        foreach ($Aux as $key => $value) {
+                            $sAux .= '<option value="' . $key . '">' . $value . '</option>';
+                        }
+                        $sAux .= '</select>';
+
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $sAux;
+                        break;
+                    case 'CANCEL_MI':
+                    case 'STATIC_MI':
+                        //count the Users in the group
+                        $cntInstanceUsers = count( $aValues['NEXT_TASK']['USER_ASSIGNED'] );
+
+                        //set TAS_MI_INSTANCE_VARIABLE value
+                        $sMIinstanceVar = '';
+                        if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] != '') {
+                            if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )] )) {
+                                $sMIinstanceVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )];
+                                if ($sMIinstanceVar > $cntInstanceUsers)
+                                    throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." ));
+                                else if ($sMIinstanceVar == 0)
+                                    throw (new Exception( "Total Multiple Instance Task cannot be zero." ));
+                            } else if (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )) {
+                                $sMIinstanceVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'];
+                                if ($sMIinstanceVar > $cntInstanceUsers)
+                                    throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." ));
+                            } else
+                                throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." ));
+                        } else
+                            throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." ));
+                            ////set TAS_MI_INSTANCE_VARIABLE value
+
+
+                        //set TAS_MI_COMPLETE_VARIABLE value
+                        $sMIcompleteVar = '';
+                        if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] != '') {
+                            if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )] )) {
+                                $sMIcompleteVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )];
+                                //
+                                if ($sMIcompleteVar > $sMIinstanceVar)
+                                    throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." ));
+                            } else if (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )) {
+                                $sMIcompleteVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'];
+                                if ($sMIcompleteVar > $sMIinstanceVar)
+                                    throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." ));
+                            } else
+                                throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." ));
+
+                        } else
+                            throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." ));
+                            //set TAS_MI_COMPLETE_VARIABLE value
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_NEXT'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];
+
+                        //If the Users in the group is equal to the MI Instance variable then Show all the users without Dropdown
+                        if ($sMIinstanceVar == $cntInstanceUsers) {
+                            foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $key => $aUser) {
+                                $hiddenName = "form[TASKS][" . $sKey . "][NEXT_TASK][USER_ASSIGNED][" . $key . "][USR_UID]";
+                                $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_UID'] = $aUser['USR_FULLNAME'];
+                                $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aUser['USR_UID'] . '">';
+                            }
+                        }                         //If the Users in the group is not equal to the MI Instance variable then Show Only count users in dropdown
+                        else {
+                            $Aux = array ();
+                            foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $aUser) {
+                                $Aux[$aUser['USR_UID']] = $aUser['USR_FULLNAME'];
+                            }
+                            asort( $Aux );
+                            $aAux = '<option value="" enabled>' . G::LoadTranslation( 'ID_SELECT' ) . '</option>';
+                            foreach ($Aux as $akey => $value) {
+                                $aAux .= '<option value="' . $akey . '">' . $value . '</option>';
+                            }
+
+                            for ($key = 0; $key < $sMIinstanceVar; $key ++) {
+                                $hiddenName = "form[TASKS][" . $sKey . "][NEXT_TASK][USER_ASSIGNED][" . $key . "][USR_UID]";
+                                $sAux = "<select name=$hiddenName id=$hiddenName";
+                                $sAux .= $aAux;
+                                $sAux .= '</select>';
+                                $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_HIDDEN_FIELD'] = "<input type='hidden' name='hidden' id='hidden' value=''>";
+                                $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED'][$key]['USR_UID'] = $sAux;
+                            }
+                        }
+                        break;
+                    case '': //when this task is the Finish process
+                        $userFields = $oDerivation->getUsersFullNameFromArray( $aFields['TASK'][$sKey]['USER_UID'] );
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $userFields['USR_FULLNAME'];
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] = true;
+                        $aFields['PROCESS']['ROU_FINISH_FLAG'] = true;
+                        break;
+                }
+                $hiddenName = 'form[TASKS][' . $sKey . ']';
+
+                /* Allow user defined Timing Control
          * Values in the dropdown will be populated from the Table TASK.
-         */
-        if($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != '') //Check for End of Process
-        {
-            $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_FLY'] = strtolower($aValues['NEXT_TASK']['TAS_TRANSFER_FLY']);
-            $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] = "<input type=hidden name='".$hiddenName."[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' id='".$hiddenName."[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' value=".$aValues['NEXT_TASK']['TAS_TRANSFER_FLY'].">";
-            if($aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] == 'true')
-            {
-                $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DURATION'] = '<input type="text" size="5" name="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" id="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" value="' . $aValues['NEXT_TASK']['TAS_DURATION'] . '">';
-                $hoursSelected = $daysSelected = '';
-                if($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS')
-                    $hoursSelected = "selected = 'selected'";
-                else
-                    $daysSelected = "selected = 'selected'";
-
-                $sAux  = '<select name='.$hiddenName.'[NEXT_TASK][TAS_TIMEUNIT] id= '.$hiddenName.'[NEXT_TASK][TAS_TIMEUNIT] ';
-                $sAux .= "<option ".$hoursSelected." value='HOURS'>Hours</option> ";
-                $sAux .= "<option ".$daysSelected." value='DAYS'>Days</option> ";
-                $sAux .= '</select>';
-                $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] = $sAux;
-
-                $workSelected = $calendarSelected = '';
-                if($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TYPE_DAY'] == '1')
-                    $workSelected = "selected = 'selected'";
-                else
-                    $calendarSelected = "selected = 'selected'";
-
-                $sAux  = '<select name='.$hiddenName.'[NEXT_TASK][TAS_TYPE_DAY] id= '.$hiddenName.'[NEXT_TASK][TAS_TYPE_DAY] ';
-                $sAux .= "<option ".$workSelected." value='1'>Work Days</option> ";
-                $sAux .= "<option ".$calendarSelected." value='2'>Calendar Days</option> ";
-                $sAux .= '</select>';
-                $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TYPE_DAY'] = $sAux;
-
-                //Check for
-                  G::LoadClass ( 'calendar' );
-                  $calendar    = new Calendar ( );
-                  $calendarObj = $calendar->getCalendarList ( true, true );
-                  $availableCalendar = $calendarObj ['array'];
-                  $aCalendar['CALENDAR_UID'] = '00000000000000000000000000000001';
-                  $aCalendar['CALENDAR_NAME'] = 'DEFAULT';
-                  $sAux  = '<select name='.$hiddenName.'[NEXT_TASK][TAS_CALENDAR] id= '.$hiddenName.'[NEXT_TASK][TAS_CALENDAR] ';
-                  $sAux .= "<option value='none'>-None-</option> ";
-                    foreach($availableCalendar as $aCalendar)
-                    {
-                      if(is_array($aCalendar))
-                        {
-                            $sAux .= "<option value='".$aCalendar['CALENDAR_UID']."'>".$aCalendar['CALENDAR_NAME']."</option> ";
-                        }
-                    }
-                  $sAux .= '</select>';
-                  $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_CALENDAR'] = $sAux;
-
-              }
-
-
-            $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_ASSIGN_TYPE']   = '<input type="hidden" name="' . $hiddenName . '[TAS_ASSIGN_TYPE]"   id="' . $hiddenName . '[TAS_ASSIGN_TYPE]"   value="' . $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] . '">';
-            if (isset ($aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'])){
-              $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DEF_PROC_CODE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_DEF_PROC_CODE]" id="' . $hiddenName . '[TAS_DEF_PROC_CODE]" value="' . $aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'] . '">';
-            } else {
-              $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DEF_PROC_CODE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_DEF_PROC_CODE]" id="' . $hiddenName . '[TAS_DEF_PROC_CODE]" value="">';
-            }
-            $aFields['TASK'][$sKey]['NEXT_TASK']['DEL_PRIORITY']      = '<input type="hidden" name="' . $hiddenName . '[DEL_PRIORITY]"      id="' . $hiddenName . '[DEL_PRIORITY]"      value="' . $sPriority . '">';
-            $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PARENT']        = '<input type="hidden" name="' . $hiddenName . '[TAS_PARENT]"        id="' . $hiddenName . '[TAS_PARENT]"        value="' . $aValues['NEXT_TASK']['TAS_PARENT'] . '">';
-          }
-      }
-      $aFields['PROCESSING_MESSAGE'] = G::loadTranslation('ID_PROCESSING');
-
-      /**
-       * New Feature: Derivation Screen can be personalized
-       * @author Erik Amaru Ortiz <erik@colosa.com>
-       */
-      $tplFile = 'cases/cases_ScreenDerivation';
-      $task    = TaskPeer::retrieveByPk($_SESSION['TASK']);
-
-      $tasDerivationScreenTpl = $task->getTasDerivationScreenTpl();
-
-      if (!empty($tasDerivationScreenTpl)) { //erik: first, verify if the task has a personalized template (for derivation screen)
-        $tplFile = $tasDerivationScreenTpl;
-        $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
-      }
-      else { //erik: verify if the process has a personalized template (for derivation screen)
-        if (!empty($aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'])) {
-          $tplFile = $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'];
-          $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
-        }
-      }
-
-      $G_PUBLISH->AddContent('smarty', $tplFile, '', '', $aFields);
-/*
+         */
+                if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != '')                 //Check for End of Process
+{
+                    $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_FLY'] = strtolower( $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] );
+                    $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] = "<input type=hidden name='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' id='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' value=" . $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] . ">";
+                    if ($aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] == 'true') {
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DURATION'] = '<input type="text" size="5" name="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" id="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" value="' . $aValues['NEXT_TASK']['TAS_DURATION'] . '">';
+                        $hoursSelected = $daysSelected = '';
+                        if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'HOURS')
+                            $hoursSelected = "selected = 'selected'";
+                        else
+                            $daysSelected = "selected = 'selected'";
+
+                        $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] ';
+                        $sAux .= "<option " . $hoursSelected . " value='HOURS'>Hours</option> ";
+                        $sAux .= "<option " . $daysSelected . " value='DAYS'>Days</option> ";
+                        $sAux .= '</select>';
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] = $sAux;
+
+                        $workSelected = $calendarSelected = '';
+                        if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TYPE_DAY'] == '1')
+                            $workSelected = "selected = 'selected'";
+                        else
+                            $calendarSelected = "selected = 'selected'";
+
+                        $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] id= ' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] ';
+                        $sAux .= "<option " . $workSelected . " value='1'>Work Days</option> ";
+                        $sAux .= "<option " . $calendarSelected . " value='2'>Calendar Days</option> ";
+                        $sAux .= '</select>';
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TYPE_DAY'] = $sAux;
+
+                        //Check for
+                        G::LoadClass( 'calendar' );
+                        $calendar = new Calendar();
+                        $calendarObj = $calendar->getCalendarList( true, true );
+                        $availableCalendar = $calendarObj['array'];
+                        $aCalendar['CALENDAR_UID'] = '00000000000000000000000000000001';
+                        $aCalendar['CALENDAR_NAME'] = 'DEFAULT';
+                        $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_CALENDAR] id= ' . $hiddenName . '[NEXT_TASK][TAS_CALENDAR] ';
+                        $sAux .= "<option value='none'>-None-</option> ";
+                        foreach ($availableCalendar as $aCalendar) {
+                            if (is_array( $aCalendar )) {
+                                $sAux .= "<option value='" . $aCalendar['CALENDAR_UID'] . "'>" . $aCalendar['CALENDAR_NAME'] . "</option> ";
+                            }
+                        }
+                        $sAux .= '</select>';
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_CALENDAR'] = $sAux;
+
+                    }
+
+                    $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_ASSIGN_TYPE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_ASSIGN_TYPE]"   id="' . $hiddenName . '[TAS_ASSIGN_TYPE]"   value="' . $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] . '">';
+                    if (isset( $aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'] )) {
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DEF_PROC_CODE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_DEF_PROC_CODE]" id="' . $hiddenName . '[TAS_DEF_PROC_CODE]" value="' . $aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'] . '">';
+                    } else {
+                        $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DEF_PROC_CODE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_DEF_PROC_CODE]" id="' . $hiddenName . '[TAS_DEF_PROC_CODE]" value="">';
+                    }
+                    $aFields['TASK'][$sKey]['NEXT_TASK']['DEL_PRIORITY'] = '<input type="hidden" name="' . $hiddenName . '[DEL_PRIORITY]"      id="' . $hiddenName . '[DEL_PRIORITY]"      value="' . $sPriority . '">';
+                    $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PARENT'] = '<input type="hidden" name="' . $hiddenName . '[TAS_PARENT]"        id="' . $hiddenName . '[TAS_PARENT]"        value="' . $aValues['NEXT_TASK']['TAS_PARENT'] . '">';
+                }
+            }
+            $aFields['PROCESSING_MESSAGE'] = G::loadTranslation( 'ID_PROCESSING' );
+
+            /**
+             * New Feature: Derivation Screen can be personalized
+             *
+             * @author Erik Amaru Ortiz <erik@colosa.com>
+             */
+            $tplFile = 'cases/cases_ScreenDerivation';
+            $task = TaskPeer::retrieveByPk( $_SESSION['TASK'] );
+
+            $tasDerivationScreenTpl = $task->getTasDerivationScreenTpl();
+
+            if (! empty( $tasDerivationScreenTpl )) { //erik: first, verify if the task has a personalized template (for derivation screen)
+                $tplFile = $tasDerivationScreenTpl;
+                $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
+            } else { //erik: verify if the process has a personalized template (for derivation screen)
+                if (! empty( $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'] )) {
+                    $tplFile = $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'];
+                    $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
+                }
+            }
+
+            $G_PUBLISH->AddContent( 'smarty', $tplFile, '', '', $aFields );
+            /*
       if (isset( $aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){
        if($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED']!="ERROR" && is_array($aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){
          $G_PUBLISH->AddContent('smarty', 'cases/cases_ScreenDerivation', '', '', $aFields);
@@ -979,86 +902,85 @@
       }else{
         $G_PUBLISH->AddContent('smarty', 'cases/cases_ScreenDerivation', '', '', $aFields);
         }
-*/
-      break;
-    case 'EXTERNAL':
-      if($noShowTitle == 0) {
-        $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
-      }
-      $oPluginRegistry = &PMPluginRegistry::getSingleton();
-      $externalSteps   = $oPluginRegistry->getSteps();
-
-      $sNamespace = '';
-      $sStepName  = '';
-      foreach ( $externalSteps as $key=>$val ) {
-        if ( $val->sStepId == $_GET['UID'] ) {
-          $sNamespace = $val->sNamespace;
-          $sStepName  = $val->sStepName;
-
-        }
-      }
-      if ( class_exists($sNamespace."plugin")) {
-        if (!$aPreviousStep) {
-          $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-        }
-        else {
-          $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-          $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
-        }
-        $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
-        $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation("ID_NEXT_STEP");
-
-        /** Added By erik date: 16-05-08
-        * Description: this was added for the additional database connections */
-        G::LoadClass ('dbConnections');
-        $oDbConnections = new dbConnections($_SESSION['PROCESS']);
-        $oDbConnections->loadAdditionalConnections();
-        $stepFilename = "$sNamespace/$sStepName";
-        G::evalJScript("
+*/
+            break;
+        case 'EXTERNAL':
+            if ($noShowTitle == 0) {
+                $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+            }
+            $oPluginRegistry = &PMPluginRegistry::getSingleton();
+            $externalSteps = $oPluginRegistry->getSteps();
+
+            $sNamespace = '';
+            $sStepName = '';
+            foreach ($externalSteps as $key => $val) {
+                if ($val->sStepId == $_GET['UID']) {
+                    $sNamespace = $val->sNamespace;
+                    $sStepName = $val->sStepName;
+
+                }
+            }
+            if (class_exists( $sNamespace . "plugin" )) {
+                if (! $aPreviousStep) {
+                    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+                } else {
+                    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
+                    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+                }
+                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
+                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation( "ID_NEXT_STEP" );
+
+                /**
+                 * Added By erik date: 16-05-08
+                 * Description: this was added for the additional database connections
+                 */
+                G::LoadClass( 'dbConnections' );
+                $oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
+                $oDbConnections->loadAdditionalConnections();
+                $stepFilename = "$sNamespace/$sStepName";
+                G::evalJScript( "
         if (parent.setCurrent) {
-          parent.setCurrent('".$_GET['UID']."');
-        }");
-
-        $G_PUBLISH->AddContent('content', $stepFilename);
-      }
-      else {
-        $aMessage['MESSAGE'] = G::loadTranslation('ID_EXTERNAL_STEP_MISSING', SYS_LANG, array("plugin"=>$sNamespace) );
-        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-      }
-      break;
-    }
+          parent.setCurrent('" . $_GET['UID'] . "');
+        }" );
+
+                $G_PUBLISH->AddContent( 'content', $stepFilename );
+            } else {
+                $aMessage['MESSAGE'] = G::loadTranslation( 'ID_EXTERNAL_STEP_MISSING', SYS_LANG, array ("plugin" => $sNamespace
+                ) );
+                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+            }
+            break;
+    }
     //Add content content step - End
-  }
-  catch ( Exception $e ) {
-    G::SendTemporalMessage(G::LoadTranslation('ID_PROCESS_DEF_PROBLEM'), 'error', 'string', 3, 100);
-    $aMessage = array();
-    $aMessage['MESSAGE'] = $e->getMessage();
-    $G_PUBLISH          = new Publisher;
-    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publish', 'blank' );
-    die;
-  }
-
-  $oHeadPublisher =& headPublisher::getSingleton();
-  $oHeadPublisher->addScriptFile("/jscore/cases/core/cases_Step.js");
-  $oHeadPublisher->addScriptCode("
+} catch (Exception $e) {
+    G::SendTemporalMessage( G::LoadTranslation( 'ID_PROCESS_DEF_PROBLEM' ), 'error', 'string', 3, 100 );
+    $aMessage = array ();
+    $aMessage['MESSAGE'] = $e->getMessage();
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+    G::RenderPage( 'publish', 'blank' );
+    die();
+}
+
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addScriptFile( "/jscore/cases/core/cases_Step.js" );
+$oHeadPublisher->addScriptCode( "
   if (typeof parent != 'undefined') {
     if (parent.showCaseNavigatorPanel) {
       parent.showCaseNavigatorPanel('$sStatus');
     }
 
     if (parent.setCurrent) {
-      parent.setCurrent('".$_GET['UID']."');
+      parent.setCurrent('" . $_GET['UID'] . "');
     }
-  }");
-
-  G::RenderPage('publish', 'blank');
-
-  if( $_SESSION['TRIGGER_DEBUG']['ISSET'] ){
-    G::evalJScript('
+  }" );
+
+G::RenderPage( 'publish', 'blank' );
+
+if ($_SESSION['TRIGGER_DEBUG']['ISSET']) {
+    G::evalJScript( '
     if (typeof showdebug != \'undefined\') {
       showdebug();
-    }');
-  }
-
-
+    }' );
+}
+
diff --git a/workflow/engine/methods/cases/cases_StepToRevise.php b/workflow/engine/methods/cases/cases_StepToRevise.php
index 894feb861..9f7fe0320 100755
--- a/workflow/engine/methods/cases/cases_StepToRevise.php
+++ b/workflow/engine/methods/cases/cases_StepToRevise.php
@@ -1,77 +1,76 @@
-<?php
-/**
- * cases_Step.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
+<?php
+/**
+ * cases_Step.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
 //  die("first");
-/* Permissions */
-switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
-    case - 2:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-    case - 1:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-}
-
-if ((int)$_SESSION['INDEX'] < 1) {
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ' . $_SERVER['HTTP_REFERER']);
-    die;
-}
-/* Includes */
-G::LoadClass('case');
-G::LoadClass('derivation');
-
-/* GET , POST & $_SESSION Vars */
+/* Permissions */
+switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+if ((int) $_SESSION['INDEX'] < 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+    die();
+}
+/* Includes */
+G::LoadClass( 'case' );
+G::LoadClass( 'derivation' );
+
+/* GET , POST & $_SESSION Vars */
 //$_SESSION['STEP_POSITION'] = (int)$_GET['POSITION'];
-
-/* Menues */
-$G_MAIN_MENU            = 'processmaker';
-$G_SUB_MENU             = 'cases';
-$G_ID_MENU_SELECTED     = 'CASES';
-$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
-
-
- /* Prepare page before to show */
-$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
-$oTemplatePower->prepare();
-$G_PUBLISH = new Publisher;
-$oCase = new Cases();
-$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
-
-$oHeadPublisher =& headPublisher::getSingleton();
-$oHeadPublisher->addScriptCode("
+
+
+/* Menues */
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'cases';
+$G_ID_MENU_SELECTED = 'CASES';
+$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
+
+/* Prepare page before to show */
+$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower->prepare();
+$G_PUBLISH = new Publisher();
+$oCase = new Cases();
+$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addScriptCode( "
 if (typeof parent != 'undefined') {
   if (parent.showCaseNavigatorPanel) {
     parent.showCaseNavigatorPanel('{$Fields['APP_STATUS']}');
   }
-}");
+}" );
 // DEPRECATED this script call is marked for removal since almost all the interface is extJS based
-$oHeadPublisher->addScriptCode('
+$oHeadPublisher->addScriptCode( '
     var Cse = {};
     Cse.panels = {};
     var leimnud = new maborak();
@@ -83,52 +82,51 @@ $oHeadPublisher->addScriptCode('
     leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
     leimnud.exec(leimnud.fix.memoryLeak);
     leimnud.event.add(window,"load",function(){
-        '.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').'
+        ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
     });
-');
+' );
 // DEPRECATED this script call is marked for removal
-$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-
-if (!isset($_GET['type'])) {
-    $_GET['type'] = 'DYNAFORM';
-}
-if (!isset($_GET['position'])) {
-    $_GET['position'] = 1;
-}
-
-$_SESSION['STEP_POSITION'] = (int)$_GET['position'];
-
+$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+
+if (! isset( $_GET['type'] )) {
+    $_GET['type'] = 'DYNAFORM';
+}
+if (! isset( $_GET['position'] )) {
+    $_GET['position'] = 1;
+}
+
+$_SESSION['STEP_POSITION'] = (int) $_GET['position'];
+
 //Obtain previous and next step - Start
-if (isset($_GET['type'])) {
-    $sType = $_GET['type'];
-} else {
-    $sType = '';
-}
-
-$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
-
-
-/** Added By erik
- * date: 16-05-08
- * Description: this was added for the additional database connections */
-G::LoadClass('dbConnections');
-$oDbConnections = new dbConnections($_SESSION['PROCESS']);
-$oDbConnections->loadAdditionalConnections();
-
-
-$G_PUBLISH = new Publisher;
-if ($_GET['DYN_UID'] != '') {
-    $_SESSION['CURRENT_DYN_UID'] = $_GET['DYN_UID'];
-    $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '',
-        $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID='.$_GET['DYN_UID']);
-}
-
-G::RenderPage('publish', 'blank');
-
-if (!isset($_GET['ex'])) {
-    $_GET['ex']=$_GET['position'];
-}
+if (isset( $_GET['type'] )) {
+    $sType = $_GET['type'];
+} else {
+    $sType = '';
+}
+
+$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
+
+/**
+ * Added By erik
+ * date: 16-05-08
+ * Description: this was added for the additional database connections
+ */
+G::LoadClass( 'dbConnections' );
+$oDbConnections = new dbConnections( $_SESSION['PROCESS'] );
+$oDbConnections->loadAdditionalConnections();
+
+$G_PUBLISH = new Publisher();
+if ($_GET['DYN_UID'] != '') {
+    $_SESSION['CURRENT_DYN_UID'] = $_GET['DYN_UID'];
+    $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '', $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID=' . $_GET['DYN_UID'] );
+}
+
+G::RenderPage( 'publish', 'blank' );
+
+if (! isset( $_GET['ex'] )) {
+    $_GET['ex'] = $_GET['position'];
+}
 ?>
 
 <script>
@@ -149,4 +147,5 @@ function setSelect()
     return 0;
   }
 }
-</script>
\ No newline at end of file
+</script>
+
diff --git a/workflow/engine/methods/cases/cases_StepToReviseInputs.php b/workflow/engine/methods/cases/cases_StepToReviseInputs.php
index 1b13d480e..63e01b85f 100755
--- a/workflow/engine/methods/cases/cases_StepToReviseInputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseInputs.php
@@ -1,68 +1,67 @@
-<?php
-/**
- * cases_Step.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
+<?php
+/**
+ * cases_Step.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
 //die("second");
-/* Permissions */
-switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
-    case - 2:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-    case - 1:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-}
-
-if ((int)$_SESSION['INDEX'] < 1) {
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ' . $_SERVER['HTTP_REFERER']);
-    die;
-}
-/* Includes */
-G::LoadClass('case');
-G::LoadClass('derivation');
-
-/* GET , POST & $_SESSION Vars */
+/* Permissions */
+switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+if ((int) $_SESSION['INDEX'] < 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+    die();
+}
+/* Includes */
+G::LoadClass( 'case' );
+G::LoadClass( 'derivation' );
+
+/* GET , POST & $_SESSION Vars */
 //$_SESSION['STEP_POSITION'] = (int)$_GET['POSITION'];
-
-/* Menues */
-$G_MAIN_MENU            = 'processmaker';
-$G_SUB_MENU             = 'cases';
-$G_ID_MENU_SELECTED     = 'CASES';
-$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
-
-
- /* Prepare page before to show */
-  $oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
-  $oTemplatePower->prepare();
-  $G_PUBLISH = new Publisher;
-$oHeadPublisher =& headPublisher::getSingleton();
+
+
+/* Menues */
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'cases';
+$G_ID_MENU_SELECTED = 'CASES';
+$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
+
+/* Prepare page before to show */
+$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower->prepare();
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = & headPublisher::getSingleton();
 //  Check if these code needs to be removed since the interface ar now moving to ExtJS
-$oHeadPublisher->addScriptCode('
+$oHeadPublisher->addScriptCode( '
     var Cse = {};
     Cse.panels = {};
     var leimnud = new maborak();
@@ -74,64 +73,62 @@ $oHeadPublisher->addScriptCode('
     leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
     leimnud.exec(leimnud.fix.memoryLeak);
     leimnud.event.add(window,"load",function(){
-        '.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').'
+        ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
 });
-  ');
+  ' );
 //  Check if these code needs to be removed since the interface ar now moving to ExtJS
-$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-
-if (!isset($_GET['position'])) {
-    $_GET['position'] = 1;
-}
-
-$_SESSION['STEP_POSITION'] = (int)$_GET['position'];
-$oCase = new Cases();
-$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
-
-$G_PUBLISH = new Publisher;
-
-if (!isset($_GET['ex'])) {
-    $_GET['ex']=0;
-}
-
-if (!isset($_GET['INP_DOC_UID'])) {
-    G::LoadClass('case');
-    $oCase         = new Cases();
-    $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_InputdocsListToRevise',
-        $oCase->getInputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
-} else {
-    $oInputDocument = new InputDocument();
-    $Fields = $oInputDocument->load($_GET['INP_DOC_UID']);
-    switch ($Fields['INP_DOC_FORM_NEEDED']) {
-        case 'REAL':
-            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_NEW');
-            $sXmlForm = 'cases/cases_AttachInputDocument2';
-            break;
-        case 'VIRTUAL':
-            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
-            $sXmlForm = 'cases/cases_AttachInputDocument1';
-            break;
-        case 'VREAL':
-            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
-            $sXmlForm = 'cases/cases_AttachInputDocument3';
-            break;
-    }
-    $Fields['MESSAGE1'] = G::LoadTranslation('ID_PLEASE_ENTER_COMMENTS');
-    $Fields['MESSAGE2'] = G::LoadTranslation('ID_PLEASE_SELECT_FILE');
-    $docName = $Fields['INP_DOC_TITLE'];
-    $oHeadPublisher->addScriptCode('var documentName=\'Reviewing Input Document<br>'.$docName.'\';');
+$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+
+if (! isset( $_GET['position'] )) {
+    $_GET['position'] = 1;
+}
+
+$_SESSION['STEP_POSITION'] = (int) $_GET['position'];
+$oCase = new Cases();
+$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+
+$G_PUBLISH = new Publisher();
+
+if (! isset( $_GET['ex'] )) {
+    $_GET['ex'] = 0;
+}
+
+if (! isset( $_GET['INP_DOC_UID'] )) {
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
+    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_InputdocsListToRevise', $oCase->getInputDocumentsCriteriaToRevise( $_SESSION['APPLICATION'] ), '' );
+} else {
+    $oInputDocument = new InputDocument();
+    $Fields = $oInputDocument->load( $_GET['INP_DOC_UID'] );
+    switch ($Fields['INP_DOC_FORM_NEEDED']) {
+        case 'REAL':
+            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_NEW' );
+            $sXmlForm = 'cases/cases_AttachInputDocument2';
+            break;
+        case 'VIRTUAL':
+            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+            $sXmlForm = 'cases/cases_AttachInputDocument1';
+            break;
+        case 'VREAL':
+            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+            $sXmlForm = 'cases/cases_AttachInputDocument3';
+            break;
+    }
+    $Fields['MESSAGE1'] = G::LoadTranslation( 'ID_PLEASE_ENTER_COMMENTS' );
+    $Fields['MESSAGE2'] = G::LoadTranslation( 'ID_PLEASE_SELECT_FILE' );
+    $docName = $Fields['INP_DOC_TITLE'];
+    $oHeadPublisher->addScriptCode( 'var documentName=\'Reviewing Input Document<br>' . $docName . '\';' );
     //  $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', $Fields, 'cases_SupervisorSaveDocument?UID=' .
     //$_GET['INP_DOC_UID'] . '&APP_UID=' . $_GET['APP_UID'] . '&position=' . $_GET['position']);
-    $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocumentsToRevise', 'cases/cases_ToReviseInputdocsList',
-        $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['INP_DOC_UID']),
-        array_merge(array('DOC_UID'=>$_GET['INP_DOC_UID']),$Fields));
+    $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-inputDocumentsToRevise', 'cases/cases_ToReviseInputdocsList', $oCase->getInputDocumentsCriteria( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['INP_DOC_UID'] ), array_merge( array ('DOC_UID' => $_GET['INP_DOC_UID']
+    ), $Fields ) );
     //$aFields
     //  $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList',
     //$oCase->getInputDocumentsCriteria($_SESSION['APPLICATION']));//$aFields
-}
-
-G::RenderPage('publish', 'blank');
-
+}
+
+G::RenderPage( 'publish', 'blank' );
+
 ?>
 
 <script>
@@ -152,4 +149,5 @@ function setSelect()
         return 0;
     }
 }
-</script>
\ No newline at end of file
+</script>
+
diff --git a/workflow/engine/methods/cases/cases_StepToReviseOutputs.php b/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
index 9b9814746..b15086069 100755
--- a/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
@@ -1,59 +1,57 @@
-<?php
-/**
- * cases_StepToReviseOutputs.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-/* Permissions */
-switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
-    case - 2:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-    case - 1:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-}
-
-/* Includes */
-G::LoadClass('case');
-
-/* Menues */
-$G_MAIN_MENU            = 'processmaker';
-$G_SUB_MENU             = 'cases';
-$G_ID_MENU_SELECTED     = 'CASES';
-$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
-
-
-/* Prepare page before to show */
-$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
-$oTemplatePower->prepare();
-$G_PUBLISH = new Publisher;
-$oHeadPublisher =& headPublisher::getSingleton();
+<?php
+/**
+ * cases_StepToReviseOutputs.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+/* Permissions */
+switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+/* Includes */
+G::LoadClass( 'case' );
+
+/* Menues */
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'cases';
+$G_ID_MENU_SELECTED = 'CASES';
+$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
+
+/* Prepare page before to show */
+$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower->prepare();
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = & headPublisher::getSingleton();
 // check if the code for the addScriptCode is necessary since the interface is now based in ExtJs
-$oHeadPublisher->addScriptCode('
+$oHeadPublisher->addScriptCode( '
 var Cse = {};
 Cse.panels = {};
 var leimnud = new maborak();
@@ -65,17 +63,16 @@ leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases
 leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
 leimnud.exec(leimnud.fix.memoryLeak);
 leimnud.event.add(window,"load",function(){
-  '.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').'});
-');
-$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-$oCase = new Cases();
-$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise',
-    $oCase->getOutputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
-G::RenderPage('publish', 'blank');
-
-if (!isset($_GET['ex'])) {
-    $_GET['ex']=0;
-}
+  ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '});
+' );
+$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+$oCase = new Cases();
+$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise', $oCase->getOutputDocumentsCriteriaToRevise( $_SESSION['APPLICATION'] ), '' );
+G::RenderPage( 'publish', 'blank' );
+
+if (! isset( $_GET['ex'] )) {
+    $_GET['ex'] = 0;
+}
 ?>
 
 
@@ -97,4 +94,5 @@ function setSelect()
         return 0;
     }
 }
-</script>
\ No newline at end of file
+</script>
+
diff --git a/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php b/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php
index a361c527b..1e9335e7e 100755
--- a/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php
+++ b/workflow/engine/methods/cases/cases_SupervisorSaveDocument.php
@@ -1,86 +1,72 @@
-<?php
-/**
- * cases_SupervisorSaveDocument.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-  try {
+<?php
+/**
+ * cases_SupervisorSaveDocument.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+try {
     //save info
-    G::LoadClass('case');
-
-    $oAppDocument = new AppDocument();
-    $aFields = array('APP_UID'             => $_GET['APP_UID'],
-                     'DEL_INDEX'           => 100000,
-                     'USR_UID'             => $_SESSION['USER_LOGGED'],
-                     'DOC_UID'             => $_GET['UID'],
-                     'APP_DOC_TYPE'        => $_POST['form']['APP_DOC_TYPE'],
-                     'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),
-                     'APP_DOC_COMMENT'     => isset($_POST['form']['APP_DOC_COMMENT']) ? $_POST['form']['APP_DOC_COMMENT'] : '',
-                     'APP_DOC_TITLE'       => '',
-                     'APP_DOC_FILENAME'    => isset($_FILES['form']['name']['APP_DOC_FILENAME']) ? $_FILES['form']['name']['APP_DOC_FILENAME'] : '');
-    $oAppDocument->create($aFields);
-    $sAppDocUid = $oAppDocument->getAppDocUid();
-    $info = pathinfo( $oAppDocument->getAppDocFilename() );
-    $ext = (isset($info['extension']) ? $info['extension'] : '');
+    G::LoadClass( 'case' );
+
+    $oAppDocument = new AppDocument();
+    $aFields = array ('APP_UID' => $_GET['APP_UID'],'DEL_INDEX' => 100000,'USR_UID' => $_SESSION['USER_LOGGED'],'DOC_UID' => $_GET['UID'],'APP_DOC_TYPE' => $_POST['form']['APP_DOC_TYPE'],'APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_COMMENT' => isset( $_POST['form']['APP_DOC_COMMENT'] ) ? $_POST['form']['APP_DOC_COMMENT'] : '','APP_DOC_TITLE' => '','APP_DOC_FILENAME' => isset( $_FILES['form']['name']['APP_DOC_FILENAME'] ) ? $_FILES['form']['name']['APP_DOC_FILENAME'] : ''
+    );
+    $oAppDocument->create( $aFields );
+    $sAppDocUid = $oAppDocument->getAppDocUid();
+    $info = pathinfo( $oAppDocument->getAppDocFilename() );
+    $ext = (isset( $info['extension'] ) ? $info['extension'] : '');
     //save the file
-    if (!empty($_FILES['form'])) {
-    	if ($_FILES['form']['error']['APP_DOC_FILENAME'] == 0) {
-        $sPathName = PATH_DOCUMENT . $_GET['APP_UID'] . PATH_SEP;
-        $sFileName = $sAppDocUid . '.' . $ext;
-        G::uploadFile($_FILES['form']['tmp_name']['APP_DOC_FILENAME'], $sPathName, $sFileName );
-
-        //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
-    	  $oPluginRegistry =& PMPluginRegistry::getSingleton();
-        if ( $oPluginRegistry->existsTrigger ( PM_UPLOAD_DOCUMENT ) && class_exists ('uploadDocumentData' ) ) {
-          $oData['APP_UID']	  = $_GET['APP_UID'];
-          $documentData = new uploadDocumentData (
-                            $_GET['APP_UID'],
-                            $_SESSION['USER_LOGGED'],
-                            $sPathName . $sFileName,
-                            $aFields['APP_DOC_FILENAME'],
-                            $sAppDocUid
-                            );
-  	      $oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT , $documentData );
-  	      unlink ( $sPathName . $sFileName );
-        }
-      //end plugin
-      }
-    }
-	  //go to the next step
-	  if (!isset($_POST['form']['MORE'])) {
-	    $oCase     = new Cases();
-	    $aFields   = $oCase->loadCase($_GET['APP_UID']);
-	    $aNextStep = $oCase->getNextSupervisorStep($aFields['PRO_UID'], $_GET['position'], 'INPUT_DOCUMENT');
-	  	G::header('location: ' . 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX=');
-	  	die;
-	  }
-	  else {
-      G::header('location: ' . $_SERVER['HTTP_REFERER']);
-      die;
-	  }
-  } catch ( Exception $e ) {
-    /* Render Error page */
-      $aMessage['MESSAGE'] = $e->getMessage();
-      $G_PUBLISH          = new Publisher;
-      $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-      G::RenderPage( 'publish' );
-  }
\ No newline at end of file
+    if (! empty( $_FILES['form'] )) {
+        if ($_FILES['form']['error']['APP_DOC_FILENAME'] == 0) {
+            $sPathName = PATH_DOCUMENT . $_GET['APP_UID'] . PATH_SEP;
+            $sFileName = $sAppDocUid . '.' . $ext;
+            G::uploadFile( $_FILES['form']['tmp_name']['APP_DOC_FILENAME'], $sPathName, $sFileName );
+
+            //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
+            $oPluginRegistry = & PMPluginRegistry::getSingleton();
+            if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) {
+                $oData['APP_UID'] = $_GET['APP_UID'];
+                $documentData = new uploadDocumentData( $_GET['APP_UID'], $_SESSION['USER_LOGGED'], $sPathName . $sFileName, $aFields['APP_DOC_FILENAME'], $sAppDocUid );
+                $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                unlink( $sPathName . $sFileName );
+            }
+            //end plugin
+        }
+    }
+    //go to the next step
+    if (! isset( $_POST['form']['MORE'] )) {
+        $oCase = new Cases();
+        $aFields = $oCase->loadCase( $_GET['APP_UID'] );
+        $aNextStep = $oCase->getNextSupervisorStep( $aFields['PRO_UID'], $_GET['position'], 'INPUT_DOCUMENT' );
+        G::header( 'location: ' . 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID=' . $aNextStep['UID'] . '&position=' . $aNextStep['POSITION'] . '&APP_UID=' . $_GET['APP_UID'] . '&DEL_INDEX=' );
+        die();
+    } else {
+        G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+        die();
+    }
+} catch (Exception $e) {
+    /* Render Error page */
+    $aMessage['MESSAGE'] = $e->getMessage();
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+    G::RenderPage( 'publish' );
+}
+
diff --git a/workflow/engine/methods/cases/cases_ToReviseInputDocView.php b/workflow/engine/methods/cases/cases_ToReviseInputDocView.php
index 4785bdf55..280844a91 100755
--- a/workflow/engine/methods/cases/cases_ToReviseInputDocView.php
+++ b/workflow/engine/methods/cases/cases_ToReviseInputDocView.php
@@ -1,82 +1,79 @@
-<?php
-/**
- * cases_Step.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-/* Permissions */
-switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
-    case - 2:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-    case - 1:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-}
-
-if ((int)$_SESSION['INDEX'] < 1) {
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ' . $_SERVER['HTTP_REFERER']);
-    die;
-}
-/* Includes */
-G::LoadClass('case');
-G::LoadClass('derivation');
-
-/* GET , POST & $_SESSION Vars */
+<?php
+/**
+ * cases_Step.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+/* Permissions */
+switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+if ((int) $_SESSION['INDEX'] < 1) {
+    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+    die();
+}
+/* Includes */
+G::LoadClass( 'case' );
+G::LoadClass( 'derivation' );
+
+/* GET , POST & $_SESSION Vars */
 //$_SESSION['STEP_POSITION'] = (int)$_GET['POSITION'];
-
-/* Menues */
-$G_MAIN_MENU            = 'processmaker';
-$G_SUB_MENU             = 'cases';
-$G_ID_MENU_SELECTED     = 'CASES';
-$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
-
-$oCase = new Cases();
-$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
-
-require_once 'classes/model/AppDocument.php';
-require_once 'classes/model/Users.php';
-
-$G_PUBLISH = new Publisher;
-
-$oAppDocument = new AppDocument();
-$oAppDocument->Fields = $oAppDocument->load($_GET['DOC']);
-$oo = $oAppDocument->load($_GET['DOC']);
-
-$oUser = new Users();
-$aUser = $oUser->load($oAppDocument->Fields['USR_UID']);
-$Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-
-$oAppDocument->Fields['VIEW'] = G::LoadTranslation('ID_OPEN');
-$oAppDocument->Fields['FILE'] = 'cases_ShowDocument?a=' . $_GET['DOC'] . '&r=' . rand();
-$G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewInputDocumentToRevise', '', G::array_merges($Fields, $oAppDocument->Fields), '');
-
-G::RenderPage( 'publish' );
-
-?>
-
-
+
+
+/* Menues */
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'cases';
+$G_ID_MENU_SELECTED = 'CASES';
+$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
+
+$oCase = new Cases();
+$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+
+require_once 'classes/model/AppDocument.php';
+require_once 'classes/model/Users.php';
+
+$G_PUBLISH = new Publisher();
+
+$oAppDocument = new AppDocument();
+$oAppDocument->Fields = $oAppDocument->load( $_GET['DOC'] );
+$oo = $oAppDocument->load( $_GET['DOC'] );
+
+$oUser = new Users();
+$aUser = $oUser->load( $oAppDocument->Fields['USR_UID'] );
+$Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
+
+$oAppDocument->Fields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
+$oAppDocument->Fields['FILE'] = 'cases_ShowDocument?a=' . $_GET['DOC'] . '&r=' . rand();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewInputDocumentToRevise', '', G::array_merges( $Fields, $oAppDocument->Fields ), '' );
+
+G::RenderPage( 'publish' );
+
diff --git a/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php b/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
index 2ef9c6be1..a7f081892 100755
--- a/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
+++ b/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
@@ -1,59 +1,57 @@
-<?php
-/**
- * cases_ToReviseOutputDocView.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-/* Permissions */
-switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
-  case - 2:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-    break;
-  case - 1:
-    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-    G::header('location: ../login/login');
-    die;
-    break;
-}
-
-/* Includes */
-G::LoadClass('case');
-
-/* Menues */
-$G_MAIN_MENU            = 'processmaker';
-$G_SUB_MENU             = 'cases';
-$G_ID_MENU_SELECTED     = 'CASES';
-$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
-
-
-/* Prepare page before to show */
-$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
-$oTemplatePower->prepare();
-$G_PUBLISH = new Publisher;
-
-$oHeadPublisher =& headPublisher::getSingleton();
-$oHeadPublisher->addScriptCode('
+<?php
+/**
+ * cases_ToReviseOutputDocView.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+/* Permissions */
+switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+/* Includes */
+G::LoadClass( 'case' );
+
+/* Menues */
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'cases';
+$G_ID_MENU_SELECTED = 'CASES';
+$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
+
+/* Prepare page before to show */
+$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower->prepare();
+$G_PUBLISH = new Publisher();
+
+$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher->addScriptCode( '
 var Cse = {};
 Cse.panels = {};
 var leimnud = new maborak();
@@ -65,37 +63,38 @@ leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases
 leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
 leimnud.exec(leimnud.fix.memoryLeak);
 leimnud.event.add(window,"load",function(){
-  '.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').'});
-');
-$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
+  ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '});
+' );
+$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
 //
-require_once 'classes/model/OutputDocument.php';
-$oOutputDocument = new OutputDocument();
-$aOD = $oOutputDocument->load($_GET['UID']);
-require_once 'classes/model/AppDocument.php';
-$oAppDocument = new AppDocument();
-$aFields = $oAppDocument->load($_GET['DOC']);
-$aFields['VIEW'] = G::LoadTranslation('ID_OPEN');
-switch ($aOD ['OUT_DOC_GENERATE']) {
-  case 'DOC':
-    $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
-    break;
-  case 'PDF':
-    $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=pdf&random=' . rand();
-    break;
-  case 'BOTH':
-    $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
-    $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=pdf&random=' . rand();
-    break;
-}
-
-$G_PUBLISH = new Publisher;
-$G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocumentToRevise', '', G::array_merges($aOD, $aFields), '');
+require_once 'classes/model/OutputDocument.php';
+$oOutputDocument = new OutputDocument();
+$aOD = $oOutputDocument->load( $_GET['UID'] );
+require_once 'classes/model/AppDocument.php';
+$oAppDocument = new AppDocument();
+$aFields = $oAppDocument->load( $_GET['DOC'] );
+$aFields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
+switch ($aOD['OUT_DOC_GENERATE']) {
+    case 'DOC':
+        $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
+        break;
+    case 'PDF':
+        $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=pdf&random=' . rand();
+        break;
+    case 'BOTH':
+        $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
+        $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=pdf&random=' . rand();
+        break;
+}
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocumentToRevise', '', G::array_merges( $aOD, $aFields ), '' );
 //
-G::RenderPage('publish', 'blank');
-
-if(!isset($_GET['ex'])) $_GET['ex']=0;
-
+G::RenderPage( 'publish', 'blank' );
+
+if (! isset( $_GET['ex'] ))
+    $_GET['ex'] = 0;
+
 ?>
 <script type="text/javascript">
 /*------------------------------ To Revise Routines ---------------------------*/
@@ -116,4 +115,5 @@ function setSelect()
     return 0;
   }
 }
-</script>
\ No newline at end of file
+</script>
+
diff --git a/workflow/engine/methods/cases/cases_UsersReassign.php b/workflow/engine/methods/cases/cases_UsersReassign.php
index efdf9f183..80804a142 100755
--- a/workflow/engine/methods/cases/cases_UsersReassign.php
+++ b/workflow/engine/methods/cases/cases_UsersReassign.php
@@ -1,75 +1,74 @@
-<?php
-/**
- * cases_UsersReassign.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_REASSIGNCASE')) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  	case -1:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	  die;
-  	break;
-  }
-  G::LoadClass('case');
-  $oCase  = new Cases();
-  $aCases = array();
-  $aUsers = array();
-  if (isset($_POST['USERS']) && is_array($_POST['USERS'])) {
-    foreach ($_POST['USERS'] as $sKey => $sUser) {
-      if ($sUser != '') {
-        $oCase->reassignCase($_POST['APPLICATIONS'][$sKey], $_POST['INDEXES'][$sKey], $_POST['USR_UID'], $sUser);
-        $aCases[] = $_POST['APPLICATIONS'][$sKey];
-        $aUsers[] = $sUser;
-      }
-    }
-  }
-  G::LoadClass('case');
-  $oCase = new Cases();
-  require_once 'classes/model/Users.php';
-  $oUser = new Users();
-  $sText = '';
-  foreach ($aCases as $sKey => $sCase) {
-    $aCase  = $oCase->loadCase($sCase);
-    $aUser  = $oUser->load($aUsers[$sKey]);
-    $sText .= '(' . $aCase['APP_NUMBER'] . ') ' . $aCase['TITLE'] . ' => ' . $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' (' . $aUser['USR_USERNAME'] . ')' . '<br />';
-  }
-  $G_MAIN_MENU            = 'processmaker';
-  $G_SUB_MENU             = 'cases';
-  $G_ID_MENU_SELECTED     = 'CASES';
-  $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REASSIGN';
-  $G_PUBLISH = new Publisher;
-  $aMessage['MESSAGE'] = $sText;
-  $aMessage['URL']     = 'cases_ReassignByUser?REASSIGN_USER=' . $_POST['USR_UID'];
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ReassignShowInfo', '', $aMessage);
-  G::RenderPage('publish');
-}
-catch (Exception $oException) {
-	die($oException->getMessage());
-}
+<?php
+/**
+ * cases_UsersReassign.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+try {
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_REASSIGNCASE' )) {
+        case - 2:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+        case - 1:
+            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+            G::header( 'location: ../login/login' );
+            die();
+            break;
+    }
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
+    $aCases = array ();
+    $aUsers = array ();
+    if (isset( $_POST['USERS'] ) && is_array( $_POST['USERS'] )) {
+        foreach ($_POST['USERS'] as $sKey => $sUser) {
+            if ($sUser != '') {
+                $oCase->reassignCase( $_POST['APPLICATIONS'][$sKey], $_POST['INDEXES'][$sKey], $_POST['USR_UID'], $sUser );
+                $aCases[] = $_POST['APPLICATIONS'][$sKey];
+                $aUsers[] = $sUser;
+            }
+        }
+    }
+    G::LoadClass( 'case' );
+    $oCase = new Cases();
+    require_once 'classes/model/Users.php';
+    $oUser = new Users();
+    $sText = '';
+    foreach ($aCases as $sKey => $sCase) {
+        $aCase = $oCase->loadCase( $sCase );
+        $aUser = $oUser->load( $aUsers[$sKey] );
+        $sText .= '(' . $aCase['APP_NUMBER'] . ') ' . $aCase['TITLE'] . ' => ' . $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' (' . $aUser['USR_USERNAME'] . ')' . '<br />';
+    }
+    $G_MAIN_MENU = 'processmaker';
+    $G_SUB_MENU = 'cases';
+    $G_ID_MENU_SELECTED = 'CASES';
+    $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REASSIGN';
+    $G_PUBLISH = new Publisher();
+    $aMessage['MESSAGE'] = $sText;
+    $aMessage['URL'] = 'cases_ReassignByUser?REASSIGN_USER=' . $_POST['USR_UID'];
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ReassignShowInfo', '', $aMessage );
+    G::RenderPage( 'publish' );
+} catch (Exception $oException) {
+    die( $oException->getMessage() );
+}
+
diff --git a/workflow/engine/methods/cases/cases_toRevise.php b/workflow/engine/methods/cases/cases_toRevise.php
index de8c360b1..013d8f912 100755
--- a/workflow/engine/methods/cases/cases_toRevise.php
+++ b/workflow/engine/methods/cases/cases_toRevise.php
@@ -1,29 +1,29 @@
-<?php
-
-switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
-    case - 2:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-    case - 1:
-        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-        G::header('location: ../login/login');
-        die;
-        break;
-}
-
-if (($RBAC_Response = $RBAC->userCanAccess("PM_USERS")) != 1)
-            return $RBAC_Response;
-
-
-	$G_MAIN_MENU            = 'processmaker';
-	$G_SUB_MENU             = 'cases';
-	$G_ID_MENU_SELECTED     = 'CASES';
-	$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
-
-  $G_PUBLISH = new Publisher;
-  $G_PUBLISH->AddContent('view', 'cases/cases_toRevise');
-  $G_PUBLISH->AddContent('smarty', 'cases/cases_toReviseIn', '', '', array());
-
-  G::RenderPage("publish-treeview");
+<?php
+
+switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+    case - 2:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+    case - 1:
+        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+        G::header( 'location: ../login/login' );
+        die();
+        break;
+}
+
+if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1)
+    return $RBAC_Response;
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'cases';
+$G_ID_MENU_SELECTED = 'CASES';
+$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'view', 'cases/cases_toRevise' );
+$G_PUBLISH->AddContent( 'smarty', 'cases/cases_toReviseIn', '', '', array () );
+
+G::RenderPage( "publish-treeview" );
+
diff --git a/workflow/engine/methods/cases/data_casesSchedulerLog.php b/workflow/engine/methods/cases/data_casesSchedulerLog.php
index 155793c2f..a98430257 100755
--- a/workflow/engine/methods/cases/data_casesSchedulerLog.php
+++ b/workflow/engine/methods/cases/data_casesSchedulerLog.php
@@ -1,89 +1,86 @@
-<?php
-/**
- * data_casesSchedulerLog.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-require_once 'classes/model/LogCasesSchedulerPeer.php';
-require_once 'classes/model/LogCasesScheduler.php';
-G::LoadClass('configuration');
-
-$co = new Configurations();
-$config = $co->getConfiguration('casesSchedulerLogList', 'pageSize','',$_SESSION['USER_LOGGED']);
-$limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
-
-$start = isset($_REQUEST['start'])? $_REQUEST['start'] : 0;
-$limit = isset($_REQUEST['limit'])? $_REQUEST['limit'] : $limit_size; 
-$filter = (isset($_POST['textFilter'])) ? $_POST['textFilter'] : '';
-
-$oCriteria = new Criteria('workflow');
-$oCriteria->clearSelectColumns();
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::LOG_CASE_UID);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::PRO_UID);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::TAS_UID);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::USR_NAME);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::EXEC_DATE);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::EXEC_HOUR);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::RESULT);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::SCH_UID);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::WS_CREATE_CASE_STATUS);
-$oCriteria->addSelectColumn(LogCasesSchedulerPeer::WS_ROUTE_CASE_STATUS);
-
-if ($filter != ''){
-	$c_or = $oCriteria->getNewCriterion(LogCasesSchedulerPeer::WS_CREATE_CASE_STATUS, '%'.$filter.'%', Criteria::LIKE)->addOr(
-			$oCriteria->getNewCriterion(LogCasesSchedulerPeer::WS_ROUTE_CASE_STATUS,'%'.$filter.'%', Criteria::LIKE));
-	$oCriteria->add($c_or);
-}
-
-$oDataset = LogCasesSchedulerPeer::doSelectRS ( $oCriteria );
-$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-
-$addTables = Array();
-while( $oDataset->next() ) {
-    $addTables[] = $oDataset->getRow();
-}
-$results = count($addTables);
-
-$oCriteria->setOffset($start);
-$oCriteria->setLimit($limit);
-
-$oCriteria->addDescendingOrderByColumn(LogCasesSchedulerPeer::EXEC_DATE);
-$oCriteria->addDescendingOrderByColumn(LogCasesSchedulerPeer::EXEC_HOUR);
-
-$oDataset = LogCasesSchedulerPeer::doSelectRS ( $oCriteria );
-$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-
-
-
+<?php
+/**
+ * data_casesSchedulerLog.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+require_once 'classes/model/LogCasesSchedulerPeer.php';
+require_once 'classes/model/LogCasesScheduler.php';
+G::LoadClass( 'configuration' );
+
+$co = new Configurations();
+$config = $co->getConfiguration( 'casesSchedulerLogList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+$limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20;
+
+$start = isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : 0;
+$limit = isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : $limit_size;
+$filter = (isset( $_POST['textFilter'] )) ? $_POST['textFilter'] : '';
+
+$oCriteria = new Criteria( 'workflow' );
+$oCriteria->clearSelectColumns();
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::LOG_CASE_UID );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::PRO_UID );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::TAS_UID );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::USR_NAME );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::EXEC_DATE );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::EXEC_HOUR );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::RESULT );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::SCH_UID );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::WS_CREATE_CASE_STATUS );
+$oCriteria->addSelectColumn( LogCasesSchedulerPeer::WS_ROUTE_CASE_STATUS );
+
+if ($filter != '') {
+    $c_or = $oCriteria->getNewCriterion( LogCasesSchedulerPeer::WS_CREATE_CASE_STATUS, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( LogCasesSchedulerPeer::WS_ROUTE_CASE_STATUS, '%' . $filter . '%', Criteria::LIKE ) );
+    $oCriteria->add( $c_or );
+}
+
+$oDataset = LogCasesSchedulerPeer::doSelectRS( $oCriteria );
+$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+
+$addTables = Array ();
+while ($oDataset->next()) {
+    $addTables[] = $oDataset->getRow();
+}
+$results = count( $addTables );
+
+$oCriteria->setOffset( $start );
+$oCriteria->setLimit( $limit );
+
+$oCriteria->addDescendingOrderByColumn( LogCasesSchedulerPeer::EXEC_DATE );
+$oCriteria->addDescendingOrderByColumn( LogCasesSchedulerPeer::EXEC_HOUR );
+
+$oDataset = LogCasesSchedulerPeer::doSelectRS( $oCriteria );
+$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+
 //$oDataset = LogCasesSchedulerPeer::doSelectRS ( $oCriteria );
 //$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-
-$addTables = Array();
-while( $oDataset->next() ) {
-    $addTables[] = $oDataset->getRow();
-}
-
+
+
+$addTables = Array ();
+while ($oDataset->next()) {
+    $addTables[] = $oDataset->getRow();
+}
+
 //$oLogCasesScheduler = new LogCasesScheduler();
 //$arrData = $oLogCasesScheduler->getAll();
-
-
-echo '{results: '.$results.', rows: '.G::json_encode($addTables).'}';
\ No newline at end of file
+
+echo '{results: ' . $results . ', rows: ' . G::json_encode( $addTables ) . '}';
+
diff --git a/workflow/engine/methods/cases/debug_triggers.php b/workflow/engine/methods/cases/debug_triggers.php
index 9862358bd..8e8adaacb 100755
--- a/workflow/engine/methods/cases/debug_triggers.php
+++ b/workflow/engine/methods/cases/debug_triggers.php
@@ -1,72 +1,73 @@
-<?php
-if( isset($_SESSION['TRIGGER_DEBUG']['info']) ) {
-  $aTriggers = $_SESSION['TRIGGER_DEBUG']['info'];
-} else {
-  $aTriggers[0] = $_SESSION['TRIGGER_DEBUG'];
-}
-
+<?php
+if (isset( $_SESSION['TRIGGER_DEBUG']['info'] )) {
+    $aTriggers = $_SESSION['TRIGGER_DEBUG']['info'];
+} else {
+    $aTriggers[0] = $_SESSION['TRIGGER_DEBUG'];
+}
+
 //print_r($aTriggers);die;
-$triggersList = Array();
-
-$i = 0;
-foreach($aTriggers as $aTrigger) {
-  
-  if($aTrigger['NUM_TRIGGERS'] != 0) {
-    
-    foreach($aTrigger['TRIGGERS_NAMES'] as $index=>$name) {
-     
-      $triggersList[$i]['name'] = $name;
-      $triggersList[$i]['execution_time'] = strtolower($aTrigger['TIME']);
-      //$t_code = $aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'];
-      //$t_code = str_replace('"', '\'',$t_code);
-      //$t_code = addslashes($t_code);
-      //$t_code = Only1br($t_code);
-      
-      //highlighting the trigger code using the geshi third party library
-      G::LoadThirdParty('geshi', 'geshi');
-      $geshi = new GeSHi($aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'], 'php');
-      $geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS, 2);
-      $geshi->set_line_style('background: #f0f0f0;');
-      
-      $triggersList[$i]['code'] = $geshi->parse_code(); //$aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'];
-      $i++;
-    }
-  } else {
-   
-  }
-}
-
+$triggersList = Array ();
+
+$i = 0;
+foreach ($aTriggers as $aTrigger) {
+
+    if ($aTrigger['NUM_TRIGGERS'] != 0) {
+
+        foreach ($aTrigger['TRIGGERS_NAMES'] as $index => $name) {
+
+            $triggersList[$i]['name'] = $name;
+            $triggersList[$i]['execution_time'] = strtolower( $aTrigger['TIME'] );
+            //$t_code = $aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'];
+            //$t_code = str_replace('"', '\'',$t_code);
+            //$t_code = addslashes($t_code);
+            //$t_code = Only1br($t_code);
+
+
+            //highlighting the trigger code using the geshi third party library
+            G::LoadThirdParty( 'geshi', 'geshi' );
+            $geshi = new GeSHi( $aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'], 'php' );
+            $geshi->enable_line_numbers( GESHI_FANCY_LINE_NUMBERS, 2 );
+            $geshi->set_line_style( 'background: #f0f0f0;' );
+
+            $triggersList[$i]['code'] = $geshi->parse_code(); //$aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'];
+            $i ++;
+        }
+    } else {
+
+    }
+}
+
 //print_r($_SESSION['TRIGGER_DEBUG']['ERRORS']); die;
-$DEBUG_ERRORS =  array_unique($_SESSION['TRIGGER_DEBUG']['ERRORS']);
-
-foreach($DEBUG_ERRORS as $error){
-  if(isset($error['ERROR']) and $error['ERROR'] != ''){
-    $triggersList[$i]['name'] = 'Error';
-    $triggersList[$i]['execution_time'] = 'error';
-    $triggersList[$i]['code'] = $error['ERROR'];
-    $i++;
-  }
-  
-  if(isset($error['FATAL']) and $error['FATAL'] != ''){
-    $error['FATAL'] = str_replace("<br />", "\n", $error['FATAL']);
-    $tmp = explode("\n", $error['FATAL']);
-    $triggersList[$i]['name'] = isset($tmp[0])? $tmp[0]: 'Fatal Error in trigger';
-    $triggersList[$i]['execution_time'] = 'Fatal error';
-    $triggersList[$i]['code'] = $error['FATAL'];
-    $i++;
-  }
-}
-
-
+$DEBUG_ERRORS = array_unique( $_SESSION['TRIGGER_DEBUG']['ERRORS'] );
+
+foreach ($DEBUG_ERRORS as $error) {
+    if (isset( $error['ERROR'] ) and $error['ERROR'] != '') {
+        $triggersList[$i]['name'] = 'Error';
+        $triggersList[$i]['execution_time'] = 'error';
+        $triggersList[$i]['code'] = $error['ERROR'];
+        $i ++;
+    }
+
+    if (isset( $error['FATAL'] ) and $error['FATAL'] != '') {
+        $error['FATAL'] = str_replace( "<br />", "\n", $error['FATAL'] );
+        $tmp = explode( "\n", $error['FATAL'] );
+        $triggersList[$i]['name'] = isset( $tmp[0] ) ? $tmp[0] : 'Fatal Error in trigger';
+        $triggersList[$i]['execution_time'] = 'Fatal error';
+        $triggersList[$i]['code'] = $error['FATAL'];
+        $i ++;
+    }
+}
+
 /*echo '{total:5, data:[
       {name:"trigger1", execution_time:"after"},
       {name:"trigger2", execution_time:"before"},
       {name:"trigger13", execution_time:"before"},
       ]}';
-      
- */
-  
-$triggersRet->total = count($triggersList);
-$triggersRet->data  = $triggersList;
 
-echo G::json_encode($triggersRet);
\ No newline at end of file
+ */
+
+$triggersRet->total = count( $triggersList );
+$triggersRet->data = $triggersList;
+
+echo G::json_encode( $triggersRet );
+
diff --git a/workflow/engine/methods/cases/debug_vars.php b/workflow/engine/methods/cases/debug_vars.php
index 0af45b480..980e70dfa 100755
--- a/workflow/engine/methods/cases/debug_vars.php
+++ b/workflow/engine/methods/cases/debug_vars.php
@@ -1,98 +1,104 @@
-<?php
-
-$request = isset($_POST['request']) ? $_POST['request'] : '';
-switch ($request) {
-    case 'getRows':
-
-        $fieldname = $_POST['fieldname'];
-
-        G::LoadClass('case');
-        $oApp    = new Cases();
-        $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
-
-        $aVars = Array();
-        for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
-            $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
-        }
-
-        $aVars = array_merge($aFields['APP_DATA'], $aVars);
-
-        $field             = $aVars[$fieldname];
-        $response->headers = Array();
-        $response->columns = Array();
-        $response->rows    = Array();
-
-        $sw = true;
-        $j = 0;
-        if (is_array($field)) {
-            foreach ($field as $row) {
-                if ($sw) {
-                    foreach ($row as $key => $value) {
-                        $response->headers[] = Array('name' => $key);
-                        $response->columns[] = Array('header' => $key, 'width' => 100, 'dataIndex' => $key);
-                    }
-                    $sw = false;
-                }
-
-
-                $tmp = Array();
-                foreach ($row as $key => $value) {
-                    $tmp[] = $value;
-                }
-                $response->rows[$j++] = $tmp;
-            }
-        } else {
-            if (is_object($field)) {
-                $response->headers = Array(Array('name' => 'name'), Array('name' => 'value'));
-                $response->columns = Array(Array('header' => 'Property', 'width' => 100, 'dataIndex' => 'name'),
-                                           Array('header' => 'Value', 'width' => 100, 'dataIndex' => 'value'));
-
-                foreach ($field as $key => $value) {
-                    $response->rows[] = Array($key, $value);
-                }
-            }
-        }
-
-        echo G::json_encode($response);
-        break;
-    default:
-        G::LoadClass('case');
-        $oApp = new Cases();
-        $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
-
-        $aVars = Array();
-        for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
-            $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
-        }
-
-        $aVars = array_merge($aFields['APP_DATA'], $aVars);
-
-
-        if (isset($_POST['filter']) && $_POST['filter'] == 'dyn') {
-            $sysVars = array_keys(G::getSystemConstants());
-            $varNames = array_keys($aVars);
-            foreach ($varNames as $var) {
-                if (in_array($var, $sysVars)) {
-                    unset($aVars[$var]);
-                }
-            }
-        }
-        if (isset($_POST['filter']) && $_POST['filter'] == 'sys') {
-            $aVars = G::getSystemConstants();
-        }
-
-        ksort($aVars);
-        $return_object->totalCount = 1;
-
-        foreach ($aVars as $i => $var) {
-            if (is_array($var) || is_object($var)) {
-                $aVars[$i] = print_r($var, true);
-            }
-        }
-
-        $return_object->data[0] = $aVars;
-
-        echo G::json_encode($return_object);
-        break;
-}
- 
\ No newline at end of file
+<?php
+
+$request = isset( $_POST['request'] ) ? $_POST['request'] : '';
+switch ($request) {
+    case 'getRows':
+
+        $fieldname = $_POST['fieldname'];
+
+        G::LoadClass( 'case' );
+        $oApp = new Cases();
+        $aFields = $oApp->loadCase( $_SESSION['APPLICATION'] );
+
+        $aVars = Array ();
+        for ($i = 0; $i < count( $_SESSION['TRIGGER_DEBUG']['DATA'] ); $i ++) {
+            $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
+        }
+
+        $aVars = array_merge( $aFields['APP_DATA'], $aVars );
+
+        $field = $aVars[$fieldname];
+        $response->headers = Array ();
+        $response->columns = Array ();
+        $response->rows = Array ();
+
+        $sw = true;
+        $j = 0;
+        if (is_array( $field )) {
+            foreach ($field as $row) {
+                if ($sw) {
+                    foreach ($row as $key => $value) {
+                        $response->headers[] = Array ('name' => $key
+                        );
+                        $response->columns[] = Array ('header' => $key,'width' => 100,'dataIndex' => $key
+                        );
+                    }
+                    $sw = false;
+                }
+
+                $tmp = Array ();
+                foreach ($row as $key => $value) {
+                    $tmp[] = $value;
+                }
+                $response->rows[$j ++] = $tmp;
+            }
+        } else {
+            if (is_object( $field )) {
+                $response->headers = Array (Array ('name' => 'name'
+                ),Array ('name' => 'value'
+                )
+                );
+                $response->columns = Array (Array ('header' => 'Property','width' => 100,'dataIndex' => 'name'
+                ),Array ('header' => 'Value','width' => 100,'dataIndex' => 'value'
+                )
+                );
+
+                foreach ($field as $key => $value) {
+                    $response->rows[] = Array ($key,$value
+                    );
+                }
+            }
+        }
+
+        echo G::json_encode( $response );
+        break;
+    default:
+        G::LoadClass( 'case' );
+        $oApp = new Cases();
+        $aFields = $oApp->loadCase( $_SESSION['APPLICATION'] );
+
+        $aVars = Array ();
+        for ($i = 0; $i < count( $_SESSION['TRIGGER_DEBUG']['DATA'] ); $i ++) {
+            $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
+        }
+
+        $aVars = array_merge( $aFields['APP_DATA'], $aVars );
+
+        if (isset( $_POST['filter'] ) && $_POST['filter'] == 'dyn') {
+            $sysVars = array_keys( G::getSystemConstants() );
+            $varNames = array_keys( $aVars );
+            foreach ($varNames as $var) {
+                if (in_array( $var, $sysVars )) {
+                    unset( $aVars[$var] );
+                }
+            }
+        }
+        if (isset( $_POST['filter'] ) && $_POST['filter'] == 'sys') {
+            $aVars = G::getSystemConstants();
+        }
+
+        ksort( $aVars );
+        $return_object->totalCount = 1;
+
+        foreach ($aVars as $i => $var) {
+            if (is_array( $var ) || is_object( $var )) {
+                $aVars[$i] = print_r( $var, true );
+            }
+        }
+
+        $return_object->data[0] = $aVars;
+
+        echo G::json_encode( $return_object );
+        break;
+}
+
diff --git a/workflow/engine/methods/cases/index.php b/workflow/engine/methods/cases/index.php
index 68141865d..12163259d 100755
--- a/workflow/engine/methods/cases/index.php
+++ b/workflow/engine/methods/cases/index.php
@@ -1,29 +1,27 @@
-<?php
-/**
- * index.php
- *  
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd., 
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
- */
-  //$newFile = str_replace ( 'index.php', 'cases_List.php' ,  __FILE__ ) ;
-  $newFile = str_replace ( 'index.php', 'main.php' ,  __FILE__ ) ;
-  return $newFile;
-  
-  
\ No newline at end of file
+<?php
+/**
+ * index.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+//$newFile = str_replace ( 'index.php', 'cases_List.php' ,  __FILE__ ) ;
+$newFile = str_replace( 'index.php', 'main.php', __FILE__ );
+return $newFile;
+
diff --git a/workflow/engine/methods/cases/main.php b/workflow/engine/methods/cases/main.php
index 6b7640db2..554bb5551 100755
--- a/workflow/engine/methods/cases/main.php
+++ b/workflow/engine/methods/cases/main.php
@@ -1,36 +1,35 @@
-<?php
-/**
- * main.php Cases List main processor
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-$RBAC->requirePermissions('PM_CASES');
-
-$G_MAIN_MENU            = 'processmaker';
-$G_ID_MENU_SELECTED     = 'CASES';
-
-$_POST['qs'] = isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '' ? '?' . $_SERVER['QUERY_STRING'] : '';
-
-$G_PUBLISH = new Publisher;
-$G_PUBLISH->AddContent('view', 'cases/cases_Load');
-G::RenderPage('publish');
-
+<?php
+/**
+ * main.php Cases List main processor
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+$RBAC->requirePermissions( 'PM_CASES' );
+
+$G_MAIN_MENU = 'processmaker';
+$G_ID_MENU_SELECTED = 'CASES';
+
+$_POST['qs'] = isset( $_SERVER['QUERY_STRING'] ) && $_SERVER['QUERY_STRING'] != '' ? '?' . $_SERVER['QUERY_STRING'] : '';
+
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent( 'view', 'cases/cases_Load' );
+G::RenderPage( 'publish' );
+
diff --git a/workflow/engine/methods/cases/main_init.php b/workflow/engine/methods/cases/main_init.php
index 79c972d06..93a5d911c 100755
--- a/workflow/engine/methods/cases/main_init.php
+++ b/workflow/engine/methods/cases/main_init.php
@@ -12,85 +12,81 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
  */
 
-G::LoadClass("configuration");
-
-
-
-
+G::LoadClass( "configuration" );
 
 $conf = new Configurations();
 
 $oHeadPublisher = &headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript("cases/main", false); //Adding a javascript file .js
-$oHeadPublisher->addContent("cases/main"); //Adding a html file  .html.
+$oHeadPublisher->addExtJsScript( "cases/main", false ); //Adding a javascript file .js
+$oHeadPublisher->addContent( "cases/main" ); //Adding a html file  .html.
+
 
 $keyMem = "USER_PREFERENCES" . $_SESSION["USER_LOGGED"];
-$memcache = &PMmemcached::getSingleton(SYS_SYS);
+$memcache = &PMmemcached::getSingleton( SYS_SYS );
 
-if (($arrayConfig = $memcache->get($keyMem)) === false) {
-    $conf->loadConfig($x, "USER_PREFERENCES", "", "", $_SESSION["USER_LOGGED"], "");
+if (($arrayConfig = $memcache->get( $keyMem )) === false) {
+    $conf->loadConfig( $x, "USER_PREFERENCES", "", "", $_SESSION["USER_LOGGED"], "" );
     $arrayConfig = $conf->aConfig;
-    $memcache->set($keyMem, $arrayConfig, PMmemcached::ONE_HOUR);
+    $memcache->set( $keyMem, $arrayConfig, PMmemcached::ONE_HOUR );
 }
 
 $confDefaultOption = "";
 
-if (isset($arrayConfig["DEFAULT_CASES_MENU"])) { //this user has a configuration record
+if (isset( $arrayConfig["DEFAULT_CASES_MENU"] )) { //this user has a configuration record
     $confDefaultOption = $arrayConfig["DEFAULT_CASES_MENU"];
 
     global $G_TMP_MENU;
 
     $oMenu = new Menu();
-    $oMenu->load("cases");
+    $oMenu->load( "cases" );
     $defaultOption = "";
 
     foreach ($oMenu->Id as $i => $id) {
         if ($id == $confDefaultOption) {
-           $defaultOption = $oMenu->Options[$i];
-           break;
+            $defaultOption = $oMenu->Options[$i];
+            break;
         }
     }
 
-    $defaultOption = ($defaultOption != "")? $defaultOption : "casesListExtJs";
-}  else {
+    $defaultOption = ($defaultOption != "") ? $defaultOption : "casesListExtJs";
+} else {
     $defaultOption = "casesListExtJs";
     $confDefaultOption = "CASES_INBOX";
 }
 
-if (isset($_GET["id"]) && isset($_GET["id"])) {
+if (isset( $_GET["id"] ) && isset( $_GET["id"] )) {
     $defaultOption = "../cases/open?APP_UID=" . $_GET["id"] . "&DEL_INDEX=" . $_GET["i"];
 
-    if (isset($_GET["a"])) {
+    if (isset( $_GET["a"] )) {
         $defaultOption .= "&action=" . $_GET["a"];
     }
 }
 
-  $oServerConf =& serverConf::getSingleton();
-  if ($oServerConf->isRtl(SYS_LANG)) {
+$oServerConf = & serverConf::getSingleton();
+if ($oServerConf->isRtl( SYS_LANG )) {
     $regionTreePanel = 'east';
     $regionDebug = 'west';
-  } else {
+} else {
     $regionTreePanel = 'west';
     $regionDebug = 'east';
-  }
-$oHeadPublisher->assign('regionTreePanel', $regionTreePanel);
-$oHeadPublisher->assign('regionDebug', $regionDebug);
-$oHeadPublisher->assign("defaultOption", $defaultOption); //User menu permissions
-$oHeadPublisher->assign("_nodeId", isset($confDefaultOption)? $confDefaultOption : "PM_USERS"); //User menu permissions
-$oHeadPublisher->assign("FORMATS", $conf->getFormats());
+}
+$oHeadPublisher->assign( 'regionTreePanel', $regionTreePanel );
+$oHeadPublisher->assign( 'regionDebug', $regionDebug );
+$oHeadPublisher->assign( "defaultOption", $defaultOption ); //User menu permissions
+$oHeadPublisher->assign( "_nodeId", isset( $confDefaultOption ) ? $confDefaultOption : "PM_USERS" ); //User menu permissions
+$oHeadPublisher->assign( "FORMATS", $conf->getFormats() );
 
 $_SESSION["current_ux"] = "NORMAL";
 
-G::RenderPage("publish", "extJs");
+G::RenderPage( "publish", "extJs" );
 
diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php
index 625f4ef8e..8ce6740aa 100755
--- a/workflow/engine/methods/cases/open.php
+++ b/workflow/engine/methods/cases/open.php
@@ -1,93 +1,88 @@
-<?php
-/**
- * open.php Open Case main processor
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
- /**
-  * @author Erik Amaru Ortiz <erik@colosa.com>
-  * @date Jan 3th, 2010
-  */
-
-  if (!isset($_GET['APP_UID']) || !isset($_GET['DEL_INDEX'])) {
-  	if (isset($_GET['APP_NUMBER'])) {
-  	  G::LoadClass('case');
-      $oCase = new Cases();
-      $_GET['APP_UID']   = $oCase->getApplicationUIDByNumber($_GET['APP_NUMBER']);
-      $_GET['DEL_INDEX'] = $oCase->getCurrentDelegation($_GET['APP_UID'], $_SESSION['USER_LOGGED']); 
-      if( is_null($_GET['APP_UID']) ) {
-       throw new Exception(G::LoadTranslation('ID_CASE_DOES_NOT_EXISTS'));
-      } 
-      if( is_null($_GET['DEL_INDEX']) ) {
-        throw new Exception(G::LoadTranslation('ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER'));
-      }      
-    }
-    else {
-  		throw new Exception("Application ID or Delegation Index is missing!. The System can't open the case.");
-  	}
-  }
-  
-  
-  require_once ("classes/model/Step.php");
-  G::LoadClass("configuration");
-  G::LoadClass("case");
-  $oCase = new Cases();
-  $conf  = new Configurations;
-
-  $oHeadPublisher =& headPublisher::getSingleton();
-
-  $oHeadPublisher->addExtJsScript('app/main', true);
-  $oHeadPublisher->addExtJsScript('cases/open', true);
-  $oHeadPublisher->assign('FORMATS',$conf->getFormats());
-  $uri = '';
-  foreach($_GET as $k=>$v) {
-    $uri .= ($uri == '')? "$k=$v": "&$k=$v";
-  }
-
-  $case   = $oCase->loadCase($_GET['APP_UID'], $_GET['DEL_INDEX']);
-
-  if (!isset($_GET['to_revise'])){
-    $script = 'cases_Open?';
-  }
-  else {
-    $script = 'cases_OpenToRevise?';
-    $delIndex = $_GET['DEL_INDEX'];
-    $appUid   = $_GET['APP_UID'];
-    $oHeadPublisher->assign('treeToReviseTitle', G::loadtranslation('ID_STEP_LIST'));
-    $casesPanelUrl = 'casesToReviseTreeContent?APP_UID='.$appUid.'&DEL_INDEX='.$delIndex;
-    $oHeadPublisher->assign('casesPanelUrl', $casesPanelUrl); //translations
-    echo "<div id='toReviseTree'></div>";
-  }
-
-  $oStep = new Step;
-  $oStep = $oStep->loadByProcessTaskPosition($case['PRO_UID'], $case['TAS_UID'], 1);
-
-  $oHeadPublisher->assign('uri', $script . $uri);
-  $oHeadPublisher->assign('_APP_NUM', '#: ' . $case['APP_NUMBER']);
-  $oHeadPublisher->assign('_ENV_CURRENT_DATE', $conf->getSystemDate(date('Y-m-d')));
-  $oHeadPublisher->assign('_ENV_CURRENT_DATE_NO_FORMAT', date('Y-m-d'));
-  $oHeadPublisher->assign('idfirstform', is_null($oStep)?'':$oStep->getStepUidObj());
-
-
-  G::RenderPage('publish', 'extJs');
-
-
+<?php
+/**
+ * open.php Open Case main processor
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+/**
+ *
+ * @author Erik Amaru Ortiz <erik@colosa.com>
+ * @date Jan 3th, 2010
+ */
+
+if (! isset( $_GET['APP_UID'] ) || ! isset( $_GET['DEL_INDEX'] )) {
+    if (isset( $_GET['APP_NUMBER'] )) {
+        G::LoadClass( 'case' );
+        $oCase = new Cases();
+        $_GET['APP_UID'] = $oCase->getApplicationUIDByNumber( $_GET['APP_NUMBER'] );
+        $_GET['DEL_INDEX'] = $oCase->getCurrentDelegation( $_GET['APP_UID'], $_SESSION['USER_LOGGED'] );
+        if (is_null( $_GET['APP_UID'] )) {
+            throw new Exception( G::LoadTranslation( 'ID_CASE_DOES_NOT_EXISTS' ) );
+        }
+        if (is_null( $_GET['DEL_INDEX'] )) {
+            throw new Exception( G::LoadTranslation( 'ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER' ) );
+        }
+    } else {
+        throw new Exception( "Application ID or Delegation Index is missing!. The System can't open the case." );
+    }
+}
+
+require_once ("classes/model/Step.php");
+G::LoadClass( "configuration" );
+G::LoadClass( "case" );
+$oCase = new Cases();
+$conf = new Configurations();
+
+$oHeadPublisher = & headPublisher::getSingleton();
+
+$oHeadPublisher->addExtJsScript( 'app/main', true );
+$oHeadPublisher->addExtJsScript( 'cases/open', true );
+$oHeadPublisher->assign( 'FORMATS', $conf->getFormats() );
+$uri = '';
+foreach ($_GET as $k => $v) {
+    $uri .= ($uri == '') ? "$k=$v" : "&$k=$v";
+}
+
+$case = $oCase->loadCase( $_GET['APP_UID'], $_GET['DEL_INDEX'] );
+
+if (! isset( $_GET['to_revise'] )) {
+    $script = 'cases_Open?';
+} else {
+    $script = 'cases_OpenToRevise?';
+    $delIndex = $_GET['DEL_INDEX'];
+    $appUid = $_GET['APP_UID'];
+    $oHeadPublisher->assign( 'treeToReviseTitle', G::loadtranslation( 'ID_STEP_LIST' ) );
+    $casesPanelUrl = 'casesToReviseTreeContent?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex;
+    $oHeadPublisher->assign( 'casesPanelUrl', $casesPanelUrl ); //translations
+    echo "<div id='toReviseTree'></div>";
+}
+
+$oStep = new Step();
+$oStep = $oStep->loadByProcessTaskPosition( $case['PRO_UID'], $case['TAS_UID'], 1 );
+
+$oHeadPublisher->assign( 'uri', $script . $uri );
+$oHeadPublisher->assign( '_APP_NUM', '#: ' . $case['APP_NUMBER'] );
+$oHeadPublisher->assign( '_ENV_CURRENT_DATE', $conf->getSystemDate( date( 'Y-m-d' ) ) );
+$oHeadPublisher->assign( '_ENV_CURRENT_DATE_NO_FORMAT', date( 'Y-m-d' ) );
+$oHeadPublisher->assign( 'idfirstform', is_null( $oStep ) ? '' : $oStep->getStepUidObj() );
+
+G::RenderPage( 'publish', 'extJs' );
+
diff --git a/workflow/engine/methods/cases/proxyCasesList.php b/workflow/engine/methods/cases/proxyCasesList.php
index 501828b13..c723b56ad 100755
--- a/workflow/engine/methods/cases/proxyCasesList.php
+++ b/workflow/engine/methods/cases/proxyCasesList.php
@@ -1,91 +1,47 @@
-<?php
+<?php
 //Getting the extJs parameters
-$callback = isset($_POST["callback"])? $_POST["callback"] : "stcCallback1001";
-$dir   = isset($_POST["dir"])? $_POST["dir"] : "DESC";
-$sort  = isset($_POST["sort"])? $_POST["sort"] : "";
-$start = isset($_POST["start"])? $_POST["start"] : "0";
-$limit = isset($_POST["limit"])? $_POST["limit"] : "25";
-$filter  = isset($_POST ["filter"])? $_POST["filter"] : "";
-$process = isset($_POST["process"])? $_POST["process"] : "";
-$category = isset($_POST["category"])? $_POST["category"] : "";
-$status  = isset($_POST["status"])? strtoupper($_POST["status"]) : "";
-$user    = isset($_POST["user"])? $_POST["user"] : "";
-$search  = isset($_POST["search"])? $_POST["search"] : "";
-$action  = isset($_GET["action"])? $_GET["action"] : (isset($_POST["action"])? $_POST["action"] : "todo");
-$type    = isset($_GET["type"])? $_GET["type"] : (isset($_POST["type"])? $_POST["type"] : "extjs");
-$dateFrom = isset($_POST["dateFrom"])? substr($_POST["dateFrom"], 0, 10) : "";
-$dateTo   = isset($_POST["dateTo"])? substr($_POST["dateTo"], 0, 10) : "";
-
-try {
-    $result = "";
-
-    $userUid = (isset($_SESSION["USER_LOGGED"]) && $_SESSION["USER_LOGGED"] != "")? $_SESSION["USER_LOGGED"] : null;
-    $user = ($user == "CURRENT_USER")? $userUid : $user;
-
-    if ((
-        $action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" ||
-        $action == "unassigned" || $action == "search"
-        )
-        &&
-        (($solrConf = System::solrEnv()) !== false)
-    ) {
-        G::LoadClass("AppSolr");
-
-        $ApplicationSolrIndex = new AppSolr(
-            $solrConf["solr_enabled"],
-            $solrConf["solr_host"],
-            $solrConf["solr_instance"]
-        );
-
-        $data = $ApplicationSolrIndex->getAppGridData(
-            $userUid,
-            $start,
-            $limit,
-            $action,
-            $filter,
-            $search,
-            $process,
-            $user,
-            $status,
-            $type,
-            $dateFrom,
-            $dateTo,
-            $callback,
-            $dir,
-            $sort
-        );
-
-        $result = G::json_encode($data);
-    } else {
-        G::LoadClass("applications");
-
-        $apps = new Applications();
-        $data = $apps->getAll(
-            $userUid,
-            $start,
-            $limit,
-            $action,
-            $filter,
-            $search,
-            $process,
-            $user,
-            $status,
-            $type,
-            $dateFrom,
-            $dateTo,
-            $callback,
-            $dir,
-            $sort,
-            $category
-        );
-
-        $result = G::json_encode($data);
-    }
-
-    echo $result;
-} catch (Exception $e) {
-    $msg = array("error" => $e->getMessage());
-
-    echo G::json_encode($msg);
-}
-
+$callback = isset( $_POST["callback"] ) ? $_POST["callback"] : "stcCallback1001";
+$dir = isset( $_POST["dir"] ) ? $_POST["dir"] : "DESC";
+$sort = isset( $_POST["sort"] ) ? $_POST["sort"] : "";
+$start = isset( $_POST["start"] ) ? $_POST["start"] : "0";
+$limit = isset( $_POST["limit"] ) ? $_POST["limit"] : "25";
+$filter = isset( $_POST["filter"] ) ? $_POST["filter"] : "";
+$process = isset( $_POST["process"] ) ? $_POST["process"] : "";
+$category = isset( $_POST["category"] ) ? $_POST["category"] : "";
+$status = isset( $_POST["status"] ) ? strtoupper( $_POST["status"] ) : "";
+$user = isset( $_POST["user"] ) ? $_POST["user"] : "";
+$search = isset( $_POST["search"] ) ? $_POST["search"] : "";
+$action = isset( $_GET["action"] ) ? $_GET["action"] : (isset( $_POST["action"] ) ? $_POST["action"] : "todo");
+$type = isset( $_GET["type"] ) ? $_GET["type"] : (isset( $_POST["type"] ) ? $_POST["type"] : "extjs");
+$dateFrom = isset( $_POST["dateFrom"] ) ? substr( $_POST["dateFrom"], 0, 10 ) : "";
+$dateTo = isset( $_POST["dateTo"] ) ? substr( $_POST["dateTo"], 0, 10 ) : "";
+
+try {
+    $result = "";
+
+    $userUid = (isset( $_SESSION["USER_LOGGED"] ) && $_SESSION["USER_LOGGED"] != "") ? $_SESSION["USER_LOGGED"] : null;
+    $user = ($user == "CURRENT_USER") ? $userUid : $user;
+
+    if (($action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" || $action == "unassigned" || $action == "search") && (($solrConf = System::solrEnv()) !== false)) {
+        G::LoadClass( "AppSolr" );
+
+        $ApplicationSolrIndex = new AppSolr( $solrConf["solr_enabled"], $solrConf["solr_host"], $solrConf["solr_instance"] );
+
+        $data = $ApplicationSolrIndex->getAppGridData( $userUid, $start, $limit, $action, $filter, $search, $process, $user, $status, $type, $dateFrom, $dateTo, $callback, $dir, $sort );
+
+        $result = G::json_encode( $data );
+    } else {
+        G::LoadClass( "applications" );
+
+        $apps = new Applications();
+        $data = $apps->getAll( $userUid, $start, $limit, $action, $filter, $search, $process, $user, $status, $type, $dateFrom, $dateTo, $callback, $dir, $sort, $category );
+
+        $result = G::json_encode( $data );
+    }
+
+    echo $result;
+} catch (Exception $e) {
+    $msg = array ("error" => $e->getMessage() );
+    echo G::json_encode( $msg );
+}
+
diff --git a/workflow/engine/methods/cases/proxyProcessList.php b/workflow/engine/methods/cases/proxyProcessList.php
index c0d85ac06..d2ec4330d 100755
--- a/workflow/engine/methods/cases/proxyProcessList.php
+++ b/workflow/engine/methods/cases/proxyProcessList.php
@@ -1,67 +1,70 @@
-<?php
-  $callback = isset($_POST['callback']) ? $_POST['callback'] : 'stcCallback1001';
-  $dir    = isset($_POST['dir'])    ? $_POST['dir']    : 'DESC';
-  $sort   = isset($_POST['sort'])   ? $_POST['sort']   : '';
-  $query  = isset($_POST['query']) ? $_POST['query'] : '';
-  //$action = isset($_GET['action']) ? $_GET['action'] : 'read';
-  $option = '';
-  if ( isset($_GET['t'] ) ) $option = $_GET['t'];
-  try {  	
-
-  G::LoadClass("BasePeer" );
-  require_once ( "classes/model/Process.php" );
-  require_once ( "classes/model/AppCacheView.php" );
-  
-  $sUIDUserLogged = $_SESSION['USER_LOGGED'];
-
-  $Criteria = new Criteria('workflow');
-
-  $Criteria->clearSelectColumns ( );
-  $Criteria->setDistinct();
-  $Criteria->addSelectColumn ( AppCacheViewPeer::PRO_UID );
-  $Criteria->addSelectColumn ( AppCacheViewPeer::APP_PRO_TITLE );
-
-  if ( $query != '' ) {
-    $Criteria->add (AppCacheViewPeer::APP_PRO_TITLE, $query . '%', Criteria::LIKE);
-  }  
-
-  $Criteria->add (AppCacheViewPeer::APP_STATUS, "TO_DO" , CRITERIA::EQUAL );
-  $Criteria->add (AppCacheViewPeer::USR_UID, $sUIDUserLogged);
-
-
-  //$totalCount = AppCacheViewPeer::doCount( $Criteria );
-      
-  if ( isset($limit) ) $Criteria->setLimit( $limit );
-  if ( isset($start) ) $Criteria->setOffset( $start );
-      
-  if ( $sort != '' ) {
-    if ( $dir == 'DESC' )
-      $Criteria->addDescendingOrderByColumn( $sort );
-    else
-      $Criteria->addAscendingOrderByColumn( $sort );
-    }
-  $oDataset = AppCacheViewPeer::doSelectRS($Criteria);
-  $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-  $oDataset->next();
-      
-  $result = array();
-  $rows = array();
-  $index =  isset($start) ? $start : 0;
-  while($aRow = $oDataset->getRow()){
-    $aRow['index'] = ++$index;
-    $rows[] = $aRow;
-      
-    $oDataset->next();
-  }
-  $result['totalCount'] = count($rows);
-  $result['data'] = $rows;
-
-    print G::json_encode( $result ) ;
-  
-  }
-  catch ( Exception $e ) {
-    $G_PUBLISH = new Publisher;
-    $aMessage['MESSAGE'] = $e->getMessage();
-    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publish', 'blank' );
-  }      
+<?php
+$callback = isset( $_POST['callback'] ) ? $_POST['callback'] : 'stcCallback1001';
+$dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'DESC';
+$sort = isset( $_POST['sort'] ) ? $_POST['sort'] : '';
+$query = isset( $_POST['query'] ) ? $_POST['query'] : '';
+//$action = isset($_GET['action']) ? $_GET['action'] : 'read';
+$option = '';
+if (isset( $_GET['t'] ))
+    $option = $_GET['t'];
+try {
+
+    G::LoadClass( "BasePeer" );
+    require_once ("classes/model/Process.php");
+    require_once ("classes/model/AppCacheView.php");
+
+    $sUIDUserLogged = $_SESSION['USER_LOGGED'];
+
+    $Criteria = new Criteria( 'workflow' );
+
+    $Criteria->clearSelectColumns();
+    $Criteria->setDistinct();
+    $Criteria->addSelectColumn( AppCacheViewPeer::PRO_UID );
+    $Criteria->addSelectColumn( AppCacheViewPeer::APP_PRO_TITLE );
+
+    if ($query != '') {
+        $Criteria->add( AppCacheViewPeer::APP_PRO_TITLE, $query . '%', Criteria::LIKE );
+    }
+
+    $Criteria->add( AppCacheViewPeer::APP_STATUS, "TO_DO", CRITERIA::EQUAL );
+    $Criteria->add( AppCacheViewPeer::USR_UID, $sUIDUserLogged );
+
+    //$totalCount = AppCacheViewPeer::doCount( $Criteria );
+
+
+    if (isset( $limit ))
+        $Criteria->setLimit( $limit );
+    if (isset( $start ))
+        $Criteria->setOffset( $start );
+
+    if ($sort != '') {
+        if ($dir == 'DESC')
+            $Criteria->addDescendingOrderByColumn( $sort );
+        else
+            $Criteria->addAscendingOrderByColumn( $sort );
+    }
+    $oDataset = AppCacheViewPeer::doSelectRS( $Criteria );
+    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $oDataset->next();
+
+    $result = array ();
+    $rows = array ();
+    $index = isset( $start ) ? $start : 0;
+    while ($aRow = $oDataset->getRow()) {
+        $aRow['index'] = ++ $index;
+        $rows[] = $aRow;
+
+        $oDataset->next();
+    }
+    $result['totalCount'] = count( $rows );
+    $result['data'] = $rows;
+
+    print G::json_encode( $result );
+
+} catch (Exception $e) {
+    $G_PUBLISH = new Publisher();
+    $aMessage['MESSAGE'] = $e->getMessage();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+    G::RenderPage( 'publish', 'blank' );
+}
+
diff --git a/workflow/engine/methods/cases/proxyReassignCasesList.php b/workflow/engine/methods/cases/proxyReassignCasesList.php
index 31831b91b..ee9bc953f 100755
--- a/workflow/engine/methods/cases/proxyReassignCasesList.php
+++ b/workflow/engine/methods/cases/proxyReassignCasesList.php
@@ -1,110 +1,98 @@
-<?php
-  $callback = isset($_POST['callback']) ? $_POST['callback'] : 'stcCallback1001';
-  $dir      = isset($_POST['dir'])      ? $_POST['dir']    : 'DESC';
-  $sort     = isset($_POST['sort'])     ? $_POST['sort']   : '';
-  $start    = isset($_POST['start'])    ? $_POST['start']  : '0';
-  $limit    = isset($_POST['limit'])    ? $_POST['limit']  : '25';
-  $filter   = isset($_POST['filter'])   ? $_POST['filter'] : '';
-  $search   = isset($_POST['search'])   ? $_POST['search'] : '';
-  $process  = isset($_POST['process'])  ? $_POST['process'] : '';
-  $user     = isset($_POST['user'])     ? $_POST['user']    : '';
-  $status   = isset($_POST['status'])   ? strtoupper($_POST['status']) : '';
-  $action   = isset($_GET['action'])    ? $_GET['action'] : (isset($_POST['action']) ? $_POST['action'] : 'todo');
-  $type     = isset($_GET['type'])      ? $_GET['type'] : (isset($_POST['type']) ? $_POST['type'] : 'extjs');
-  $user     = isset($_POST['user'])     ? $_POST['user'] : '';
-  
-  $sentUids          = explode( ',', $_POST['APP_UIDS'] );
-
-  $allUidsRecords = array();
-  $allTasUids = array();
- 
-  // getting all App Uids and task Uids
-  foreach ($sentUids as $sentUid){
-    $aItem = explode('|',$sentUid);
-    $allUidsRecords[] = array ( 'APP_UID' => $aItem[0] , 'TAS_UID' => $aItem[1], 'DEL_INDEX' => $aItem[2]);
-  }
- 
-	$sReassignFromUser = isset($_POST['user'])    ? $_POST['user']    : '';
-	$sProcessUid       = isset($_POST['process']) ? $_POST['process'] : '';
-
-        G::LoadClass( 'tasks'  );
-        G::LoadClass( 'groups' );
-        G::LoadClass( 'case'   );
-        G::LoadClass( 'users'  );
-        require_once ( "classes/model/AppCacheView.php" );
-
-        $oTasks  = new Tasks  ();
-        $oGroups = new Groups ();
-        $oUser   = new Users  ();
-        $oCases  = new Cases  ();
- 
-        $aCasesList = Array();
-        $vard = 0;
-        foreach ( $allUidsRecords as $aRecord ) {
-            $vard = $vard + 1;
-            $APP_UID  = $aRecord['APP_UID'];
-            $delIndex = $aRecord['DEL_INDEX'];
-        	  $aCase  = $oCases->loadCaseByDelegation($APP_UID,$delIndex);
-
-            $aUsersInvolved = Array();
-            $aCaseGroups = $oTasks->getGroupsOfTask($aCase['TAS_UID'], 1);
-
-            foreach ( $aCaseGroups as $aCaseGroup ) {
-                $aCaseUsers = $oGroups->getUsersOfGroup($aCaseGroup['GRP_UID']);
-                foreach ( $aCaseUsers as $aCaseUser ) {
-                    if ( $aCaseUser['USR_UID'] != $sReassignFromUser ) {
-                        $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']);
-                        $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME']   
-                    }
-                }
-            }
-
-            $aCaseUsers = $oTasks->getUsersOfTask($aCase['TAS_UID'], 1);
-            foreach ( $aCaseUsers as $aCaseUser ) {
-                if ( $aCaseUser['USR_UID'] != $sReassignFromUser ) {
-                    $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']);
-                    $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); 
-                }
-            }
-            $oTmp = $aUsersInvolved;
-            $aCase['USERS'] = $oTmp;
-            array_push($aCasesList, $aCase);
-        }
- 
-        $filedNames = Array (
-            "APP_UID",
-            "APP_NUMBER",
-            "APP_UPDATE_DATE",
-            "DEL_PRIORITY",
-            "DEL_INDEX",
-            "TAS_UID",
-            "DEL_INIT_DATE",
-            "DEL_FINISH_DATE",
-            "USR_UID",
-            "APP_STATUS",
-            "DEL_TASK_DUE_DATE",
-            "APP_CURRENT_USER",
-            "APP_TITLE",
-            "APP_PRO_TITLE",
-            "APP_TAS_TITLE",
-            "APP_DEL_PREVIOUS_USER",
-            "USERS"
-        );
-
-        $aCasesList = array_merge(Array($filedNames), $aCasesList);
-        $rows   = array();
-        $i = $start;
-        for ($j=0;$j<$limit;$j++){
-          $i++;
-          if (isset($aCasesList[$i])){
-            $rows[] = $aCasesList[$i];
-          }
-        }
-        $totalCount = count($aCasesList)-1;
-        $result = array();
-        $result['totalCount'] = $totalCount;
-        
-        $index  = $start;
-        $result['data'] = $rows;
-      //print the result in json format
-        print G::json_encode( $result ) ;
+<?php
+$callback = isset( $_POST['callback'] ) ? $_POST['callback'] : 'stcCallback1001';
+$dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'DESC';
+$sort = isset( $_POST['sort'] ) ? $_POST['sort'] : '';
+$start = isset( $_POST['start'] ) ? $_POST['start'] : '0';
+$limit = isset( $_POST['limit'] ) ? $_POST['limit'] : '25';
+$filter = isset( $_POST['filter'] ) ? $_POST['filter'] : '';
+$search = isset( $_POST['search'] ) ? $_POST['search'] : '';
+$process = isset( $_POST['process'] ) ? $_POST['process'] : '';
+$user = isset( $_POST['user'] ) ? $_POST['user'] : '';
+$status = isset( $_POST['status'] ) ? strtoupper( $_POST['status'] ) : '';
+$action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
+$type = isset( $_GET['type'] ) ? $_GET['type'] : (isset( $_POST['type'] ) ? $_POST['type'] : 'extjs');
+$user = isset( $_POST['user'] ) ? $_POST['user'] : '';
+
+$sentUids = explode( ',', $_POST['APP_UIDS'] );
+
+$allUidsRecords = array ();
+$allTasUids = array ();
+
+// getting all App Uids and task Uids
+foreach ($sentUids as $sentUid) {
+    $aItem = explode( '|', $sentUid );
+    $allUidsRecords[] = array ('APP_UID' => $aItem[0],'TAS_UID' => $aItem[1],'DEL_INDEX' => $aItem[2]
+    );
+}
+
+$sReassignFromUser = isset( $_POST['user'] ) ? $_POST['user'] : '';
+$sProcessUid = isset( $_POST['process'] ) ? $_POST['process'] : '';
+
+G::LoadClass( 'tasks' );
+G::LoadClass( 'groups' );
+G::LoadClass( 'case' );
+G::LoadClass( 'users' );
+require_once ("classes/model/AppCacheView.php");
+
+$oTasks = new Tasks();
+$oGroups = new Groups();
+$oUser = new Users();
+$oCases = new Cases();
+
+$aCasesList = Array ();
+$vard = 0;
+foreach ($allUidsRecords as $aRecord) {
+    $vard = $vard + 1;
+    $APP_UID = $aRecord['APP_UID'];
+    $delIndex = $aRecord['DEL_INDEX'];
+    $aCase = $oCases->loadCaseByDelegation( $APP_UID, $delIndex );
+
+    $aUsersInvolved = Array ();
+    $aCaseGroups = $oTasks->getGroupsOfTask( $aCase['TAS_UID'], 1 );
+
+    foreach ($aCaseGroups as $aCaseGroup) {
+        $aCaseUsers = $oGroups->getUsersOfGroup( $aCaseGroup['GRP_UID'] );
+        foreach ($aCaseUsers as $aCaseUser) {
+            if ($aCaseUser['USR_UID'] != $sReassignFromUser) {
+                $aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] );
+                $aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']
+                ); // . ' (' . $aCaseUserRecord['USR_USERNAME']
+            }
+        }
+    }
+
+    $aCaseUsers = $oTasks->getUsersOfTask( $aCase['TAS_UID'], 1 );
+    foreach ($aCaseUsers as $aCaseUser) {
+        if ($aCaseUser['USR_UID'] != $sReassignFromUser) {
+            $aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] );
+            $aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']
+            );
+        }
+    }
+    $oTmp = $aUsersInvolved;
+    $aCase['USERS'] = $oTmp;
+    array_push( $aCasesList, $aCase );
+}
+
+$filedNames = Array ("APP_UID","APP_NUMBER","APP_UPDATE_DATE","DEL_PRIORITY","DEL_INDEX","TAS_UID","DEL_INIT_DATE","DEL_FINISH_DATE","USR_UID","APP_STATUS","DEL_TASK_DUE_DATE","APP_CURRENT_USER","APP_TITLE","APP_PRO_TITLE","APP_TAS_TITLE","APP_DEL_PREVIOUS_USER","USERS"
+);
+
+$aCasesList = array_merge( Array ($filedNames
+), $aCasesList );
+$rows = array ();
+$i = $start;
+for ($j = 0; $j < $limit; $j ++) {
+    $i ++;
+    if (isset( $aCasesList[$i] )) {
+        $rows[] = $aCasesList[$i];
+    }
+}
+$totalCount = count( $aCasesList ) - 1;
+$result = array ();
+$result['totalCount'] = $totalCount;
+
+$index = $start;
+$result['data'] = $rows;
+//print the result in json format
+print G::json_encode( $result );
+
diff --git a/workflow/engine/methods/cases/proxyReassignUsersList.php b/workflow/engine/methods/cases/proxyReassignUsersList.php
index a1ff66226..6cbbb776d 100755
--- a/workflow/engine/methods/cases/proxyReassignUsersList.php
+++ b/workflow/engine/methods/cases/proxyReassignUsersList.php
@@ -1,108 +1,110 @@
-<?php
-
-G::LoadClass('configuration');
-
-  $callback = isset($_POST['callback']) ? $_POST['callback'] : 'stcCallback1001';
-  $query    = isset($_POST['query'])    ? $_POST['query']    : '';
-  $dir      = isset($_POST['dir'])      ? $_POST['dir']    : 'DESC';
-  $sort     = isset($_POST['sort'])     ? $_POST['sort']   : '';
-  $start    = isset($_POST['start'])    ? $_POST['start']  : '0';
-  $limit    = isset($_POST['limit'])    ? $_POST['limit']  : '25';
-  $filter   = isset($_POST['filter'])   ? $_POST['filter'] : '';
-  $search   = isset($_POST['search'])   ? $_POST['search'] : '';
-  $process  = isset($_POST['process'])  ? $_POST['process'] : '';
-  $user     = isset($_POST['user'])     ? $_POST['user']    : '';
-  $status   = isset($_POST['status'])   ? strtoupper($_POST['status']) : '';
-  $action   = isset($_GET['action'])    ? $_GET['action'] : (isset($_POST['action']) ? $_POST['action'] : 'todo');
-  $type     = isset($_GET['type'])      ? $_GET['type'] : (isset($_POST['type']) ? $_POST['type'] : 'extjs');
-
-function array_sort($array, $on, $order=SORT_ASC, $query='')
-{
-    $new_array = array();
-    $sortable_array = array();
-
-    if (count($array) > 0) {
-        foreach ($array as $k => $v) {
-            if (is_array($v)) {
-                foreach ($v as $k2 => $v2) {
-                    if ($k2 == $on) {
-                        $sortable_array[$k] = $v2;
-                    }
-                }
-            } else {
-                $sortable_array[$k] = $v;
-            }
-        }
-
-        switch ($order) {
-            case SORT_ASC:
-                asort($sortable_array);
-            break;
-            case SORT_DESC:
-                arsort($sortable_array);
-            break;
-        }
-
-        foreach ($sortable_array as $k => $v) {
-            if ($query==''){
-                $new_array[] = $array[$k];
-            }
-            else {
-              if ( preg_match("/".$query."/i", $array[$k]['userFullname']) ) {
-                $new_array[] = $array[$k];
-              }
-            }
-        }
-    }
-    return $new_array;
-}
+<?php
+
+G::LoadClass( 'configuration' );
+
+$callback = isset( $_POST['callback'] ) ? $_POST['callback'] : 'stcCallback1001';
+$query = isset( $_POST['query'] ) ? $_POST['query'] : '';
+$dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'DESC';
+$sort = isset( $_POST['sort'] ) ? $_POST['sort'] : '';
+$start = isset( $_POST['start'] ) ? $_POST['start'] : '0';
+$limit = isset( $_POST['limit'] ) ? $_POST['limit'] : '25';
+$filter = isset( $_POST['filter'] ) ? $_POST['filter'] : '';
+$search = isset( $_POST['search'] ) ? $_POST['search'] : '';
+$process = isset( $_POST['process'] ) ? $_POST['process'] : '';
+$user = isset( $_POST['user'] ) ? $_POST['user'] : '';
+$status = isset( $_POST['status'] ) ? strtoupper( $_POST['status'] ) : '';
+$action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
+$type = isset( $_GET['type'] ) ? $_GET['type'] : (isset( $_POST['type'] ) ? $_POST['type'] : 'extjs');
+
+function array_sort ($array, $on, $order = SORT_ASC, $query = '')
+{
+    $new_array = array ();
+    $sortable_array = array ();
+
+    if (count( $array ) > 0) {
+        foreach ($array as $k => $v) {
+            if (is_array( $v )) {
+                foreach ($v as $k2 => $v2) {
+                    if ($k2 == $on) {
+                        $sortable_array[$k] = $v2;
+                    }
+                }
+            } else {
+                $sortable_array[$k] = $v;
+            }
+        }
+
+        switch ($order) {
+            case SORT_ASC:
+                asort( $sortable_array );
+                break;
+            case SORT_DESC:
+                arsort( $sortable_array );
+                break;
+        }
+
+        foreach ($sortable_array as $k => $v) {
+            if ($query == '') {
+                $new_array[] = $array[$k];
+            } else {
+                if (preg_match( "/" . $query . "/i", $array[$k]['userFullname'] )) {
+                    $new_array[] = $array[$k];
+                }
+            }
+        }
+    }
+    return $new_array;
+}
 //  $APP_UIDS          = explode(',', $_POST['APP_UID']);
-
-  $appUid = isset($_POST['application']) ? $_POST['application'] : '';
+
+
+$appUid = isset( $_POST['application'] ) ? $_POST['application'] : '';
 //  $processUid = isset($_POST['process'])     ? $_POST['process'] : '';
-  $TaskUid    = isset($_POST['task'])        ? $_POST['task'] : '';
-	$sReassignFromUser = isset($_POST['currentUser']) ? $_POST['currentUser'] : '';
-
-        G::LoadClass('tasks');
-        G::LoadClass('groups');
-        G::LoadClass('case');
-        G::LoadClass('users');
-
-        $oTasks  = new Tasks();
-        $oGroups = new Groups();
-        $oUser   = new Users();
-        $oCases  = new Cases();
-
-        $aCasesList = Array();
-
-            $aUsersInvolved = Array();
-            $aCaseGroups = $oTasks->getGroupsOfTask($TaskUid, 1);
-            $oConf = new Configurations;
-            $ConfEnv= $oConf->getFormats();
-            foreach ( $aCaseGroups as $aCaseGroup ) {
-              $aCaseUsers = $oGroups->getUsersOfGroup($aCaseGroup['GRP_UID']);
-              foreach ( $aCaseUsers as $aCaseUser ) {
-                if ( $aCaseUser['USR_UID'] != $sReassignFromUser ) {
-                  $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']);
-                  $sCaseUser = G::getFormatUserList ($ConfEnv['format'],$aCaseUserRecord);
-//                        $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
-                  $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $sCaseUser); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
-                }
-              }
-            }
-
-            $aCaseUsers = $oTasks->getUsersOfTask($TaskUid, 1);
-            foreach ( $aCaseUsers as $aCaseUser ) {
-                if ( $aCaseUser['USR_UID'] != $sReassignFromUser ) {
-                    $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']);
-                    $sCaseUser = G::getFormatUserList ($ConfEnv['format'],$aCaseUserRecord);
-//                    $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
-                    $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $sCaseUser); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
-                }
-            }
+$TaskUid = isset( $_POST['task'] ) ? $_POST['task'] : '';
+$sReassignFromUser = isset( $_POST['currentUser'] ) ? $_POST['currentUser'] : '';
+
+G::LoadClass( 'tasks' );
+G::LoadClass( 'groups' );
+G::LoadClass( 'case' );
+G::LoadClass( 'users' );
+
+$oTasks = new Tasks();
+$oGroups = new Groups();
+$oUser = new Users();
+$oCases = new Cases();
+
+$aCasesList = Array ();
+
+$aUsersInvolved = Array ();
+$aCaseGroups = $oTasks->getGroupsOfTask( $TaskUid, 1 );
+$oConf = new Configurations();
+$ConfEnv = $oConf->getFormats();
+foreach ($aCaseGroups as $aCaseGroup) {
+    $aCaseUsers = $oGroups->getUsersOfGroup( $aCaseGroup['GRP_UID'] );
+    foreach ($aCaseUsers as $aCaseUser) {
+        if ($aCaseUser['USR_UID'] != $sReassignFromUser) {
+            $aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] );
+            $sCaseUser = G::getFormatUserList( $ConfEnv['format'], $aCaseUserRecord );
+            //                        $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
+            $aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $sCaseUser
+            ); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
+        }
+    }
+}
+
+$aCaseUsers = $oTasks->getUsersOfTask( $TaskUid, 1 );
+foreach ($aCaseUsers as $aCaseUser) {
+    if ($aCaseUser['USR_UID'] != $sReassignFromUser) {
+        $aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] );
+        $sCaseUser = G::getFormatUserList( $ConfEnv['format'], $aCaseUserRecord );
+        //                    $aUsersInvolved[] = array ( 'userUid' => $aCaseUser['USR_UID'] , 'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
+        $aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $sCaseUser
+        ); // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
+    }
+}
 //            $oTmp = new stdClass();
 //            $oTmp->items = $aUsersInvolved;
-        $result = array();
-        $aUsersInvolved = array_sort($aUsersInvolved,'userFullname',SORT_ASC, $query);
-        $result['data'] = $aUsersInvolved;
-        print G::json_encode( $result ) ;
+$result = array ();
+$aUsersInvolved = array_sort( $aUsersInvolved, 'userFullname', SORT_ASC, $query );
+$result['data'] = $aUsersInvolved;
+print G::json_encode( $result );
diff --git a/workflow/engine/methods/cases/proxySaveReassignCasesList.php b/workflow/engine/methods/cases/proxySaveReassignCasesList.php
index 3b1d4cb2b..dc3657acd 100755
--- a/workflow/engine/methods/cases/proxySaveReassignCasesList.php
+++ b/workflow/engine/methods/cases/proxySaveReassignCasesList.php
@@ -1,97 +1,95 @@
-<?php
-/**
- * proxySaveReassignCasesList.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
- $aData = G::json_decode($_POST['data']);
- $appSelectedUids = array ();
- $items = explode(",",$_POST['APP_UIDS']);
- foreach ($items as $item) {
-   $dataUids = explode("|",$item);
-   $appSelectedUids[] = $dataUids[0];
- }
-
+<?php
+/**
+ * proxySaveReassignCasesList.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+$aData = G::json_decode( $_POST['data'] );
+$appSelectedUids = array ();
+$items = explode( ",", $_POST['APP_UIDS'] );
+foreach ($items as $item) {
+    $dataUids = explode( "|", $item );
+    $appSelectedUids[] = $dataUids[0];
+}
+
 // var_dump($aData);
 //var_dump($appSelectedUids);
-      $casesReassignedCount = 0;
-      $serverResponse = array();
-      G::LoadClass ('case');
-      $oCases = new Cases();
-      require_once ('classes/model/Task.php');
-      require_once ('classes/model/AppCacheView.php');
-      $oAppCacheView      = new AppCacheView();
-      $oCasesReassignList = $oAppCacheView->getToReassignListCriteria();
-      if (isset($_POST['selected'])&&$_POST['selected']=='true'){
-        $oCasesReassignList->add(AppCacheViewPeer::APP_UID,$appSelectedUids,Criteria::IN);
-      }
-      // if there are no records to save return -1
-      if (empty($aData)){
-        $serverResponse['TOTAL']=-1;
-        echo G::json_encode($serverResponse);
-        die();
-      }
+$casesReassignedCount = 0;
+$serverResponse = array ();
+G::LoadClass( 'case' );
+$oCases = new Cases();
+require_once ('classes/model/Task.php');
+require_once ('classes/model/AppCacheView.php');
+$oAppCacheView = new AppCacheView();
+$oCasesReassignList = $oAppCacheView->getToReassignListCriteria();
+if (isset( $_POST['selected'] ) && $_POST['selected'] == 'true') {
+    $oCasesReassignList->add( AppCacheViewPeer::APP_UID, $appSelectedUids, Criteria::IN );
+}
+// if there are no records to save return -1
+if (empty( $aData )) {
+    $serverResponse['TOTAL'] = - 1;
+    echo G::json_encode( $serverResponse );
+    die();
+}
 //      $params = array ();
 //      $sql = BasePeer::createSelectSql($oCasesReassignList, $params);
 //      var_dump($sql);
-      if ( is_array($aData) ) {
-        $currentCasesReassigned=0;
-        foreach ($aData as $data){
-          $oTmpReassignCriteria = $oCasesReassignList;
-          $oTmpReassignCriteria->add(AppCacheViewPeer::TAS_UID,$data->TAS_UID);
-          $rs = AppCacheViewPeer::doSelectRS($oTmpReassignCriteria);
-          $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-          $rs->next();
-          $row = $rs->getRow();
-          $aCase = $oCases->loadCaseInCurrentDelegation($data->APP_UID);
-          $oCases->reassignCase($aCase['APP_UID'], $aCase['DEL_INDEX'], ($aCase['USR_UID'] != '' ? $aCase['USR_UID'] : $_SESSION['USER_LOGGED']), $data->APP_REASSIGN_USER_UID);
-          $currentCasesReassigned++;
-          $casesReassignedCount++;
-          $serverResponse[] = array ('APP_REASSIGN_USER' => $data->APP_REASSIGN_USER,
-                                     'APP_TITLE'         => $data->APP_TITLE,
-                                     'TAS_TITLE'         => $data->APP_TAS_TITLE,
-                                     'REASSIGNED_CASES'  => $currentCasesReassigned);
-        }
-      }
-      else {
-        $oTmpReassignCriteria = $oCasesReassignList;
-        $oTmpReassignCriteria->add(AppCacheViewPeer::TAS_UID,$aData->TAS_UID);
-        $rs = AppCacheViewPeer::doSelectRS($oTmpReassignCriteria);
-        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $rs->next();
-        $row = $rs->getRow();
-        $currentCasesReassigned=0;
-        while (is_array($row)) {
-          $APP_UID = $row['APP_UID'];
-          $aCase = $oCases->loadCaseInCurrentDelegation($APP_UID);
-          $oCases->reassignCase($aCase['APP_UID'], $aCase['DEL_INDEX'], ($aCase['USR_UID'] != '' ? $aCase['USR_UID'] : $_SESSION['USER_LOGGED']), $aData->APP_REASSIGN_USER_UID);
-          $currentCasesReassigned++;
-          $casesReassignedCount++;
-//              var_dump($aCase);
-//              echo ("<br>");
-          $rs->next();
-          $row = $rs->getRow();
-        }
-        $serverResponse[] = array ('TAS_TITLE'=>$aData->APP_TAS_TITLE,'REASSIGNED_CASES'=>$currentCasesReassigned);
-      }
-
-      $serverResponse['TOTAL'] = $casesReassignedCount;
-      echo G::json_encode($serverResponse);
+if (is_array( $aData )) {
+    $currentCasesReassigned = 0;
+    foreach ($aData as $data) {
+        $oTmpReassignCriteria = $oCasesReassignList;
+        $oTmpReassignCriteria->add( AppCacheViewPeer::TAS_UID, $data->TAS_UID );
+        $rs = AppCacheViewPeer::doSelectRS( $oTmpReassignCriteria );
+        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $rs->next();
+        $row = $rs->getRow();
+        $aCase = $oCases->loadCaseInCurrentDelegation( $data->APP_UID );
+        $oCases->reassignCase( $aCase['APP_UID'], $aCase['DEL_INDEX'], ($aCase['USR_UID'] != '' ? $aCase['USR_UID'] : $_SESSION['USER_LOGGED']), $data->APP_REASSIGN_USER_UID );
+        $currentCasesReassigned ++;
+        $casesReassignedCount ++;
+        $serverResponse[] = array ('APP_REASSIGN_USER' => $data->APP_REASSIGN_USER,'APP_TITLE' => $data->APP_TITLE,'TAS_TITLE' => $data->APP_TAS_TITLE,'REASSIGNED_CASES' => $currentCasesReassigned
+        );
+    }
+} else {
+    $oTmpReassignCriteria = $oCasesReassignList;
+    $oTmpReassignCriteria->add( AppCacheViewPeer::TAS_UID, $aData->TAS_UID );
+    $rs = AppCacheViewPeer::doSelectRS( $oTmpReassignCriteria );
+    $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $rs->next();
+    $row = $rs->getRow();
+    $currentCasesReassigned = 0;
+    while (is_array( $row )) {
+        $APP_UID = $row['APP_UID'];
+        $aCase = $oCases->loadCaseInCurrentDelegation( $APP_UID );
+        $oCases->reassignCase( $aCase['APP_UID'], $aCase['DEL_INDEX'], ($aCase['USR_UID'] != '' ? $aCase['USR_UID'] : $_SESSION['USER_LOGGED']), $aData->APP_REASSIGN_USER_UID );
+        $currentCasesReassigned ++;
+        $casesReassignedCount ++;
+        //              var_dump($aCase);
+        //              echo ("<br>");
+        $rs->next();
+        $row = $rs->getRow();
+    }
+    $serverResponse[] = array ('TAS_TITLE' => $aData->APP_TAS_TITLE,'REASSIGNED_CASES' => $currentCasesReassigned
+    );
+}
+
+$serverResponse['TOTAL'] = $casesReassignedCount;
+echo G::json_encode( $serverResponse );
+
diff --git a/workflow/engine/methods/cases/summary.php b/workflow/engine/methods/cases/summary.php
index 1678dcfb7..c9e151de5 100755
--- a/workflow/engine/methods/cases/summary.php
+++ b/workflow/engine/methods/cases/summary.php
@@ -1,80 +1,77 @@
-<?php
-/**
- * summary.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
-try {
-  global $RBAC;
-  switch ($RBAC->userCanAccess('PM_CASES')) {
-  	case -2:
-  	  throw new Exception(G::LoadTranslation('ID_USER_HAVENT_RIGHTS_SYSTEM'));
-  	break;
-  	case -1:
-  	  throw new Exception(G::LoadTranslation('ID_USER_HAVENT_RIGHTS_PAGE'));
-  	break;
-  }
-
-  if (!isset($_REQUEST['APP_UID']) || !isset($_REQUEST['DEL_INDEX']) || !isset($_REQUEST['DYN_UID'])) {
-    throw new Exception(G::LoadTranslation('ID_REQUIRED_FIELDS_ERROR') . ' (APP_UID, DEL_INDEX, DYN_UID)');
-  }
-
-  if ($_REQUEST['APP_UID'] == '' || $_REQUEST['DEL_INDEX'] == '' || $_REQUEST['DYN_UID'] == '') {
-    throw new Exception(G::LoadTranslation('ID_REQUIRED_FIELDS_ERROR') . ' (APP_UID, DEL_INDEX, DYN_UID)');
-  }
-
-  G::LoadClass('case');
-  $case = new Cases();
-  if ($RBAC->userCanAccess('PM_ALLCASES') < 0 && $case->userParticipatedInCase($_REQUEST['APP_UID'], $_SESSION['USER_LOGGED']) == 0) {
-    throw new Exception(G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED'));
-  }
-
-  $applicationFields = $case->loadCase($_REQUEST['APP_UID'], $_REQUEST['DEL_INDEX']);
-
-  if (file_exists(PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml')) {
-    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#';
-    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
-    $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = '#';
-
-    G::LoadClass ('dbConnections');
-    $_SESSION['PROCESS'] = $applicationFields['PRO_UID'];
-    $dbConnections = new dbConnections($_SESSION['PROCESS']);
-    $dbConnections->loadAdditionalConnections();
-    $_SESSION['CURRENT_DYN_UID'] = $_REQUEST['DYN_UID'];
-
-    global $G_PUBLISH;
-    $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent('dynaform', 'xmlform', $applicationFields['PRO_UID'] . '/' . $_REQUEST['DYN_UID'], '', $applicationFields['APP_DATA'], '', '', 'view');
-    G::RenderPage('publish', 'blank');
-  }
-  else {
-    throw new Exception(G::LoadTranslation('INVALID_FILE') . ': ' . $_REQUEST['DYN_UID']);
-  }
-}
-catch (Exception $error) {
-  global $G_PUBLISH;
-  $G_PUBLISH = new Publisher();
-  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => $error->getMessage()));
-  G::RenderPage('publish', 'blank');
-  die();
-}
\ No newline at end of file
+<?php
+/**
+ * summary.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2011 Colosa Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
+ * Coral Gables, FL, 33134, USA, or email info@colosa.com.
+ */
+
+try {
+    global $RBAC;
+    switch ($RBAC->userCanAccess( 'PM_CASES' )) {
+        case - 2:
+            throw new Exception( G::LoadTranslation( 'ID_USER_HAVENT_RIGHTS_SYSTEM' ) );
+            break;
+        case - 1:
+            throw new Exception( G::LoadTranslation( 'ID_USER_HAVENT_RIGHTS_PAGE' ) );
+            break;
+    }
+
+    if (! isset( $_REQUEST['APP_UID'] ) || ! isset( $_REQUEST['DEL_INDEX'] ) || ! isset( $_REQUEST['DYN_UID'] )) {
+        throw new Exception( G::LoadTranslation( 'ID_REQUIRED_FIELDS_ERROR' ) . ' (APP_UID, DEL_INDEX, DYN_UID)' );
+    }
+
+    if ($_REQUEST['APP_UID'] == '' || $_REQUEST['DEL_INDEX'] == '' || $_REQUEST['DYN_UID'] == '') {
+        throw new Exception( G::LoadTranslation( 'ID_REQUIRED_FIELDS_ERROR' ) . ' (APP_UID, DEL_INDEX, DYN_UID)' );
+    }
+    G::LoadClass( 'case' );
+    $case = new Cases();
+    if ($RBAC->userCanAccess( 'PM_ALLCASES' ) < 0 && $case->userParticipatedInCase( $_REQUEST['APP_UID'], $_SESSION['USER_LOGGED'] ) == 0) {
+        throw new Exception( G::LoadTranslation( 'ID_NO_PERMISSION_NO_PARTICIPATED' ) );
+    }
+    $applicationFields = $case->loadCase( $_REQUEST['APP_UID'], $_REQUEST['DEL_INDEX'] );
+
+    if (file_exists( PATH_DYNAFORM . $applicationFields['PRO_UID'] . PATH_SEP . $_REQUEST['DYN_UID'] . '.xml' )) {
+        $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+        $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = '#';
+        $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
+        $applicationFields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = '#';
+
+        G::LoadClass( 'dbConnections' );
+        $_SESSION['PROCESS'] = $applicationFields['PRO_UID'];
+        $dbConnections = new dbConnections( $_SESSION['PROCESS'] );
+        $dbConnections->loadAdditionalConnections();
+        $_SESSION['CURRENT_DYN_UID'] = $_REQUEST['DYN_UID'];
+
+        global $G_PUBLISH;
+        $G_PUBLISH = new Publisher();
+        $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $applicationFields['PRO_UID'] . '/' . $_REQUEST['DYN_UID'], '', $applicationFields['APP_DATA'], '', '', 'view' );
+        G::RenderPage( 'publish', 'blank' );
+    } else {
+        throw new Exception( G::LoadTranslation( 'INVALID_FILE' ) . ': ' . $_REQUEST['DYN_UID'] );
+    }
+} catch (Exception $error) {
+    global $G_PUBLISH;
+    $G_PUBLISH = new Publisher();
+    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => $error->getMessage()
+    ) );
+    G::RenderPage( 'publish', 'blank' );
+    die();
+}
+