diff --git a/workflow/engine/methods/cases/cases_StepToRevise.php b/workflow/engine/methods/cases/cases_StepToRevise.php
index 90f7221a0..3bd4e186e 100755
--- a/workflow/engine/methods/cases/cases_StepToRevise.php
+++ b/workflow/engine/methods/cases/cases_StepToRevise.php
@@ -23,55 +23,55 @@
  *
  */
 //  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;
+/* 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("
+if (typeof parent != 'undefined') {
+  if (parent.showCaseNavigatorPanel) {
+    parent.showCaseNavigatorPanel('{$Fields['APP_STATUS']}');
   }
-
-  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("
-  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('
+}");
+// DEPRECATED this script call is marked for removal since almost all the interface is extJS based
+$oHeadPublisher->addScriptCode('
     var Cse = {};
     Cse.panels = {};
     var leimnud = new maborak();
@@ -83,60 +83,71 @@
     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);
+');
+// 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;
+if (!isset($_GET['type'])) {
+    $_GET['type'] = 'DYNAFORM';
+}
+if (!isset($_GET['position'])) {
+    $_GET['position'] = 1;
+}
 
-  $_SESSION['STEP_POSITION'] = (int)$_GET['position'];
+$_SESSION['STEP_POSITION'] = (int)$_GET['position'];
 
-  //Obtain previous and next step - Start
-  if(isset($_GET['type']))
+//Obtain previous and next step - Start
+if (isset($_GET['type'])) {
     $sType = $_GET['type'];
-  else
+} else {
     $sType = '';
+}
 
-  try {
-      $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType);
-      $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType);
-  }
-  catch (exception $e) {
+try {
+    $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType);
+    $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType);
+} catch (exception $e) {
     G::SendTemporalMessage($e->getMessage(), 'error', 'string');
-  }
+}
 
-  if (!$aPreviousStep) {
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
-  } else {
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.$aPreviousStep['UID'].'&position='.$aPreviousStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX'];
-      $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
-  }
+if (!$aPreviousStep) {
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+} else {
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.
+        $aPreviousStep['UID'].'&position='.$aPreviousStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.
+        $_GET['DEL_INDEX'];
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
+}
 
-  $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX'];
+$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.$aNextStep['UID'].
+    '&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX'];
 
 
-  /** 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();
+/** 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'] != '') {
+$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_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '',
+        $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID='.$_GET['DYN_UID']);
+}
 
-  G::RenderPage('publish', 'blank');
+G::RenderPage('publish', 'blank');
 
-  if(!isset($_GET['ex'])) $_GET['ex']=$_GET['position'];
+if (!isset($_GET['ex'])) {
+    $_GET['ex']=$_GET['position'];
+}
 ?>
 
+
 <script>
 /*------------------------------ To Revise Routines ---------------------------*/
 // DEPRECATED this JS section is marked for removal
diff --git a/workflow/engine/methods/cases/cases_StepToReviseInputs.php b/workflow/engine/methods/cases/cases_StepToReviseInputs.php
index f4726b74a..53fae4f6f 100755
--- a/workflow/engine/methods/cases/cases_StepToReviseInputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseInputs.php
@@ -63,24 +63,26 @@ $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
 $oHeadPublisher =& headPublisher::getSingleton();
 //  Check if these code needs to be removed since the interface ar now moving to ExtJS
 $oHeadPublisher->addScriptCode('
-  var Cse = {};
-  Cse.panels = {};
-  var leimnud = new maborak();
-  leimnud.make();
-  leimnud.Package.Load("rpc,drag,drop,panel,app,validator,fx,dom,abbr",{Instance:leimnud,Type:"module"});
-  leimnud.Package.Load("json",{Type:"file"});
-  leimnud.Package.Load("cases",{Type:"file",Absolute:true,Path:"/jscore/cases/core/cases.js"});
-  leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases/core/cases_Step.js"});
-  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){}':'').'
+    var Cse = {};
+    Cse.panels = {};
+    var leimnud = new maborak();
+    leimnud.make();
+    leimnud.Package.Load("rpc,drag,drop,panel,app,validator,fx,dom,abbr",{Instance:leimnud,Type:"module"});
+    leimnud.Package.Load("json",{Type:"file"});
+    leimnud.Package.Load("cases",{Type:"file",Absolute:true,Path:"/jscore/cases/core/cases.js"});
+    leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases/core/cases_Step.js"});
+    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){}':'').'
 });
   ');
 //  Check if these code needs to be removed since the interface ar now moving to ExtJS
-  $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
+$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 
-if(!isset($_GET['position'])) $_GET['position'] = 1;
+if (!isset($_GET['position'])) {
+    $_GET['position'] = 1;
+}
 
 $_SESSION['STEP_POSITION'] = (int)$_GET['position'];
 $oCase = new Cases();
@@ -88,56 +90,66 @@ $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
 
 $G_PUBLISH = new Publisher;
 
-if(!isset($_GET['ex'])) $_GET['ex']=0;
+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']);
-  //Obtain previous and next step - Start
-  try {
-    $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $_GET['type']);
-    $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $_GET['type']);
-    if (!$aPreviousStep) {
-      $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+    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']);
+    //Obtain previous and next step - Start
+    try {
+        $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $_GET['type']);
+        $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'],
+            $_GET['type']);
+        if (!$aPreviousStep) {
+            $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
+        } else {
+            $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] =
+                'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='. $aNextStep['UID'].'&position='.
+                    $aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='. $_GET['DEL_INDEX'];
+            $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
+        }
+        $Fields['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='.
+            $aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.
+            $_GET['DEL_INDEX'];
+    } catch (exception $e) {
+        //
     }
-    else {
-      $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX'];
-      $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
+
+    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['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX'];
-  }
-  catch (exception $e) {
-
-  }
-
-  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'];
-  $Fields['NEXT_STEP_LABEL'] = G::loadtranslation('ID_NEXT_STEP');
-  $Fields['PREVIOUS_STEP_LABEL'] = G::loadtranslation('ID_PREVIOUS_STEP');
-  $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-inputDocuments', '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
+    $Fields['MESSAGE1'] = G::LoadTranslation('ID_PLEASE_ENTER_COMMENTS');
+    $Fields['MESSAGE2'] = G::LoadTranslation('ID_PLEASE_SELECT_FILE');
+    $docName = $Fields['INP_DOC_TITLE'];
+    $Fields['NEXT_STEP_LABEL'] = G::loadtranslation('ID_NEXT_STEP');
+    $Fields['PREVIOUS_STEP_LABEL'] = G::loadtranslation('ID_PREVIOUS_STEP');
+    $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-inputDocuments', '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');
diff --git a/workflow/engine/methods/cases/cases_StepToReviseOutputs.php b/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
index d4c62febe..f4035092a 100755
--- a/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
@@ -69,12 +69,16 @@ leimnud.event.add(window,"load",function(){
 ');
 $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 $oCase = new Cases();
-$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise', $oCase->getOutputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
+$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise',
+    $oCase->getOutputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
 G::RenderPage('publish', 'blank');
 
-if(!isset($_GET['ex'])) $_GET['ex']=0;
-
+if (!isset($_GET['ex'])) {
+    $_GET['ex']=0;
+}
 ?>
+
+
 <script type="text/javascript">
 /*------------------------------ To Revise Routines ---------------------------*/
 //Deprecated Section since the interface are now movig to ExtJS