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

Adding Groups validation in selfservice value based

Browse Source
This commit is contained in:
Jenny Murillo
2016-03-23 19:16:08 -04:00
parent 0cf59dff9e
commit 9f32bd7fbb
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -257,7 +257,7 @@ try {
if (isset ( $_SESSION ['user_experience'] ) && $flagGmail === false) { if (isset ( $_SESSION ['user_experience'] ) && $flagGmail === false) {
$aNextStep ['PAGE'] = $casesRedirector . '?ux=' . $_SESSION ['user_experience']; $aNextStep ['PAGE'] = $casesRedirector . '?ux=' . $_SESSION ['user_experience'];
$debuggerAvailable = false; $debuggerAvailable = false;
} else if ($flagGmail == true) { } else if ($flagGmail === true) {
$aNextStep ['PAGE'] = $casesRedirector . '?gmail=1'; $aNextStep ['PAGE'] = $casesRedirector . '?gmail=1';
} else { } else {
$aNextStep ['PAGE'] = $casesRedirector; $aNextStep ['PAGE'] = $casesRedirector;

25
workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
View File

@@ -82,6 +82,7 @@ class Pmgmail {
*/ */
public function sendEmail($app_uid, $mailToAddresses, $index, $arrayTask = null, $arrayData = null) public function sendEmail($app_uid, $mailToAddresses, $index, $arrayTask = null, $arrayData = null)
{ {
require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Application.php");
//getting the default email server //getting the default email server
$defaultEmail = $this->emailAccount(); $defaultEmail = $this->emailAccount();
@@ -160,20 +161,28 @@ class Pmgmail {
while ( $rsCriteria->next () ) { while ( $rsCriteria->next () ) {
$row = $rsCriteria->getRow (); $row = $rsCriteria->getRow ();
} }
$taskUsers = unserialize ( $row ['GRP_UID'] ); $targetIds = unserialize ( $row ['GRP_UID'] );
$oUsers = new \Users (); $oUsers = new \Users ();
if ($taskUsers !== false){
foreach ( $taskUsers as $user ) { if (is_array($targetIds)) {
$usrData = $oUsers->loadDetails ( $user ); foreach ( $targetIds as $user ) {
$usrData = $oUsers->loadDetails ( $user );
if ($usrData !== null) {
$isGroup = true;
}
$nextMail = $usrData ['USR_EMAIL']; $nextMail = $usrData ['USR_EMAIL'];
$mailToAddresses .= ($mailToAddresses == '') ? $nextMail : ',' . $nextMail; $mailToAddresses .= ($mailToAddresses == '') ? $nextMail : ',' . $nextMail;
} }
} else { } else {
$usrData = $oUsers->loadDetails ( $user ); $group = new \Groups();
$mailToAddresses = $usrData ['USR_EMAIL']; $users = $group->getUsersOfGroup($targetIds);
foreach ($users as $user) {
$nextMail = $user['USR_EMAIL'];
$mailToAddresses .= ($mailToAddresses == '') ? $nextMail : ',' . $nextMail;
}
} }
}
}
} }
} }
} else { } else {

4
workflow/public_html/pmGmail/sso.php
View File

@@ -27,7 +27,9 @@ curl_setopt( $gCurl, CURLOPT_CONNECTTIMEOUT, 0);
curl_setopt($gCurl, CURLOPT_SSL_VERIFYHOST, false); curl_setopt($gCurl, CURLOPT_SSL_VERIFYHOST, false);
if (curl_exec ( $gCurl ) === false) { if (curl_exec ( $gCurl ) === false) {
echo 'Curl error: ' . curl_error ( $gCurl ); echo 'Curl error: ' . curl_error ( $gCurl );
error_log(Bootstrap::LoadTranslation('ID_SERVER_COMMUNICATION_ERROR'));
die ();
} else { } else {
$gCurl_response = curl_exec ( $gCurl ); $gCurl_response = curl_exec ( $gCurl );
curl_close ( $gCurl ); curl_close ( $gCurl );