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

Merged in paulis/processmaker/PM-1955 (pull request #1829)

Browse Source 
I solved the issue PM-1955 new parameter in sendMessage
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-02 12:55:16 -04:00
parent f9c2f216a6 4f6260903d
commit 06a3395af4
4 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmFunctions.php
View File

@@ -831,7 +831,7 @@ function getEmailConfiguration ()
* @param array | $aAttachment = array() | Attachment | An Optional arrray. An array of files (full paths) to be attached to the email. * @param array | $aAttachment = array() | Attachment | An Optional arrray. An array of files (full paths) to be attached to the email.
* @param boolean | $showMessage = true | Show message | Optional parameter. Set to TRUE to show the message in the case's message history. * @param boolean | $showMessage = true | Show message | Optional parameter. Set to TRUE to show the message in the case's message history.
* @param int | $delIndex = 0 | Delegation index of the case | Optional parameter. The delegation index of the current task in the case. * @param int | $delIndex = 0 | Delegation index of the case | Optional parameter. The delegation index of the current task in the case.
* @param array | $config = array() | Email server configuration | An optional array: An array of parameters to be used in the Email sent (MESS_ENGINE, MESS_SERVER, MESS_PORT, MESS_FROM_MAIL, MESS_RAUTH, MESS_ACCOUNT, MESS_PASSWORD, and SMTPSecure). * @param string(100) | $config = '' | Email server configuration | An optional array: An array of parameters to be used in the Email sent (MESS_ENGINE, MESS_SERVER, MESS_PORT, MESS_FROM_MAIL, MESS_RAUTH, MESS_ACCOUNT, MESS_PASSWORD, and SMTPSecure) Or String: UID of Email server .
* @return int | | result | Result of sending email * @return int | | result | Result of sending email
* *
*/ */

12
workflow/engine/classes/class.wsBase.php
View File

@@ -923,6 +923,18 @@ class wsBase
$licensedFeatures = & PMLicensedFeatures::getSingleton(); $licensedFeatures = & PMLicensedFeatures::getSingleton();
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
if (!empty($config) && $licensedFeatures->verifyfeature('nKaNTNuT1MzK0RsMEtXTnYzR09ucHF2WGNuS0hRdDBBak42WXJhNVVOOG1INEVoaU1EaTllbjBBeEJNeG9wRVJ6NmxQelhyVTBvdThzPQ==')) { if (!empty($config) && $licensedFeatures->verifyfeature('nKaNTNuT1MzK0RsMEtXTnYzR09ucHF2WGNuS0hRdDBBak42WXJhNVVOOG1INEVoaU1EaTllbjBBeEJNeG9wRVJ6NmxQelhyVTBvdThzPQ==')) {
if(!is_array($config)){
$emailServer = new EmailServer();
$criteria = $emailServer->getSelAllColumns();
$criteria->add(EmailServerPeer::MESS_UID, $config, CRITERIA::EQUAL);
$criteria = EmailServerPeer::doSelectRS($criteria);
$criteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($criteria->next()) {
$row = $criteria->getRow();
$config = $row;
$config['SMTPSecure'] = $row['SMTPSECURE'];
}
}
$aSetup = $config; $aSetup = $config;
} else { } else {
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/

22
workflow/engine/classes/model/EmailServer.php
View File

@@ -1,5 +1,27 @@
<?php <?php
class EmailServer extends BaseEmailServer class EmailServer extends BaseEmailServer
{ {
/**
* Get all columns by EMAIL_SERVER
*
* @return object criteria
*/
public function getSelAllColumns(){
$criteria = new Criteria("workflow");
$criteria->addSelectColumn( EmailServerPeer::MESS_UID);
$criteria->addSelectColumn( EmailServerPeer::MESS_ENGINE);
$criteria->addSelectColumn( EmailServerPeer::MESS_SERVER);
$criteria->addSelectColumn( EmailServerPeer::MESS_PORT);
$criteria->addSelectColumn( EmailServerPeer::MESS_RAUTH);
$criteria->addSelectColumn( EmailServerPeer::MESS_ACCOUNT);
$criteria->addSelectColumn( EmailServerPeer::MESS_PASSWORD);
$criteria->addSelectColumn( EmailServerPeer::MESS_FROM_MAIL);
$criteria->addSelectColumn( EmailServerPeer::MESS_FROM_NAME);
$criteria->addSelectColumn( EmailServerPeer::SMTPSECURE);
$criteria->addSelectColumn( EmailServerPeer::MESS_TRY_SEND_INMEDIATLY);
$criteria->addSelectColumn( EmailServerPeer::MAIL_TO);
$criteria->addSelectColumn( EmailServerPeer::MESS_DEFAULT);
return $criteria;
}
} }

5
workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php
View File

@@ -565,6 +565,11 @@ class TriggerWizard
break; break;
case "bool": case "bool":
case "boolean": case "boolean":
$paramValue = 'true';
if($arrayParamData["input"][$paramName]!=''){
$paramValue = $arrayParamData["input"][$paramName];
}
break;
case "array": case "array":
$paramValue = trim($arrayParamData["input"][$paramName]); $paramValue = trim($arrayParamData["input"][$paramName]);
break; break;