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

[scalable-opengroupware.org] / SoObjects / Mailer / SOGoMailAccounts.m

diff --git a/SoObjects/Mailer/SOGoMailAccounts.m b/SoObjects/Mailer/SOGoMailAccounts.m
index d215e8e104ef6231a73737199f1230e8612ac490..bb3ac3ba4687fc2a987b89eef1cc4f9e0fc738c2 100644 (file)
--- a/SoObjects/Mailer/SOGoMailAccounts.m
+++ b/SoObjects/Mailer/SOGoMailAccounts.m
@@ -23,18 +23,11 @@
 #include "SOGoUser+Mail.h"
 #include "common.h"
 #include <NGObjWeb/SoObject+SoDAV.h>
-#include <SOGo/WOContext+Agenor.h>
 
 @implementation SOGoMailAccounts
 
 static NSString *AgenorShareLoginMarker  = @".-.";
 
-/* detect webmail being accessed from the outside */
-
-- (BOOL)isInternetRequest {
-  return ([context isAccessFromIntranet] ? NO : YES);
-}
-
 /* listing the available mailboxes */
 
 - (BOOL) isInHomeFolderBranchOfLoggedInAccount: (NSString *) userLogin
@@ -71,9 +64,6 @@ static NSString *AgenorShareLoginMarker  = @".-.";
   account = [user primaryIMAP4AccountString];
   if ([account isNotNull]) account = [NSArray arrayWithObject:account];
   
-  if ([self isInternetRequest]) /* only show primary mailbox in Internet */
-    return account;
-  
   shares  = [user valueForKey:@"additionalIMAP4AccountStrings"];
   return ([shares count] == 0)
     ? account
@@ -156,19 +146,10 @@ static NSString *AgenorShareLoginMarker  = @".-.";
   }
   
   if ([self isValidMailAccountName:_key]) {
-    /* forbid shares for requests coming from the Internet */
     BOOL isSharedKey;
     
     isSharedKey = [_key rangeOfString:AgenorShareLoginMarker].length > 0;
     
-    if ([self isInternetRequest]) {
-      if (isSharedKey) {
-       return [NSException exceptionWithHTTPStatus:403 /* Forbidden */
-                           reason:
-                             @"Access to shares forbidden from the Internet"];
-      }
-    }
-    
     return isSharedKey
       ? [self sharedMailAccountWithName:_key inContext:_ctx]
       : [self mailAccountWithName:_key inContext:_ctx];
@@ -185,6 +166,11 @@ static NSString *AgenorShareLoginMarker  = @".-.";
   return YES;
 }
 
+- (NSString *) davContentType
+{
+  return @"httpd/unix-directory";
+}
+
 /* acls */
 
 - (NSArray *) aclsForUser: (NSString *) uid