fixbis

ActiveSync/SOGoActiveSyncDispatcher.m

@@ -370,7 +370,9 @@ void handle_eas_terminate(int signum)
   NSMutableString *s;
   NSData *d;
 
-  int type;
+  int type, status;
+
+  status = 1;
 
   parentId = [[(id)[theDocumentElement getElementsByTagName: @"ParentId"] lastObject] textValue];
   displayName = [[(id)[theDocumentElement getElementsByTagName: @"DisplayName"] lastObject] textValue];
@@ -413,7 +415,12 @@ void handle_eas_terminate(int signum)
         // FIXME
         // handle exists (status == 2)
         // handle right synckey
-        if ([newFolder create])
+        if([newFolder exists])
+        {
+          nameInContainer = [newFolder nameInContainer];
+          status = 2;
+        }
+        else if ([newFolder create])
           {
             SOGoMailAccount *accountFolder;
             NSDictionary *imapGUIDs;
@@ -528,7 +535,7 @@ void handle_eas_terminate(int signum)
   [s appendString: @"<?xml version=\"1.0\" encoding=\"utf-8\"?>"];
   [s appendString: @"<!DOCTYPE ActiveSync PUBLIC \"-//MICROSOFT//DTD ActiveSync//EN\" \"http://www.microsoft.com/\">"];
   [s appendString: @"<FolderCreate xmlns=\"FolderHierarchy:\">"];
-  [s appendFormat: @"<Status>%d</Status>", 1];
+  [s appendFormat: @"<Status>%d</Status>", status];
   [s appendFormat: @"<SyncKey>%@</SyncKey>", syncKey];
   [s appendFormat: @"<ServerId>%@</ServerId>", [nameInContainer stringByEscapingURL]];
   [s appendString: @"</FolderCreate>"];

SoObjects/SOGo/SOGoDAVAuthenticator.m

@@ -49,7 +49,7 @@
 - (BOOL) checkLogin: (NSString *) _login
            password: (NSString *) _pwd
 {
-  NSString *domain;
+  NSString *domain, *trueLogin;
   SOGoSystemDefaults *sd;
   SOGoCASSession *session;
   SOGoPasswordPolicyError perr;
@@ -58,9 +58,10 @@
 
   domain = nil;
   perr = PolicyNoError;
+  trueLogin = [_login stringByReplacingString: @"%40"
+                                           withString: @"@"];
   rc = ([[SOGoUserManager sharedUserManager]
-          checkLogin: [_login stringByReplacingString: @"%40"
-                                           withString: @"@"]
+          checkLogin: trueLogin
             password: _pwd
               domain: &domain
                 perr: &perr