Monotone-Parent: 3c0201014f53f29be70c0414896fda18bebaba81

Monotone-Revision: 89e96558858b2cf13a764624a48709a6ae445040

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-22T18:40:05
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2007-05-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxUserRightsEditor.m ([UIxUserRightsEditor -userIsDefaultUser]) 
+	([UIxUserRightsEditor -_initRights]): take the new SOGoObject's
+	"defaultUserID" method into account.
+
 	* UI/MailerUI/UIxMailUserRightsEditor.m: added all the missing
 	methods to support the IMAP acls mentionned in the RFC 4314,
 	removed the ones specific to Cyrus.

UI/Common/UIxUserRightsEditor.h

@@ -34,6 +34,7 @@
 {
   NSMutableArray *userRights;
   NSString *uid;
+  NSString *defaultUserID;
 }
 
 - (NSString *) userDisplayName;

UI/Common/UIxUserRightsEditor.m

@@ -25,6 +25,7 @@
 #import <NGObjWeb/WORequest.h>
 #import <SoObjects/SOGo/LDAPUserManager.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
+#import <SoObjects/SOGo/SOGoObject.h>
 
 #import "UIxUserRightsEditor.h"
 
@@ -36,6 +37,7 @@
     {
       uid = nil;
       userRights = [NSMutableArray new];
+      defaultUserID = nil;
     }
 
   return self;
@@ -55,7 +57,10 @@
 
 - (BOOL) userIsDefaultUser
 {
-  return [uid isEqualToString: SOGoDefaultUserID];
+  if (!defaultUserID)
+    ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
+
+  return [uid isEqualToString: defaultUserID];
 }
 
 - (NSString *) userDisplayName
@@ -82,8 +87,11 @@
   newUID = [[context request] formValueForKey: @"uid"];
   if ([newUID length] > 0)
     {
+      if (!defaultUserID)
+	ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
+
       um = [LDAPUserManager sharedUserManager];
-      if ([newUID isEqualToString: SOGoDefaultUserID]
+      if ([newUID isEqualToString: defaultUserID]
 	  || [[um getEmailForUID: newUID] length] > 0)
 	{
 	  ASSIGN (uid, newUID);