Merged in paulis/processmaker/HOR-1487 (pull request #4607)

HOR-1487

workflow/engine/methods/services/ActionsByEmailDataFormPost.php

@@ -12,133 +12,133 @@ if (PMLicensedFeatures
                 $_REQUEST['APP_UID'] = $_GET['APP_UID'];
             }
         }
-    
+
         if ($_REQUEST['DEL_INDEX'] == '') {
             throw new Exception('The parameter DEL_INDEX is empty.');
         }
-    
+
         if ($_REQUEST['ABER'] == '') {
             throw new Exception('The parameter ABER is empty.');
         }
-    
+
         if (!isset($_REQUEST['form'])) {
             $_REQUEST['form'] = array();
         }
-    
+
         $_REQUEST['APP_UID']   = G::decrypt($_REQUEST['APP_UID'],   URL_KEY);
         $_REQUEST['DEL_INDEX'] = G::decrypt($_REQUEST['DEL_INDEX'], URL_KEY);
         $_REQUEST['ABER']      = G::decrypt($_REQUEST['ABER'],      URL_KEY);
         G::LoadClass('case');
-    
+
         $case = new Cases();
         $casesFields = $case->loadCase($_REQUEST['APP_UID'], $_REQUEST['DEL_INDEX']);
-    
+
         $casesFields['APP_DATA'] = array_merge($casesFields['APP_DATA'], $_REQUEST['form']);
-    
+
         //Get user info
         $current_user_uid = null;
         $currentUsrName   = null;
-    
+
         $criteria = new Criteria("workflow");
-    
+
         $criteria->addSelectColumn(AppDelegationPeer::USR_UID);
         $criteria->add(AppDelegationPeer::APP_UID, $_REQUEST["APP_UID"]);
         $criteria->add(AppDelegationPeer::DEL_INDEX, $_REQUEST["DEL_INDEX"]);
-    
+
         $rsSQL = AppDelegationPeer::doSelectRS($criteria);
         $rsSQL->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    
+
         while ($rsSQL->next()) {
             $row = $rsSQL->getRow();
-    
+
             $current_user_uid = $row["USR_UID"];
         }
-    
+
         if ($current_user_uid != null) {
             $criteria = new Criteria("workflow");
-    
+
             $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
             $criteria->add(UsersPeer::USR_UID, $current_user_uid);
-    
+
             $rsSQL = UsersPeer::doSelectRS($criteria);
             $rsSQL->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    
+
             $rsSQL->next();
-    
+
             $row = $rsSQL->getRow();
             $currentUsrName = $row["USR_USERNAME"];
-    
+
             $casesFields["APP_DATA"]["USER_LOGGED"]  = $current_user_uid;
             $casesFields["APP_DATA"]["USR_USERNAME"] = $currentUsrName;
         }
-    
+
         foreach ($casesFields["APP_DATA"] as $index => $value) {
             $_SESSION[$index] = $value;
         }
-    
+
         //Update case info
         $case->updateCase($_REQUEST['APP_UID'], $casesFields);
-    
+
         G::LoadClass('wsBase');
-    
+
         $wsBaseInstance = new wsBase();
         $result = $wsBaseInstance->derivateCase($casesFields['CURRENT_USER_UID'], $_REQUEST['APP_UID'], $_REQUEST ['DEL_INDEX'], true);
         $code = (is_array($result) ? $result['status_code'] : $result->status_code);
-    
+
         $dataResponses = array();
         $dataResponses['ABE_REQ_UID'] = $_REQUEST['ABER'];
         $dataResponses['ABE_RES_CLIENT_IP'] = $_SERVER['REMOTE_ADDR'];
         $dataResponses['ABE_RES_DATA'] = serialize($_REQUEST['form']);
         $dataResponses['ABE_RES_STATUS'] = 'PENDING';
         $dataResponses['ABE_RES_MESSAGE'] = '';
-    
+
         try {
             require_once 'classes/model/AbeResponses.php';
-    
+
             $abeAbeResponsesInstance = new AbeResponses();
             $dataResponses['ABE_RES_UID'] = $abeAbeResponsesInstance->createOrUpdate($dataResponses);
         } catch (Exception $error) {
             throw $error;
         }
