From c4ebb8c4209675c616770e013d8a7138f44645a2 Mon Sep 17 00:00:00 2001 From: thomasb Date: Thu, 30 Aug 2007 07:50:01 +0000 Subject: Don't add message footer when saving as draft git-svn-id: https://svn.roundcube.net/trunk@764 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/mail/sendmail.inc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index 929f3ed3f..7a87d2e91 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/program/steps/mail/sendmail.inc @@ -220,16 +220,8 @@ if (!empty($CONFIG['useragent'])) $message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset); // 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); - $message_body .= "\r\n" . rcube_charset_convert($content, 'UTF-8', $message_charset); - } - } +if (!$savedraft && !empty($CONFIG['generic_message_footer']) && ($footer = file_get_contents(realpath($CONFIG['generic_message_footer'])))) + $message_body .= "\r\n" . rcube_charset_convert($footer, 'UTF-8', $message_charset); // try to autodetect operating system and use the correct line endings // use the configured delimiter for headers -- cgit v1.2.3