projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite of the foldLine function in order to fold correctly in case of
[squirrelmail.git]
/
class
/
deliver
/
Deliver_SendMail.class.php
diff --git
a/class/deliver/Deliver_SendMail.class.php
b/class/deliver/Deliver_SendMail.class.php
index 762485e9e56853687cb410c1d369a2cced65ddb0..57b17ad7d33c93bf2a7203035f7e51314b2a8750 100644
(file)
--- a/
class/deliver/Deliver_SendMail.class.php
+++ b/
class/deliver/Deliver_SendMail.class.php
@@
-2,7
+2,7
@@
/**
* Deliver_SendMail.class.php
*
/**
* Deliver_SendMail.class.php
*
- * Copyright (c) 1999-200
2
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
3
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Delivery backend for the Deliver class.
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Delivery backend for the Deliver class.
@@
-16,9
+16,7
@@
class Deliver_SendMail extends Deliver {
function preWriteToStream(&$s) {
if ($s) {
function preWriteToStream(&$s) {
if ($s) {
- if ($s{0} == '.') $s = '.' . $s;
- $s = str_replace("\n.","\n..",$s);
- $s = str_replace("\r\n", "\n", $s);
+ $s = str_replace("\r\n", "\n", $s);
}
}
}
}
@@
-27,9
+25,9
@@
class Deliver_SendMail extends Deliver {
$from = $rfc822_header->from[0];
$envelopefrom = $from->mailbox.'@'.$from->host;
if (strstr($sendmail_path, "qmail-inject")) {
$from = $rfc822_header->from[0];
$envelopefrom = $from->mailbox.'@'.$from->host;
if (strstr($sendmail_path, "qmail-inject")) {
- $stream = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w");
+ $stream = popen (escapeshellcmd("$sendmail_path -
i -
f$envelopefrom"), "w");
} else {
} else {
- $stream = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), "w");
+ $stream = popen (escapeshellcmd("$sendmail_path -
i -
t -f$envelopefrom"), "w");
}
return $stream;
}
}
return $stream;
}
@@
-38,5
+36,10
@@
class Deliver_SendMail extends Deliver {
pclose($stream);
return true;
}
pclose($stream);
return true;
}
+
+ function getBcc() {
+ return true;
+ }
+
}
?>
}
?>