feat(mail): new parameter to disable S/MIME certificates

This commit is contained in:
Francis Lachapelle
2021-08-11 18:18:29 -04:00
parent 90752c4382
commit 545cfe58c6
6 changed files with 26 additions and 1 deletions

View File

@@ -2082,6 +2082,12 @@ parameter _SOGoSelectedAddressBook_.
Defaults to `NO` when unset.
|D |SOGoMailCertificateEnabled
|Parameter used to enable S/MIME certificate management from the account editor of the
preferences window.
Defaults to `YES` when unset.
|U |SOGoSelectedAddressBook
|Parameter used to specify the address book in which to add unknown mail
recipients if _SOGoMailAddOutgoingAddresses_ is enabled.

View File

@@ -115,6 +115,7 @@
SOGoMailComposeMessageType = "html";
SOGoMailComposeFontSize = "0";
SOGoMailDisplayRemoteInlineImages = "never";
SOGoMailCertificateEnabled = YES;
SOGoMailAutoSave = "5";

View File

@@ -66,6 +66,7 @@
- (BOOL) mailKeepDraftsAfterSend;
- (BOOL) mailAttachTextDocumentsInline;
- (NSArray *) mailListViewColumnsOrder;
- (BOOL) mailCertificateEnabled;
- (BOOL) aclSendEMailNotifications;
- (BOOL) appointmentSendEMailNotifications;

View File

@@ -322,6 +322,11 @@
return [self stringArrayForKey: @"SOGoMailListViewColumnsOrder"];
}
- (BOOL) mailCertificateEnabled
{
return [self boolForKey: @"SOGoMailCertificateEnabled"];
}
- (NSArray *) superUsernames
{
return [self stringArrayForKey: @"SOGoSuperUsernames"];

View File

@@ -1,6 +1,6 @@
/* UIxAccountEditor.m - this file is part of SOGo
*
* Copyright (C) 2010-2017 Inverse inc.
* Copyright (C) 2010-2021 Inverse inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@
#import <SOGo/NSDictionary+Utilities.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoDomainDefaults.h>
#import <SOGo/SOGoUser.h>
#import <SOGoUI/UIxComponent.h>
@@ -55,6 +57,14 @@
[super dealloc];
}
- (BOOL) showSecurityOptions
{
SOGoDomainDefaults *dd;
dd = [[context activeUser] domainDefaults];
return [dd mailCertificateEnabled];
}
- (BOOL) _validateFilterId
{

View File

@@ -238,6 +238,7 @@
</md-tab>
<!-- security tab -->
<var:if condition="showSecurityOptions">
<md-tab id="accountSecurityView" ng-disabled="$AccountDialogController.account.isNew" label:label="Security">
<md-content id="accountSecurityContent" class="md-padding">
@@ -345,6 +346,7 @@
</md-content>
</md-tab>
</var:if>
</md-tabs>