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

Comment

Browse Source
This commit is contained in:
Laurent Destailleur 2013-03-13 19:14:49 +01:00
parent a47616cb95
commit 80b5bd7215
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,9 +106,9 @@ class CMailFile
// We define end of line (RFC 821). // We define end of line (RFC 821).
$this->eol="\r\n"; $this->eol="\r\n";
// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n). // We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
$this->eol2="\r\n"; $this->eol2="\r\n";
if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
{ {
$this->eol="\n"; $this->eol="\n";
$this->eol2="\n"; $this->eol2="\n";
@ -551,7 +551,7 @@ class CMailFile
/** /**
* Write content of a SMTP request into a dump file (mode = all) * Write content of a SMTP request into a dump file (mode = all)
* Used for debugging. * Used for debugging.
* Note that to see full SMTP protocol, you can use tcpdump -w /tmp/smtp -s 2000 port 25" * Note that to see full SMTP protocol, you can use tcpdump -w /tmp/smtp -s 2000 port 25"
* *
* @return void * @return void
*/ */
@ -572,7 +572,7 @@ class CMailFile
} }
elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{ {
fputs($fp, $this->smtps->log); fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
} }
fclose($fp); fclose($fp);
@ -751,7 +751,7 @@ class CMailFile
{ {
$strContent = preg_replace("/\r\n/si", "\n", $strContent); $strContent = preg_replace("/\r\n/si", "\n", $strContent);
} }
//$strContent = rtrim(chunk_split($strContent)); // Function chunck_split seems bugged //$strContent = rtrim(chunk_split($strContent)); // Function chunck_split seems bugged
$strContent = rtrim(wordwrap($strContent)); $strContent = rtrim(wordwrap($strContent));