diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc index 879d1dde7..d61ef726e 100644 --- a/Documentation/SOGoInstallationGuide.asciidoc +++ b/Documentation/SOGoInstallationGuide.asciidoc @@ -2965,6 +2965,9 @@ If not set, it defaults to `102400` bytes, or 100 KB. |S |SOGoEASSearchInBody |Parameter used to enable EAS Search operation in all parts of a message. +|S |SOGoEASDisableUI +|Parameter used to disable EAS user interface options. Default value is `NO` + Defaults to `NO`, which means to search only in Subject- and From-header. |======================================================================= diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h index bb9f0ebbf..d24ece6dc 100644 --- a/SoObjects/SOGo/SOGoSystemDefaults.h +++ b/SoObjects/SOGo/SOGoSystemDefaults.h @@ -121,8 +121,9 @@ static const NSString *kDisableSharingCalendar = @"Calendar"; - (int) maximumSyncResponseSize; - (int) maximumPictureSize; - (BOOL) easSearchInBody; +- (BOOL) isEasUIDisabled; -- (BOOL) isPasswordRecoveryEnabled; +- (BOOL)isPasswordRecoveryEnabled; - (NSArray *) passwordRecoveryDomains; - (NSString *) JWTSecret; diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m index fbd18c7db..ff6efcaee 100644 --- a/SoObjects/SOGo/SOGoSystemDefaults.m +++ b/SoObjects/SOGo/SOGoSystemDefaults.m @@ -746,6 +746,11 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict, return [self boolForKey: @"SOGoEASSearchInBody"]; } +- (BOOL) isEasUIDisabled +{ + return [self boolForKey: @"SOGoEASDisableUI"]; +} + // // See https://msdn.microsoft.com/en-us/library/gg672032(v=exchg.80).aspx // diff --git a/UI/Contacts/UIxContactFolderProperties.m b/UI/Contacts/UIxContactFolderProperties.m index 8d99ea2ca..431d2800d 100644 --- a/UI/Contacts/UIxContactFolderProperties.m +++ b/UI/Contacts/UIxContactFolderProperties.m @@ -26,6 +26,7 @@ #import #import +#import #import @@ -91,4 +92,9 @@ return response; } +- (BOOL) isEasUIEnabled +{ + return ![[SOGoSystemDefaults sharedSystemDefaults] isEasUIDisabled]; +} + @end diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 6de9ce09f..f9dc38ede 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -1741,4 +1741,9 @@ static NSArray *reminderValues = nil; return [self shouldDisplayPasswordRecovery] || [self shouldDisplayPasswordChange]; } +- (BOOL) isEasUIEnabled +{ + return ![[SOGoSystemDefaults sharedSystemDefaults] isEasUIDisabled]; +} + @end diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m index 262fa7675..564ae8209 100644 --- a/UI/Scheduler/UIxCalendarProperties.m +++ b/UI/Scheduler/UIxCalendarProperties.m @@ -26,6 +26,7 @@ #import #import +#import #import @@ -149,4 +150,9 @@ return response; } +- (BOOL) isEasUIEnabled +{ + return ![[SOGoSystemDefaults sharedSystemDefaults] isEasUIDisabled]; +} + @end diff --git a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox index f341e9ced..ab34982fb 100644 --- a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox +++ b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox @@ -20,15 +20,17 @@ - - - (Microsoft Enterprise ActiveSync) - - + + + + (Microsoft Enterprise ActiveSync) + + + diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index a243cb75a..fc46be6ee 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -662,15 +662,17 @@ -
- - - -
+ +
+ + + +
+
- - (Microsoft Enterprise ActiveSync) - + + + (Microsoft Enterprise ActiveSync) + +