-    
+
         if ($code == 0) {
             //Save Cases Notes
             include_once 'utils.php';
-    
+
             $dataAbeRequests = loadAbeRequest($_REQUEST['ABER']);
             $dataAbeConfiguration = loadAbeConfiguration($dataAbeRequests['ABE_UID']);
-    
+
             if ($dataAbeConfiguration['ABE_CASE_NOTE_IN_RESPONSE'] == 1) {
                 $response = new stdclass();
                 $response->usrUid = $casesFields['APP_DATA']['USER_LOGGED'];
                 $response->appUid = $_REQUEST['APP_UID'];
                 $response->noteText = "Check the information that was sent for the receiver: " . $dataAbeRequests['ABE_REQ_SENT_TO'];
-    
+
                 postNote($response);
             }
-    
+
             $dataAbeRequests['ABE_REQ_ANSWERED'] = 1;
             $code == 0 ? uploadAbeRequest($dataAbeRequests) : '';
-    
+
             if (isset ( $_FILES ['form'] )) {
                 foreach ($_FILES ['form'] ['name'] as $fieldName => $value) {
                     if ($_FILES ['form'] ['error'] [$fieldName] == 0) {
                         $appDocument = new AppDocument ( );
-    
+
                         if ( isset ( $_REQUEST['INPUTS'] [$fieldName] ) && $_REQUEST['INPUTS'] [$fieldName] != '' ) {
                             require_once 'classes/model/AppFolder.php';
                             require_once 'classes/model/InputDocument.php';
-    
+
                             $inputDocument = new InputDocument();
                             $id = $inputDocument->load($_REQUEST['INPUTS'] [$fieldName]);
-    
+
                             //Get the Custom Folder ID (create if necessary)
                             $oFolder=new AppFolder();
                             $folderId=$oFolder->createFromPath($id['INP_DOC_DESTINATION_PATH']);
-    
+
                             //Tags
                             $fileTags=$oFolder->parseTags($id['INP_DOC_TAGS']);
-    
+
                             $fields = array (
                                 'APP_UID' => $_REQUEST['APP_UID'],
                                 'DEL_INDEX' => $_REQUEST ['DEL_INDEX'],
@@ -165,7 +165,7 @@ if (PMLicensedFeatures
                                 'APP_DOC_FILENAME' => $_FILES ['form'] ['name'] [$fieldName]
                             );
                         }
-    
+
                         $appDocument->create($fields);
                         $docVersion = $appDocument->getDocVersion();
                         $appDocUid = $appDocument->getAppDocUid ();
@@ -173,12 +173,12 @@ if (PMLicensedFeatures
                         $extension = (isset ( $info ['extension'] ) ? $info ['extension'] : '');
                         $pathName = PATH_DOCUMENT . $_REQUEST['APP_UID'] . PATH_SEP;
                         $fileName = $appDocUid . '_'.$docVersion.'.' . $extension;
-    
+
                         G::uploadFile ( $_FILES ['form'] ['tmp_name'] [$fieldName], $pathName, $fileName );
                     }
                 }
             }
-    
+
             $assign = $result['message'];
             $aMessage['MESSAGE'] = '<strong>The information was submitted. Thank you.</strong>';
         } else {
@@ -186,23 +186,23 @@ if (PMLicensedFeatures
                                  Error code: '.$result->status_code.'<br />
                                  Error message: '.$result->message.'<br /><br />');
         }
-    
+
         // Update
         $dataResponses['ABE_RES_STATUS'] = ($code == 0 ? 'SENT' : 'ERROR');
         $dataResponses['ABE_RES_MESSAGE'] = ($code == 0 ? '-' : $result->message);
-    
+
         try {
             $abeAbeResponsesInstance = new AbeResponses();
             $abeAbeResponsesInstance->createOrUpdate($dataResponses);
         } catch (Exception $error) {
             throw $error;
         }
-    
+
         $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showInfo', '', $aMessage);
     } catch (Exception $error) {
-        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => $error->getMessage().'Please contact to your system administrator.'));
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => $error->getMessage().' Please contact to your system administrator.'));
     }
-    
+
     G::RenderPage('publish', 'blank');
 }
 

workflow/engine/methods/services/utils.php

@@ -13,13 +13,13 @@ function postNote($httpData)
     $noteContent = addslashes($httpData->noteText);
 
     $result = $appNotes->postNewNote($appUid, $usrUid, $noteContent, false);
-    //return true;
 
-    //die();
+
+
     //send the response to client
     @ini_set('implicit_flush', 1);
     ob_start();
-    //echo G::json_encode($result);
+
     @ob_flush();
     @flush();
     @ob_end_flush();
@@ -33,7 +33,9 @@ function postNote($httpData)
     $p = $oCase->getUsersParticipatedInCase($appUid);
 
     foreach ($p['array'] as $key => $userParticipated) {
-        $noteRecipientsList[] = $key;
+        if(!empty($key)){
+            $noteRecipientsList[] = $key;
+        }
     }
 
     $noteRecipients = implode(",", $noteRecipientsList);