Changeset 940fc13 in github

Timestamp:

Aug 29, 2008 9:19:36 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

e1eb70b

Parents:

cca626e

Message:

#1485297: remove signature's div ID from sent html message

File:

• program/steps/mail/sendmail.inc (modified) (1 diff)

program/steps/mail/sendmail.inc

@@ -222 +222 @@
   $headers['User-Agent'] = $CONFIG['useragent'];
 
+$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
+$isHtml = ($isHtmlVal == "1");
+
 // fetch message body
 $message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
+
+// remove signature's div ID
+if (!$savedraft && $isHtml)
+  $message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);
 
 // append generic footer to all messages
 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);
-
-$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
-$isHtml = ($isHtmlVal == "1");
 
 // create extended PEAR::Mail_mime instance