diff options
| author | thomascube <thomas@roundcube.net> | 2009-05-01 17:58:12 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2009-05-01 17:58:12 +0000 |
| commit | 762a699dc7a5d0e3971a4679f714b7fa8d8832cf (patch) | |
| tree | 03a40a40fce5d59550de63faaf739e000080c32e /program | |
| parent | ffa6c1011c2330c19038482aa7256790f5539380 (diff) | |
Hard-wrap message headers according to RFC
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_mail_mime.php | 2 | ||||
| -rw-r--r-- | 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 f59354fea..ab93d3a70 100644 --- a/program/include/rcube_mail_mime.php +++ b/program/include/rcube_mail_mime.php @@ -180,7 +180,7 @@ class rcube_mail_mime extends Mail_mime } } - $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 34e2c0904..742322602 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -226,7 +226,7 @@ if (!empty($identity_arr['bcc'])) $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']; |