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

BUG-12282 attach documents into emails using original name doesn't work SOLVED

Browse Source 
- Cuando se esta enviando un email y guardar los datos del mismo los attach documents se guardaban solo el path del documento.
- Se cambio la forma de guardado desde ahora se guarda un serializado de los datos donde puede haber un array asociativo donde si el key es numerico envia sin nombre y si tuviera otro valor lo asocia como el nombre del file en el email.
This commit is contained in:
Marco Antonio Nina
2013-07-09 08:23:22 -04:00
parent 3029214043
commit 3d3d077c21
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,7 +138,14 @@ class spoolRun
*/ */
public function create ($aData) public function create ($aData)
{ {
$attachment = (is_array($aData['app_msg_attach'])) ? $aData['app_msg_attach'] : unserialize($aData['app_msg_attach']); if (is_array($aData['app_msg_attach'])) {
$attachment = $aData['app_msg_attach'];
} else {
$attachment = @unserialize($aData['app_msg_attach']);
if ($attachment === false) {
$attachment = explode(',', $aData['app_msg_attach']);
}
}
$aData['app_msg_attach'] = serialize($attachment); $aData['app_msg_attach'] = serialize($attachment);
$aData['app_msg_show_message'] = (isset($aData['app_msg_show_message'])) ? $aData['app_msg_show_message'] : 1; $aData['app_msg_show_message'] = (isset($aData['app_msg_show_message'])) ? $aData['app_msg_show_message'] : 1;
$sUID = $this->db_insert( $aData ); $sUID = $this->db_insert( $aData );
@@ -182,7 +189,7 @@ class spoolRun
$this->fileData['cc'] = $sCC; $this->fileData['cc'] = $sCC;
$this->fileData['bcc'] = $sBCC; $this->fileData['bcc'] = $sBCC;
$this->fileData['template'] = $sTemplate; $this->fileData['template'] = $sTemplate;
$this->fileData['attachments'] = is_string($aAttachment) ? $aAttachment : (is_array($aAttachment) ? $aAttachment : (($aAttachment != '') ? explode(',', $aAttachment) : array())); $this->fileData['attachments'] = $aAttachment;
$this->fileData['envelope_to'] = array (); $this->fileData['envelope_to'] = array ();
$this->fileData["contentTypeIsHtml"] = $bContentTypeIsHtml; $this->fileData["contentTypeIsHtml"] = $bContentTypeIsHtml;
@@ -441,10 +448,9 @@ class spoolRun
$oPHPMailer->Body = $msBody; $oPHPMailer->Body = $msBody;
if (is_array($this->fileData['attachments'])) { $attachment = @unserialize($this->fileData['attachments']);
if ($attachment === false) {
$attachment = $this->fileData['attachments']; $attachment = $this->fileData['attachments'];
} else {
$attachment = unserialize($this->fileData['attachments']);
} }
if (is_array($attachment)) { if (is_array($attachment)) {
foreach ($attachment as $key => $fileAttach) { foreach ($attachment as $key => $fileAttach) {