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

PM-3000

Browse Source 
0017474: El email FROM no respeta la configuración "Email configuration"(adicionar una nueva opcion en el plugin "actions by email")

Conflicts:

	workflow/engine/classes/model/ListInbox.php
This commit is contained in:
dheeyi
2015-09-21 13:02:43 -04:00
parent 3ec47edc0a
commit 4374dbdea7
13 changed files with 153 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,16 +449,15 @@ class spoolRun
$oPHPMailer->SMTPSecure = $this->config['SMTPSecure'];
}
break;
}
}
$oPHPMailer->CharSet = "UTF-8";
$oPHPMailer->Encoding = "8bit";
$oPHPMailer->Host = $this->config['MESS_SERVER'];
$oPHPMailer->Port = $this->config['MESS_PORT'];
$oPHPMailer->Username = $this->config['MESS_ACCOUNT'];
$oPHPMailer->Password = $this->config['MESS_PASSWORD'];
$oPHPMailer->From = $this->fileData['from_email'];
$oPHPMailer->FromName = utf8_decode( $this->fileData['from_name'] );
$oPHPMailer->SetFrom($this->fileData['from_email'], utf8_decode($this->fileData['from_name']));
if (isset($this->fileData['reply_to'])) {
if ($this->fileData['reply_to'] != '') {
$oPHPMailer->AddReplyTo($this->fileData['reply_to'], $this->fileData['reply_to_name']);