fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in mcuiza/processmaker/PM-1365 (pull request #1422)

Browse Source 
PM-1365 (Al hacer resend de un email en el Message History, se despliega un alert con dos notice )
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-11 13:56:04 -04:00
parent 7bb5518099 d56bf7133f
commit f7d400bd67
1 changed files with 162 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.spool.php
View File

@@ -229,6 +229,7 @@ class spoolRun
$this->fileData['envelope_to'] = array ();
$this->fileData["contentTypeIsHtml"] = $bContentTypeIsHtml;
if (array_key_exists('MESS_ENGINE',$this->config)) {
if ($this->config['MESS_ENGINE'] == 'OPENMAIL') {
if ($this->config['MESS_SERVER'] != '') {
if (($sAux = @gethostbyaddr( $this->config['MESS_SERVER'] ))) {
@@ -241,6 +242,7 @@ class spoolRun
}
}
}
}
/**
* send mail
@@ -416,6 +418,7 @@ class spoolRun
private function handleMail ()
{
if (count( $this->fileData['envelope_to'] ) > 0) {
if (array_key_exists('MESS_ENGINE',$this->config)) {
switch ($this->config['MESS_ENGINE']) {
case 'MAIL':
case 'PHPMAILER':
@@ -577,6 +580,7 @@ class spoolRun
}
}
}
}
/**
* try resend the emails from spool