From 88e471addf4ca6bfbf53bd89a1e3f3724a72dcf7 Mon Sep 17 00:00:00 2001 From: vanmer Date: Mon, 3 May 2004 22:22:44 +0000 Subject: [PATCH] -implented function clean_crlf -Implemented to fix sendmail->postfix rejection of messages with attachments because of stray LF's git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7353 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver_SendMail.class.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php index 44095a61..57e92ae3 100644 --- a/class/deliver/Deliver_SendMail.class.php +++ b/class/deliver/Deliver_SendMail.class.php @@ -47,6 +47,24 @@ class Deliver_SendMail extends Deliver { function getBcc() { return true; } + + /** + * function clean_crlf + * + * Cleans each line to only end in a LF + * Returns the length of the line including a CR, + * so that length is correct when the message is saved to imap + * Implemented to fix sendmail->postfix rejection of messages with attachments because of stray LF's + * + * @param string $s string to strip of CR's + * @return integer length of string including a CR for each LF + */ + function clean_crlf(&$s) { + $s = str_replace("\r\n", "\n", $s); + $s = str_replace("\r", "\n", $s); + $s2 = str_replace("\n", "\r\n", $s); + return strlen($s2); + } } ?> -- 2.25.1