From 762a699dc7a5d0e3971a4679f714b7fa8d8832cf Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Fri, 01 May 2009 13:58:12 -0400 Subject: [PATCH] Hard-wrap message headers according to RFC --- program/include/rcube_mail_mime.php | 2 +- program/steps/mail/sendmail.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/program/include/rcube_mail_mime.php b/program/include/rcube_mail_mime.php index f59354f..ab93d3a 100644 --- a/program/include/rcube_mail_mime.php +++ b/program/include/rcube_mail_mime.php @@ -180,7 +180,7 @@ } } - $input[$hdr_name] = $hdr_value; + $input[$hdr_name] = wordwrap($hdr_value, 990, "\n", true); // hard limit header length } return $input; diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 34e2c09..7423226 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -226,7 +226,7 @@ $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc']; // add subject -$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, FALSE, $message_charset)); +$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, TRUE, $message_charset)); if (!empty($identity_arr['organization'])) $headers['Organization'] = $identity_arr['organization']; -- Gitblit v1.9.1