amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-02 21:52:19 +00:00
Code Issues Projects Releases Wiki Activity

feat(core): Update to ckeditor 5. Fixes #5920. Add SOGoForceRawHtmlSignature to disable raw-html-embed. Removed CKEditor signature box style when composing mail. Fix issue where raw-html-embed was added when changind signature

Browse Source
This commit is contained in:
smizrahi
2024-04-08 10:37:33 +02:00
parent a9e02d94a2
commit 98e00d09a3
7 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUser.m
+10 -4
View File
@@ -1026,10 +1026,15 @@ static const NSString *kEncryptedUserNamePrefix = @"uenc";
- (NSArray *) mailAccounts
{
return [self mailAccountsWithDelegatedIdentities: YES];
return [self mailAccountsWithDelegatedIdentities: YES forceRawHtmlSignature: [[self domainDefaults] forceRawHtmlSignature]];
}
- (NSArray *) mailAccountsWithDelegatedIdentities: (BOOL) appendDeletegatedIdentities
- (NSArray *) mailAccountsNoRawHtmlSignature
{
return [self mailAccountsWithDelegatedIdentities: YES forceRawHtmlSignature: NO];
}
- (NSArray *) mailAccountsWithDelegatedIdentities: (BOOL) appendDeletegatedIdentities forceRawHtmlSignature: (BOOL) forceRawHtmlSignature
{
NSArray *auxAccounts;
@@ -1112,8 +1117,9 @@ static const NSString *kEncryptedUserNamePrefix = @"uenc";
if ([tmpIdentity objectForKey: @"signature"] ) {
// Add raw html embed class
if ([[tmpIdentity objectForKey: @"signature"] rangeOfString:@"raw-html-embed"].location == NSNotFound
&& [[[self userDefaults] mailComposeMessageType] isEqualToString: @"html"]) {
signature = [NSString stringWithFormat:@"<div class=\"raw-html-embed\">%@</div>", [tmpIdentity objectForKey: @"signature"]];
&& [[[self userDefaults] mailComposeMessageType] isEqualToString: @"html"]
&& forceRawHtmlSignature) {
signature = [NSString stringWithFormat:@"<div class=\"raw-html-embed sogo-raw-html-embed\">%@</div>", [tmpIdentity objectForKey: @"signature"]];
[tmpIdentity setObject:signature forKey:@"signature"];
}
}