lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change split to 76 chars

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-01 16:00:22 +01:00
parent 0a78b3f970
commit 43626c6ca4
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/class/CMailFile.class.php
View File

@ -30,10 +30,9 @@
*/ */
/** /**
* \class CMailFile * Class to send emails (with attachments or not)
* \brief Class to send emails (with attachments or not) * Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
* \remarks Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to); * $mailfile->sendfile();
* \remarks $mailfile->sendfile();
*/ */
class CMailFile class CMailFile
{ {
@ -106,8 +105,6 @@ class CMailFile
// We define end of line (RFC 822bis section 2.3) // We define end of line (RFC 822bis section 2.3)
$this->eol="\r\n"; $this->eol="\r\n";
//if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
//if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
// On defini mixed_boundary // On defini mixed_boundary
$this->mixed_boundary = dol_hash(uniqid("dolibarr1")); $this->mixed_boundary = dol_hash(uniqid("dolibarr1"));
@ -479,7 +476,7 @@ class CMailFile
if (is_readable($newsourcefile)) if (is_readable($newsourcefile))
{ {
$contents = file_get_contents($newsourcefile); // Need PHP 4.3 $contents = file_get_contents($newsourcefile); // Need PHP 4.3
$encoded = chunk_split(base64_encode($contents), 68, $this->eol); $encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
return $encoded; return $encoded;
} }
else else

2
htdocs/core/class/smtps.class.php
View File

@ -1293,7 +1293,7 @@ class SMTPs
{ {
if ( $strContent ) if ( $strContent )
{ {
$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); $strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType; $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName; $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;