Changeset 85 in subversion for trunk/roundcubemail/program/steps/mail/sendmail.inc

Timestamp:

Nov 18, 2005 10:32:20 AM (8 years ago)

Author:

roundcube

Message:

Fixed minor bugs

File:

• trunk/roundcubemail/program/steps/mail/sendmail.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -138 +138 @@
 
 
+// append generic footer to all messages
+if (!empty($CONFIG['generic_message_footer']))
+  {
+  $file = realpath($CONFIG['generic_message_footer']);
+  if($fp = fopen($file, 'r'))
+    {
+    $content = fread($fp, filesize($file));
+    fclose($fp);
+    $_POST['_message'] .= "\r\n" . $content;
+    }
+  }
+
+
+// use the configured delimiter for headers
+$header_delm = $rcmail_config['mail_header_delimiter'] ? $rcmail_config['mail_header_delimiter'] : "\r\n";
+
 // create PEAR::Mail_mime instance
-$MAIL_MIME = new Mail_mime("\n");
+$MAIL_MIME = new Mail_mime($header_delm);
 $MAIL_MIME->setTXTBody(stripslashes($_POST['_message']), FALSE, TRUE);
 //$MAIL_MIME->setTXTBody(wordwrap(stripslashes($_POST['_message'])), FALSE, TRUE);
@@ -159 +175 @@
                        'html_encoding' => 'quoted-printable',
                        'head_encoding' => 'quoted-printable',
-                       'head_charset'  => 'ISO-8859-1',
-                       'html_charset'  => 'ISO-8859-1',
-                       'text_charset'  => 'ISO-8859-1');
+                       'head_charset'  => $CHARSET,
+                       'html_charset'  => $CHARSET,
+                       'text_charset'  => $CHARSET);
 
 // compose message body and get headers