feat(preferences): allow hiding of vacation the vacation period

This is controllable using the new SOGoVacationPeriodEnabled
domain defaults variable.
This commit is contained in:
Ludovic Marcotte
2019-11-05 15:33:16 -05:00
parent 32968092e2
commit c2e7f6a866
7 changed files with 81 additions and 280 deletions
+1
View File
@@ -52,6 +52,7 @@
- (int) forwardConstraints;
- (NSArray *) forwardConstraintsDomains;
- (BOOL) vacationEnabled;
- (BOOL) vacationPeriodEnabled;
- (NSString *) vacationDefaultSubject;
- (NSString *) vacationHeaderTemplateFile;
- (NSString *) vacationFooterTemplateFile;
+12
View File
@@ -220,6 +220,18 @@
return [self boolForKey: @"SOGoVacationEnabled"];
}
- (BOOL) vacationPeriodEnabled
{
id o;
o = [self stringForKey: @"SOGoVacationPeriodEnabled"];
if (o)
return [o boolValue];
return YES;
}
- (NSString *) vacationDefaultSubject
{
return [self stringForKey: @"SOGoVacationDefaultSubject"];
+6 -2
View File
@@ -927,7 +927,9 @@ static NSString *sieveScriptName = @"sogo";
}
// Start date of auto-reply
if ([[values objectForKey: @"startDateEnabled"] boolValue] && dateCapability)
if ([dd vacationPeriodEnabled] &&
[[values objectForKey: @"startDateEnabled"] boolValue] &&
dateCapability)
{
[req addObjectUniquely: @"date"];
[req addObjectUniquely: @"relational"];
@@ -938,7 +940,9 @@ static NSString *sieveScriptName = @"sogo";
}
// End date of auto-reply
if ([[values objectForKey: @"endDateEnabled"] boolValue] && dateCapability)
if ([dd vacationPeriodEnabled] &&
[[values objectForKey: @"endDateEnabled"] boolValue] &&
dateCapability)
{
[req addObjectUniquely: @"date"];
[req addObjectUniquely: @"relational"];