amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-17 07:33:57 +00:00
Code Issues Projects Releases Wiki Activity

fix(identity): fix signatrue when changing identity

Browse Source
This commit is contained in:
Hivert Quentin
2026-02-05 08:47:52 +01:00
parent 3abbc31ed4
commit 71d865b86a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UI/WebServerResources/js/Mailer/MessageEditorController.js
View File

@@ -385,6 +385,7 @@
this.setFromIdentity = function (identity) {
var node, children, nl, reNl, nlNb, space, signature, previousIdentity;
var nl2, reNl2;
if (identity && identity.full)
{
@@ -399,6 +400,8 @@
nl = '<br />';
reNl = '<br ?/>(&nbsp;)?[ \n]?';
space = '&nbsp;';
nl2 = '<br ?>';
reNl2 = '<br ?>(&nbsp;)?[ \n]?';
} else {
nl = '\n';
reNl = '\n';
@@ -424,8 +427,9 @@
if (currentIdentity.signature) {
try {
var currentSignature = new RegExp('(' + reNl + '){' + nlNb + '}--' + space + reNl +
currentIdentity.signature.replace(/[-\[\]{}()*+?.,\\^$|#\s]/g, '\\$&'));
//var currentSignature = new RegExp('(' + reNl + '){' + nlNb + '}--' + space + reNl +
// currentIdentity.signature.replace(/[-\[\]{}()*+?.,\\^$|#\s]/g, '\\$&'));
var currentSignature = new RegExp('(<p>)?(<br ?\/?>(&nbsp;)?[ \\n]?)?--&nbsp;<br ?\/?>(&nbsp;)?[ \\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;