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

Merged in jennydmz/processmaker/GI-210 (pull request #3417)

Browse Source 
GI-210
This commit is contained in:
Dante Loayza
2015-12-18 18:03:07 -04:00
parent 2389d3e122 35dadba9b7
commit 6465b8f4cd
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1017,14 +1017,17 @@ class wsBase
); );
$oSpool->create( $messageArray ); $oSpool->create( $messageArray );
$oSpool->sendMail(); if ($gmail != 1){
$oSpool->sendMail();
if ($oSpool->status == 'sent') { if ($oSpool->status == 'sent') {
$result = new wsResponse( 0, G::loadTranslation( 'ID_MESSAGE_SENT' ) . ": " . $sTo ); $result = new wsResponse( 0, G::loadTranslation( 'ID_MESSAGE_SENT' ) . ": " . $sTo );
} else {
$result = new wsResponse( 29, $oSpool->status . ' ' . $oSpool->error . print_r( $aSetup, 1 ) );
}
} else { } else {
$result = new wsResponse( 29, $oSpool->status . ' ' . $oSpool->error . print_r( $aSetup, 1 ) ); $result = "";
} }
return $result; return $result;
} catch (Exception $e) { } catch (Exception $e) {
return new wsResponse( 100, $e->getMessage() ); return new wsResponse( 100, $e->getMessage() );

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

@@ -124,8 +124,6 @@ if ($action == "draft"){
curl_setopt( $curlApp, CURLOPT_RETURNTRANSFER, true); curl_setopt( $curlApp, CURLOPT_RETURNTRANSFER, true);
curl_setopt( $curlApp, CURLOPT_SSL_VERIFYPEER,false); curl_setopt( $curlApp, CURLOPT_SSL_VERIFYPEER,false);
curl_setopt( $curlApp, CURLOPT_CONNECTTIMEOUT, 0); curl_setopt( $curlApp, CURLOPT_CONNECTTIMEOUT, 0);
curl_setopt( $curlApp, CURLOPT_FRESH_CONNECT, true);
curl_setopt( $curlApp, CURLOPT_TIMEOUT_MS, 1);
$curl_response_app = curl_exec( $curlApp ); $curl_response_app = curl_exec( $curlApp );
curl_close( $curlApp ); curl_close( $curlApp );