Changeset 765 in subversion for branches/devel-vnext/program/steps/mail/sendmail.inc

Timestamp:

Aug 30, 2007 10:15:33 AM (6 years ago)

Author:

till

Message:

+ added changes from trunk (r764)

File:

• branches/devel-vnext/program/steps/mail/sendmail.inc (modified) (1 diff)

branches/devel-vnext/program/steps/mail/sendmail.inc

@@ -194 +194 @@
 
 // append generic footer to all messages
-if (!empty($CONFIG['generic_message_footer'])) {
-    $file = realpath($CONFIG['generic_message_footer']);
-    if(($fp = @fopen($file, 'r')) !== false) {
-        $content = fread($fp, filesize($file));
-        fclose($fp);
-        $message_body .= "\r\n";
-        $message_body .= rc_main::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); 
 }