git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1064 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / UI / Common / UIxFolderActions.m

diff --git a/UI/Common/UIxFolderActions.m b/UI/Common/UIxFolderActions.m
index 4f5ff9e6b62e28553e2af1bab2f6fb6dd03baa6e..fdd9f80172d9efd9ba9a489ebafea798e66ae2a6 100644 (file)
--- a/UI/Common/UIxFolderActions.m
+++ b/UI/Common/UIxFolderActions.m
@@ -31,10 +31,10 @@
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/SoSecurityManager.h>
 
-#import <SOGo/AgenorUserManager.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoObject.h>
-#import <SOGo/SOGoPermissions.h>
+#import <SoObjects/SOGo/LDAPUserManager.h>
+#import <SoObjects/SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/SOGoObject.h>
+#import <SoObjects/SOGo/SOGoPermissions.h>
 
 #import "UIxFolderActions.h"
 
@@ -46,8 +46,10 @@
 - (void) _setupContext
 {
   NSString *clientClass;
+  SOGoUser *activeUser;
 
-  login = [[context activeUser] login];
+  activeUser = [context activeUser];
+  login = [activeUser login];
   clientObject = [self clientObject];
   owner = [clientObject ownerInContext: nil];
 
@@ -59,8 +61,8 @@
   else
     baseFolder = nil;
 
-  um = [AgenorUserManager sharedUserManager];
-  ud = [um getUserSettingsForUID: login];
+  um = [LDAPUserManager sharedUserManager];
+  ud = [activeUser userSettings];
   moduleSettings = [ud objectForKey: baseFolder];
   if (!moduleSettings)
     {
@@ -119,14 +121,15 @@
 
   [self _setupContext];
   email = [NSString stringWithFormat: @"%@ <%@>",
-                   [um getCNForUID: owner], [um getEmailForUID: owner]];
+                   [um getCNForUID: owner],
+                   [um getEmailForUID: owner]];
   if ([baseFolder isEqualToString: @"Contacts"])
     folderName = [NSString stringWithFormat: @"%@ (%@)",
                           [clientObject nameInContainer], email];
   else
     folderName = email;
 
-  folderDict = [NSMutableDictionary new];
+  folderDict = [NSMutableDictionary dictionary];
   [folderDict setObject: folderName forKey: @"displayName"];
   [folderDict setObject: [NSNumber numberWithBool: NO] forKey: @"active"];