merge of '072677283f59903d1be242f3d96735460ef0985f'

and '4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f'

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

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-01T00:48:46

ChangeLog

@@ -1,3 +1,16 @@
+2012-04-30  Ludovic Marcotte  <lmarcotte@inverse.ca> 
+
+	* SoObjects/SOGo/SOGoDomainDefaults.{h,m} - added
+	-hideSystemEMail that honors SOGoHideSystemEMail.
+	Right now, this variable is limited only to
+	the calendar-user-address-set response but can/will be
+	extended later.
+
+	* SoObjects/Appointments/SOGoUserFolder+Appointments.m
+	(-davCalendarUserAddressSet): Modified to honor
+	SOGoHideSystemEMail domain default.
+
+
 2012-04-25  Jean Raby  <jraby@inverse.ca>
 
 	* SoObjects/Mailer/SOGoDraftObject.m

SoObjects/Appointments/SOGoUserFolder+Appointments.m

@@ -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

@@ -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

@@ -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