amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-25 16:33:22 +00:00
Code Issues Projects Releases Wiki Activity

merge of '072677283f59903d1be242f3d96735460ef0985f'

Browse Source 
and '4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f'

Monotone-Parent: 072677283f59903d1be242f3d96735460ef0985f
Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f
Monotone-Revision: 672825b550345066a5eea3c60a50e21c47b5624f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-01T00:48:46
This commit is contained in:
Francis Lachapelle
2012-05-01 00:48:46 +00:00
parent 1e2e40dc6c 19540fada1
commit a1f0d669a2
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoUserFolder+Appointments.m
+14 -1
View File
@@ -68,7 +68,20 @@
doneEmails = [NSMutableDictionary dictionary];
ownerUser = [SOGoUser userWithLogin: owner];
emails = [[ownerUser allEmails] objectEnumerator];
emails = nil;
if ([[ownerUser domainDefaults] hideSystemEMail])
{
int count;
count = [[ownerUser allEmails] count];
if (count > 1)
emails = [[[ownerUser allEmails] subarrayWithRange: NSMakeRange(0, count-1)] objectEnumerator];
}
if (!emails)
emails = [[ownerUser allEmails] objectEnumerator];
while ((currentEmail = [emails nextObject]))
{
if (![doneEmails objectForKey: currentEmail])
SoObjects/SOGo/SOGoDomainDefaults.h
+3 -1
View File
@@ -1,6 +1,6 @@
/* SOGoDomainDefaults.h - this file is part of SOGo
*
* Copyright (C) 2009-2010 Inverse inc.
* Copyright (C) 2009-2012 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@@ -75,6 +75,8 @@
- (NSArray *) additionalJSFiles;
- (BOOL) hideSystemEMail;
@end
#endif /* SOGODOMAINDEFAULTS_H */
SoObjects/SOGo/SOGoDomainDefaults.m
+6 -1
View File
@@ -1,6 +1,6 @@
/* SOGoDomainDefaults.m - this file is part of SOGo
*
* Copyright (C) 2009-2010 Inverse inc.
* Copyright (C) 2009-2012 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@@ -314,4 +314,9 @@
return [self stringArrayForKey: @"SOGoUIAdditionalJSFiles"];
}
- (BOOL) hideSystemEMail
{
return [self boolForKey: @"SOGoHideSystemEMail"];
}
@end