diff --git a/workflow/engine/methods/cases/caseHistory_Ajax.php b/workflow/engine/methods/cases/caseHistory_Ajax.php index 30312621b..e3fc9d007 100644 --- a/workflow/engine/methods/cases/caseHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseHistory_Ajax.php @@ -1,148 +1,115 @@ . - * - * 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; +use ProcessMaker\Util\DateTime; -if ($actionAjax == 'historyGridList_JXP') { +$actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null; - global $G_PUBLISH; - $criteria = Cases::getTransferHistoryCriteria($_SESSION['APPLICATION']); +switch ($actionAjax) { + case 'historyGridList_JXP': + global $G_PUBLISH; + $criteria = Cases::getTransferHistoryCriteria($_SESSION['APPLICATION']); - $rs = GulliverBasePeer::doSelectRs($criteria); - $totalCount = $rs->getRecordCount(); + $dataSet = GulliverBasePeer::doSelectRs($criteria); + $totalCount = $dataSet->getRecordCount(); - $start = $_REQUEST["start"]; - $limit = $_REQUEST["limit"]; + $start = $_REQUEST['start']; + $limit = $_REQUEST['limit']; - $criteria->setLimit($limit); - $criteria->setOffset($start); + $criteria->setLimit($limit); + $criteria->setOffset($start); - $rs = GulliverBasePeer::doSelectRs($criteria); - $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $result = new stdClass(); - $aProcesses = Array(); - while ($rs->next()) { - $result = $rs->getRow(); - $result["ID_HISTORY"] = $result["PRO_UID"] . '_' . $result["APP_UID"] . '_' . $result["TAS_UID"]; - $aProcesses[] = $result; - } + $dataSet = GulliverBasePeer::doSelectRs($criteria); + $dataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $result = new stdClass(); + $process = []; + while ($dataSet->next()) { + $result = $dataSet->getRow(); + $result['ID_HISTORY'] = $result['PRO_UID'] . '_' . $result['APP_UID'] . '_' . $result['TAS_UID']; + $process[] = $result; + } - $newDir = '/tmp/test/directory'; - G::verifyPath($newDir); - $r = new stdclass(); - $r->data = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($aProcesses); - $r->totalCount = $totalCount; + $response = new stdclass(); + $response->data = DateTime::convertUtcToTimeZone($process); + $response->totalCount = $totalCount; - echo G::json_encode($r); + echo G::json_encode($response); + break; + case '': + //!dataInput + $idHistory = $_REQUEST['idHistory']; + + //!dataSytem + $idHistoryArray = explode('*', $idHistory); + $_REQUEST['PRO_UID'] = $idHistoryArray[0]; + $_REQUEST['APP_UID'] = $idHistoryArray[1]; + $_REQUEST['TAS_UID'] = $idHistoryArray[2]; + $_REQUEST['DYN_UID'] = ''; + + ?> + + + + + + + + +
+
+ AddContent('view', 'cases/cases_DynaformHistory'); + G::RenderPage('publish', 'raw'); + ?> +
+
+ + + + + + + + + + + + + + + + + + + +
  
  + +  
  
+
+ Load($idDin); + + $title = ''; + if ($row) { + $title = $row['DYN_TITLE']; + } + + //assign task + $result = new stdClass(); + $result->dynTitle = $title; + $result->md5Hash = G::encryptOld($idDin . $dynDate); + + echo G::json_encode($result); + break; } - -if ($actionAjax == 'historyGridListChangeLogPanelBody_JXP') { - //!dataInput - $idHistory = $_REQUEST["idHistory"]; - //!dataInput - - - //!dataSytem - $idHistoryArray = explode( "*", $idHistory ); - $_REQUEST["PRO_UID"] = $idHistoryArray[0]; - $_REQUEST["APP_UID"] = $idHistoryArray[1]; - $_REQUEST["TAS_UID"] = $idHistoryArray[2]; - $_REQUEST["DYN_UID"] = ""; - - ?> - - - - - - - - -
-
- AddContent( 'view', 'cases/cases_DynaformHistory' ); - G::RenderPage( 'publish', 'raw' ); - ?> -
-
- - - - - - - - - - - - - - - - - - - -
  
  - -  
  
-
- Load($idDin); - - if ($row) { - $dynTitle = $row['DYN_TITLE']; - } - - $md5Hash = G::encryptOld( $idDin . $dynDate ); - - //assign task - $result = new stdClass(); - $result->dynTitle = $dynTitle; - $result->md5Hash = $md5Hash; - - echo G::json_encode( $result ); - -} - diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php index 8a9c4f268..8ed713a92 100644 --- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php @@ -1,26 +1,4 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ use ProcessMaker\Core\System; @@ -28,185 +6,188 @@ $filter = new InputFilter(); $_POST = $filter->xssFilterHard($_POST); $_REQUEST = $filter->xssFilterHard($_REQUEST); -$arrayToTranslation = array( - "TRIGGER" => G::LoadTranslation("ID_TRIGGER_DB"), - "DERIVATION" => G::LoadTranslation("ID_DERIVATION_DB") -); +$arrayToTranslation = [ + 'TRIGGER' => G::LoadTranslation('ID_TRIGGER_DB'), + 'DERIVATION' => G::LoadTranslation('ID_DERIVATION_DB') +]; -$actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null; +$actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null; -if ($actionAjax == 'messageHistoryGridList_JXP') { - - if (!isset($_REQUEST['start']) || $_REQUEST['start'] =='') { - $_REQUEST['start'] = 0; - } - - if (!isset($_REQUEST['limit']) || $_REQUEST['limit'] =='') { - $_REQUEST['limit'] = 20; - } - - $dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'ASC'; - $sort = isset( $_POST['sort'] ) ? $_POST['sort'] : ''; - - global $G_PUBLISH; - $oCase = new Cases(); - $oCase->dir = $dir; - $oCase->sort = $sort; - - $appMessageArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true, $_REQUEST['start'], $_REQUEST['limit']); - $appMessageCountArray = $oCase->getHistoryMessagesTrackerExt( $_SESSION['APPLICATION'], true); - $result = new stdClass(); - $aProcesses = Array (); - - - $proUid = $_SESSION['PROCESS']; - $appUid = $_SESSION['APPLICATION']; - $tasUid = $_SESSION['TASK']; - $usrUid = $_SESSION['USER_LOGGED']; - - $respBlock = $oCase->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'BLOCK' ); - $respView = $oCase->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' ); - $respResend = $oCase->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'RESEND' ); - - $delIndex = array(); - $respMess = ""; - - if (count($respBlock["MSGS_HISTORY"]) > 0) { - $respMess = $respBlock["MSGS_HISTORY"]["PERMISSION"]; - if (isset($respBlock["MSGS_HISTORY"]["DEL_INDEX"])) { - $delIndex = $respBlock["MSGS_HISTORY"]["DEL_INDEX"]; +switch ($actionAjax) { + case 'messageHistoryGridList_JXP': + if (!isset($_REQUEST['start']) || $_REQUEST['start'] == '') { + $_REQUEST['start'] = 0; } - } - if (count($respView["MSGS_HISTORY"]) > 0) { - $respMess = $respView["MSGS_HISTORY"]["PERMISSION"]; - if (isset($respView["MSGS_HISTORY"]["DEL_INDEX"])) { - $delIndex = $respView["MSGS_HISTORY"]["DEL_INDEX"]; + if (!isset($_REQUEST['limit']) || $_REQUEST['limit'] == '') { + $_REQUEST['limit'] = 20; } - } - if (count($respResend["MSGS_HISTORY"]) > 0) { - $respMess = $respResend["MSGS_HISTORY"]["PERMISSION"]; - if (isset($respResend["MSGS_HISTORY"]["DEL_INDEX"])) { - $delIndex = $respResend["MSGS_HISTORY"]["DEL_INDEX"]; - } - } + $dir = isset($_POST['dir']) ? $_POST['dir'] : 'ASC'; + $sort = isset($_POST['sort']) ? $_POST['sort'] : ''; - $totalCount = 0; - foreach ($appMessageArray as $index => $value) { - if (($appMessageArray[$index]['APP_MSG_SHOW_MESSAGE'] == 1 && $respMess != 'BLOCK' ) && - ($appMessageArray[$index]['DEL_INDEX'] == 0 || in_array($appMessageArray[$index]['DEL_INDEX'], $delIndex ))) { + global $G_PUBLISH; + $case = new Cases(); + $case->dir = $dir; + $case->sort = $sort; - $appMessageArray[$index]['ID_MESSAGE'] = $appMessageArray[$index]['APP_UID'] . '_' . $appMessageArray[$index]['APP_MSG_UID']; - if ($respMess == 'BLOCK' || $respMess == '') { - $appMessageArray[$index]['APP_MSG_BODY'] = ""; + $appMessageArray = $case->getHistoryMessagesTrackerExt($_SESSION['APPLICATION'], true, $_REQUEST['start'], $_REQUEST['limit']); + $appMessageCountArray = $case->getHistoryMessagesTrackerExt($_SESSION['APPLICATION'], true); + $result = new stdClass(); + $process = []; + + + $proUid = $_SESSION['PROCESS']; + $appUid = $_SESSION['APPLICATION']; + $tasUid = $_SESSION['TASK']; + $usrUid = $_SESSION['USER_LOGGED']; + + $respBlock = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, 'BLOCK'); + $respView = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, 'VIEW'); + $respResend = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, 'RESEND'); + + $delIndex = []; + $respMess = ''; + + if (count($respBlock['MSGS_HISTORY']) > 0) { + $respMess = $respBlock['MSGS_HISTORY']['PERMISSION']; + if (isset($respBlock['MSGS_HISTORY']['DEL_INDEX'])) { + $delIndex = $respBlock['MSGS_HISTORY']['DEL_INDEX']; } - $aProcesses[] = array_merge($appMessageArray[$index], array('MSGS_HISTORY' => $respMess)); - $totalCount ++; - } - } - - $aProcesses = array_splice($aProcesses, $_REQUEST['start'], $_REQUEST['limit']); - - $newDir = '/tmp/test/directory'; - G::verifyPath( $newDir ); - $r = new stdclass(); - $r->data = $aProcesses; - $r->totalCount = $totalCount; - - if (!empty($aProcesses)) { - if (!isset($r->data[0])) { - $r->data[0] = array('APP_MSG_TYPE' => ''); } - foreach ($r->data as $key => $value) { - $r->data[$key]["APP_MSG_TYPE"] = array_key_exists($r->data[$key]["APP_MSG_TYPE"], $arrayToTranslation) ? - $arrayToTranslation[$r->data[$key]["APP_MSG_TYPE"]] : - $r->data[$key]["APP_MSG_TYPE"]; + if (count($respView['MSGS_HISTORY']) > 0) { + $respMess = $respView['MSGS_HISTORY']['PERMISSION']; + if (isset($respView['MSGS_HISTORY']['DEL_INDEX'])) { + $delIndex = $respView['MSGS_HISTORY']['DEL_INDEX']; + } } - } - echo G::json_encode( $r ); -} -if ($actionAjax == 'showHistoryMessage') { - - ?> - - - - $value) { + if (($appMessageArray[$index]['APP_MSG_SHOW_MESSAGE'] == 1 && $respMess != 'BLOCK') && + ($appMessageArray[$index]['DEL_INDEX'] == 0 || in_array($appMessageArray[$index]['DEL_INDEX'], $delIndex))) { + $appMessageArray[$index]['ID_MESSAGE'] = $appMessageArray[$index]['APP_UID'] . '_' . $appMessageArray[$index]['APP_MSG_UID']; + if ($respMess == 'BLOCK' || $respMess == '') { + $appMessageArray[$index]['APP_MSG_BODY'] = ''; + } + $process[] = array_merge($appMessageArray[$index], ['MSGS_HISTORY' => $respMess]); + $totalCount++; + } + } - $_POST["APP_UID"] = $_REQUEST["APP_UID"]; - $_POST['APP_MSG_UID'] = $_REQUEST["APP_MSG_UID"]; + $process = array_splice($process, $_REQUEST['start'], $_REQUEST['limit']); - $G_PUBLISH = new Publisher(); - $oCase = new Cases(); + $response = new stdclass(); + $response->data = $process; + $response->totalCount = $totalCount; - $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ) ); + if (!empty($process)) { + if (!isset($response->data[0])) { + $response->data[0] = array('APP_MSG_TYPE' => ''); + } - ?> - - getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ); + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_MessagesView', '', $case->getHistoryMessagesTrackerView($_POST['APP_UID'], $_POST['APP_MSG_UID'])); + ?> + + getHistoryMessagesTrackerView($_POST['APP_UID'], $_POST['APP_MSG_UID']); - $oSpool->setConfig($aSetup); - $oSpool->create( array ('msg_uid' => $data['MSG_UID'],'app_uid' => $data['APP_UID'],'del_index' => $data['DEL_INDEX'],'app_msg_type' => $data['APP_MSG_TYPE'],'app_msg_subject' => $data['APP_MSG_SUBJECT'],'app_msg_from' => $data['APP_MSG_FROM'],'app_msg_to' => $data['APP_MSG_TO'],'app_msg_body' => $data['APP_MSG_BODY'],'app_msg_cc' => $data['APP_MSG_CC'],'app_msg_bcc' => $data['APP_MSG_BCC'],'app_msg_attach' => $data['APP_MSG_ATTACH'],'app_msg_template' => $data['APP_MSG_TEMPLATE'],'app_msg_status' => 'pending' - ) ); - $oSpool->sendMail(); + $spool = new SpoolRun(); - } catch (Exception $e) { - - $errorMessage = $e->getMessage(); - } - - echo $errorMessage; + $spool->setConfig(System::getEmailConfiguration()); + $spool->create([ + 'msg_uid' => $data['MSG_UID'], + 'app_uid' => $data['APP_UID'], + 'del_index' => $data['DEL_INDEX'], + 'app_msg_type' => $data['APP_MSG_TYPE'], + 'app_msg_subject' => $data['APP_MSG_SUBJECT'], + 'app_msg_from' => $data['APP_MSG_FROM'], + 'app_msg_to' => $data['APP_MSG_TO'], + 'app_msg_body' => $data['APP_MSG_BODY'], + 'app_msg_cc' => $data['APP_MSG_CC'], + 'app_msg_bcc' => $data['APP_MSG_BCC'], + 'app_msg_attach' => $data['APP_MSG_ATTACH'], + 'app_msg_template' => $data['APP_MSG_TEMPLATE'], + 'app_msg_status' => 'pending' + ]); + $spool->sendMail(); + } catch (Exception $error) { + $message = $error->getMessage(); + } + echo $message; + break; } -