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

[scalable-opengroupware.org] / Main / SOGo.m

diff --git a/Main/SOGo.m b/Main/SOGo.m
index e7690fda574677c6a60c5ebaca885afcb30037eb..32be4cedd250a429633e0d73bd5241a3799dc212 100644 (file)
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -47,6 +47,7 @@
 #import <SoObjects/SOGo/SOGoUserFolder.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoWebAuthenticator.h>
+#import <SoObjects/SOGo/WORequest+SOGo.h>
 
 #import "build.h"
 #import "SOGoProductLoader.h"
@@ -236,13 +237,11 @@ static BOOL debugObjectAllocation = NO;
 - (id) authenticatorInContext: (WOContext *) context
 {
   id authenticator;
-  NSString *key;
 
-  key = [[context request] requestHandlerKey];
-  if ([key isEqualToString: @"dav"])
-    authenticator = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
-  else
+  if ([[context request] handledByDefaultHandler])
     authenticator = [SOGoWebAuthenticator sharedSOGoWebAuthenticator];
+  else
+    authenticator = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
 
   return authenticator;
 }