mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-18 14:11:21 +00:00
fix(mail): replace the previous signature when switching identity
setFromIdentity located the previous signature by embedding its HTML in a regular expression. Metacharacters, plain text and CKEditor's <br> serialization made the search miss, and the regex-too-large fallback appended the new signature. The delimiter is now matched with a fixed-size pattern. The signature body is compared as text, from the end of the break that follows the dash. A missed match is null. One missing blank line before the delimiter is still recognized. Fixes #6168 Fixes #6214 Fixes #5695
This commit is contained in:
1 parent
4043033327
commit
82e49b5eab
2 files changed
+689
-20
No files matched your search
@@ -385,7 +385,6 @@
|
||||
|
||||
this.setFromIdentity = function (identity) {
|
||||
var node, children, nl, reNl, nlNb, space, signature, previousIdentity;
|
||||
var nl2, reNl2;
|
||||
|
||||
if (identity && identity.full)
|
||||
{
|
||||
@@ -398,10 +397,8 @@
|
||||
|
||||
if (this.composeType == "html") {
|
||||
nl = '<br />';
|
||||
reNl = '<br ?/>( )?[ \n]?';
|
||||
reNl = '<br ?/?>( )?[ \n]?';
|
||||
space = ' ';
|
||||
nl2 = '<br ?>';
|
||||
reNl2 = '<br ?>( )?[ \n]?';
|
||||
} else {
|
||||
nl = '\n';
|
||||
reNl = '\n';
|
||||
@@ -423,24 +420,43 @@
|
||||
else
|
||||
signature = '';
|
||||
|
||||
previousIdentity = _.find(this.identities, function (currentIdentity, index) {
|
||||
var breakAfterDash = (this.composeType == "html") ? '<br ?/?>' : reNl;
|
||||
var signatureMarker = new RegExp('(<p>)?(?:' + reNl + '){1,' + nlNb + '}--' + space + breakAfterDash, 'g');
|
||||
var endOfSignature = function (text, from, currentSignature) {
|
||||
var parts, at, i, br;
|
||||
|
||||
if (currentIdentity.signature) {
|
||||
try {
|
||||
//var currentSignature = new RegExp('(' + reNl + '){' + nlNb + '}--' + space + reNl +
|
||||
// currentIdentity.signature.replace(/[-\[\]{}()*+?.,\\^$|#\s]/g, '\\$&'));
|
||||
var currentSignature = new RegExp('(<p>)?(<br ?\/?>( )?[ \\n]?)?-- <br ?\/?>( )?[ \\n]?(<\/p>)?' + currentIdentity.signature)
|
||||
if (vm.message.editable.text.search(currentSignature) >= 0) {
|
||||
vm.message.editable.text = vm.message.editable.text.replace(currentSignature, signature);
|
||||
return true;
|
||||
}
|
||||
} catch (error) {
|
||||
// An error can occur (regex too long) when the signature is too big (using images)
|
||||
// In this case, just add the signature at the end (#5695)
|
||||
vm.message.editable.text += signature;
|
||||
return true;
|
||||
parts = (vm.composeType == "html") ? currentSignature.split(/<br ?\/?>/) : [currentSignature];
|
||||
at = from;
|
||||
for (i = 0; i < parts.length; i++) {
|
||||
if (i > 0) {
|
||||
br = text.slice(at).match(/^<br ?\/?>/);
|
||||
if (!br)
|
||||
return null;
|
||||
at += br[0].length;
|
||||
}
|
||||
|
||||
if (!text.startsWith(parts[i], at))
|
||||
return null;
|
||||
at += parts[i].length;
|
||||
}
|
||||
if (vm.composeType == "html" && text.startsWith('</p>', at))
|
||||
at += '</p>'.length;
|
||||
return at;
|
||||
};
|
||||
|
||||
previousIdentity = _.find(this.identities, function (currentIdentity) {
|
||||
var text, match, end;
|
||||
|
||||
if (!currentIdentity.signature)
|
||||
return false;
|
||||
|
||||
text = vm.message.editable.text;
|
||||
signatureMarker.lastIndex = 0;
|
||||
while ((match = signatureMarker.exec(text))) {
|
||||
end = endOfSignature(text, match.index + match[0].length, currentIdentity.signature);
|
||||
if (end == null)
|
||||
continue;
|
||||
vm.message.editable.text = text.slice(0, match.index) + signature + text.slice(end);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user