fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-3364 (pull request #8275)

Browse Source 
PMCORE-3364 Actions By Email IMAP response doesn't work when replied from mobile

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Roly Gutierrez
2021-11-17 15:00:40 +00:00
committed by Julio Cesar Laura Avendaño
parent 86d6b43897 6166fa9218
commit 90948c3473
1 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
workflow/engine/classes/ActionsByEmailCoreClass.php
View File

@@ -7,6 +7,7 @@ use ProcessMaker\Services\Api\Project\Variable;
class ActionsByEmailCoreClass extends PMPlugin class ActionsByEmailCoreClass extends PMPlugin
{ {
//The %0d and %0a are URL-encoded forms of CR and LF
const BODY_REPLY_LF = '%0D%0A'; const BODY_REPLY_LF = '%0D%0A';
private $abeRequest = []; private $abeRequest = [];
private $appNumber = null; private $appNumber = null;
@@ -716,38 +717,60 @@ class ActionsByEmailCoreClass extends PMPlugin
$customGrid = unserialize($this->getItemAbeProperties('ABE_CUSTOM_GRID')); $customGrid = unserialize($this->getItemAbeProperties('ABE_CUSTOM_GRID'));
$field = new stdClass(); $field = new stdClass();
$field->label = ''; $field->label = '';
$html = '<div style="width: 100%"></div><strong>' . $field->label . '</strong><table align="left" border="0"><tr>';
$html .= '<td><table align="left" cellpadding="2"><tr>'; $html = ''
. "<div style='width: 100%; display: inline-block;'>\n"
. "<strong>{$field->label}</strong>\n"
. "<table align='left' border='0'>\n"
. "<tr>\n"
. "<td>\n"
. "<table align='left' cellpadding='2'>\n"
. "<tr>\n";
$index = 1; $index = 1;
foreach ($customGrid as $key => $value) { foreach ($customGrid as $key => $value) {
// Get the subject
$emailSubject = $this->getSubjectByResponse($value['abe_custom_label']); $emailSubject = $this->getSubjectByResponse($value['abe_custom_label']);
$emailBody = $this->getBodyByResponse($value['abe_custom_value']); $emailBody = $this->getBodyByResponse($value['abe_custom_value']);
// Define the html for the actions
$html .= '<td align="center"><a style="' . $value['abe_custom_format'] . '" '; $emailSubject = rawurlencode($emailSubject);
$html .= 'href="mailto:' . $noReply . '?subject=' . $emailSubject . '&body=' . $emailBody . '" target="_blank" >'; $emailBody = rawurlencode($emailBody);
$html .= $value['abe_custom_label'];
$html .= '</a></td>' . (($index % 5 == 0) ? '</tr><tr>' : ' '); $href = "mailto:{$noReply}?subject={$emailSubject}&body={$emailBody}";
$html = $html
. "<td align='center'>\n"
. "<a style=\"{$value['abe_custom_format']}\" href=\"{$href}\" target='_blank' >{$value['abe_custom_label']}</a>\n"
. "</td>\n";
//this is left for compatibility with template customizations
if ($index % 5 === 0) {
$html = $html
. "</tr>\n"
. "<tr>\n";
}
$index++; $index++;
} }
$html .= '</tr></table></div>'; $html = $html
. "</tr>\n"
. "</table>\n"
. "</td>\n"
. "</tr>\n"
. "</table>\n"
. "</div>\n";
return $html; return $html;
} }
/** /**
* Get the subject for response the action by email * Get the subject for response the action by email.
* *
* @param string $fieldLabel * @param string $fieldLabel
*
* @return string * @return string
*/ */
private function getSubjectByResponse($fieldLabel) private function getSubjectByResponse(string $fieldLabel): string
{ {
$subject = G::LoadTranslation('ID_CASE') . ' ' . $this->getCasePropertiesKey('APP_TITLE'); $subject = G::LoadTranslation('ID_CASE') . ' ' . $this->getCasePropertiesKey('APP_TITLE');
$subject .= $this->delimiter . ' ' . $fieldLabel; $subject .= $this->delimiter . ' ' . $fieldLabel;
return $subject;
return urlencode($subject);
} }
/** /**
@@ -769,10 +792,11 @@ class ActionsByEmailCoreClass extends PMPlugin
]; ];
$bodyToCrypt = G::json_encode($bodyToCrypt); $bodyToCrypt = G::json_encode($bodyToCrypt);
$body = str_repeat(self::BODY_REPLY_LF, 4); $CR_LF = "\r\n";
$body .= '/' . str_repeat("=", 24) . self::BODY_REPLY_LF; $body = str_repeat($CR_LF, 4);
$body .= G::LoadTranslation('ID_ABE_EMAIL_RESPONSE_BODY_NOTE') . self::BODY_REPLY_LF; $body .= '/' . str_repeat("=", 24) . $CR_LF;
$body .= '{' . Crypt::encryptString($bodyToCrypt) . '}' . self::BODY_REPLY_LF; $body .= G::LoadTranslation('ID_ABE_EMAIL_RESPONSE_BODY_NOTE') . $CR_LF;
$body .= '{' . Crypt::encryptString($bodyToCrypt) . '}' . $CR_LF;
$body .= str_repeat("=", 24) . '/'; $body .= str_repeat("=", 24) . '/';
return $body; return $body;
} }