diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-08-30 07:50:01 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-08-30 07:50:01 +0000 |
| commit | c4ebb8c4209675c616770e013d8a7138f44645a2 (patch) | |
| tree | d4a8c63d67d42f3a33fd52edb1d86d7b4373bde3 | |
| parent | 8c555e147be04f165edb1569a7679f0a6a469ca3 (diff) | |
Don't add message footer when saving as draft
git-svn-id: https://svn.roundcube.net/trunk@764 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 12 |
1 files 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 |