Monotone-Parent: 5d729efce0fc70839821f83308c6adead44aec1c

Monotone-Revision: 1c0531a754185ea8992128b43f8114ecf312a212

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-04T15:41:59
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2007-09-04 15:41:59 +00:00
parent f4c37e58d8
commit 0856cd6e79
5 changed files with 12 additions and 11 deletions

View File

@ -20,7 +20,6 @@
*/ */
#import <NGObjWeb/SoObject+SoDAV.h> #import <NGObjWeb/SoObject+SoDAV.h>
#import <NGObjWeb/SoHTTPAuthenticator.h>
#import <NGExtensions/NSNull+misc.h> #import <NGExtensions/NSNull+misc.h>
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
#import <NGExtensions/NSString+misc.h> #import <NGExtensions/NSString+misc.h>

View File

@ -43,7 +43,8 @@ libSOGo_HEADER_FILES = \
NSDictionary+URL.h \ NSDictionary+URL.h \
NSCalendarDate+SOGo.h \ NSCalendarDate+SOGo.h \
\ \
SOGoAuthenticator.h \ SOGoDAVAuthenticator.h \
SOGoWebAuthenticator.h \
SOGoMailer.h \ SOGoMailer.h \
SOGoUser.h \ SOGoUser.h \
@ -71,7 +72,8 @@ libSOGo_OBJC_FILES = \
NSNull+Utilities.m \ NSNull+Utilities.m \
NSCalendarDate+SOGo.m \ NSCalendarDate+SOGo.m \
\ \
SOGoAuthenticator.m \ SOGoDAVAuthenticator.m \
SOGoWebAuthenticator.m \
SOGoMailer.m \ SOGoMailer.m \
SOGoUser.m \ SOGoUser.m \

View File

@ -46,7 +46,7 @@
#import "SOGoPermissions.h" #import "SOGoPermissions.h"
#import "SOGoUser.h" #import "SOGoUser.h"
#import "SOGoAuthenticator.h" #import "SOGoDAVAuthenticator.h"
#import "SOGoUserFolder.h" #import "SOGoUserFolder.h"
#import "SOGoDAVRendererTypes.h" #import "SOGoDAVRendererTypes.h"
@ -268,13 +268,13 @@ static BOOL kontactGroupDAV = YES;
- (SOGoDAVSet *) davCurrentUserPrivilegeSet - (SOGoDAVSet *) davCurrentUserPrivilegeSet
{ {
SOGoAuthenticator *sAuth; SOGoDAVAuthenticator *sAuth;
SoUser *user; SoUser *user;
NSArray *roles; NSArray *roles;
SoClassSecurityInfo *sInfo; SoClassSecurityInfo *sInfo;
NSArray *davPermissions; NSArray *davPermissions;
sAuth = [SOGoAuthenticator sharedSOGoAuthenticator]; sAuth = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
user = [sAuth userInContext: context]; user = [sAuth userInContext: context];
roles = [user rolesForObject: self inContext: context]; roles = [user rolesForObject: self inContext: context];
sInfo = [[self class] soClassSecurityInfo]; sInfo = [[self class] soClassSecurityInfo];

View File

@ -28,7 +28,7 @@
#import <NGExtensions/NSString+misc.h> #import <NGExtensions/NSString+misc.h>
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
#import <SoObjects/SOGo/SOGoAuthenticator.h> #import <SoObjects/SOGo/SOGoWebAuthenticator.h>
#import <SoObjects/SOGo/SOGoUser.h> #import <SoObjects/SOGo/SOGoUser.h>
#import "SOGoRootPage.h" #import "SOGoRootPage.h"
@ -59,7 +59,7 @@
{ {
WOResponse *r; WOResponse *r;
NSString *login, *rhk; NSString *login, *rhk;
SOGoAuthenticator *auth; SOGoWebAuthenticator *auth;
SOGoUser *user; SOGoUser *user;
SOGoUserFolder *home; SOGoUserFolder *home;
WOApplication *base; WOApplication *base;
@ -72,7 +72,7 @@
auth = [[self clientObject] authenticatorInContext: context]; auth = [[self clientObject] authenticatorInContext: context];
user = [auth userInContext: context]; user = [auth userInContext: context];
login = [user login]; login = [user login];
if ([login isEqualToString:@"anonymous"]) { if ([login isEqualToString:@"anonymous"]) {
/* use root page for unauthenticated users */ /* use root page for unauthenticated users */
return self; return self;

View File

@ -33,7 +33,7 @@
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
#import <Appointments/SOGoFreeBusyObject.h> #import <Appointments/SOGoFreeBusyObject.h>
#import <SoObjects/SOGo/SOGoAuthenticator.h> #import <SoObjects/SOGo/SOGoWebAuthenticator.h>
#import <SoObjects/SOGo/SOGoUser.h> #import <SoObjects/SOGo/SOGoUser.h>
#import <SoObjects/SOGo/NSCalendarDate+SOGo.h> #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
#import <SOGoUI/UIxComponent.h> #import <SOGoUI/UIxComponent.h>
@ -205,7 +205,7 @@ static NSString *defaultModule = nil;
WOResponse *response; WOResponse *response;
NSEnumerator *cookies; NSEnumerator *cookies;
WOCookie *cookie; WOCookie *cookie;
SOGoAuthenticator *auth; SOGoWebAuthenticator *auth;
id container; id container;
container = [[self clientObject] container]; container = [[self clientObject] container];