Fix lack of signature separator for plain text signatures in html mode (#14...

Aleksander Machniak

2015-04-08 aa38c512fb7634f51bfa168476105dd071f4bd35

Fix lack of signature separator for plain text signatures in html mode (#1490352)

 CHANGELOG

@@ -14,6 +14,7 @@
- Fix message list header in classic skin on window resize in Internet Explorer (#1490213)
- Fix so text/calendar parts are listed as attachments even if not marked as such (#1490325)
- Fix so unrecognized TNEF attachments are displayed on the list of attachments (#1490351)
- Fix lack of signature separator for plain text signatures in html mode (#1490352)

RELEASE 1.1.1
-------------

 program/steps/mail/compose.inc

@@ -628,21 +628,17 @@
                $text = $html = $sql_arr['signature'];

                if ($sql_arr['html_signature']) {
                    $h2t  = new rcube_html2text($sql_arr['signature'], false, true);
                    $h2t  = new rcube_html2text($html, false, true);
                    $text = trim($h2t->get_text());
                }
                else {
                    $html = htmlentities($html, ENT_NOQUOTES, RCUBE_CHARSET);
                    $t2h  = new rcube_text2html($text, false);
                    $html = $t2h->get_html();
                }

                if (!preg_match('/^--[ -]\r?\n/m', $text)) {
                    $text = $separator . "\n" . $text;
                    $html = $separator . "<br>" . $html;
                }

                if (!$sql_arr['html_signature']) {
                    $t2h  = new rcube_text2html($sql_arr['signature'], false);
                    $html = $t2h->get_html();
                }

                $a_signatures[$identity_id]['text'] = $text;