mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-12 23:37:15 +00:00
feat(preferences): allow hiding of vacation the vacation period
This is controllable using the new SOGoVacationPeriodEnabled domain defaults variable.
This commit is contained in:
1 parent
32968092e2
commit
c2e7f6a866
7 files changed
+81
-280
No files matched your search
@@ -52,6 +52,7 @@
|
||||
- (int) forwardConstraints;
|
||||
- (NSArray *) forwardConstraintsDomains;
|
||||
- (BOOL) vacationEnabled;
|
||||
- (BOOL) vacationPeriodEnabled;
|
||||
- (NSString *) vacationDefaultSubject;
|
||||
- (NSString *) vacationHeaderTemplateFile;
|
||||
- (NSString *) vacationFooterTemplateFile;
|
||||
|
||||
@@ -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"];
|
||||
|
||||
@@ -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"];
|
||||
|
||||
Reference in new issue
Block a user